X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fcurrent_user.inc;h=53e7855cdc931db5ccd15d2734719c5b24a8626c;hb=c2f2b28297b0355051ca2508fc7778438f5c6a3d;hp=023591d351852727b06a1022b3b0e8d0eab29213;hpb=2b1a80aee9aa1265589bb59933e8bd322c50fc2b;p=fa-stable.git

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 023591d3..53e7855c 100644
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -15,10 +15,10 @@ 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;
@@ -49,27 +49,24 @@ 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;
+			}
 		}
 
 		return $this->logged;
@@ -110,14 +107,14 @@ 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, 
-		$graphic_links, $lang) {
-		update_user_display_prefs($this->username, $price_dec, 
+		$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, $graphic_links, $lang);
+			$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);
 	}
 }
@@ -302,30 +299,38 @@ 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, $graphic_links, $lang)
+	$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, $graphic_links, $lang);
+		$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);
 }