X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fcurrent_user.inc;h=c1c68e439a287070a98d1d543b9a2566b7eca056;hb=bb991dc5b071e966b39954bb53d3b0efe8420938;hp=bb265047d0934bf6637318106c40a6986f194762;hpb=839171c1b88061ca27cfd8c81b10fac332ae9f47;p=fa-stable.git

diff --git a/includes/current_user.inc b/includes/current_user.inc
index bb265047..c1c68e43 100644
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -127,7 +127,6 @@ class current_user
 	function can_access($page_level)
 	{
 		global $security_groups, $security_areas;
-
 		if (isset($security_groups)) {
 			return $this->company == 0 &&
 				in_array(20, $security_groups[$this->access]);
@@ -135,7 +134,10 @@ class current_user
 
 		if ($page_level === 'SA_OPEN') 
 			return true;
-		$code = @$security_areas[$page_level][0];
+		if ($page_level === 'SA_DENIED' || $page_level === '') 
+			return false;
+
+		$code = $security_areas[$page_level][0];
 
 		// only first registered company has site admin privileges
 		return $code && in_array($code, $this->role_set)
@@ -147,11 +149,11 @@ class current_user
 		return $this->can_access($page_level);
 	}
 
-	function get_db_connection()
+	function get_db_connection($id=-1)
 	{
     	global $db_connections;
 
-    	$connection = $db_connections[$this->company];
+    	$connection = $db_connections[$id == -1 ? $this->company : $id];
 
     	//print_r($connection);
 
@@ -165,18 +167,15 @@ class current_user
     	return $db;
 	}
 
-	function update_prefs($price_dec, $qty_dec, $exrate_dec, $percent_dec, 
-		$showgl, $showcodes, $date_format, $date_sep, $tho_sep, $dec_sep, 
-		$theme, $pagesize, $show_hints, $profile, $rep_popup, $query_size, 
-		$graphic_links, $lang, $stickydate, $startup_tab) {
-		update_user_display_prefs($this->user, $price_dec, 
-			$qty_dec, $exrate_dec, $percent_dec, $showgl, $showcodes, 
-			$date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize, 
-			$show_hints, $profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate, $startup_tab);
-
-		// re-read the prefs
-		$user = get_user($this->user);
-		$this->prefs = new user_prefs($user);
+	function update_prefs($prefs)
+	{
+		global $allow_demo_mode;
+		
+		if(!$allow_demo_mode) {
+			update_user_prefs($this->user, $prefs);
+		}
+
+		$this->prefs = new user_prefs(get_user($this->user));
 	}
 }
 
@@ -184,7 +183,7 @@ class current_user
 
 function round2($number, $decimals=0)
 {
-	$delta = ($number < 0 ? -.000001 : .000001);
+	$delta = ($number < 0 ? -.0000000001 : .0000000001);
 	return round($number+$delta, $decimals);
 }
 
@@ -194,7 +193,7 @@ function number_format2($number, $decimals=0)
 	$tsep = $thoseps[$_SESSION["wa_current_user"]->prefs->tho_sep()];
 	$dsep = $decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()];
 	//return number_format($number, $decimals, $dsep,	$tsep);
-	$delta = ($number < 0 ? -.000001 : .000001);
+	$delta = ($number < 0 ? -.0000000001 : .0000000001);
 	return number_format($number+$delta, $decimals, $dsep,	$tsep);
 }
 //
@@ -222,6 +221,15 @@ function price_decimal_format($number, &$dec)
 	}
 	return number_format2($number, $dec);
 }
+// function money_format doesn't exist in OS Win.
+if (!function_exists('money_format'))
+{
+	function money_format($format, $number) 
+	{
+		return price_format($number);
+	} 
+}	
+
 // 2008-06-15. Added extra parameter $stock_id and reference for $dec
 //--------------------------------------------------------------------
 function qty_format($number, $stock_id=null, &$dec) {
@@ -255,10 +263,12 @@ function user_numeric($input) {
 
     $num = trim($input);
     $sep = $thoseps[user_tho_sep()];
-    if($sep!='') $num = str_replace( $sep, '', $num);
-	str_replace($sep, '', $num);
+    if ($sep!='')
+    	$num = str_replace( $sep, '', $num);
+
     $sep = $decseps[user_dec_sep()];
-    if($sep!='.') $num = str_replace( $sep, '.', $num);
+    if ($sep!='.')
+    	$num = str_replace( $sep, '.', $num);
 
     if (!is_numeric($num))
 	  return false;
@@ -384,14 +394,9 @@ function user_startup_tab()
 	return $_SESSION["wa_current_user"]->prefs->start_up_tab();
 }
 
-function set_user_prefs($price_dec, $qty_dec, $exrate_dec, $percent_dec, $showgl, $showcodes,
-	$date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize, $show_hints,
-	$print_profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate, $startup_tab)
+function set_user_prefs($prefs)
 {
-
-	$_SESSION["wa_current_user"]->update_prefs($price_dec, $qty_dec, $exrate_dec, $percent_dec, $showgl, $showcodes,
-		$date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize, $show_hints,
-		$print_profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate, $startup_tab);
+	$_SESSION["wa_current_user"]->update_prefs($prefs);
 }
 
 function add_user_js_data() {
@@ -422,4 +427,76 @@ function session_timeout()
 	$tout = @get_company_pref('login_tout'); // mask warning for db ver. 2.2
 	return $tout ? $tout : ini_get('session.gc_maxlifetime');
 }
+
+//-----------------------------------------------------------------------------
+//	Inserts $elements into $array at position $index.
+//	$elements is list of any objects
+//
+function array_insert(&$array, $index, $elements)
+{
+	if (!is_array($elements)) $elements = array($elements);
+
+	$head  = array_splice($array, 0, $index);
+	$array = array_merge($head, $elements, $array);
+}
+
+function array_remove(&$array, $index, $len=1)
+{
+	array_splice($array, $index, $len);
+}
+
+function array_substitute(&$array, $index, $len, $elements)
+{
+	array_splice($array, $index, $len);
+	array_insert($array, $index, $elements);
+}
+
+function array_append(&$array, $elements)
+{
+	foreach($elements as $key => $el) {
+		if(is_int($key))
+			$array[] = $el;
+		else
+			$array[$key] = $el;
+	}
+}
+//
+//	Search $needle in $haystack or in $haystack[][$valuekey]
+//	returns $needle found or null.
+//
+function array_search_value($needle, $haystack, $valuekey=null)
+{
+	foreach($haystack as $key => $value) {
+		$val = isset($valuekey) ? $value[$valuekey] : $value;
+		if ($needle == $val){
+			return $value;
+		}
+	}
+	return null;
+}
+//
+//	Search $needle in $haystack or in $haystack[][$valuekey]
+//	returns array of keys of $haystack elements found
+//
+function array_search_keys($needle, $haystack, $valuekey=null)
+{
+	$keys = array();
+	if($haystack)
+		foreach($haystack as $key => $value) {
+			$val = isset($valuekey) ? $value[$valuekey] : $value;
+			if ($needle == $val){
+				$keys[] = $key;
+			}
+		}
+	return $keys;
+}
+//
+//	Find first (single) $needle in $haystack or in $haystack[][$valuekey]
+//	returns $haystack element found or null
+//
+function array_search_key($needle, $haystack, $valuekey=null)
+{
+	$keys = array_search_keys($needle, $haystack, $valuekey);
+	return @$keys[0];
+}
 ?>
\ No newline at end of file