Even more rewrites/fixes from EL branch (please report any broken part after you...

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 51fa7f9e1e90bc1c13b5d16889fe0905794d11af..f798980ef65caba77bd40755dd7a1d79cd81d907 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -57,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'));
@@ -75,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
@@ -118,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');
@@ -146,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'))) {
@@ -211,7 +229,7 @@ if (!isAdminRegistered()) {
                switch ($ret) {
                        case 'done': // Admin and password are okay, so we log in now
                                // Construct URL and redirect
-                               $URL = 'modules.php?module=admin&';
+                               $url = 'modules.php?module=admin&';
 
                                // Rewrite overview module
                                if (getWhat() == 'overview') {
@@ -219,12 +237,12 @@ 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);
+                        redirectToUrl($url);
                         break;
 
                        case '404': // Administrator login not found
@@ -294,7 +312,13 @@ if (!isAdminRegistered()) {
                        }
                } elseif (isGetRequestParameterSet('area')) {
                        // Restore old area value
-                       $content = merge_array($content, array('target' => 'area', 'value' => getRequestParameter('area')));
+                       $content = merge_array(
+                               $content,
+                               array(
+                                       'target' => 'area',
+                                       'value'  => getRequestParameter('area')
+                               )
+                       );
                } else {
                        // Set default values
                        $content = merge_array($content, array('target' => 'action', 'value' => 'login'));