More XHTML-fied and extended header added to templates

[mailer.git] / inc / modules / admin / action-logout.php

diff --git a/inc/modules/admin/action-logout.php b/inc/modules/admin/action-logout.php
index 56272aba32f6a787bf906a2992397ca83cf0cd51..579c966509bacdfbfc63425f9e3936a6c73530db 100644 (file)
--- a/inc/modules/admin/action-logout.php
+++ b/inc/modules/admin/action-logout.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Ausloggen-Menuepunkt                             *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009)             $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -32,25 +37,24 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
-OUTPUT_HTML("</FONT><br /><br />");
+ADD_DESCR("admin", __FILE__);
 
-if (!empty($_POST['no'])) {
+if (REQUEST_ISSET_POST(('no'))) {
        // Do not logout now
-       LOAD_URL("modules.php?module=admin");
-} elseif ((!empty($_POST['yes'])) && ($GLOBALS['action'] == "logout")) {
+       LOAD_URL("admin.php");
+} elseif ((REQUEST_ISSET_POST(('yes'))) && ($GLOBALS['action'] == "logout")) {
        // Redirect to logout link
        LOAD_URL("modules.php?module=admin&amp;logout=1");
-} else {
-       // Load logout form template
-       LOAD_TEMPLATE("admin_logout_form");
 }
+
+// Load logout form template
+LOAD_TEMPLATE("admin_logout_form");
+
 //
 ?>