Removed obsolete complete parameter.

[fa-stable.git] / includes / session.inc

diff --git a/includes/session.inc b/includes/session.inc
index f6ac6b26ce8bbcba0e29b98c605b6fc8f819476a..4a92fe238f80656ff65ee56a498aa12dfed98ada 100644 (file)
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -174,16 +174,16 @@ 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");
 
-
 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'],
@@ -236,19 +236,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'];