X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-logout.php;h=3eaf9e7583a136495b0e1bffc7814c03cd7d1971;hb=c47144dd555bbab4acdf9085e4623900dedb0e7c;hp=797f8e262dd4e7fcf06fc66ead931e53b9045502;hpb=b5912168d72ae511eb623c3d92540c82d31b93c5;p=mailer.git

diff --git a/inc/modules/member/what-logout.php b/inc/modules/member/what-logout.php
index 797f8e262d..3eaf9e7583 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                  *
@@ -32,42 +32,32 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
-}
- elseif (!IS_LOGGED_IN())
-{
+} elseif (!IS_MEMBER()) {
 	LOAD_URL("modules.php?module=index");
 }
 
 // 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";
 
-
-if (set_session("userid", "", time() - 3600, COOKIE_PATH) && set_session("u_hash", "", time() - 3600, COOKIE_PATH) && set_session("lifetime", "", time() - 3600, COOKIE_PATH))
-{
+if (destroy_user_session()) {
 	// Remove theme cookie as well
-	set_session("mxchange_theme", "", time() - 3600, COOKIE_PATH);
+	set_session("mxchange_theme", "");
 
 	// Logout completed
-	$URL .= "&msg=".CODE_LOGOUT_DONE;
+	$URL .= "&msg=".CODE_LOGOUT_DONE;
 
 	// Destroy session here
 	@session_destroy();
-}
- else
-{
+} else {
 	// Cannot logout! :-(
-	$URL .= "&msg=".CODE_LOGOUT_FAILED;
+	$URL .= "&msg=".CODE_LOGOUT_FAILED;
 }
 
-//
+// Load the URL
 LOAD_URL($URL);
+
 //
 ?>