projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wrong type for AP Surf Set in demo data.
[fa-stable.git]
/
includes
/
current_user.inc
diff --git
a/includes/current_user.inc
b/includes/current_user.inc
index 431cfefe2546cd90dbc56968a16578f4898208ea..23887cb65d62d995a7bfce41ba30e2b0c2d651dd 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)
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;
@@
-305,11
+305,13
@@
function number_format2($number, $decimals=0)
$tsep = $SysPrefs->thoseps[user_tho_sep()];
$dsep = $SysPrefs->decseps[user_dec_sep()];
$tsep = $SysPrefs->thoseps[user_tho_sep()];
$dsep = $SysPrefs->decseps[user_dec_sep()];
+ if ($number == '')
+ $number = 0;
if($decimals==='max')
$dec = 15 - floor(log10(abs($number)));
else {
$delta = ($number < 0 ? -.0000000001 : .0000000001);
if($decimals==='max')
$dec = 15 - floor(log10(abs($number)));
else {
$delta = ($number < 0 ? -.0000000001 : .0000000001);
- $number += $delta;
+
@
$number += $delta;
$dec = $decimals;
}
$dec = $decimals;
}
@@
-351,7
+353,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);
@@
-511,7
+513,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()
@@
-730,6
+732,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;