* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team *
* For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
if ((isPostRequestElementSet('send_link')) && (isPostRequestElementSet('email'))) {
// Output result
displayMessage(sendAdminPasswordResetLink(postRequestElement('email')));
- } elseif (isGetRequestElementSet('hash')) {
- // Output form for hash validation
- loadTemplate('admin_validate_reset_hash_form', FALSE, getRequestElement('hash'));
- } elseif ((isPostRequestElementSet('validate_hash')) && (isPostRequestElementSet('admin_login')) && (isPostRequestElementSet('hash'))) {
+ } elseif ((isPostRequestElementSet('validate_hash')) && (isPostRequestElementSet('admin_login')) && (isGetRequestElementSet('hash'))) {
// Validate the login data and hash
- $valid = adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('admin_login'));
+ $valid = adminResetValidateHashLogin(getRequestElement('hash'), postRequestElement('admin_login'));
// Valid?
if ($valid === TRUE) {
// Prepare content first
$content = array(
- 'hash' => postRequestElement('hash'),
+ 'hash' => getRequestElement('hash'),
'admin_login' => postRequestElement('admin_login')
);
// Validation failed
displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}');
}
+ } elseif (isGetRequestElementSet('hash')) {
+ // Output form for hash validation
+ loadTemplate('admin_validate_reset_hash_form', FALSE, getRequestElement('hash'));
} else {
// Output reset password form
loadTemplate('admin_reset_password_send_link');
break;
default: // Others will be logged
- logDebugMessage(__FILE__, __LINE__, sprintf("Unknown return code %s from ifAdminLoginDataIsValid()", $ret));
+ logDebugMessage(__FILE__, __LINE__, sprintf('Unknown return code %s from ifAdminLoginDataIsValid()', $ret));
break;
} // END - switch
} // END - if
// Check for password
if (!isPostRequestElementSet('admin_password')) {
// No password entered?
- $passwdMessage = '{--ADMIN_NO_PASS--}';
- } elseif (strlen(postRequestElement('admin_password')) < getConfig('minium_admin_pass_length')) {
- // Or password too short?
- $passwdMessage = '{--ADMIN_SHORT_PASS--}';
+ $passwdMessage = '{--ADMIN_NO_PASSWORD--}';
} elseif ((!empty($ret)) && (postRequestElement('login') == 'password')) {
// An error comes back from login?
$passwdMessage = $ret;
$register = getRequestElement('setup');
// Special logout redirect for installation of given extension
- loadTemplate(sprintf("admin_logout_%s_install", $register));
+ loadTemplate(sprintf('admin_logout_%s_install', $register));
} elseif (isGetRequestElementSet('remove')) {
// Secure input
$remove = getRequestElement('remove');
// Special logout redirect for removal of given extension
- loadTemplate(sprintf("admin_logout_%s_remove", $remove));
+ loadTemplate(sprintf('admin_logout_%s_remove', $remove));
} else {
// Logged out normally
loadTemplate('admin_logout');
}
} else {
// Something went wrong here...
- loadTemplate('admin_settings_unsaved', FALSE, '{--ADMIN_LOGOUT_FAILED--}');
+ displayErrorMessage('{--ADMIN_LOGOUT_FAILED--}');
// Add fatal message
addFatalMessage(__FILE__, __LINE__, '{--CANNOT_UNREG_SESS--}');
break;
default: // Others will be logged
- logDebugMessage(__FILE__, __LINE__, sprintf("Unknown return code %s from ifAdminCookiesAreValid()", $ret));
+ logDebugMessage(__FILE__, __LINE__, sprintf('Unknown return code %s from ifAdminCookiesAreValid()', $ret));
break;
} // END - switch
}