[0004212] Work Order Entry: fixed error when voided WO refence is reused.

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

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 62d729b628963c11f352412f549b42faa7f886bd..23887cb65d62d995a7bfce41ba30e2b0c2d651dd 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -36,7 +36,7 @@ class current_user
        var $prefs;
        var $cur_con; // current db connection (can be different from $company for superuser)
 
-       function current_user()
+       function __construct()
        {
                global $def_coy;
                
@@ -302,14 +302,16 @@ function round2($number, $decimals=0)
 function number_format2($number, $decimals=0)
 {
        global $SysPrefs;
-       $tsep = $SysPrefs->thoseps[user_dec_sep()];
+       $tsep = $SysPrefs->thoseps[user_tho_sep()];
        $dsep = $SysPrefs->decseps[user_dec_sep()];
-       //return number_format($number, $decimals, $dsep,       $tsep);
+
+       if ($number == '')
+               $number = 0;
        if($decimals==='max')
                $dec = 15 - floor(log10(abs($number)));
        else {
                $delta = ($number < 0 ? -.0000000001 : .0000000001);
-               $number += $delta;
+               @$number += $delta;
                $dec = $decimals;
        }
 
@@ -351,7 +353,7 @@ function price_decimal_format($number, &$dec)
        if ($pos !== false)
        {
                $len = strlen(substr($str, $pos + 1));
-               if ($len > $dec)
+               if ($len > $dec && $len < ini_get('precision')-3)
                        $dec = $len;
        }
        return number_format2($number, $dec);
@@ -414,12 +416,12 @@ function user_numeric($input) {
        $num = str_replace( $sep, '.', $num);
 
     if (!is_numeric($num))
-         return false;
+               return false;
     $num = (float)$num;
     if ($num == (int)$num)
-         return (int)$num;
+               return (int)$num;
     else
-         return $num;
+               return $num;
 }
 
 function user_company()
@@ -511,7 +513,7 @@ function user_date_sep()
 {
        global $SysPrefs;
 
-       return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->date_sep() : $SysPrefs->dflt_date_sep;
+       return isset($_SESSION["wa_current_user"]->prefs->date_sep) ? $_SESSION["wa_current_user"]->prefs->date_sep() : $SysPrefs->dflt_date_sep;
 }
 
 function user_tho_sep()
@@ -683,10 +685,12 @@ function array_append(&$array, $elements)
 //
 function array_search_value($needle, $haystack, $valuekey=null)
 {
-       foreach($haystack as $key => $value) {
-               $val = isset($valuekey) ? @$value[$valuekey] : $value;
-               if ($needle == $val){
-                       return $value;
+       if (is_array($haystack)) {
+               foreach($haystack as $key => $value) {
+                       $val = isset($valuekey) ? @$value[$valuekey] : $value;
+                       if ($needle == $val){
+                               return $value;
+                       }
                }
        }
        return null;
@@ -698,13 +702,14 @@ function array_search_value($needle, $haystack, $valuekey=null)
 function array_search_keys($needle, $haystack, $valuekey=null)
 {
        $keys = array();
-       if($haystack)
+       if (is_array($haystack)) {
                foreach($haystack as $key => $value) {
                        $val = isset($valuekey) ? @$value[$valuekey] : $value;
                        if ($needle == $val){
                                $keys[] = $key;
                        }
                }
+       }       
        return $keys;
 }
 //
@@ -727,6 +732,8 @@ function recalculate_cols(&$cols)
 
 function flush_dir($path, $wipe = false) 
 {
+       if (!file_exists($path))
+               return;
        $dir = @opendir($path);
        if(!$dir)
                return;