More rewrites of constants and fix for loading mass-included scripts by GET_DIR_AS_AR...

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 7261d1cddcad84f4bd02cf169f6f6aa612991b77..198995ae10a5686dee2201ef647306850404e2f1 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Login is default
-if ((empty($GLOBALS['action'])) && ($check == "admin_only")) {
+if ((empty($GLOBALS['action'])) && (CHECK_MODULE($GLOBALS['module']) == "admin_only")) {
        // Redirect to right URL
        LOAD_URL("modules.php?module=admin&action=login");
 } // END - if
@@ -53,7 +53,7 @@ FIX_DELETED_COOKIES(array('admin_login', 'admin_md5', 'admin_last', 'admin_to'))
 $ret = "init";
 
 // Is no admin registered?
-if (!isBooleanConstantAndTrue('admin_registered')) {
+if (!isAdminRegistered()) {
        // Admin is not registered so we have to inform the user
        if ((IS_FORM_SENT()) && ((!REQUEST_ISSET_POST(('login'))) || (!REQUEST_ISSET_POST(('pass'))) || (strlen(REQUEST_POST('pass')) < 4))) {
                REQUEST_SET_POST('ok', "***");
@@ -97,7 +97,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                        }
 
                        // Admin still not registered?
-                       if (!isBooleanConstantAndTrue('admin_registered')) {
+                       if (!isAdminRegistered()) {
                                // Write to config that registration is done
                                changeDataInFile(constant('PATH')."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
 
@@ -319,13 +319,13 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                // Load logout template
                if (REQUEST_ISSET_GET(('register'))) {
                        // Secure input
-                       $register = SQL_ESCAPE(REQUEST_GET('register'));
+                       $register = REQUEST_GET(('register'));
 
                        // Special logout redirect for installation of given extension
                        LOAD_TEMPLATE(sprintf("admin_logout_%s_install", $register));
                } elseif (REQUEST_ISSET_GET(('remove'))) {
                        // Secure input
-                       $remove = SQL_ESCAPE(REQUEST_GET('remove'));
+                       $remove = REQUEST_GET(('remove'));
 
                        // Special logout redirect for removal of given extension
                        LOAD_TEMPLATE(sprintf("admin_logout_%s_remove", $remove));
@@ -358,7 +358,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                        $area = "entrance";
 
                        // Check for similar URL variable
-                       if (REQUEST_ISSET_GET(('area'))) $area = SQL_ESCAPE(REQUEST_GET('area'));
+                       if (REQUEST_ISSET_GET(('area'))) $area = REQUEST_GET(('area'));
 
                        // Load "logical-area menu-system" file
                        LOAD_INC_ONCE("inc/modules/admin/lasys-inc.php");