Security line in all includes changed

[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 1fefc2a0aff9a099cea42160e48e89fc29ecb510..2658ae6291455408a8c7b07397965b5020fc5016 100644 (file)
--- a/inc/modules/admin/action-logout.php
+++ b/inc/modules/admin/action-logout.php
@@ -32,28 +32,21 @@
  ************************************************************************/
 
 // 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>");
 
-if (!empty($_POST['no']))
-{
+if (!empty($_POST['no'])) {
        // Do not logout now
-       LOAD_URL(URL."/modules.php?module=admin");
-}
- elseif ((!empty($_POST['yes'])) && ($GLOBALS['action'] == "logout"))
-{
+       LOAD_URL("modules.php?module=admin");
+} elseif ((!empty($_POST['yes'])) && ($GLOBALS['action'] == "logout")) {
        // Redirect to logout link
-       LOAD_URL(URL."/modules.php?module=admin&amp;logout=1");
-}
- else
-{
+       LOAD_URL("modules.php?module=admin&amp;logout=1");
+} else {
        // Load logout form template
        LOAD_TEMPLATE("admin_logout_form");
 }