X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fcurrent_user.inc;h=12d559dd178d752d4f4d48fa75c43352785256de;hb=bcbf5c697db09a36994f391b5fe568d269145c68;hp=a86d00d3058ac68493f56c34e47cfabd659501a3;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/includes/current_user.inc b/includes/current_user.inc
index a86d00d3..12d559dd 100644
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -45,14 +45,15 @@ class current_user
 		{
             $myrow = db_fetch($Auth_Result);
 
-            $this->access = $myrow["full_access"];
-            $this->name = $myrow["real_name"];
-            $this->loginname = $loginname;
-            $this->username = $this->loginname;
-            $this->prefs = new user_prefs($myrow);
-
-			update_user_visitdate($loginname);
-			$this->logged = true;
+        	    $this->access = $myrow["full_access"];
+        	    $this->name = $myrow["real_name"];
+        	    $this->loginname = $loginname;
+        	    $this->username = $this->loginname;
+        	    $this->prefs = new user_prefs($myrow);
+
+		    update_user_visitdate($loginname);
+		    $this->logged = true;
+
 		} 
 		else 
 		{
@@ -113,6 +114,45 @@ function number_format2($number, $decimals=0)
 	return number_format($number, $decimals, $dsep,	$tsep);
 }
 
+function price_format($number) {
+    return number_format2($number, 
+	$_SESSION["wa_current_user"]->prefs->price_dec());
+}
+
+function qty_format($number) {
+    return number_format2($number, 
+	$_SESSION["wa_current_user"]->prefs->qty_dec());
+}
+
+function exrate_format($number) {
+    return number_format2($number, 
+	$_SESSION["wa_current_user"]->prefs->exrate_dec());
+}
+
+function percent_format($number) {
+    return number_format2($number, 
+	$_SESSION["wa_current_user"]->prefs->percent_dec());
+}
+
+function user_numeric($input) {
+    global $decseps, $thoseps;
+
+    $num = trim($input);
+    $sep = $thoseps[user_tho_sep()];
+    if($sep!='') $num = str_replace( $sep, '', $num);
+	str_replace($sep, '', $num);
+    $sep = $decseps[user_dec_sep()];
+    if($sep!='.') $num = str_replace( $sep, '.', $num);
+    
+    if (!is_numeric($num))
+	  return false;
+    $num = (float)$num;
+    if ($num == (int)$num)
+	  return (int)$num;
+    else
+	  return $num;
+}
+
 function user_company() 
 {
 	return $_SESSION["wa_current_user"]->company;
@@ -196,6 +236,24 @@ function set_user_prefs($price_dec, $qty_dec, $exrate_dec, $percent_dec, $showgl
 		$date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize);
 }
 
+function add_user_js_data() {
+	global $path_to_root, $thoseps, $decseps;
+
+	$ts = $thoseps[user_tho_sep()];
+	$ds = $decseps[user_dec_sep()];
+  
+    $js = "\n<script type=\"text/javascript\">\n"
+	  . "<!--\n"
+	  . "var user = {\n"
+	  . "theme: '". $path_to_root . '/themes/'. 'default' /*user_theme()*/.'/'."',\n"
+	  . "loadtxt: '"._('Requesting data...')."',\n"
+	  . "ts: '$ts',\n"
+	  . "ds: '$ds',\n"
+	  . "pdec : " . user_price_dec() . "}\n--></script>";
+
+  add_js_source($js);
+}
+
 //--------------------------------------------------------------------------
 
 ?>
\ No newline at end of file