X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fprefs%2Fuserprefs.inc;h=863dc1fab05f8a74a8583aef68e9e4a8ddba3bf6;hb=67100a2b9c55e5ed9126bbf28aafb54d829066df;hp=dcbc9fcd8c22c05a343ac0809a843ac5c3731582;hpb=5b8f4c4b4aa8cf996bc071f116bfce1273200fa2;p=fa-stable.git diff --git a/includes/prefs/userprefs.inc b/includes/prefs/userprefs.inc index dcbc9fcd..863dc1fa 100644 --- a/includes/prefs/userprefs.inc +++ b/includes/prefs/userprefs.inc @@ -41,14 +41,14 @@ class user_prefs 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 +93,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 +180,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)