X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fsession.inc;h=2178a8d51e84b5a339fad042b69d176dd64cf3b1;hb=2a0f29497517eca1cde8b2832da5761edefb2268;hp=b7880a91fbf6bba4572c8175907b04efa0a15645;hpb=7e1e2c6ca0e1a974e3d606bae5fa322c7fa4d3bc;p=fa-stable.git

diff --git a/includes/session.inc b/includes/session.inc
index b7880a91..2178a8d5 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -59,8 +59,7 @@ function check_page_security($page_security)
 				. "<br>" . _("Please contact your system administrator.")	
 			: _("Please remove \$security_groups and \$security_headings arrays from config.php file!");
 
-		page(_("Access denied"), false);
-			display_error($msg);
+		display_error($msg);
 		end_page();
 		kill_login();
 		exit;
@@ -68,17 +67,12 @@ function check_page_security($page_security)
 
 	if (!$_SESSION["wa_current_user"]->can_access_page($page_security))
 	{
-		// no_menu parameter guess here is ugly hack, but works for now.
-		// Better solution is to use global switch for menu, set before 
-		// session.inc inclusion.
-		page(_("Access denied"), strpos($_SERVER['PHP_SELF'], '/view/'));
 
 		echo "<center><br><br><br><b>";
 		echo _("The security settings on your account do not permit you to access this function");
 		echo "</b>";
 		echo "<br><br><br><br></center>";
 		end_page();
-		//kill_login();
 		exit;
 	}
 }
@@ -124,9 +118,9 @@ if (!isset($path_to_root))
 if (isset($_GET['path_to_root']) || isset($_POST['path_to_root']))
 	die("Restricted access");
 
+include_once($path_to_root . "/includes/current_user.inc");
 include_once($path_to_root . "/frontaccounting.php");
 include_once($path_to_root . "/admin/db/security_db.inc");
-include_once($path_to_root . "/includes/current_user.inc");
 include_once($path_to_root . "/includes/lang/language.php");
 include_once($path_to_root . "/config_db.php");
 include_once($path_to_root . "/includes/ajax.inc");
@@ -229,14 +223,12 @@ if (strstr($_SERVER['PHP_SELF'], 'logout.php') == false){
 		}
 	}
 
+	include_once($path_to_root . '/company/'.user_company().'/installed_extensions.php');
+
 	if (!isset($_SESSION["App"])) {
 		$_SESSION["App"] = new front_accounting();
 		$_SESSION["App"]->init();
 	}
-
-//----------------------------------------------------------------------------------------
-
-	check_page_security($page_security);
 }
 // POST vars cleanup needed for direct reuse.
 // We quote all values later with db_escape() before db update.