From 8b5ccd302bd1497de721a25e4ce086bebf95173f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 08 Jun 2008 15:32:42 -0400
Subject: [PATCH] Fixed a problem with the logout when the php session has ended.

---
 interface/lib/classes/auth.inc.php |    3 ++-
 interface/web/js/scrigo.js         |    3 +++
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/interface/lib/classes/auth.inc.php b/interface/lib/classes/auth.inc.php
index ef9b4fc..3bd5f5c 100644
--- a/interface/lib/classes/auth.inc.php
+++ b/interface/lib/classes/auth.inc.php
@@ -94,7 +94,8 @@
 	public function check_module_permissions($module) {
 		// Check if the current user has the permissions to access this module
 		if(!stristr($_SESSION["s"]["user"]["modules"],$module)) {
-			header("Location: ../index.php");
+			echo "LOGIN_REDIRECT:/index.php";
+			//header("Location: ../index.php");
 			exit;
 		}
 	}
diff --git a/interface/web/js/scrigo.js b/interface/web/js/scrigo.js
index df43d2f..3fde066 100644
--- a/interface/web/js/scrigo.js
+++ b/interface/web/js/scrigo.js
@@ -46,6 +46,9 @@
 				loadContent(parts[1]);
 				//redirect = parts[1];
 				//window.setTimeout('loadContent(redirect)', 1000);
+			} else if (o.responseText.indexOf('LOGIN_REDIRECT:') > -1) {
+				// Go to the login page
+				document.location.href = 'index.php';
 			} else {
 				document.getElementById('pageContent').innerHTML = o.responseText;
 			}

--
Gitblit v1.9.1