function number_format2($number, $decimals=0)
{
global $SysPrefs;
- $tsep = $SysPrefs->thoseps[$_SESSION["wa_current_user"]->prefs->tho_sep()];
- $dsep = $SysPrefs->decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()];
+ $tsep = $SysPrefs->thoseps[user_dec_sep()];
+ $dsep = $SysPrefs->decseps[user_dec_sep()];
//return number_format($number, $decimals, $dsep, $tsep);
if($decimals==='max')
$dec = 15 - floor(log10(abs($number)));
}
function price_format($number) {
- return number_format2($number,
- $_SESSION["wa_current_user"]->prefs->price_dec());
+ return number_format2($number, user_price_dec());
}
function price_decimal_format($number, &$dec)
if ($stock_id != null)
$dec = get_unit_dec($stock_id);
if ($stock_id == null || $dec == -1 || $dec == null)
- $dec = $_SESSION["wa_current_user"]->prefs->qty_dec();
+ $dec = user_qty_dec();
return $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()
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()