Restored multi field search in item select and display of currency in customer sel.

[fa-stable.git] / includes / current_user.inc

diff --git a/includes/current_user.inc b/includes/current_user.inc
index a913bf5e56789ef8ddfc66e85aafd6d3a8a4dc21..9e5938eba5e2f1bc1092420b0860aa79683119f8 100644 (file)
--- 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 
                {
@@ -93,9 +94,9 @@ 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) {
+               $date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize, $show_hints) {
                update_user_display_prefs($this->username, $price_dec, $qty_dec, $exrate_dec, $percent_dec, $showgl,
-                       $showcodes, $date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize);
+                       $showcodes, $date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize, $show_hints);
 
                // re-read the prefs
                $user = get_user($this->username);
@@ -227,12 +228,35 @@ function user_pagesize()
        return $_SESSION["wa_current_user"]->prefs->get_pagesize();
 }
 
+function user_hints() 
+{
+       return $_SESSION["wa_current_user"]->prefs->show_hints();
+}
+
 function set_user_prefs($price_dec, $qty_dec, $exrate_dec, $percent_dec, $showgl, $showcodes,
-       $date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize) 
+       $date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize, $show_hints) 
 {
 
        $_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);
+               $date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize, $show_hints);
+}
+
+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);
 }
 
 //--------------------------------------------------------------------------