X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=7822bf081ffafcc12e37c2c6716ded7d0f16f7e7;hp=3455022bc731152e5df9c077c623e9e1a8008a8b;hb=d9f35786166902b9bc3f402d4f2abeed5ae0528d;hpb=57227d33e870ec5cd271209c4a978a52b45c2dd6

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 3455022bc7..7822bf081f 100644
--- 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'))) {
@@ -215,7 +233,7 @@ if (!isAdminRegistered()) {
 
 				// Rewrite overview module
 				if (getWhat() == 'overview') {
-					setAction(getModeAction(getModule(), getWhat()));
+					setAction(getActionFromModuleWhat(getModule(), getWhat()));
 				} // END - if
 
 				// Add data to URL