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

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 4d2d2081..549c31b0 100644
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -1,18 +1,29 @@
 <?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");
 
 //--------------------------------------------------------------------------
 
 class current_user
 {
-
+	var $user;
 	var $loginname;
 	var $username;
-	var	$name;
+	var $name;
 	var $company;
 	var $pos;
 	var $access;
+	var $timeout;
+	var $last_act;
 
 	var $logged;
 	var $ui_mode = 0;
@@ -21,10 +32,13 @@ class current_user
 
 	function current_user()
 	{
-		$this->loginname = $username = $this->name = $this->company = "";
+		global $def_coy;
+		
+		$this->loginname = $this->username = $this->name = "";
+		$this->company = isset($def_coy)? $def_coy : 0;
 		$this->logged = false;
 
-		$this->prefs = null;
+		$this->prefs = new user_prefs();
 	}
 
 	function logged_in()
@@ -40,27 +54,26 @@ 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;
+				$this->last_act = time();
+				$this->timeout = session_timeout();
+			}
 		}
 
 		return $this->logged;
@@ -100,26 +113,35 @@ 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) {
-		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);
+			$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);
 	}
 }
 
 //--------------------------------------------------------------------------
 
+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.
@@ -132,6 +154,7 @@ function price_format($number) {
     return number_format2($number,
 	$_SESSION["wa_current_user"]->prefs->price_dec());
 }
+
 // 2008-06-15. Added extra parameter $stock_id and reference for $dec
 //--------------------------------------------------------------------
 function qty_format($number, $stock_id=null, &$dec) {
@@ -279,34 +302,52 @@ 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, $query_size)
+	$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);
+		$print_profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate);
 }
 
 function add_user_js_data() {
-	global $path_to_root, $thoseps, $decseps;
+	global $path_to_root, $thoseps, $decseps, $date_system, $dateseps;
 
 	$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"	// server date
+	  . "datesys: ".$date_system.",\n"
+	  . "datefmt: ".user_date_format().",\n"
+	  . "datesep: '".$dateseps[user_date_sep()]."',\n"
 	  . "ts: '$ts',\n"
 	  . "ds: '$ds',\n"
-	  . "pdec : " . user_price_dec() . "}\n--></script>";
+	  . "pdec : " . user_price_dec() . "}\n";
 
   add_js_source($js);
 }
 
 //--------------------------------------------------------------------------
 
+function session_timeout()
+{
+	$tout = @get_company_pref('login_tout'); // mask warning for db ver. 2.2
+	return $tout ? $tout : ini_get('session.gc_maxlifetime');
+}
 ?>
\ No newline at end of file