X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fsession.inc;h=97c8e1045158592c4411a1888cba49db3ade227a;hb=af7088b5a3b03f886d2602171d09e1728894701a;hp=f6ac6b26ce8bbcba0e29b98c605b6fc8f819476a;hpb=f7b0f0130571e3473baead5cffe25666170fe70f;p=fa-stable.git

diff --git a/includes/session.inc b/includes/session.inc
index f6ac6b26..97c8e104 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -174,20 +174,21 @@ include_once($path_to_root . "/includes/prefs/sysprefs.inc");
 
 ini_set('session.gc_maxlifetime', 36000); // 10hrs
 
-session_name('FrontAccounting');
+session_name('FA'.md5(dirname(__FILE__)));
 session_start();
+
 // this is to fix the "back-do-you-want-to-refresh" issue - thanx PHPFreaks
 header("Cache-control: private");
 
-
+include_once($path_to_root . "/config.php");
 get_text_init();
 
 // Page Initialisation
-if (!isset($_SESSION['language'])) 
+if (!isset($_SESSION['language']) || !method_exists($_SESSION['language'], 'set_language')) 
 {
 	$l = array_search_value($dflt_lang, $installed_languages,  'code');
 	$_SESSION['language'] = new language($l['name'], $l['code'], $l['encoding'],
-	 isset($l['rtl']) ? 'rtl' : 'ltr');
+	 (isset($l['rtl']) && $l['rtl'] === true) ? 'rtl' : 'ltr');
 }
 
 $_SESSION['language']->set_language($_SESSION['language']->code);
@@ -200,7 +201,7 @@ if (file_exists($path_to_root . "/lang/".$_SESSION['language']->code."/locale.in
 }
 
 include_once($path_to_root . "/includes/access_levels.inc");
-include_once($path_to_root . "/config.php");
+include_once($path_to_root . "/version.php");
 include_once($path_to_root . "/includes/main.inc");
 
 // Ajax communication object
@@ -236,19 +237,19 @@ if (strstr($_SERVER['PHP_SELF'], 'logout.php') == false){
 		// Show login screen
 		if (!isset($_POST["user_name_entry_field"]) or $_POST["user_name_entry_field"] == "")
 		{
-			$_SESSION['timeout'] = array( 'uri'=> $_SERVER['REQUEST_URI'],
+			// strip ajax marker from uri, to force synchronous page reload
+			$_SESSION['timeout'] = array( 'uri'=>preg_replace('/JsHttpRequest=(?:(\d+)-)?([^&]+)/s',
+					'', @$_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");
-			}
+			include($path_to_root . "/access/login.php");
+			if (in_ajax())
+				$Ajax->activate('_page_body');
 			exit;
 		} else {
-			$succeed = $_SESSION["wa_current_user"]->login($_POST["company_login_name"],
+
+			$succeed = isset($db_connections[$_POST["company_login_name"]]) &&
+				$_SESSION["wa_current_user"]->login($_POST["company_login_name"],
 				$_POST["user_name_entry_field"], md5($_POST["password"]));
 			// select full vs fallback ui mode on login
 			$_SESSION["wa_current_user"]->ui_mode = $_POST['ui_mode'];