Fix for newsletter

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index a117d14b8970864db74e0f9614b4f0a2520fa90e..06823fef116a420c0528e4b03a86950f61b3332a 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);
 }
@@ -203,6 +203,8 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
        if ((isset($_POST['ok'])) && ($_POST['ok'] != "***")) {
                // All required data was entered so we check his account
                $ret = CHECK_ADMIN_LOGIN($_POST['login'], $_POST['pass']);
+
+               // Which status do we have?
                switch ($ret)
                {
                case "done": // Admin and password are okay, so we log in now
@@ -359,7 +361,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                        if (empty($_CONFIG['admin_menu'])) $_CONFIG['admin_menu'] = "OLD";
 
                        // Check for version and switch between old menu system and new "intelligent menu system"
-                       if ((ADMIN_CHECK_MENU_MODE() == "NEW") && (file_exists(PATH."inc/modules/admin/la_sys-inc.php"))) {
+                       if ((ADMIN_CHECK_MENU_MODE() == "NEW") && (FILE_READABLE(PATH."inc/modules/admin/la_sys-inc.php"))) {
                                // Default area is the entrance, of course
                                $area = "entrance";
 
@@ -395,11 +397,10 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
        }
 }
 
-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);
 }
 //
 ?>