From 1ae6f845378f58ec9f45e66216dedcaec53a50b2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 29 Sep 2008 23:14:53 +0000 Subject: [PATCH] Some more glitches fixed away... --- inc/databases.php | 2 +- inc/modules/member/what-logout.php | 7 +------ inc/session.php | 8 ++++++-- modules.php | 9 ++++++++- templates/de/emails/admin/admin_refback.tpl | 2 +- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/inc/databases.php b/inc/databases.php index e812ac9b8f..16f28821c8 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -113,7 +113,7 @@ define('USAGE_BASE', "usage"); define('SERVER_URL', "http://www.mxchange.org"); // This current patch level -define('CURR_SVN_REVISION', "416"); +define('CURR_SVN_REVISION', "417"); // Take a prime number which is long (if you know a longer one please try it out!) define('_PRIME', 591623); diff --git a/inc/modules/member/what-logout.php b/inc/modules/member/what-logout.php index c048b06423..00e83449b0 100644 --- a/inc/modules/member/what-logout.php +++ b/inc/modules/member/what-logout.php @@ -10,7 +10,7 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Aus dem Mitgliesbereich ausloggen * * -------------------------------------------------------------------- * - * Logout_mod: new from 15.01.04 / Fixed Reset of Cooks * + * * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * @@ -42,11 +42,6 @@ if (!defined('__SECURITY')) { // Base URL for redirection (both cases) $URL = URL."/modules.php?module=index"; -// Patched by Robert Niedziela: cookies won't (?) be deleted on some newer IE versions - -// NEW: Fixed the Set of Cookies, you mus add right TimeSet, if you changed it in What_login.php! (eg. time()- cookieTime - - if (destroy_user_session()) { // Remove theme cookie as well set_session("mxchange_theme", ""); diff --git a/inc/session.php b/inc/session.php index 4c93c2267c..7d609e44ee 100644 --- a/inc/session.php +++ b/inc/session.php @@ -95,8 +95,11 @@ if (isset($_SESSION['userid'])) { if (!IS_MEMBER()) { // Then destroy the user id destroy_user_session(); + + // Kill userid + $GLOBALS['userid'] = 0; } // END - if -} +} // END - if // Test session if index.php or modules.php is loaded if ((basename($_SERVER['PHP_SELF']) == "index.php") || (basename($_SERVER['PHP_SELF']) == "modules.php") || (isBooleanConstantAndTrue('mxchange_installing'))) { @@ -107,7 +110,8 @@ if ((basename($_SERVER['PHP_SELF']) == "index.php") || (basename($_SERVER['PHP_S // Cookies rejected! define('__COOKIES', false); } -} +} // END - if + //* DEBUG: */ print("
".print_r($_SESSION, true)."
"); // diff --git a/modules.php b/modules.php index 72cd6943e0..9dcd410fea 100644 --- a/modules.php +++ b/modules.php @@ -73,13 +73,20 @@ if (IS_MEMBER()) { $username .= " ("._ADMIN_SHORT.")"; } // END - if } else { - // Hmmm, logged in and no valid cookies??? + // Hmmm, logged in and no valid userid? $username = ""._UNKNOWN.""; + + // Destroy session + destroy_user_session(); + + // Kill userid + $GLOBALS['userid'] = 0; } // Free memory SQL_FREERESULT($result); } elseif (IS_ADMIN()) { + // Admin is there $username = _ADMIN; } else { // He's a guest, hello there... ;-) diff --git a/templates/de/emails/admin/admin_refback.tpl b/templates/de/emails/admin/admin_refback.tpl index 1d4bea773e..5ded5824b5 100644 --- a/templates/de/emails/admin/admin_refback.tpl +++ b/templates/de/emails/admin/admin_refback.tpl @@ -1,4 +1,4 @@ -Hallo Administrator, +{--HELLO_ADMIN--}, Das Mitglied $UID hat soeben Ref-Back für ein anderes Mitglied eingestellt. -- 2.39.5