Rerun of dashboard.inc file

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

diff --git a/includes/current_user.inc b/includes/current_user.inc
index fa676ec2cc570b93b379b01b8f0a48ea99004a65..239324c69dd0f304942fbc8980a88da21eb68afe 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -154,14 +154,12 @@ class current_user
 
                if ($user != false) {
 
-                       $bytes = openssl_random_pseudo_bytes(8, $cstrong);
-                       $password   = base64_encode($bytes);
-
+                       $password = generate_password();
                        $hash = md5($password);
 
                        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,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 {
@@ -416,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()