Missing admin account or wrong pass is not fatal

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 401dfc75d03b69e1e2e56f00ccede303fd51dd6f..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
@@ -363,19 +363,19 @@ if (!isAdminRegistered()) {
                        } 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);
-                       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('ADMIN_404'), getSession('admin_login')));
+                       loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_404'), getSession('admin_login')));
                        destroyAdminSession();
                        break;
 
                case 'pass': // Wrong password
                        setRequestPostElement('ok', $ret);
-                       addFatalMessage(__FILE__, __LINE__, getMessage('WRONG_PASS'));
+                       loadTemplate('admin_settings_saved', false, getMessage('WRONG_PASS'));
                        destroyAdminSession();
                        break;