cleanup2 according to Apmuthu's list.

[fa-stable.git] / includes / current_user.inc

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 4f5e7898b4297302a1626a72c82c557ad9b00cf9..87f71b1e45ce2a6c9ee10357bb4f3cc1ae4ee3c1 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -448,17 +448,23 @@ function user_qty_dec()
 
 function user_price_dec()
 {
-       return $_SESSION["wa_current_user"]->prefs->price_dec();
+       global $SysPrefs;
+
+       return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->price_dec() : $SysPrefs->prices_dec;
 }
 
 function user_exrate_dec()
 {
-       return $_SESSION["wa_current_user"]->prefs->exrate_dec();
+       global $SysPrefs;
+
+       return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->exrate_dec() : $SysPrefs->rates_dec;
 }
 
 function user_percent_dec()
 {
-       return $_SESSION["wa_current_user"]->prefs->percent_dec();
+       global $SysPrefs;
+
+       return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->percent_dec() : $SysPrefs->percent_dec;
 }
 
 function user_show_gl_info()
@@ -473,33 +479,56 @@ function user_show_codes()
 
 function user_date_format()
 {
-       return $_SESSION["wa_current_user"]->prefs->date_format();
+       global $SysPrefs;
+
+       return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->date_format() : $SysPrefs->dflt_date_fmt;
 }
 
 function user_date_display()
 {
-       return $_SESSION["wa_current_user"]->prefs->date_display();
+       $fmt ='m/d/Y';
+       if (isset($_SESSION["wa_current_user"])) {
+               $fmt = $_SESSION["wa_current_user"]->prefs->date_display();
+       } else {
+               $sep = user_date_sep();
+               $user_date_fmt = user_date_format();
+               switch ($user_date_fmt) {
+                       case 0:
+                       $fmt = "m".$sep."d".$sep."Y"; break;
+                       case 1:
+                       $fmt = "d".$sep."m".$sep."Y"; break;
+                       case 2:
+                       $fmt = "Y".$sep."m".$sep."d"; break;
+                       case 3:
+                       $fmt = "M".$sep."j".$sep."Y"; break;
+                       case 4:
+                       $fmt = "j".$sep."M".$sep."Y"; break;
+                       default:
+                       $fmt = "Y".$sep."M".$sep."j";
+               }
+       }
 }
 
 function user_date_sep()
 {
-       return $_SESSION["wa_current_user"]->prefs->date_sep();
+       global $SysPrefs;
+
+       return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->date_sep() : $SysPrefs->dflt_date_sep;
 }
 
 function user_tho_sep()
 {
-       return $_SESSION["wa_current_user"]->prefs->tho_sep();
+       return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->tho_sep() : 0;
 }
 
 function user_dec_sep()
 {
-       return $_SESSION["wa_current_user"]->prefs->dec_sep();
+       return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->dec_sep() : 0;
 }
 
 function user_theme()
 {
-       return isset($_SESSION["wa_current_user"]) ?
-               $_SESSION["wa_current_user"]->prefs->get_theme() : 'default';
+       return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->get_theme() : 'default';
 }
 
 function user_pagesize()