Better color in data picker

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

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 1a9396d3f9c7a715ac22b1e2c74269aeeaa8c617..dabec3ce2cfd94f6b33ed52cbbbce8e5cef8dcb5 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
-    Copyright (C) 2005-2008  FrontAccounting, LLC.
-       Released under the terms of the GNU Affero General Public License,
-       AGPL, as published by the Free Software Foundation, either version 
-       3 of the License, or (at your option) any later version.
+    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/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 include_once($path_to_root . "/includes/prefs/userprefs.inc");
 
@@ -30,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()
@@ -123,12 +123,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.