X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-logout.php;h=444063102b52d84327a0bbbf56aa24cc24c1bb79;hb=9a7e55141378f5323480fcbf33b033d2750392f4;hp=797f8e262dd4e7fcf06fc66ead931e53b9045502;hpb=f2349ad1aac06d2c76c239f74cface7b316333f9;p=mailer.git

diff --git a/inc/modules/member/what-logout.php b/inc/modules/member/what-logout.php
index 797f8e262d..444063102b 100644
--- a/inc/modules/member/what-logout.php
+++ b/inc/modules/member/what-logout.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/16/2003 *
- * ===============                              Last change: 04/03/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 10/16/2003 *
+ * ===================                          Last change: 04/03/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-logout.php                                  *
@@ -10,10 +10,15 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Aus dem Mitgliesbereich ausloggen                *
  * -------------------------------------------------------------------- *
- *         Logout_mod: new from 15.01.04 / Fixed Reset of Cooks         *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * @TODO Rewrite the code to a filter                                   *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -32,42 +37,32 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-}
- elseif (!IS_LOGGED_IN())
-{
-	LOAD_URL("modules.php?module=index");
+if (!defined('__SECURITY')) {
+	exit();
+} elseif (!isMember()) {
+	redirectToIndexMemberOnlyModule();
 }
 
 // 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
-
+$url = 'modules.php?module=index&amp;code=';
 
-if (set_session("userid", "", time() - 3600, COOKIE_PATH) && set_session("u_hash", "", time() - 3600, COOKIE_PATH) && set_session("lifetime", "", time() - 3600, COOKIE_PATH))
-{
+// Do the logout but keep session if current user is also admin
+if (destroyMemberSession(!isAdmin())) {
 	// Remove theme cookie as well
-	set_session("mxchange_theme", "", time() - 3600, COOKIE_PATH);
+	// @TODO Move this in a filter, e.g. member_logout
+	if (isExtensionActive('theme')) {
+		setMailerTheme('');
+	} // END - if
 
 	// Logout completed
-	$URL .= "&msg=".CODE_LOGOUT_DONE;
-
-	// Destroy session here
-	@session_destroy();
-}
- else
-{
+	$url .= getCode('LOGOUT_DONE');
+} else {
 	// Cannot logout! :-(
-	$URL .= "&msg=".CODE_LOGOUT_FAILED;
+	$url .= getCode('LOGOUT_FAILED');
 }
 
-//
-LOAD_URL($URL);
-//
+// Load the URL
+redirectToUrl($url);
+
+// [EOF]
 ?>