X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fmain.inc;h=be058ed9293306e1fa933b09b09a1df1b8dd218d;hb=97ce7657f26ca3cc7f7d705a8ca019bf06b31600;hp=f5ecd4d6f491659c21229184443e957aba89341c;hpb=3b06c6c4718610a408cae2e9b76c3134ca30b84c;p=fa-stable.git

diff --git a/includes/main.inc b/includes/main.inc
index f5ecd4d6..be058ed9 100644
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -23,6 +23,12 @@ include_once($path_to_root . "/includes/ui/ui_view.inc");
 include_once($path_to_root . "/includes/ui/ui_controls.inc");
 
 $page_nested = -1;
+// static js files path
+$js_path = $path_to_root.'/js/';
+// standard external js scripts included in all files
+$js_static = array('JsHttpRequest.js', 'behaviour.js', 'utils.js', 'inserts.js');
+// additional js source included in header
+$js_lib = $js_userlib = array();
 
 function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $script_only=false, $css='')
 {
@@ -62,11 +68,29 @@ function end_page($no_menu=false, $is_index=false, $final_screen=false, $type_no
 	page_footer($no_menu, $is_index);
 }
 
+function css_files_ensure_init() {
+	global $css_files, $path_to_root;
+
+	if (!isset($css_files))
+	{
+		$theme = user_theme();
+		$css_files = array();
+		$css_files[] = $path_to_root . "/themes/$theme/default.css";
+	}
+}
+
+function add_css_file($filename)
+{
+	global $css_files;
+	css_files_ensure_init();
+	$css_files[] = $filename;
+}
+
 function cache_js_file($fpath, $text) 
 {
-	global $go_debug;
+	global $SysPrefs;
 
-	if(!$go_debug) $text = js_compress($text);
+	if (!$SysPrefs->go_debug) $text = js_compress($text);
 
     $file = force_open($fpath);
 	if (!$file) return false;
@@ -117,7 +141,7 @@ function add_js_ufile($filename)
 function add_js_source($text) 
 {
 	  global $js_lib;
-	  
+
 	  $search = array_search($text, $js_lib);
 	  if ($search === false || $search === null) // php>4.2.0 returns null
 		$js_lib[] = $text;
@@ -155,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
@@ -377,4 +404,45 @@ function clean_file_name($filename) {
     return preg_replace('/[^a-zA-Z0-9.\-_]/', '_', $filename);
 }
 
-?>
\ No newline at end of file
+/*
+	Simple random password generator.
+*/
+function generate_password()
+{
+	if (PHP_VERSION >= '5.3')
+		$bytes = openssl_random_pseudo_bytes(8, $cstrong);
+	else
+		$bytes = sprintf("08%x", mt_rand(0,0xffffffff));
+
+	return  base64_encode($bytes);
+}
+
+if (!function_exists('array_fill_keys')) // since 5.2
+{
+	function array_fill_keys($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;
+}