Fixed error handling in debug mode

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

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 05b98800643be3190a59d21175450dd77377b5a4..b6663e31d2d045f3539facf4dc4e8a3d749f86e3 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 include_once($path_to_root . "/includes/prefs/userprefs.inc");
 
 //--------------------------------------------------------------------------
@@ -11,6 +20,7 @@ class current_user
        var $username;
        var     $name;
        var $company;
+       var $pos;
        var $access;
 
        var $logged;
@@ -20,10 +30,10 @@ class current_user
 
        function current_user()
        {
-               $this->loginname = $username = $this->name = $this->company = "";
+               $this->loginname = $this->username = $this->name = $this->company = "";
                $this->logged = false;
 
-               $this->prefs = null;
+               $this->prefs = new user_prefs();
        }
 
        function logged_in()
@@ -48,6 +58,7 @@ class current_user
 
                    $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);
@@ -98,11 +109,12 @@ 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) {
+               $theme, $pagesize, $show_hints, $profile, $rep_popup, $query_size, 
+               $graphic_links, $lang, $stickydate) {
                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, 
-                       $show_hints, $profile, $rep_popup);
+                       $show_hints, $profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate);
 
                // re-read the prefs
                $user = get_user($this->username);
@@ -112,12 +124,20 @@ class current_user
 
 //--------------------------------------------------------------------------
 
+function round2($number, $decimals=0)
+{
+       $delta = ($number < 0 ? -.000001 : .000001);
+       return round($number+$delta, $decimals);
+}
+
 function number_format2($number, $decimals=0)
 {
        global $thoseps, $decseps;
        $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);
+       //return number_format($number, $decimals, $dsep,       $tsep);
+       $delta = ($number < 0 ? -.000001 : .000001);
+       return number_format($number+$delta, $decimals, $dsep,  $tsep);
 }
 //
 //     Current ui mode.
@@ -182,6 +202,11 @@ function user_company()
        return $_SESSION["wa_current_user"]->company;
 }
 
+function user_pos()
+{
+       return $_SESSION["wa_current_user"]->pos;
+}
+
 function user_language()
 {
        return $_SESSION["wa_current_user"]->prefs->language();
@@ -267,14 +292,29 @@ function user_rep_popup()
        return $_SESSION["wa_current_user"]->prefs->rep_popup();
 }
 
+function user_query_size()
+{
+       return $_SESSION["wa_current_user"]->prefs->query_size();
+}
+
+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)
+       $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);
+               $print_profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate);
 }
 
 function add_user_js_data() {
@@ -283,14 +323,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);
 }