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

diff --git a/includes/session.inc b/includes/session.inc
index e327b3bb..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;
 	}
@@ -92,6 +97,22 @@ function strip_quotes($data)
 	return $data;
 }
 
+//============================================================================
+//
+//
+function login_timeout()
+{
+	// 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))
+		{
+			$_SESSION["wa_current_user"]->logged = false;
+		}
+		$_SESSION["wa_current_user"]->last_act = time();
+	}
+}
 //============================================================================
 if (!isset($path_to_root))
 {
@@ -103,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");
@@ -110,24 +132,28 @@ include_once($path_to_root . "/includes/ajax.inc");
 include_once($path_to_root . "/includes/ui/ui_msgs.inc");
 
 /*
+	Uncomment the setting below when using FA on shared hosting
+	to avoid unexpeced session timeouts.
 	Make sure this directory exists and is writable!
-//	$session_save_path = dirname(__FILE__).'/../tmp/';
 */
+//ini_set('session.save_path', dirname(__FILE__).'/../tmp/');
+
+ini_set('session.gc_maxlifetime', 36000); // 10hrs
 
 session_name('FrontAccounting');
 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")) 
@@ -135,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");
 
@@ -148,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);
@@ -157,15 +188,27 @@ set_error_handler('error_handler' /*, errtypes */);
 
 if (!isset($_SESSION["wa_current_user"]))
 	$_SESSION["wa_current_user"] = new current_user();
+
 set_global_connection();
 
+login_timeout();
+
 if (!$_SESSION["wa_current_user"]->logged_in())
 {
 	// Show login screen
 	if (!isset($_POST["user_name_entry_field"]) or $_POST["user_name_entry_field"] == "")
 	{
-		include($path_to_root . "/access/login.php");
-		$Ajax->redirect($path_to_root . "/access/login.php");
+		if (strstr($_SERVER['PHP_SELF'], 'timeout.php') == false) 
+			$_SESSION['timeout'] = array( 'uri'=> $_SERVER['REQUEST_URI'],
+				'post' => $_POST);
+
+		if (!in_ajax()) {
+			include($path_to_root . "/access/login.php");
+		} else {
+			// ajax update of current page elements - open login window in popup
+			// to not interfere with ajaxified page.
+			$Ajax->popup($path_to_root . "/access/timeout.php");
+		}
 		exit;
 	} else {
 		$succeed = $_SESSION["wa_current_user"]->login($_POST["company_login_name"],
@@ -178,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);
 	}
 }
 
@@ -188,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);