A couple of smaller fixes.

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

diff --git a/includes/current_user.inc b/includes/current_user.inc
index a7a35303fc73aea76e4375991e87473220a268f4..ef14c821402b12db3cfb428fb5af3069945d2719 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -187,14 +187,29 @@ function round2($number, $decimals=0)
        return round($number+$delta, $decimals);
 }
 
+/*
+       Returns number formatted according to user setup and using $decimals digits after dot 
+       (defualt is 0). When $decimals is set to 'max' maximum available precision is used 
+       (decimals depend on value) and trailing zeros are trimmed.
+*/
 function number_format2($number, $decimals=0)
 {
        global $thoseps, $decseps;
        $tsep = $thoseps[$_SESSION["wa_current_user"]->prefs->tho_sep()];
        $dsep = $decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()];
        //return number_format($number, $decimals, $dsep,       $tsep);
-       $delta = ($number < 0 ? -.0000000001 : .0000000001);
-       return number_format($number+$delta, $decimals, $dsep,  $tsep);
+       if($decimals==='max')
+               $dec = 15 - floor(log10(abs($number)));
+       else {
+               $delta = ($number < 0 ? -.0000000001 : .0000000001);
+               $number += $delta;
+               $dec = $decimals;
+       }
+
+       $num = number_format($number, $dec, $dsep, $tsep);
+
+       return $decimals==='max' ? rtrim($num, '0') : $num;
+
 }
 //
 //     Current ui mode.
@@ -236,6 +251,7 @@ function qty_format($number, $stock_id=null, &$dec) {
        $dec = get_qty_dec($stock_id);
     return number_format2($number, $dec);
 }
+
 // and get_qty_dec
 function get_qty_dec($stock_id=null)
 {
@@ -248,6 +264,13 @@ function get_qty_dec($stock_id=null)
        return $dec;
 }
 //-------------------------------------------------------------------
+//
+//     Maximum precision format. Strips trailing unsignificant digits.
+//
+function maxprec_format($number) {
+    return number_format2($number, 'max');
+}
+
 function exrate_format($number) {
     return number_format2($number,
        $_SESSION["wa_current_user"]->prefs->exrate_dec());
@@ -353,7 +376,8 @@ function user_dec_sep()
 
 function user_theme()
 {
-       return $_SESSION["wa_current_user"]->prefs->get_theme();
+       return isset($_SESSION["wa_current_user"]) ?
+               $_SESSION["wa_current_user"]->prefs->get_theme() : 'default';
 }
 
 function user_pagesize()
@@ -469,7 +493,7 @@ function array_append(&$array, $elements)
 function array_search_value($needle, $haystack, $valuekey=null)
 {
        foreach($haystack as $key => $value) {
-               $val = isset($valuekey) ? $value[$valuekey] : $value;
+               $val = isset($valuekey) ? @$value[$valuekey] : $value;
                if ($needle == $val){
                        return $value;
                }