X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fmain.inc;h=be058ed9293306e1fa933b09b09a1df1b8dd218d;hb=66cfb670d9261ad0364a91822dc0766de1620799;hp=322a51bb8ee442e14eb77aa628534afe0cfd0e7e;hpb=76f793a7214ab8decbe6de5da0b15f234610c3ac;p=fa-stable.git

diff --git a/includes/main.inc b/includes/main.inc
index 322a51bb..be058ed9 100644
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -179,6 +179,9 @@ function js_compress($sJS)
 	
 		//loop through line's characters and take out any literal strings, replace them with ___i___ where i is the index of this string
 		$len = strlen($line);
+		if (version_compare(PHP_VERSION, '7.0.0') >= 0) // uninitialized string offser error fix. @Braath Waate
+			$line .= chr(32);
+		
 		for($j=0;$j<$len;$j++)
 		{
 			$c = $line[$j];		// this is _really_ faster than subst
@@ -418,7 +421,28 @@ if (!function_exists('array_fill_keys')) // since 5.2
 {
 	function array_fill_keys($keys, $value)
 	{
-		return array_combine($keys, array_fill(count($keys), $value));
+		return (object)array_combine($keys, array_fill(count($keys), $value));
 	}
 }
 
+/*
+	This function aims to generate cryptographically strong random identifier.
+	Result identifier has length 4[strength/8/3] 
+*/
+function random_id($strength = 128)
+{
+	$n = ceil($strength/8);
+
+	if (function_exists('openssl_random_pseudo_bytes'))
+		$bin = openssl_random_pseudo_bytes($n, $cstrong); 	// openssl on php 5.3 and up
+	else if (file_exists('/dev/urandom'))
+		$bin = file_get_contents('/dev/urandom', false, null, -1, $n);  // linux std random device
+	else {
+		$bin = '';
+		for($i=0; $i < $n; $i++)
+			$bin .= chr(mt_rand(0, 255));	// Mersene Twister generator
+	}
+	$id = strtr(base64_encode($bin), '+/=', '-_x');	// see RFC 4648 Section 5
+
+	return $id;
+}