X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fprefs%2Fuserprefs.inc;h=50fa0a8811e1b5cf3a32a220dcae1179ff0a1746;hb=3613e32ad573d5faccb974a421702bdd87583878;hp=43afba6fff0225fb97466ea2648a1d6692273e61;hpb=0d6c125d288d9b8c533b179f7f88aa748890047a;p=fa-stable.git

diff --git a/includes/prefs/userprefs.inc b/includes/prefs/userprefs.inc
index 43afba6f..50fa0a88 100644
--- a/includes/prefs/userprefs.inc
+++ b/includes/prefs/userprefs.inc
@@ -33,19 +33,26 @@ class user_prefs
 	var $show_hints;
 	var $query_size; // table pager page length
 	var $graphic_links; // use 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;
+			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"];
-			language::set_language($this->language);
+			$_SESSION['language']->set_language($this->language);
 
 			$this->qty_dec = $user["qty_dec"];
 			$this->price_dec = $user["prices_dec"];
@@ -65,9 +72,44 @@ class user_prefs
 			$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 get_all()
+	{
+			return array(
+			'language' => $this->language,
+			'qty_dec' => $this->qty_dec,
+			'prices_dec' => $this->price_dec,
+			'rates_dec' => $this->exrate_dec,
+			'percent_dec' => $this->percent_dec,
+			'show_gl' => $this->show_gl_info,
+			'show_codes' => $this->show_codes,
+			'date_format' =>$this->date_format,
+			'date_sep' => $this->date_sep,
+			'tho_sep' => $this->tho_sep,
+			'dec_sep' => $this->dec_sep,
+			'theme' => $this->theme,
+			'page_size' => $this->pagesize,
+			'show_hints' => $this->show_hints,
+			'print_profile' => $this->print_profile,
+			'rep_popup' => $this->rep_popup,
+			'query_size' => $this->query_size,
+			'graphic_links' => $this->graphic_links,
+			'sticky_doc_date' => $this->sticky_date,
+			'startup_tab' => $this->startup_tab);
+	}
+	
 	function language() 
 	{
 		return $this->language;
@@ -169,6 +211,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) 
 	{