projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Password reset mail could take several hours. After fix only a couple of seconds...
[fa-stable.git]
/
includes
/
current_user.inc
diff --git
a/includes/current_user.inc
b/includes/current_user.inc
index 52fafa53e690e785dd8b3bb845c2636a312ae6f2..c3d162e037e1d440175cfd6f6118f0a6c2b01d46 100644
(file)
--- a/
includes/current_user.inc
+++ b/
includes/current_user.inc
@@
-158,8
+158,14
@@
class current_user
$hash = md5($password);
update_user_password($user['id'], $user['user_id'], $hash);
$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;
}
return true;
}
@@
-315,7
+321,7
@@
function number_format2($number, $decimals=0)
$dec = $decimals;
}
$dec = $decimals;
}
- $num = number_format($number,
$dec
, $dsep, $tsep);
+ $num = number_format($number,
intval($dec)
, $dsep, $tsep);
return $decimals==='max' ? rtrim($num, '0') : $num;
return $decimals==='max' ? rtrim($num, '0') : $num;
@@
-353,7
+359,7
@@
function price_decimal_format($number, &$dec)
if ($pos !== false)
{
$len = strlen(substr($str, $pos + 1));
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);
$dec = $len;
}
return number_format2($number, $dec);