All, except security block, include()/require() rewritten to own LOAD_INC()/LOAD_INC_...

[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 07011ba80f861f51347a018f39f3aa2dc66064b1..b717f17bcca13b19e9bfdf7573b4b95a8bbe5687 100644 (file)
--- a/inc/modules/admin/what-config_secure.php
+++ b/inc/modules/admin/what-config_secure.php
@@ -32,41 +32,34 @@
  ************************************************************************/
 
 // 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__));
+ADD_DESCR("admin", __FILE__);
 
-if (isset($_POST['ok']))
-{
+if (isset($_POST['ok'])) {
        // If salt length is empty or null then we shall generate new passwords
-       if (empty($_POST['salt_length']) || ($_POST['salt_length'] == "0"))
-       {
+       if (empty($_POST['salt_length']) || ($_POST['salt_length'] == "0")) {
                // Generate new passwords for all!
-               require(PATH."/inc/gen_sql_patches.php");
+               LOAD_INC("inc/gen_sql_patches.php");
 
                // Forget the wrong number!
                unset($_POST['salt_length']);
 
                // Redirect to logout link
                LOAD_URL("modules.php?module=admin&logout=1");
-       }
+       } // END - if
 
        // Save settings
        ADMIN_SAVE_SETTINGS($_POST);
-}
- else
-{
+} else {
        // Remember stuff in constants
-       define('__PASS_LEN'   , $_CONFIG['pass_len']);
+       define('__PASS_LEN'   , getConfig('pass_len'));
 
        // Password-salt length
-       define('__SALT_LENGTH', $_CONFIG['salt_length']);
+       define('__SALT_LENGTH', getConfig('salt_length'));
 
        // Load template
        LOAD_TEMPLATE("admin_config_secure");