* 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 *
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'));
// 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
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');
} // END - if
// Output message in seperate template
- loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NOT_REGISTERED'));
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}');
// 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'))) {
loadTemplate('admin_reset_password_form', false, $content);
} else {
// Cannot validate the login data and hash
- loadTemplate('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED'));
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED--}');
}
} elseif ((isPostRequestParameterSet('reset_pass')) && (isPostRequestParameterSet('hash')) && (isPostRequestParameterSet('login')) && (isPostRequestParameterSet('pass1')) && (postRequestParameter('pass1') == postRequestParameter('pass2'))) {
// Okay, we shall the admin password here. So first revalidate the hash
loadTemplate('admin_reset_pass_done', false, doResetAdminPassword(postRequestParameter('login'), postRequestParameter('pass1')));
} else {
// Validation failed
- loadTemplate('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2'));
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}');
}
} else {
// Output reset password form
if (isGetRequestParameterSet('register')) {
// Registration of first admin is done
- if (getRequestParameter('register') == 'done') loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REGISTER_DONE'));
+ if (getRequestParameter('register') == 'done') loadTemplate('admin_settings_saved', false, '{--ADMIN_REGISTER_DONE--}');
} // END - if
// Check if the admin has submitted data or not
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') {
- setAction(getModeAction(getModule(), getWhat()));
+ setAction(getActionFromModuleWhat(getModule(), getWhat()));
} // 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
setPostRequestParameter('ok', $ret);
- $ret = getMaskedMessage('ADMIN_404', postRequestParameter('login'));
+ $ret = getMaskedMessage('ADMIN_ACCOUNT_404', postRequestParameter('login'));
destroyAdminSession();
break;
}
} 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'));
case '404': // Administrator login not found
setPostRequestParameter('ok', $ret);
- loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_404', getSession('admin_login')));
+ loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_ACCOUNT_404', getSession('admin_login')));
destroyAdminSession();
break;
case 'pass': // Wrong password
setPostRequestParameter('ok', $ret);
- loadTemplate('admin_settings_saved', false, getMessage('WRONG_PASS'));
+ loadTemplate('admin_settings_saved', false, '{--WRONG_PASS--}');
destroyAdminSession();
break;