X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fcurrent_user.inc;h=ea106e152b081c57a51d0a0215ae6f0ceed87990;hb=c51f4515e92fc251aa51b7809d4514161655fa37;hp=29705106919d5ddf505aced28f432bd530f912ab;hpb=2a49105ee2573b6167425382888f0cf5ae0e5e3a;p=fa-stable.git

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 29705106..ea106e15 100644
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -170,15 +170,30 @@ class current_user
 	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);
+		$graphic_links, $lang, $stickydate, $startup_tab)
+	{
+		global $allow_demo_mode;
+
+		$user = array(
+			'prices_dec' => $price_dec, 	'qty_dec' => $qty_dec,
+			'rates_dec' => $exrate_dec,		'percent_dec' => $percent_dec,
+			'show_gl' => $showgl,			'show_codes' => $showcodes,
+			'date_format' => $date_format,	'date_sep' => $date_sep,
+			'tho_sep' => $tho_sep,			'dec_sep' => $dec_sep,
+			'theme' => $theme,				'page_size' => $pagesize,
+			'show_hints' => $show_hints,	'print_profile' => $profile,
+			'rep_popup' => $rep_popup,		'query_size' => $query_size,
+			'graphic_links' => $graphic_links,	'language' => $lang,
+			'sticky_doc_date' => $stickydate,	'startup_tab' => $startup_tab
+		);
+
+		if(!$allow_demo_mode) {
+			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);
+		}
+		$this->prefs = new user_prefs(get_user($this->user));
 	}
 }
 
@@ -224,6 +239,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) {
@@ -257,10 +281,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;