X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fcurrent_user.inc;h=c3d162e037e1d440175cfd6f6118f0a6c2b01d46;hb=df660a601cabb0afe7f3246884f16207b9a0c314;hp=c5e2c975521bbfb821eb2b514ffc634b19a02d33;hpb=5e63c6ace55729bbb5ee3b060035a25a4426eb0a;p=fa-stable.git

diff --git a/includes/current_user.inc b/includes/current_user.inc
index c5e2c975..c3d162e0 100644
--- 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)
 
-	function current_user()
+	function __construct()
 	{
 		global $def_coy;
 		
@@ -150,18 +150,22 @@ class current_user
 
 		set_global_connection();
 
-		$myrow = get_user_by_email($email);
+		$user = get_user_by_email($email);
 
-		if ($myrow['id'] != "") {
-
-			$bytes = openssl_random_pseudo_bytes(8, $cstrong);
-			$password   = base64_encode($bytes);
+		if ($user != false) {
 
+			$password = generate_password();
 			$hash = md5($password);
 
-			update_user_password($myrow['id'], $myrow['user_id'], $hash);
+			update_user_password($user['id'], $user['user_id'], $hash);
+			
+			$sender = get_company_pref('email');
+			if (empty($sender))
+				$header = "";
+			else
+				$header = "From: $sender";
 
-			mail($myrow['email'], _("New password for")." ".$SysPrefs->app_title, $password);
+			mail($email, _("New password for")." ".$SysPrefs->app_title, $password, $header);
 
 			return true;
 		}
@@ -304,18 +308,20 @@ function round2($number, $decimals=0)
 function number_format2($number, $decimals=0)
 {
 	global $SysPrefs;
-	$tsep = $SysPrefs->thoseps[$_SESSION["wa_current_user"]->prefs->tho_sep()];
-	$dsep = $SysPrefs->decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()];
-	//return number_format($number, $decimals, $dsep,	$tsep);
+	$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);
-		$number += $delta;
+		@$number += $delta;
 		$dec = $decimals;
 	}
 
-	$num = number_format($number, $dec, $dsep, $tsep);
+	$num = number_format($number, intval($dec), $dsep, $tsep);
 
 	return $decimals==='max' ? rtrim($num, '0') : $num;
 
@@ -342,8 +348,7 @@ function fallback_mode() {
 }
 
 function price_format($number) {
-    return number_format2($number,
-	$_SESSION["wa_current_user"]->prefs->price_dec());
+    return number_format2($number, user_price_dec());
 }
 
 function price_decimal_format($number, &$dec)
@@ -354,7 +359,7 @@ function price_decimal_format($number, &$dec)
 	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);
@@ -383,7 +388,7 @@ function get_qty_dec($stock_id=null)
 	if ($stock_id != null)
 		$dec = get_unit_dec($stock_id);
 	if ($stock_id == null || $dec == -1 || $dec == null)
-		$dec = $_SESSION["wa_current_user"]->prefs->qty_dec();
+		$dec = user_qty_dec();
 	return $dec;
 }
 //-------------------------------------------------------------------
@@ -417,12 +422,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()
@@ -449,17 +454,23 @@ function user_qty_dec()
 
 function user_price_dec()
 {
-	return $_SESSION["wa_current_user"]->prefs->price_dec();
+	global $SysPrefs;
+
+	return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->price_dec() : 2;
 }
 
 function user_exrate_dec()
 {
-	return $_SESSION["wa_current_user"]->prefs->exrate_dec();
+	global $SysPrefs;
+
+	return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->exrate_dec() : 4;
 }
 
 function user_percent_dec()
 {
-	return $_SESSION["wa_current_user"]->prefs->percent_dec();
+	global $SysPrefs;
+
+	return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->percent_dec() : 1;
 }
 
 function user_show_gl_info()
@@ -474,33 +485,56 @@ function user_show_codes()
 
 function user_date_format()
 {
-	return $_SESSION["wa_current_user"]->prefs->date_format();
+	global $SysPrefs;
+
+	return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->date_format() : $SysPrefs->dflt_date_fmt;
 }
 
 function user_date_display()
 {
-	return $_SESSION["wa_current_user"]->prefs->date_display();
+ 	$fmt ='m/d/Y';
+ 	if (isset($_SESSION["wa_current_user"])) {
+  		$fmt = $_SESSION["wa_current_user"]->prefs->date_display();
+ 	} else {
+  		$sep = user_date_sep();
+  		$user_date_fmt = user_date_format();
+  		switch ($user_date_fmt) {
+   			case 0:
+    			$fmt = "m".$sep."d".$sep."Y"; break;
+   			case 1:
+    			$fmt = "d".$sep."m".$sep."Y"; break;
+   			case 2:
+    			$fmt = "Y".$sep."m".$sep."d"; break;
+   			case 3:
+    			$fmt = "M".$sep."j".$sep."Y"; break;
+   			case 4:
+    			$fmt = "j".$sep."M".$sep."Y"; break;
+   			default:
+    			$fmt = "Y".$sep."M".$sep."j";
+  		}
+  	}
 }
 
 function user_date_sep()
 {
-	return $_SESSION["wa_current_user"]->prefs->date_sep();
+	global $SysPrefs;
+
+	return isset($_SESSION["wa_current_user"]->prefs->date_sep) ? $_SESSION["wa_current_user"]->prefs->date_sep() : $SysPrefs->dflt_date_sep;
 }
 
 function user_tho_sep()
 {
-	return $_SESSION["wa_current_user"]->prefs->tho_sep();
+	return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->tho_sep() : 0;
 }
 
 function user_dec_sep()
 {
-	return $_SESSION["wa_current_user"]->prefs->dec_sep();
+	return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->dec_sep() : 0;
 }
 
 function user_theme()
 {
-	return isset($_SESSION["wa_current_user"]) ?
-		$_SESSION["wa_current_user"]->prefs->get_theme() : 'default';
+	return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->get_theme() : 'default';
 }
 
 function user_pagesize()
@@ -657,10 +691,12 @@ function array_append(&$array, $elements)
 //
 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;
@@ -672,13 +708,14 @@ function array_search_value($needle, $haystack, $valuekey=null)
 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;
 			}
 		}
+	}	
 	return $keys;
 }
 //
@@ -701,6 +738,8 @@ function recalculate_cols(&$cols)
 
 function flush_dir($path, $wipe = false) 
 {
+	if (!file_exists($path))
+		return;
 	$dir = @opendir($path);
 	if(!$dir)
 		return;