Re-added

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 367a96cbe9fb14fc0f3d641005974a85ecdab340..515c745ee9fb0e8ffc28c647ac18bc9e0b2e8f2a 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -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,15 +361,15 @@ 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_READABLE(PATH."inc/modules/admin/la_sys-inc.php"))) {
+                       if ((ADMIN_CHECK_MENU_MODE() == "NEW") && (FILE_READABLE(PATH."inc/modules/admin/lasys-inc.php"))) {
                                // Default area is the entrance, of course
                                $area = "entrance";
 
                                // Check for similar URL variable
-                               if (!empty($_GET['area'])) $area = $_GET['area'];
+                               if (!empty($_GET['area'])) $area = SQL_ESCAPE($_GET['area']);
 
                                // Load "logical-area menu-system" file
-                               require_once(PATH."inc/modules/admin/la_sys-inc.php");
+                               require_once(PATH."inc/modules/admin/lasys-inc.php");
 
                                // Create new-style menu system will "logical areas"
                                ADMIN_LOGICAL_AREA_SYSTEM($area, $act, $GLOBALS['what']);
@@ -395,10 +397,5 @@ 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);
-}
 //
 ?>