Security line in all includes changed

[mailer.git] / inc / modules / admin / what-config_secure.php

diff --git a/inc/modules/admin/what-config_secure.php b/inc/modules/admin/what-config_secure.php
index 2ad3c4bf37f2fcc1c6067aa07edb55ccaa02900f..6b69b6df564968330dfb52451c48216cdd34441c 100644 (file)
--- a/inc/modules/admin/what-config_secure.php
+++ b/inc/modules/admin/what-config_secure.php
@@ -32,13 +32,10 @@
  ************************************************************************/
 
 // 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);
 }
-global $link;
-
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
 
@@ -54,7 +51,7 @@ if (isset($_POST['ok']))
                unset($_POST['salt_length']);
 
                // Redirect to logout link
-               LOAD_URL(URL."/modules.php?module=admin&logout=1");
+               LOAD_URL("modules.php?module=admin&logout=1");
        }
 
        // Save settings
@@ -63,10 +60,10 @@ if (isset($_POST['ok']))
  else
 {
        // Remember stuff in constants
-       define('__PASS_LEN'   , $CONFIG['pass_len']);
+       define('__PASS_LEN'   , $_CONFIG['pass_len']);
 
        // Password-salt length
-       define('__SALT_LENGTH', $CONFIG['salt_length']);
+       define('__SALT_LENGTH', $_CONFIG['salt_length']);
 
        // Load template
        LOAD_TEMPLATE("admin_config_secure");