Supplier Inquiry/Customer Inquiry: removed inconsistency in unsettled/overdue transac...

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

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 62d729b628963c11f352412f549b42faa7f886bd..431cfefe2546cd90dbc56968a16578f4898208ea 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -302,9 +302,9 @@ 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($decimals==='max')
                $dec = 15 - floor(log10(abs($number)));
        else {
@@ -414,12 +414,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()
@@ -683,10 +683,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 +700,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;
 }
 //