X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fcurrent_user.inc;h=dabec3ce2cfd94f6b33ed52cbbbce8e5cef8dcb5;hb=2e181b13aa722a43e78b897404912d6b13a0a937;hp=4d2d208177d0af531764cf1a097c64d6acaa2f73;hpb=9ee0badebd7b5c62dc964ef399e6bd36ae9d8348;p=fa-stable.git

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 4d2d2081..dabec3ce 100644
--- 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");
 
 //--------------------------------------------------------------------------
@@ -21,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()
@@ -100,11 +109,11 @@ 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) {
+		$theme, $pagesize, $show_hints, $profile, $rep_popup, $query_size, $graphic_links) {
 		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, $query_size);
+			$show_hints, $profile, $rep_popup, $query_size, $graphic_links);
 
 		// re-read the prefs
 		$user = get_user($this->username);
@@ -114,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.
@@ -279,14 +296,19 @@ 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 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)
+	$print_profile, $rep_popup, $query_size, $graphic_links)
 {
 
 	$_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);
+		$print_profile, $rep_popup, $query_size, $graphic_links);
 }
 
 function add_user_js_data() {