summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
48affba)
Signed-off-by: Roland Häder <roland@mxchange.org>
if ((isPostRequestElementSet('send_link')) && (isPostRequestElementSet('email'))) {
// Output result
displayMessage(sendAdminPasswordResetLink(postRequestElement('email')));
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
// 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(
// Valid?
if ($valid === TRUE) {
// Prepare content first
$content = array(
- 'hash' => postRequestElement('hash'),
+ 'hash' => getRequestElement('hash'),
'admin_login' => postRequestElement('admin_login')
);
'admin_login' => postRequestElement('admin_login')
);
// Validation failed
displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}');
}
// 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');
} else {
// Output reset password form
loadTemplate('admin_reset_password_send_link');
<tr>
<td class="table_footer" colspan="2">
<input type="hidden" name="hash" value="$content[hash]" />
<tr>
<td class="table_footer" colspan="2">
<input type="hidden" name="hash" value="$content[hash]" />
- <input type="hidden" name="login" value="$content[admin_login]" />
+ <input type="hidden" name="admin_login" value="$content[admin_login]" />
<input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
<input type="submit" class="form_submit" name="reset_pass" value="{--ADMIN_RESET_PASSWORD_SUBMIT--}" />
</td>
<input type="reset" class="form_reset" value="{--CLEAR_FORM--}" />
<input type="submit" class="form_submit" name="reset_pass" value="{--ADMIN_RESET_PASSWORD_SUBMIT--}" />
</td>
{--ADMIN_ENTER_LOGIN--}
</td>
<td class="bottom">
{--ADMIN_ENTER_LOGIN--}
</td>
<td class="bottom">
- <input type="text" class="form_field" name="login" size="20" maxlength="255" />
+ <input type="text" class="form_field" name="admin_login" size="20" maxlength="255" />