Even more fixes for broken first installation attempt (sorry all)

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 13f64f1146c8cbad1b3e97e067f7adef79d546d1..65ee5460d68b550055d6117e7d4fa35b65eb0255 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -67,12 +67,15 @@ if (!isAdminRegistered()) {
                destroyAdminSession(false);
 
                // Do registration
-               $ret = addAdminAccount(postRequestParameter('login'), $hashedPass, getConfig('WEBMASTER'));
+               $ret = addAdminAccount(postRequestParameter('login'), $hashedPass, getWebmaster());
 
                // Check if registration wents fine
                switch ($ret) {
                        case 'done':
+                               // Change ADMIN_REGISTERED entry
                                $done = changeDataInInclude(getCachePath() . 'config-local.php', 'ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
+
+                               // Was it successfull?
                                if ($done === true) {
                                        // Registering is done
                                        redirectToUrl('modules.php?module=admin&register=done');
@@ -155,6 +158,7 @@ if (!isAdminRegistered()) {
                        $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);
                        $content['pass1_message'] = loadTemplate('admin_login_msg', true, $pass1Message);
                        $content['pass2_message'] = loadTemplate('admin_login_msg', true, $pass2Message);
+                       $content['error_message'] = loadTemplate('admin_login_msg', true, $errorMessage);
                } // END - if
 
                // Output message in seperate template
@@ -211,7 +215,10 @@ if (!isAdminRegistered()) {
 
        if (isGetRequestParameterSet('register')) {
                // Registration of first admin is done
-               if (getRequestParameter('register') == 'done') loadTemplate('admin_settings_saved', false, '{--ADMIN_REGISTER_DONE--}');
+               if (getRequestParameter('register') == 'done') {
+                       // Regisration done!
+                       loadTemplate('admin_settings_saved', false, '{--ADMIN_REGISTER_DONE--}');
+               } // END - if
        } // END - if
 
        // Check if the admin has submitted data or not
@@ -235,13 +242,17 @@ if (!isAdminRegistered()) {
                                } // END - if
 
                                // Add data to URL
-                               if (isWhatSet())        $url .= 'what='.getWhat();
-                                elseif (isActionSet()) $url .= 'action='.getAction();
-                                elseif (isGetRequestParameterSet('area'))  $url .= 'area='.getRequestParameter('area');
+                               if (isWhatSet()) {
+                                       $url .= 'what=' . getWhat();
+                               } elseif (isActionSet()) {
+                                       $url .= 'action=' . getAction();
+                               } elseif (isGetRequestParameterSet('area')) {
+                                       $url .= 'area=' . getRequestParameter('area');
+                               }
 
-                        // Load URL
-                        redirectToUrl($url);
-                        break;
+                               // Load URL
+                               redirectToUrl($url);
+                               break;
 
                        case '404': // Administrator login not found
                                setPostRequestParameter('ok', $ret);
@@ -274,7 +285,8 @@ if (!isAdminRegistered()) {
 
                if (isFormSent()) {
                        // Set messages to zero
-                       $loginMessage = ''; $passwdMessage = '';
+                       $loginMessage = '';
+                       $passwdMessage = '';
 
                        // No login entered?
                        if (!isPostRequestParameterSet('login')) $loginMessage = '{--ADMIN_NO_LOGIN--}';