Fixed get_standard_cost() result for dummy items.

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

diff --git a/includes/session.inc b/includes/session.inc
index ba703dee0e8432e5dbd442cfcfd78b2e66db3be8..af62f7fff5a537ee40d8eccb79d304060d220733 100644 (file)
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -176,8 +176,9 @@ if (!isset($_SESSION['language']))
 $_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")) 
+if (file_exists($path_to_root . "/lang/".$_SESSION['language']->code."/locale.inc"))
 {
+       include_once($path_to_root . "/lang/".$_SESSION['language']->code."/locale.inc");
        $Hooks = new Hooks();
 }
 
@@ -220,16 +221,14 @@ 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"],
@@ -256,7 +255,6 @@ if (strstr($_SERVER['PHP_SELF'], 'logout.php') == false){
        }
 }
 
-
 // POST vars cleanup needed for direct reuse.
 // We quote all values later with db_escape() before db update.
        $_POST = strip_quotes($_POST);