X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fcurrent_user.inc;h=ee9e38f05c06c54718af2d653707c52c03396ffa;hb=8f7ac519b7aaf8ec219862597e878d3a28316ac6;hp=f55f248dd2618c27c58912a7261dc3f040ef8144;hpb=850b2dc645b7e16d6b2f5a5e10cac03d8956180c;p=fa-stable.git

diff --git a/includes/current_user.inc b/includes/current_user.inc
index f55f248d..ee9e38f0 100644
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -15,13 +15,15 @@ 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;
@@ -30,7 +32,10 @@ class current_user
 
 	function current_user()
 	{
-		$this->loginname = $this->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 = new user_prefs();
@@ -49,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;
@@ -111,13 +115,13 @@ class current_user
 		$showgl, $showcodes, $date_format, $date_sep, $tho_sep, $dec_sep, 
 		$theme, $pagesize, $show_hints, $profile, $rep_popup, $query_size, 
 		$graphic_links, $lang, $stickydate) {
-		update_user_display_prefs($this->username, $price_dec, 
+		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, $lang, $stickydate);
 
 		// re-read the prefs
-		$user = get_user($this->username);
+		$user = get_user($this->user);
 		$this->prefs = new user_prefs($user);
 	}
 }
@@ -150,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) {
@@ -318,24 +323,30 @@ function set_user_prefs($price_dec, $qty_dec, $exrate_dec, $percent_dec, $showgl
 }
 
 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"
+	  . "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()
+{
+	return get_company_pref('login_tout');
+}
 ?>
\ No newline at end of file