Wrong column for array_substitute in delivery and invoice templates.

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

diff --git a/includes/session.inc b/includes/session.inc
index 4712f742b57c608055646bb988da0cc5140d4701..27e6f8e6746e407ebc98471d7891b007aff20d7e 100644 (file)
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -77,7 +77,6 @@ class SessionManager
 
                // Create new session without destroying the old one
                session_regenerate_id();
- 
                // Grab current session ID and close both sessions to allow other scripts to use them
                $newSession = session_id();
                session_write_close();
@@ -452,6 +451,14 @@ 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);
                }