Primary key in users table changed to 'id'.

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

diff --git a/includes/current_user.inc b/includes/current_user.inc
index dabec3ce2cfd94f6b33ed52cbbbce8e5cef8dcb5..97afe9d0cdbd1d2e55df7b858a2d0632a184afdd 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -15,10 +15,10 @@ include_once($path_to_root . "/includes/prefs/userprefs.inc");
 
 class current_user
 {
-
+       var $user;
        var $loginname;
        var $username;
-       var     $name;
+       var $name;
        var $company;
        var $pos;
        var $access;
@@ -49,27 +49,24 @@ class current_user
        function login($company, $loginname, $password)
        {
                $this->set_company($company);
+           $this->logged = false;
 
                $Auth_Result = get_user_for_login($loginname, $password);
 
                if (db_num_rows($Auth_Result) > 0)
                {
-            $myrow = db_fetch($Auth_Result);
-
+                       $myrow = db_fetch($Auth_Result);
+                       if (! @$myrow["inactive"]) {
                    $this->access = $myrow["full_access"];
                    $this->name = $myrow["real_name"];
                    $this->pos = $myrow["pos"];
                    $this->loginname = $loginname;
                    $this->username = $this->loginname;
                    $this->prefs = new user_prefs($myrow);
-
-                   update_user_visitdate($loginname);
-                   $this->logged = true;
-
-               }
-               else
-               {
-                       $this->logged = false;
+                   $this->user = @$myrow["id"];
+                       update_user_visitdate($this->username);
+                       $this->logged = true;
+                       }
                }
 
                return $this->logged;
@@ -109,14 +106,15 @@ 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) {
-               update_user_display_prefs($this->username, $price_dec, 
+               $theme, $pagesize, $show_hints, $profile, $rep_popup, $query_size, 
+               $graphic_links, $lang, $stickydate) {
+               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);
+                       $show_hints, $profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate);
 
                // re-read the prefs
-               $user = get_user($this->username);
+               $user = get_user($this->user);
                $this->prefs = new user_prefs($user);
        }
 }
@@ -301,14 +299,19 @@ function user_graphic_links()
        return $_SESSION["wa_current_user"]->prefs->graphic_links();
 }
 
+function sticky_doc_date()
+{
+       return $_SESSION["wa_current_user"]->prefs->sticky_date();
+}
+
 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)
+       $print_profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate)
 {
 
        $_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);
+               $print_profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate);
 }
 
 function add_user_js_data() {
@@ -317,14 +320,14 @@ function add_user_js_data() {
        $ts = $thoseps[user_tho_sep()];
        $ds = $decseps[user_dec_sep()];
 
-    $js = "\n<script type=\"text/javascript\">\n"
-         . "<!--\n"
+    $js = "\n"
          . "var user = {\n"
-         . "theme: '". $path_to_root . '/themes/'. 'default' /*user_theme()*/.'/'."',\n"
+         . "theme: '". $path_to_root . '/themes/'. user_theme().'/'."',\n"
          . "loadtxt: '"._('Requesting data...')."',\n"
+         . "date: '".Today()."',\n"
          . "ts: '$ts',\n"
          . "ds: '$ds',\n"
-         . "pdec : " . user_price_dec() . "}\n--></script>";
+         . "pdec : " . user_price_dec() . "}\n";
 
   add_js_source($js);
 }