X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fprefs%2Fuserprefs.inc;h=93f941807bc40143a16205270a8805eb6895259f;hb=fbdfe3f3da62ecf86e3ad978b89efbb6c317a47a;hp=00b77a9a34fe2df0d4d1cce5f1efbb0a841da130;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/includes/prefs/userprefs.inc b/includes/prefs/userprefs.inc
index 00b77a9a..93f94180 100644
--- a/includes/prefs/userprefs.inc
+++ b/includes/prefs/userprefs.inc
@@ -33,31 +33,56 @@ class user_prefs
 	var $show_hints;
 	var $query_size; // table pager page length
 	var $graphic_links; // use graphic links
-
-	function user_prefs(&$user) 
-	{
-
-		$this->language = $user["language"];
-		language::set_language($this->language);
-
-		$this->qty_dec = $user["qty_dec"];
-		$this->price_dec = $user["prices_dec"];
-		$this->exrate_dec = $user["rates_dec"];
-		$this->percent_dec = $user["percent_dec"];
-
-		$this->show_gl_info = $user["show_gl"];
-		$this->show_codes = $user["show_codes"];
-		$this->date_format = $user["date_format"];
-		$this->date_sep = $user["date_sep"];
-		$this->tho_sep = $user["tho_sep"];
-		$this->dec_sep = $user["dec_sep"];
-		$this->theme = $user["theme"];
-		$this->pagesize = $user["page_size"];
-		$this->show_hints = $user["show_hints"];
-		$this->print_profile = $user["print_profile"];
-		$this->rep_popup = $user["rep_popup"];
-		$this->query_size = $user["query_size"];
-		$this->graphic_links = $user["graphic_links"];
+	var $sticky_date;	// save date on subsequent document entry
+	var $startup_tab;  // default start-up menu tab
+	
+	function user_prefs($user=null)
+	{
+		if ($user == null) { 
+			// set default values, used before login
+			global $dflt_lang, $dflt_date_sep, $dflt_date_fmt;
+			
+			$this->date_sep = $dflt_date_sep;
+			$this->date_format = $dflt_date_fmt;
+			$this->tho_sep = 0;
+			$this->dec_sep = 0;
+			$this->price_dec = 2;
+			$this->language = $dflt_lang;
+			$this->theme = 'default';
+			
+		} else {
+			$this->language = $user["language"];
+			$_SESSION['language']->set_language($this->language);
+
+			$this->qty_dec = $user["qty_dec"];
+			$this->price_dec = $user["prices_dec"];
+			$this->exrate_dec = $user["rates_dec"];
+			$this->percent_dec = $user["percent_dec"];
+
+			$this->show_gl_info = $user["show_gl"];
+			$this->show_codes = $user["show_codes"];
+			$this->date_format = $user["date_format"];
+			$this->date_sep = $user["date_sep"];
+			$this->tho_sep = $user["tho_sep"];
+			$this->dec_sep = $user["dec_sep"];
+			$this->theme = $user["theme"];
+			$this->pagesize = $user["page_size"];
+			$this->show_hints = $user["show_hints"];
+			$this->print_profile = $user["print_profile"];
+			$this->rep_popup = $user["rep_popup"];
+			$this->query_size = $user["query_size"];
+			$this->graphic_links = $user["graphic_links"];
+			if (isset($user["sticky_doc_date"]))
+			{
+				$this->sticky_date = $user["sticky_doc_date"];
+				$this->startup_tab = $user['startup_tab'];
+			}
+			else
+			{
+				$this->sticky_date = 0;
+				$this->startup_tab = "orders";
+			}
+		}
 	}
 
 	function language() 
@@ -161,6 +186,16 @@ class user_prefs
 	{
 		return $this->graphic_links;
 	}
+	
+	function sticky_date()
+	{
+		return $this->sticky_date;
+	}
+	
+	function start_up_tab()
+	{
+		return $this->startup_tab;
+	}
 
 	function set_dec($price_dec, $qty_dec, $exrate_dec, $percent_dec, $showgl, $showcodes) 
 	{