Merged changes up to 2.3.16 into unstable

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

diff --git a/includes/session.inc b/includes/session.inc
index 9a3efc267fd696e5206ede57d78a6c29dc56d7fc..da23735e62df03ebaafded64fef8d3b5e72412c5 100644 (file)
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -354,7 +354,6 @@ foreach ($installed_extensions as $ext)
 // ini_set('session.save_path', dirname(__FILE__).'/../tmp/');
 
 ini_set('session.gc_maxlifetime', 36000); // 10hrs
-ini_set('session.cache_limiter', 'private'); // prevent 'page expired' errors
 
 hook_session_start(@$_POST["company_login_name"]);
 
@@ -456,6 +455,16 @@ if (strstr($_SERVER['PHP_SELF'], 'logout.php') == false){
                        // Incorrect password
                                login_fail();
                        }
+                       elseif(isset($_SESSION['timeout']) && !$_SESSION['timeout']['post'])
+                       {
+                               // in case of GET request redirect to avoid confirmation dialog 
+                               // after return from menu option
+                               header("HTTP/1.1 303 See Other");
+                               header("Location: ".$_SESSION['timeout']['uri']);
+                               exit();
+                       }
+                       $lang = &$_SESSION['language'];
+                       $lang->set_language($_SESSION['language']->code);
                }
        } else
        {       set_global_connection();