Compilation time added, some compileCode() calles removed, ADMIN_WHAT_404 added

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 43df3fa8de2b1ba35f439d1ad969b5ab0ebf5196..b9b59ece5f405ce696c877bf469619881f8cb448 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -101,7 +101,7 @@ if (!isAdminRegistered()) {
                                        changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
 
                                        // Load URL for login
-                                       redirectToUrl('modules.php?module=admin');
+                                       redirectToUrl('admin.php');
                                } // END - if
                                break;
                } // END - switch
@@ -229,7 +229,7 @@ if (!isAdminRegistered()) {
 
                        case '404': // Administrator login not found
                                setRequestPostElement('ok', $ret);
-                               $ret = getMessage('ADMIN_404');
+                               $ret = sprintf(getMessage('ADMIN_404'), postRequestElement('login'));
                                destroyAdminSession();
                                break;
 
@@ -337,11 +337,12 @@ if (!isAdminRegistered()) {
 } else {
        // Maybe an Admin want's to login?
        $ret = ifAdminCookiesAreValid(getSession('admin_login'), getSession('admin_md5'));
-       switch ($ret)
-       {
+
+       // Check status
+       switch ($ret) {
                case 'done':
                        // Check for access control line of current menu entry
-                       $GLOBALS['acl_allow'] = runFilterChain('check_admin_acl');
+                       runFilterChain('check_admin_acl');
 
                        // When type of admin menu is not set fallback to old menu system
                        if (!isConfigEntrySet('admin_menu')) setConfigEntry('admin_menu', 'OLD');
@@ -358,30 +359,30 @@ if (!isAdminRegistered()) {
                                loadIncludeOnce('inc/modules/admin/lasys-inc.php');
 
                                // Create new-style menu system will logical areas
-                               ADMIN_LOGICAL_AREA_SYSTEM($area, $action, getWhat());
+                               doAdminLogicalArea($area, $action, getWhat());
                        } else {
                                // This little call constructs the whole default old and lacky menu system
                                // on left side. It also renders the content on right side
-                               doAdminAction(getWhat());
+                               doAdminAction();
                        }
                        break;
 
                case '404': // Administrator login not found
                        setRequestPostElement('ok', $ret);
+                       loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_404'), getSession('admin_login')));
                        destroyAdminSession();
-                       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_404'));
                        break;
 
                case 'pass': // Wrong password
                        setRequestPostElement('ok', $ret);
+                       loadTemplate('admin_settings_saved', false, getMessage('WRONG_PASS'));
                        destroyAdminSession();
-                       addFatalMessage(__FILE__, __LINE__, getMessage('WRONG_PASS'));
                        break;
 
                default: // Others will be logged
                        logDebugMessage(__FILE__, __LINE__, sprintf("Unknown return code %s from ifAdminCookiesAreValid()", $ret));
                        break;
-       }
+       } // END - switch
 }
 
 // [EOF]