projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rerun of connect_db_mysqli.inc.
[fa-stable.git]
/
includes
/
current_user.inc
diff --git
a/includes/current_user.inc
b/includes/current_user.inc
index 62d729b628963c11f352412f549b42faa7f886bd..bb7478cd119b348bd8fcd819065b6a9f8d73c7e8 100644
(file)
--- a/
includes/current_user.inc
+++ b/
includes/current_user.inc
@@
-32,11
+32,12
@@
class current_user
var $old_db;
var $logged;
var $ui_mode = 0;
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)
var $prefs;
var $cur_con; // current db connection (can be different from $company for superuser)
- function
current_user
()
+ function
__construct
()
{
global $def_coy;
{
global $def_coy;
@@
-134,6
+135,7
@@
class current_user
$this->email = @$myrow["email"];
update_user_visitdate($this->username);
$this->logged = true;
$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
$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);
$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;
}
@@
-302,9
+310,10
@@
function round2($number, $decimals=0)
function number_format2($number, $decimals=0)
{
global $SysPrefs;
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()];
$dsep = $SysPrefs->decseps[user_dec_sep()];
- //return number_format($number, $decimals, $dsep, $tsep);
+
+ $number = (float)$number;
if($decimals==='max')
$dec = 15 - floor(log10(abs($number)));
else {
if($decimals==='max')
$dec = 15 - floor(log10(abs($number)));
else {
@@
-313,7
+322,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;
@@
-351,23
+360,15
@@
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);
}
-// function money_format doesn't exist in OS Win.
-if (!function_exists('money_format'))
-{
- function money_format($format, $number)
- {
- return price_format($number);
- }
-}
// 2008-06-15. Added extra parameter $stock_id and reference for $dec
//--------------------------------------------------------------------
// 2008-06-15. Added extra parameter $stock_id and reference for $dec
//--------------------------------------------------------------------
-function qty_format($number, $stock_id
=null
, &$dec) {
+function qty_format($number, $stock_id, &$dec) {
$dec = get_qty_dec($stock_id);
return number_format2($number, $dec);
}
$dec = get_qty_dec($stock_id);
return number_format2($number, $dec);
}
@@
-414,12
+415,12
@@
function user_numeric($input) {
$num = str_replace( $sep, '.', $num);
if (!is_numeric($num))
$num = str_replace( $sep, '.', $num);
if (!is_numeric($num))
- return false;
+
return false;
$num = (float)$num;
if ($num == (int)$num)
$num = (float)$num;
if ($num == (int)$num)
- return (int)$num;
+
return (int)$num;
else
else
- return $num;
+
return $num;
}
function user_company()
}
function user_company()
@@
-511,7
+512,7
@@
function user_date_sep()
{
global $SysPrefs;
{
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()
}
function user_tho_sep()
@@
-683,10
+684,12
@@
function array_append(&$array, $elements)
//
function array_search_value($needle, $haystack, $valuekey=null)
{
//
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;
}
}
return null;
@@
-698,13
+701,14
@@
function array_search_value($needle, $haystack, $valuekey=null)
function array_search_keys($needle, $haystack, $valuekey=null)
{
$keys = array();
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;
}
}
foreach($haystack as $key => $value) {
$val = isset($valuekey) ? @$value[$valuekey] : $value;
if ($needle == $val){
$keys[] = $key;
}
}
+ }
return $keys;
}
//
return $keys;
}
//
@@
-727,6
+731,8
@@
function recalculate_cols(&$cols)
function flush_dir($path, $wipe = false)
{
function flush_dir($path, $wipe = false)
{
+ if (!file_exists($path))
+ return;
$dir = @opendir($path);
if(!$dir)
return;
$dir = @opendir($path);
if(!$dir)
return;