From d497aeb2d93ed1c705007fa6ff84a4c470f7f538 Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Wed, 30 Sep 2009 22:19:13 +0000
Subject: [PATCH] Access level checking moved to page() function  to make 
 session start and access checking independent

---
 includes/main.inc    | 4 +++-
 includes/session.inc | 9 +--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/includes/main.inc b/includes/main.inc
index f52d88c6..f01bcddc 100644
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -28,13 +28,15 @@ include_once($path_to_root . "/includes/ui/ui_controls.inc");
 function page($title, $no_menu=false, $is_index=false, $onload="", $js="", $script_only=false)
 {
 
-   	global $path_to_root;
+   	global $path_to_root, $page_security;
+
 
    	$hide_menu = $no_menu;
 
    	include($path_to_root . "/includes/page/header.inc");
 
    	page_header($title, $no_menu, $is_index, $onload, $js);
+	check_page_security($page_security);
 //	error_box();
 	if($script_only) {		
 		echo '<noscript>';
diff --git a/includes/session.inc b/includes/session.inc
index 89d8c333..3617a91c 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;
 	}
 }
@@ -244,7 +238,6 @@ if (strstr($_SERVER['PHP_SELF'], 'logout.php') == false){
 	*/
 	add_access_extensions();
 
-	check_page_security($page_security);
 }
 // POST vars cleanup needed for direct reuse.
 // We quote all values later with db_escape() before db update.
-- 
2.30.2