Fixes for sending pool

[mailer.git] / inc / modules / admin.php

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 7e809cf2e1485ff6fa5335ebeea481a86dd08a0c..36a322a0c9e6a579d0797fb8b37197563f4ff308 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // 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);
 }
@@ -49,7 +49,7 @@ require_once(PATH."inc/modules/admin/admin-inc.php");
 // Fix "deleted" cookies in PHP4 (PHP5 does remove them, PHP4 sets them to deleted!)
 FIX_DELETED_COOKIES(array('admin_login', 'admin_md5', 'admin_last', 'admin_to'));
 
-if (!isBooleanConstantAndTrue('admin_registered')) {
+if (!defined('admin_registered')) {
        // Admin is not registered so we have to inform the user
        if ((isset($_POST['ok'])) && ((empty($_POST['login'])) || (empty($_POST['pass'])) || (strlen($_POST['pass']) < 4))) $_POST['ok'] = "***";
        if ((isset($_POST['ok'])) && ($_POST['ok'] != "***")) {
@@ -90,7 +90,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                                $ret = "done";
                        }
 
-                       if (!isBooleanConstantAndTrue('admin_registered')) {
+                       if (!defined('admin_registered')) {
                                // Write to config that registration is done
                                admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
 
@@ -397,8 +397,8 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 
 if (isBooleanConstantAndTrue('admin_registered')) {
        // Check config.php and inc directory for right access rights
-       if (is_INCWritable("config"))     ADD_FATAL(FATAL_CONFIG_WRITABLE);
-       if (is_INCWritable("dummy"))      ADD_FATAL(FATAL_INC_WRITABLE);
+       // DEPRECATED: if (is_INCWritable("config"))     ADD_FATAL(FATAL_CONFIG_WRITABLE);
+       // DEPRECATED: if (is_INCWritable("dummy"))      ADD_FATAL(FATAL_INC_WRITABLE);
 }
 //
 ?>