X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fprefs%2Fuserprefs.inc;h=24cd15c5cca9dbdc353025230122916ae284a341;hb=7ad222595e84451daea8aaa06c83d817cc3c774c;hp=43afba6fff0225fb97466ea2648a1d6692273e61;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git

diff --git a/includes/prefs/userprefs.inc b/includes/prefs/userprefs.inc
index 43afba6f..24cd15c5 100644
--- a/includes/prefs/userprefs.inc
+++ b/includes/prefs/userprefs.inc
@@ -9,7 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-class user_prefs 
+
+class user_prefs extends \stdClass
 {
 
 	var $language;
@@ -33,19 +34,37 @@ 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
+	var $transaction_days; // transaction days in inquiries
+	var $save_report_selection; // save report selections days 0...
+	var $use_date_picker; // use date picker for all date fields
+	var $def_print_destination; // default print destination. 0 = PDF/Printer, 1 = Excel
+	var $def_print_orientation; // default print orientation. 0 = Portrait. 1 = Landscape
 
-	function user_prefs($user=null)
+	function __construct($user=null)
 	{
 		if ($user == null) { 
 			// set default values, used before login
-			global $dflt_lang;
-			
+			global $dflt_lang, $SysPrefs;
+
+			$this->date_sep = $SysPrefs->dflt_date_sep;
+			$this->date_format = $SysPrefs->dflt_date_fmt;
+			$this->tho_sep = 0;
+			$this->dec_sep = 0;
+			$this->price_dec = 2;
 			$this->language = $dflt_lang;
 			$this->theme = 'default';
-			
+			$this->transaction_days = -30;
+			$this->save_report_selections = 0;
+			$this->use_date_picker = 1;
+			$this->def_print_destination = 0;
+			$this->def_print_orientation = 0;
+
 		} else {
+			global $path_to_root;
 			$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 +84,56 @@ 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";
+			}
+			$this->transaction_days = @$user['transaction_days'];
+			$this->save_report_selections = @$user['save_report_selections'];
+			$this->use_date_picker = @$user['use_date_picker'];
+			$this->def_print_destination = @$user['def_print_destination'];
+			$this->def_print_orientation = @$user['def_print_orientation'];
+
+			if (!file_exists("$path_to_root/themes/$this->theme"))
+				$this->theme = "default";
 		}
 	}
-
+	
+	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,
+			'save_report_selections' => $this->save_report_selections,
+			'use_date_picker' => $this->use_date_picker,
+			'def_print_destination' => $this->def_print_destination,
+			'def_print_orientation' => $this->def_print_orientation);
+	}
+	
 	function language() 
 	{
 		return $this->language;
@@ -115,14 +181,20 @@ class user_prefs
 
 	function date_display() 
 	{
-		global $dateseps;
-		$sep = $dateseps[$this->date_sep];
+		global $SysPrefs;
+		$sep = $SysPrefs->dateseps[$this->date_sep];
 		if ($this->date_format == 0)
 			return "m".$sep."d".$sep."Y";
 		elseif ($this->date_format == 1)
 			return "d".$sep."m".$sep."Y";
-		else
+		elseif ($this->date_format == 2)
 			return "Y".$sep."m".$sep."d";
+		elseif ($this->date_format == 3)
+			return "M".$sep."j".$sep."Y";
+		elseif ($this->date_format == 4)
+			return "j".$sep."M".$sep."Y";
+		else
+			return "Y".$sep."M".$sep."j";
 	}
 
 	function tho_sep() 
@@ -169,6 +241,41 @@ class user_prefs
 	{
 		return $this->graphic_links;
 	}
+	
+	function sticky_date()
+	{
+		return $this->sticky_date;
+	}
+	
+	function start_up_tab()
+	{
+		return $this->startup_tab;
+	}
+
+    function transaction_days() 
+    {
+        return $this->transaction_days;
+    }
+
+    function save_report_selections() 
+    {
+        return $this->save_report_selections;
+    }
+
+    function use_date_picker() 
+    {
+        return $this->use_date_picker;
+    }
+
+    function def_print_destination() 
+    {
+        return $this->def_print_destination;
+    }
+
+    function def_print_orientation() 
+    {
+        return $this->def_print_orientation;
+    }
 
 	function set_dec($price_dec, $qty_dec, $exrate_dec, $percent_dec, $showgl, $showcodes) 
 	{
@@ -192,4 +299,3 @@ class user_prefs
 
 }
 
-?>
\ No newline at end of file