X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin.php;h=b12271915ce446d9ba9a2ccbc35b31ccdd65d413;hb=7f746f060a7b69433149b462e64c5121ce853151;hp=78705e7aff8562e47fdd978185396ff6439b3a49;hpb=af57cc214f46f69247698f50d2eec74a8449b79c;p=mailer.git
diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 78705e7aff..b12271915c 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -1,7 +1,7 @@
secureString(postRequestElement('hash')),
- 'login' => secureString(postRequestElement('login'))
+ 'hash' => secureString(postRequestParameter('hash')),
+ 'login' => secureString(postRequestParameter('login'))
);
// Validation okay so display form for final password change
@@ -173,11 +174,11 @@ if (!isAdminRegistered()) {
// Cannot validate the login data and hash
loadTemplate('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED'));
}
- } elseif ((isPostRequestElementSet('reset_pass')) && (isPostRequestElementSet('hash')) && (isPostRequestElementSet('login')) && (isPostRequestElementSet('pass1')) && (postRequestElement('pass1') == postRequestElement('pass2'))) {
+ } 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
- if (adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('login'))) {
+ if (adminResetValidateHashLogin(postRequestParameter('hash'), postRequestParameter('login'))) {
// Output result
- loadTemplate('admin_reset_pass_done', false, doResetAdminPassword(postRequestElement('login'), postRequestElement('pass1')));
+ 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'));
@@ -186,26 +187,26 @@ if (!isAdminRegistered()) {
// Output reset password form
loadTemplate('admin_send_reset_link');
}
-} elseif ((!isSessionVariableSet('admin_login')) || (!isSessionVariableSet('admin_md5')) || (!isSessionVariableSet('admin_last')) || (!isSessionVariableSet('admin_to')) || ((getSession('admin_last') + bigintval(getSession('admin_to')) * 3600 * 24) < time())) {
+} elseif ((!isSessionVariableSet('admin_login')) || (!isSessionVariableSet('admin_md5')) || (!isSessionVariableSet('admin_last'))) {
// At leat one administrator account was created
- if ((isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5')) && (isSessionVariableSet('admin_last')) && (isSessionVariableSet('admin_to'))) {
+ if ((isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5')) && (isSessionVariableSet('admin_last'))) {
// Timeout for last login, we have to logout first!
redirectToUrl('modules.php?module=admin&logout=1');
} // END - if
- if (isGetRequestElementSet('register')) {
+ if (isGetRequestParameterSet('register')) {
// Registration of first admin is done
- if (getRequestElement('register') == 'done') loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REGISTER_DONE'));
+ if (getRequestParameter('register') == 'done') loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REGISTER_DONE'));
} // END - if
// Check if the admin has submitted data or not
- if ((isFormSent()) && ((!isPostRequestElementSet('login')) || (!isPostRequestElementSet('pass')) || (strlen(postRequestElement('pass')) < 4))) {
- setRequestPostElement('ok', '***');
+ if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('pass')) || (strlen(postRequestParameter('pass')) < 4))) {
+ setPostRequestParameter('ok', '***');
} // END - if
- if ((isFormSent()) && (postRequestElement('ok') != '***')) {
+ if ((isFormSent()) && (postRequestParameter('ok') != '***')) {
// All required data was entered so we check his account
- $ret = ifAdminLoginDataIsValid(postRequestElement('login'), postRequestElement('pass'));
+ $ret = ifAdminLoginDataIsValid(postRequestParameter('login'), postRequestParameter('pass'));
// Which status do we have?
switch ($ret) {
@@ -215,27 +216,27 @@ if (!isAdminRegistered()) {
// 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 (isGetRequestElementSet('area')) $URL .= 'area='.getRequestElement('area');
+ elseif (isGetRequestParameterSet('area')) $URL .= 'area='.getRequestParameter('area');
// Load URL
redirectToUrl($URL);
break;
case '404': // Administrator login not found
- setRequestPostElement('ok', $ret);
- $ret = sprintf(getMessage('ADMIN_404'), postRequestElement('login'));
+ setPostRequestParameter('ok', $ret);
+ $ret = getMaskedMessage('ADMIN_404', postRequestParameter('login'));
destroyAdminSession();
break;
case 'pass': // Wrong password
- setRequestPostElement('ok', $ret);
- $ret = '{--WRONG_PASS--} [{--ADMIN_RESET_PASS--}]';
+ setPostRequestParameter('ok', $ret);
+ $ret = '{--WRONG_PASS--} [{--ADMIN_RESET_PASS--}]';
destroyAdminSession();
break;
@@ -248,8 +249,8 @@ if (!isAdminRegistered()) {
// Error detected?
if ($ret != 'done') {
$content['login'] = '';
- if (isPostRequestElementSet('login')) {
- $content['login'] = postRequestElement('login');
+ if (isPostRequestParameterSet('login')) {
+ $content['login'] = postRequestParameter('login');
} // END - if
// Init array elements
@@ -261,27 +262,23 @@ if (!isAdminRegistered()) {
$loginMessage = ''; $passwdMessage = '';
// No login entered?
- if (!isPostRequestElementSet('login')) $loginMessage = getMessage('ADMIN_NO_LOGIN');
+ if (!isPostRequestParameterSet('login')) $loginMessage = getMessage('ADMIN_NO_LOGIN');
// An error comes back from login?
- if ((!empty($ret)) && (postRequestElement('ok') == '404')) $loginMessage = $ret;
+ if ((!empty($ret)) && (postRequestParameter('ok') == '404')) $loginMessage = $ret;
// No password entered?
- if (!isPostRequestElementSet('pass')) $passwdMessage = getMessage('ADMIN_NO_PASS');
+ if (!isPostRequestParameterSet('pass')) $passwdMessage = getMessage('ADMIN_NO_PASS');
// Or password too short?
- if (strlen(postRequestElement('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
+ if (strlen(postRequestParameter('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
// An error comes back from login?
- if ((!empty($ret)) && (postRequestElement('ok') == 'pass')) $passwdMessage = $ret;
+ if ((!empty($ret)) && (postRequestParameter('ok') == 'pass')) $passwdMessage = $ret;
// Load message template
$content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);
$content['pass_message'] = loadTemplate('admin_login_msg', true, $passwdMessage);
-
- // Reset variables
- unset($loginMessage);
- unset($passwdMessage);
} // END - if
// Load login form
@@ -296,9 +293,9 @@ if (!isAdminRegistered()) {
// Set default values
$content = merge_array($content, array('target' => 'action', 'value' => 'login'));
}
- } elseif (isGetRequestElementSet('area')) {
+ } elseif (isGetRequestParameterSet('area')) {
// Restore old area value
- $content = merge_array($content, array('target' => 'area', 'value' => getRequestElement('area')));
+ $content = merge_array($content, array('target' => 'area', 'value' => getRequestParameter('area')));
} else {
// Set default values
$content = merge_array($content, array('target' => 'action', 'value' => 'login'));
@@ -307,19 +304,19 @@ if (!isAdminRegistered()) {
// Load login form template
loadTemplate('admin_login_form', false, $content);
} // END - if
-} elseif (isGetRequestElementSet('logout')) {
+} elseif (isGetRequestParameterSet('logout')) {
// Only try to remove cookies
if (destroyAdminSession()) {
// Load logout template
- if (isGetRequestElementSet('register')) {
+ if (isGetRequestParameterSet('register')) {
// Secure input
- $register = getRequestElement('register');
+ $register = getRequestParameter('register');
// Special logout redirect for installation of given extension
loadTemplate(sprintf("admin_logout_%s_install", $register));
- } elseif (isGetRequestElementSet('remove')) {
+ } elseif (isGetRequestParameterSet('remove')) {
// Secure input
- $remove = getRequestElement('remove');
+ $remove = getRequestParameter('remove');
// Special logout redirect for removal of given extension
loadTemplate(sprintf("admin_logout_%s_remove", $remove));
@@ -353,7 +350,7 @@ if (!isAdminRegistered()) {
$area = 'entrance';
// Check for similar URL variable
- if (isGetRequestElementSet('area')) $area = getRequestElement('area');
+ if (isGetRequestParameterSet('area')) $area = getRequestParameter('area');
// Load logical-area menu-system file
loadIncludeOnce('inc/modules/admin/lasys-inc.php');
@@ -368,13 +365,13 @@ if (!isAdminRegistered()) {
break;
case '404': // Administrator login not found
- setRequestPostElement('ok', $ret);
- loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_404'), getSession('admin_login')));
+ setPostRequestParameter('ok', $ret);
+ loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_404', getSession('admin_login')));
destroyAdminSession();
break;
case 'pass': // Wrong password
- setRequestPostElement('ok', $ret);
+ setPostRequestParameter('ok', $ret);
loadTemplate('admin_settings_saved', false, getMessage('WRONG_PASS'));
destroyAdminSession();
break;