X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fcurrent_user.inc;h=76d52f2f126f5228c4b74e6a1d2e406de14e4106;hb=85f86f5985c98cb9da31d583d0ab74280cd8b3a5;hp=51c03ee626f0e29f75fa453e756a541732a31bd8;hpb=ab5bb181d749dae6f681ee44cba86c9ef2d26c06;p=fa-stable.git

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 51c03ee6..76d52f2f 100644
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -18,10 +18,11 @@ if (!defined('TB_PREF')) {
 
 class current_user
 {
-	var $user;
+	var $user = 0;
 	var $loginname;
 	var $username;
 	var $name;
+	var $email;
 	var $company; // user's company
 	var $pos;
 	var $access;
@@ -58,8 +59,8 @@ class current_user
 
 	function login($company, $loginname, $password)
 	{
-		global $security_areas, $security_groups, $security_headings, $path_to_root;
-		
+		global $security_areas, $security_groups, $security_headings, $path_to_root, $login_delay;
+
 		$this->set_company($company);
 	    $this->logged = false;
 
@@ -73,6 +74,9 @@ class current_user
 		if (!isset($Auth_Result))	// if not used: standard method
 			$Auth_Result = get_user_auth($loginname, md5($password));
 
+		if ($login_delay > 0)
+			write_login_filelog($loginname, $Auth_Result);
+
 		if ($Auth_Result)
 		{
 			$myrow = get_user_by_login($loginname);
@@ -117,6 +121,7 @@ class current_user
         	    $this->username = $this->loginname;
         	    $this->prefs = new user_prefs($myrow);
         	    $this->user = @$myrow["id"];
+                $this->email = @$myrow["email"];
 		    	update_user_visitdate($this->username);
 		    	$this->logged = true;
 				$this->last_act = time();
@@ -161,6 +166,74 @@ class current_user
 		return $this->can_access($page_level);
 	}
 
+	function check_application_access($waapp)
+	{
+		if (!$this->hide_inaccessible_menu_items())
+		{
+			return true;
+		}
+
+		foreach ($waapp->modules as $module)
+		{
+			if ($this->check_module_access($module))
+			{
+				return true;
+			}
+		}
+
+		return false;
+
+	}
+
+	function check_module_access($module)
+	{
+
+		if (!$this->hide_inaccessible_menu_items())
+		{
+			return true;
+		}
+
+		if (sizeof($module->lappfunctions) > 0)
+		{
+			foreach ($module->lappfunctions as $appfunction)
+			{
+				if ($appfunction->label != "" && $this->can_access_page($appfunction->access))
+				{
+					return true;
+				}
+			}
+		}
+
+		if (sizeof($module->rappfunctions) > 0)
+		{
+			foreach ($module->rappfunctions as $appfunction)
+			{
+				if ($appfunction->label != "" && $this->can_access_page($appfunction->access))
+				{
+					return true;
+				}
+			}
+		}
+
+		return false;
+
+	}
+
+	function hide_inaccessible_menu_items()
+	{
+		global $hide_inaccessible_menu_items;
+
+		if (!isset($hide_inaccessible_menu_items) || $hide_inaccessible_menu_items == 0)
+		{
+			return false;
+		}
+
+		else
+		{
+			return true;
+		}
+	}
+
 	function set_db_connection($id = -1)
 	{
 		return set_global_connection($id);
@@ -217,11 +290,11 @@ if (!floatcmp($value1, $value2))
 	compare value is 0
 */
 
-define('FLOAT_COMP_DELTA', 0.0000001);
+define('FLOAT_COMP_DELTA', 0.004);
 
 function floatcmp($a, $b)
 {
-    return $a - $b > FLOAT_COMP_DELTA ? 1 : $b - $a > FLOAT_COMP_DELTA ? -1 : 0;
+    return $a - $b > FLOAT_COMP_DELTA ? 1 : ($b - $a > FLOAT_COMP_DELTA ? -1 : 0);
 }
 
 //
@@ -539,6 +612,14 @@ function array_search_key($needle, $haystack, $valuekey=null)
 	return @$keys[0];
 }
 
+// Recalculate report columns if orientation is landscape.
+function recalculate_cols(&$cols)
+{
+	$factor = (user_pagesize() == "A4" ? 1.4 : 1.3);
+	foreach($cols as $key => $col)
+		$cols[$key] = intval($col * $factor); 
+}
+
 function flush_dir($path, $wipe = false) 
 {
 	$dir = opendir($path);
@@ -569,4 +650,5 @@ function company_path($comp=null)
 			. '/'.$comp;
 }
 
+
 ?>
\ No newline at end of file