X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fmember%2Fwhat-logout.php;h=444063102b52d84327a0bbbf56aa24cc24c1bb79;hb=7b50f1945e168fcd2daa82898c3bb71d59bc653a;hp=d16554c595308dd84941c699373b2ddc43fdeb7c;hpb=cb20090aa0558f1b74f0e9f925f29819e8bb3a45;p=mailer.git

diff --git a/inc/modules/member/what-logout.php b/inc/modules/member/what-logout.php
index d16554c595..444063102b 100644
--- a/inc/modules/member/what-logout.php
+++ b/inc/modules/member/what-logout.php
@@ -14,12 +14,11 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
+ * @TODO Rewrite the code to a filter                                   *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * 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 *
@@ -39,27 +38,31 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } elseif (!isMember()) {
 	redirectToIndexMemberOnlyModule();
 }
 
 // Base URL for redirection (both cases)
-$URL = 'modules.php?module=index&code=';
+$url = 'modules.php?module=index&code=';
 
-if (destroyMemberSession()) {
+// Do the logout but keep session if current user is also admin
+if (destroyMemberSession(!isAdmin())) {
 	// Remove theme cookie as well
-	if (isExtensionActive('theme')) setTheme('');
+	// @TODO Move this in a filter, e.g. member_logout
+	if (isExtensionActive('theme')) {
+		setMailerTheme('');
+	} // END - if
 
 	// Logout completed
-	$URL .= getCode('LOGOUT_DONE');
+	$url .= getCode('LOGOUT_DONE');
 } else {
 	// Cannot logout! :-(
-	$URL .= getCode('LOGOUT_FAILED');
+	$url .= getCode('LOGOUT_FAILED');
 }
 
 // Load the URL
-redirectToUrl($URL);
+redirectToUrl($url);
 
 // [EOF]
 ?>