Also reset (aka daily reset scripts) renamed. The naming 'reset' came from the time...

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 261878ad0623b77382ee3a1a45ba6dd704a511d4..284e3dd9fb5043c205cb6e9ce882d7f5302b4731 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -72,7 +72,7 @@ if (!isAdminRegistered()) {
                // Check if registration wents fine
                switch ($ret) {
                        case 'done':
-                               $done = changeDataInFile(getCachePath() . 'config-local.php', 'ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
+                               $done = changeDataInInclude(getCachePath() . 'config-local.php', 'ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
                                if ($done === true) {
                                        // Registering is done
                                        redirectToUrl('modules.php?module=admin&register=done');
@@ -354,7 +354,7 @@ if (!isAdminRegistered()) {
        }
 } else {
        // Maybe an Admin want's to login?
-       $ret = ifAdminCookiesAreValid(getSession('admin_id'), getSession('admin_md5'));
+       $ret = ifAdminCookiesAreValid(getCurrentAdminId(), getAdminMd5());
 
        // Check status
        switch ($ret) {
@@ -362,9 +362,6 @@ if (!isAdminRegistered()) {
                        // Check for access control line of current menu entry
                        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');
-
                        // Check for version and switch between old menu system and new intelligent menu system
                        if ((adminGetMenuMode() == 'NEW') && (isIncludeReadable('inc/modules/admin/lasys-inc.php'))) {
                                // Default area is the entrance, of course
@@ -387,7 +384,7 @@ if (!isAdminRegistered()) {
 
                case '404': // Administrator login not found
                        setPostRequestParameter('ok', $ret);
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_ACCOUNT_404', getSession('admin_id')));
+                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_ACCOUNT_404', getCurrentAdminId()));
                        destroyAdminSession();
                        break;