Rerun Feature 5388: Print Invoices (documents) list gets too long. Fixed by default...

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

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 23887cb65d62d995a7bfce41ba30e2b0c2d651dd..82c8daaf619ee1e46829bc8895c6bfc3be1dd12a 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -32,6 +32,7 @@ class current_user
        var $old_db;
        var $logged;
        var $ui_mode = 0;
+       var $login_attempt=0;
        
        var $prefs;
        var $cur_con; // current db connection (can be different from $company for superuser)
@@ -134,6 +135,7 @@ class current_user
                 $this->email = @$myrow["email"];
                        update_user_visitdate($this->username);
                        $this->logged = true;
+                       $this->login_attempt=0;
                                $this->last_act = time();
                                $this->timeout = session_timeout();
                                flush_dir(user_js_cache()); // refresh cache on login
@@ -158,8 +160,14 @@ class current_user
                        $hash = md5($password);
 
                        update_user_password($user['id'], $user['user_id'], $hash);
+                       
+                       $sender = get_company_pref('email');
+                       if (empty($sender))
+                               $header = "";
+                       else
+                               $header = "From: $sender";
 
-                       mail($email, _("New password for")." ".$SysPrefs->app_title, $password);
+                       mail($email, _("New password for")." ".$SysPrefs->app_title, $password, $header);
 
                        return true;
                }
@@ -315,7 +323,7 @@ function number_format2($number, $decimals=0)
                $dec = $decimals;
        }
 
-       $num = number_format($number, $dec, $dsep, $tsep);
+       $num = number_format($number, intval($dec), $dsep, $tsep);
 
        return $decimals==='max' ? rtrim($num, '0') : $num;