PHP7 compatibility fixes.

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

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 87f71b1e45ce2a6c9ee10357bb4f3cc1ae4ee3c1..e6f051885848068c5abe02ef574776594dbff276 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;
                
@@ -150,18 +150,16 @@ class current_user
 
                set_global_connection();
 
-               $myrow = get_user_by_email($email);
+               $user = get_user_by_email($email);
 
-               if ($myrow['id'] != "") {
-
-                       $bytes = openssl_random_pseudo_bytes(8, $cstrong);
-                       $password   = base64_encode($bytes);
+               if ($user != false) {
 
+                       $password = generate_password();
                        $hash = md5($password);
 
-                       update_user_password($myrow['id'], $myrow['user_id'], $hash);
+                       update_user_password($user['id'], $user['user_id'], $hash);
 
-                       mail($myrow['email'], _("New password for")." ".$SysPrefs->app_title, $password);
+                       mail($email, _("New password for")." ".$SysPrefs->app_title, $password);
 
                        return true;
                }
@@ -304,9 +302,11 @@ 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 {
@@ -416,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()
@@ -450,21 +450,21 @@ function user_price_dec()
 {
        global $SysPrefs;
 
-       return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->price_dec() : $SysPrefs->prices_dec;
+       return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->price_dec() : 2;
 }
 
 function user_exrate_dec()
 {
        global $SysPrefs;
 
-       return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->exrate_dec() : $SysPrefs->rates_dec;
+       return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->exrate_dec() : 4;
 }
 
 function user_percent_dec()
 {
        global $SysPrefs;
 
-       return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->percent_dec() : $SysPrefs->percent_dec;
+       return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->percent_dec() : 1;
 }
 
 function user_show_gl_info()
@@ -513,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()
@@ -685,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;
@@ -700,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;
 }
 //