X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fprefs%2Fuserprefs.inc;h=1939d6f44d935431f32bbdda4b392f017a9c6469;hb=HEAD;hp=80a3a62f2286068e22d3d6f137550553ae5379f6;hpb=0c1ab57c09d87eed2bd248892dbfe3f256767a82;p=fa-stable.git

diff --git a/includes/prefs/userprefs.inc b/includes/prefs/userprefs.inc
index 80a3a62f..1939d6f4 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
 {
 
 	var $language;
@@ -36,19 +37,19 @@ class user_prefs
 	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 $save_report_selections; // 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, $dflt_date_sep, $dflt_date_fmt;
-			
-			$this->date_sep = $dflt_date_sep;
-			$this->date_format = $dflt_date_fmt;
+			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;
@@ -93,11 +94,11 @@ class user_prefs
 				$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'];
+			$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";
@@ -180,8 +181,8 @@ 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)
@@ -298,4 +299,3 @@ class user_prefs
 
 }
 
-?>
\ No newline at end of file