Fix for missing array elements

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index b12271915ce446d9ba9a2ccbc35b31ccdd65d413..7822bf081ffafcc12e37c2c6716ded7d0f16f7e7 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -58,6 +58,9 @@ if (!isAdminRegistered()) {
                setPostRequestParameter('ok', '***');
        } // END - if
 
+       // Clear error message
+       $errorMessage = '';
+
        if ((isFormSent()) && (postRequestParameter('ok') != '***')) {
                // Hash the password with the old function because we are here in install mode
                $hashedPass = md5(postRequestParameter('pass1'));
@@ -76,21 +79,35 @@ if (!isAdminRegistered()) {
                                        // Registering is done
                                        redirectToUrl('modules.php?module=admin&register=done');
                                } else {
-                                       $ret = getMessage('ADMIN_CANNOT_COMPLETE');
+                                       // Registration incomplete
+                                       $errorMessage = getMessage('ADMIN_CANNOT_COMPLETE');
+
+                                       // Set this to have our error message displayed
+                                       setPostRequestParameter('ok', '***');
                                }
                                break;
 
                        case 'failed': // Registration has failed
-                               $ret = getMessage('ADMIN_REGISTER_FAILED');
+                               $errorMessage = getMessage('ADMIN_REGISTER_FAILED');
+
+                               // Set this to have our error message displayed
+                               setPostRequestParameter('ok', '***');
                                break;
 
                        case 'already': // Admin does already exists!
-                               $ret = getMessage('ADMIN_LOGIN_ALREADY_REG');
+                               $errorMessage = getMessage('ADMIN_LOGIN_ALREADY_REG');
+
+                               // Set this to have our error message displayed
+                               setPostRequestParameter('ok', '***');
                                break;
 
                        default:
                                // Any other kind will be logged
-                               logDebugMessage(__FILE__, __LINE__, sprintf("Unknown return code %s from ifAdminLoginDataIsValid().", $ret));
+                               $errorMessage = sprintf("Unknown return code %s from ifAdminLoginDataIsValid().", $ret);
+                               logDebugMessage(__FILE__, __LINE__, $errorMessage);
+
+                               // Set this to have our error message displayed
+                               setPostRequestParameter('ok', '***');
                                break;
                } // END - switch
        } // END - if
@@ -119,7 +136,7 @@ if (!isAdminRegistered()) {
                        if (empty($content['login'])) $loginMessage = getMessage('ADMIN_NO_LOGIN');
 
                        // An error comes back from registration?
-                       if ((!empty($ret)) && ($ret != 'init')) $loginMessage = $ret;
+                       if ((!empty($ret)) && ($ret != 'init')) $loginMessage = $errorMessage;
 
                        // No password 1 entered or to short?
                        if (!isPostRequestParameterSet('pass1')) $pass1Message = getMessage('ADMIN_NO_PASS1');
@@ -147,7 +164,7 @@ if (!isAdminRegistered()) {
 
                // Load register template
                loadTemplate('admin_reg_form', false, $content);
-       }
+       } // END - if
 } elseif (isGetRequestParameterSet('reset_pass')) {
        // Is the form submitted?
        if ((isPostRequestParameterSet('send_link')) && (isPostRequestParameterSet('email'))) {