X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fcurrent_user.inc;h=e6f051885848068c5abe02ef574776594dbff276;hb=ca4b0e00f434d0180fe3e3ec9fa3d31a278a9fef;hp=89b475fd6d6c83573e1c40c1d8a75afa841ed73e;hpb=577328a5a3a3d5cd6e2252798a355fa20a8f591e;p=fa-stable.git

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 89b475fd..e6f05188 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,16 @@ 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);
 
-			mail($myrow['email'], _("New password for")." ".$SysPrefs->app_title, $password);
+			mail($email, _("New password for")." ".$SysPrefs->app_title, $password);
 
 			return true;
 		}
@@ -304,9 +302,11 @@ function round2($number, $decimals=0)
 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()];
-	//return number_format($number, $decimals, $dsep,	$tsep);
+
+	if ($number == '')
+		$number = 0;
 	if($decimals==='max')
 		$dec = 15 - floor(log10(abs($number)));
 	else {
@@ -416,12 +416,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()
@@ -448,17 +448,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()
@@ -473,41 +479,56 @@ function user_show_codes()
 
 function user_date_format()
 {
-  global $SysPrefs;
+	global $SysPrefs;
 
-	return isset($_SESSION["wa_current_user"]) ?
-	  $_SESSION["wa_current_user"]->prefs->date_format() : $SysPrefs->dflt_date_fmt;
+	return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->date_format() : $SysPrefs->dflt_date_fmt;
 }
 
 function user_date_display()
 {
-  global $SysPrefs;
-
-	return isset($_SESSION["wa_current_user"]) ?
-	  $_SESSION["wa_current_user"]->prefs->date_display() : $SysPres->dflt_date_sep;
+ 	$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 isset($_SESSION["wa_current_user"]) ?
-		$_SESSION["wa_current_user"]->prefs->tho_sep() : 0;
+	return isset($_SESSION["wa_current_user"]) ? $_SESSION["wa_current_user"]->prefs->tho_sep() : 0;
 }
 
 function user_dec_sep()
 {
-	return isset($_SESSION["wa_current_user"]) ?
-		$_SESSION["wa_current_user"]->prefs->dec_sep() : 0;
+	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()
@@ -664,10 +685,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;
@@ -679,13 +702,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;
 }
 //