X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fsession.inc;h=a306acf063010cabf703a03599cc8dea2b684763;hb=2b2cbcfe6a448536113966cbb11b79eda73db5ab;hp=dad1c1c94f1cca20259e8f77ac2f937a8e7a18da;hpb=8f7ac519b7aaf8ec219862597e878d3a28316ac6;p=fa-stable.git

diff --git a/includes/session.inc b/includes/session.inc
index dad1c1c9..a306acf0 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -51,10 +51,15 @@ function check_page_security($page_security)
 {
 	if (!$_SESSION["wa_current_user"]->check_user_access())
 	{
-		echo "<br><br><br><center>";
-		echo "<b>" . _("Security settings have not been defined for your user account.");
-		echo "<br>" . _("Please contact your system administrator.") . "</b>";
-
+		// notification after upgrade from pre-2.2 version
+		$msg = $_SESSION["wa_current_user"]->old_db ?
+			 _("Security settings have not been defined for your user account.")
+				. "<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);
+		end_page();
 		kill_login();
 		exit;
 	}
@@ -97,7 +102,9 @@ function strip_quotes($data)
 //
 function login_timeout()
 {
-	if ($_SESSION["wa_current_user"]->logged) {
+	// skip timeout on logout page
+	if ($_SESSION["wa_current_user"]->logged 
+			&& !strpos($_SERVER['PHP_SELF'], 'logout.php')) {
 		$tout = $_SESSION["wa_current_user"]->timeout;
 		if ($tout && (time() > $_SESSION["wa_current_user"]->last_act + $tout))
 		{
@@ -117,6 +124,7 @@ if (isset($_GET['path_to_root']) || isset($_POST['path_to_root']))
 	die("Restricted access");
 
 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");
@@ -137,15 +145,15 @@ session_start();
 // this is to fix the "back-do-you-want-to-refresh" issue - thanx PHPFreaks
 header("Cache-control: private");
 
-get_text::init();
+get_text_init();
 
 // Page Initialisation
 if (!isset($_SESSION['languages'])) 
 {
-	language::load_languages(); // sets also default $_SESSION['language']
+	load_languages(); // sets also default $_SESSION['language']
 }
 
-language::set_language($_SESSION['language']->code);
+$_SESSION['language']->set_language($_SESSION['language']->code);
 
 // include $Hooks object if locale file exists
 if(@include_once($path_to_root . "/lang/".$_SESSION['language']->code."/locale.inc")) 
@@ -153,6 +161,7 @@ if(@include_once($path_to_root . "/lang/".$_SESSION['language']->code."/locale.i
 	$Hooks = new Hooks();
 }
 
+include_once($path_to_root . "/includes/access_levels.inc");
 include_once($path_to_root . "/config.php");
 include_once($path_to_root . "/includes/main.inc");
 
@@ -166,6 +175,10 @@ $Editors = array();
 // page help. Currently help for function keys.
 $Pagehelp = array();
 
+$SysPrefs = new sys_prefs();
+
+$Refs = new references();
+
 // intercept all output to destroy it in case of ajax call
 register_shutdown_function('end_flush');
 ob_start('output_html',0);
@@ -208,8 +221,8 @@ if (!$_SESSION["wa_current_user"]->logged_in())
 			// Incorrect password
 			login_fail();
 		}
-		$lang = $_SESSION['language'];
-		language::set_language($_SESSION['language']->code);
+		$lang = &$_SESSION['language'];
+		$lang->set_language($_SESSION['language']->code);
 	}
 }
 
@@ -218,13 +231,6 @@ if (!isset($_SESSION["App"])) {
 	$_SESSION["App"]->init();
 }
 
-// Run with debugging messages for the system administrator(s) but not anyone else
-/*if (in_array(15, $security_groups[$_SESSION["AccessLevel"]])) {
-	$debug = 1;
-} else {
-	$debug = 0;
-}*/
-
 //----------------------------------------------------------------------------------------
 
 check_page_security($page_security);