// Is no admin registered?
if (!isAdminRegistered()) {
// Admin is not registered so we have to inform the user
- if ((isFormSent()) && ((!isPostRequestParameterSet('admin_login')) || (!isPostRequestParameterSet('admin_pass1')) || (strlen(postRequestParameter('admin_pass1')) < getConfig('minium_admin_pass_length')) || (!isPostRequestParameterSet('admin_pass2')) || (strlen(postRequestParameter('admin_pass2')) < getConfig('minium_admin_pass_length')) || (postRequestParameter('admin_pass1') != postRequestParameter('admin_pass2')))) {
- setPostRequestParameter('ok', '***');
+ if ((isFormSent()) && ((!isPostRequestElementSet('admin_login')) || (!isPostRequestElementSet('admin_pass1')) || (strlen(postRequestElement('admin_pass1')) < getConfig('minium_admin_pass_length')) || (!isPostRequestElementSet('admin_pass2')) || (strlen(postRequestElement('admin_pass2')) < getConfig('minium_admin_pass_length')) || (postRequestElement('admin_pass1') != postRequestElement('admin_pass2')))) {
+ setPostRequestElement('ok', '***');
} // END - if
// Clear error message
$errorMessage = '';
- if ((isFormSent()) && (postRequestParameter('ok') != '***')) {
+ if ((isFormSent()) && (postRequestElement('ok') != '***')) {
// Hash the password with the old function because we are here in install mode
- $hashedPass = md5(postRequestParameter('admin_pass1'));
+ $hashedPass = md5(postRequestElement('admin_pass1'));
// Kill maybe existing session variables
destroyAdminSession(false);
// Do registration
- $ret = addAdminAccount(postRequestParameter('admin_login'), $hashedPass, getWebmaster());
+ $ret = addAdminAccount(postRequestElement('admin_login'), $hashedPass, getWebmaster());
// Check if registration wents fine
switch ($ret) {
$errorMessage = '{--ADMIN_CANNOT_COMPLETE--}';
// Set this to have our error message displayed
- setPostRequestParameter('ok', '***');
+ setPostRequestElement('ok', '***');
}
break;
$errorMessage = '{--ADMIN_REGISTER_FAILED--}';
// Set this to have our error message displayed
- setPostRequestParameter('ok', '***');
+ setPostRequestElement('ok', '***');
break;
case 'already': // Admin does already exists!
$errorMessage = '{--ADMIN_LOGIN_ALREADY_REG--}';
// Set this to have our error message displayed
- setPostRequestParameter('ok', '***');
+ setPostRequestElement('ok', '***');
break;
default:
logDebugMessage(__FILE__, __LINE__, $errorMessage);
// Set this to have our error message displayed
- setPostRequestParameter('ok', '***');
+ setPostRequestElement('ok', '***');
break;
} // END - switch
} // END - if
if ($ret != 'done') {
// Init login name
$content['admin_login'] = '';
- if (isPostRequestParameterSet('admin_login')) {
- $content['admin_login'] = postRequestParameter('admin_login');
+ if (isPostRequestElementSet('admin_login')) {
+ $content['admin_login'] = postRequestElement('admin_login');
} // END - if
// Init array elements
$content['error_message'] = '';
// Yet-another notice-fix
- if ((isFormSent()) && (postRequestParameter('ok') == '***')) {
+ if ((isFormSent()) && (postRequestElement('ok') == '***')) {
// Init variables
$loginMessage = '';
$pass1Message = '';
} // END - if
// No password 1 entered or to short?
- if (!isPostRequestParameterSet('admin_pass1')) {
- $pass1Message = '{--ADMIN_NO_PASS1--}';
- } elseif (strlen(postRequestParameter('admin_pass1')) < getConfig('minium_admin_pass_length')) {
- $pass1Message = '{--ADMIN_SHORT_PASS1--}';
+ if (!isPostRequestElementSet('admin_pass1')) {
+ $pass1Message = '{--ADMIN_NO_PASSWORD1--}';
+ } elseif (strlen(postRequestElement('admin_pass1')) < getConfig('minium_admin_pass_length')) {
+ $pass1Message = '{--ADMIN_SHORT_PASSWORD1--}';
}
// No password 2 entered or to short?
- if (!isPostRequestParameterSet('admin_pass2')) {
- $pass2Message = '{--ADMIN_NO_PASS2--}';
- } elseif (strlen(postRequestParameter('admin_pass2')) < getConfig('minium_admin_pass_length')) {
- $pass2Message = '{--ADMIN_SHORT_PASS2--}';
+ if (!isPostRequestElementSet('admin_pass2')) {
+ $pass2Message = '{--ADMIN_NO_PASSWORD2--}';
+ } elseif (strlen(postRequestElement('admin_pass2')) < getConfig('minium_admin_pass_length')) {
+ $pass2Message = '{--ADMIN_SHORT_PASSWORD2--}';
}
// Both didn't match?
- if (postRequestParameter('admin_pass1') != postRequestParameter('admin_pass2')) {
+ if (postRequestElement('admin_pass1') != postRequestElement('admin_pass2')) {
// No match
- if (empty($pass1Message)) $pass1Message = '{--ADMIN_PASS1_MISMATCH--}';
- if (empty($pass2Message)) $pass2Message = '{--ADMIN_PASS2_MISMATCH--}';
+ if (empty($pass1Message)) $pass1Message = '{--ADMIN_PASSWORD1_MISMATCH--}';
+ if (empty($pass2Message)) $pass2Message = '{--ADMIN_PASSWORD2_MISMATCH--}';
} // END - if
// Output error messages
// Load register template
loadTemplate('admin_reg_form', false, $content);
} // END - if
-} elseif (isGetRequestParameterSet('reset_pass')) {
+} elseif (isGetRequestElementSet('reset_pass')) {
// Is the form submitted?
- if ((isPostRequestParameterSet('send_link')) && (isPostRequestParameterSet('email'))) {
+ if ((isPostRequestElementSet('send_link')) && (isPostRequestElementSet('email'))) {
// Output result
- displayMessage(sendAdminPasswordResetLink(postRequestParameter('email')));
- } elseif (isGetRequestParameterSet('hash')) {
+ displayMessage(sendAdminPasswordResetLink(postRequestElement('email')));
+ } elseif (isGetRequestElementSet('hash')) {
// Output form for hash validation
- loadTemplate('admin_validate_reset_hash_form', false, getRequestParameter('hash'));
- } elseif ((isPostRequestParameterSet('validate_hash')) && (isPostRequestParameterSet('admin_login')) && (isPostRequestParameterSet('hash'))) {
+ loadTemplate('admin_validate_reset_hash_form', false, getRequestElement('hash'));
+ } elseif ((isPostRequestElementSet('validate_hash')) && (isPostRequestElementSet('admin_login')) && (isPostRequestElementSet('hash'))) {
// Validate the login data and hash
- $valid = adminResetValidateHashLogin(postRequestParameter('hash'), postRequestParameter('admin_login'));
+ $valid = adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('admin_login'));
// Valid?
if ($valid === true) {
// Prepare content first
$content = array(
- 'hash' => postRequestParameter('hash'),
- 'admin_login' => postRequestParameter('admin_login')
+ 'hash' => postRequestElement('hash'),
+ 'admin_login' => postRequestElement('admin_login')
);
// Validation okay so display form for final password change
// Cannot validate the login data and hash
displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED--}');
}
- } elseif ((isPostRequestParameterSet('reset_pass')) && (isPostRequestParameterSet('hash')) && (isPostRequestParameterSet('admin_login')) && (isPostRequestParameterSet('admin_pass1')) && (postRequestParameter('admin_pass1') == postRequestParameter('admin_pass2'))) {
+ } elseif ((isPostRequestElementSet('reset_pass')) && (isPostRequestElementSet('hash')) && (isPostRequestElementSet('admin_login')) && (isPostRequestElementSet('admin_pass1')) && (postRequestElement('admin_pass1') == postRequestElement('admin_pass2'))) {
// Okay, we shall the admin password here. So first revalidate the hash
- if (adminResetValidateHashLogin(postRequestParameter('hash'), postRequestParameter('admin_login'))) {
+ if (adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('admin_login'))) {
// Output result
- loadTemplate('admin_reset_password_done', false, doResetAdminPassword(postRequestParameter('admin_login'), postRequestParameter('admin_pass1')));
+ loadTemplate('admin_reset_password_done', false, doResetAdminPassword(postRequestElement('admin_login'), postRequestElement('admin_pass1')));
} else {
// Validation failed
displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}');
redirectToUrl('modules.php?module=admin&logout=1');
} // END - if
- if (isGetRequestParameterSet('register')) {
+ if (isGetRequestElementSet('register')) {
// Registration of first admin is done
- if (getRequestParameter('register') == 'done') {
+ if (getRequestElement('register') == 'done') {
// Regisration done!
displayMessage('{--ADMIN_REGISTER_DONE--}');
} // END - if
} // END - if
// Check if the admin has submitted data or not
- if ((isFormSent()) && ((!isPostRequestParameterSet('admin_login')) || (!isPostRequestParameterSet('admin_password')) || (strlen(postRequestParameter('admin_password')) < getConfig('minium_admin_pass_length')))) {
- setPostRequestParameter('ok', '***');
+ if ((isFormSent()) && ((!isPostRequestElementSet('admin_login')) || (!isPostRequestElementSet('admin_password')) || (strlen(postRequestElement('admin_password')) < getConfig('minium_admin_pass_length')))) {
+ setPostRequestElement('ok', '***');
} // END - if
- if ((isFormSent()) && (postRequestParameter('ok') != '***')) {
+ if ((isFormSent()) && (postRequestElement('ok') != '***')) {
// All required data was entered so we check his account
- $ret = ifAdminLoginDataIsValid(postRequestParameter('admin_login'), postRequestParameter('admin_password'));
+ $ret = ifAdminLoginDataIsValid(postRequestElement('admin_login'), postRequestElement('admin_password'));
// Which status do we have?
switch ($ret) {
$url .= 'what=' . getWhat();
} elseif (isActionSet()) {
$url .= 'action=' . getAction();
- } elseif (isGetRequestParameterSet('area')) {
- $url .= 'area=' . getRequestParameter('area');
+ } elseif (isGetRequestElementSet('area')) {
+ $url .= 'area=' . getRequestElement('area');
}
// Load URL
break;
case '404': // Administrator login not found
- setPostRequestParameter('ok', $ret);
- $ret = '{%message,ADMIN_ACCOUNT_404=' . postRequestParameter('admin_login') . '%}';
+ setPostRequestElement('ok', $ret);
+ $ret = '{%message,ADMIN_ACCOUNT_404=' . postRequestElement('admin_login') . '%}';
destroyAdminSession();
break;
case 'password': // Wrong password
- setPostRequestParameter('ok', $ret);
+ setPostRequestElement('ok', $ret);
$ret = '{--WRONG_PASS--} [<a href="{%url=modules.php?module=admin&reset_pass=1%}">{--ADMIN_RESET_PASS--}</a>]';
destroyAdminSession();
break;
// Error detected?
if ($ret != 'done') {
$content['admin_login'] = '';
- if (isPostRequestParameterSet('admin_login')) {
- $content['admin_login'] = postRequestParameter('admin_login');
+ if (isPostRequestElementSet('admin_login')) {
+ $content['admin_login'] = postRequestElement('admin_login');
} // END - if
// Init array elements
$passwdMessage = '';
// Check for login
- if (!isPostRequestParameterSet('admin_login')) {
+ if (!isPostRequestElementSet('admin_login')) {
// No login entered?
$loginMessage = '{--ADMIN_NO_LOGIN--}';
- } elseif ((!empty($ret)) && (postRequestParameter('ok') == '404')) {
+ } elseif ((!empty($ret)) && (postRequestElement('ok') == '404')) {
// An error comes back from login?
$loginMessage = $ret;
}
// Check for password
- if (!isPostRequestParameterSet('admin_password')) {
+ if (!isPostRequestElementSet('admin_password')) {
// No password entered?
$passwdMessage = '{--ADMIN_NO_PASS--}';
- } elseif (strlen(postRequestParameter('admin_password')) < getConfig('minium_admin_pass_length')) {
+ } elseif (strlen(postRequestElement('admin_password')) < getConfig('minium_admin_pass_length')) {
// Or password too short?
$passwdMessage = '{--ADMIN_SHORT_PASS--}';
- } elseif ((!empty($ret)) && (postRequestParameter('ok') == 'password')) {
+ } elseif ((!empty($ret)) && (postRequestElement('ok') == 'password')) {
// An error comes back from login?
$passwdMessage = $ret;
}
// Set default values
$content = merge_array($content, array('target' => 'action', 'value' => 'login'));
}
- } elseif (isGetRequestParameterSet('area')) {
+ } elseif (isGetRequestElementSet('area')) {
// Restore old area value
$content = merge_array(
$content,
array(
'target' => 'area',
- 'value' => getRequestParameter('area')
+ 'value' => getRequestElement('area')
)
);
} else {
// Load login form template
loadTemplate('admin_login_form', false, $content);
} // END - if
-} elseif (isGetRequestParameterSet('logout')) {
+} elseif (isGetRequestElementSet('logout')) {
// Only try to remove cookies
if (destroyAdminSession()) {
// Load logout template
- if (isGetRequestParameterSet('register')) {
+ if (isGetRequestElementSet('register')) {
// Secure input
- $register = getRequestParameter('register');
+ $register = getRequestElement('register');
// Special logout redirect for installation of given extension
loadTemplate(sprintf("admin_logout_%s_install", $register));
- } elseif (isGetRequestParameterSet('remove')) {
+ } elseif (isGetRequestElementSet('remove')) {
// Secure input
- $remove = getRequestParameter('remove');
+ $remove = getRequestElement('remove');
// Special logout redirect for removal of given extension
loadTemplate(sprintf("admin_logout_%s_remove", $remove));
$area = 'entrance';
// Check for similar URL variable
- if (isGetRequestParameterSet('area')) $area = getRequestParameter('area');
+ if (isGetRequestElementSet('area')) $area = getRequestElement('area');
// Load logical-area menu-system file
loadIncludeOnce('inc/modules/admin/lasys-inc.php');
break;
case '404': // Administrator login not found
- setPostRequestParameter('ok', $ret);
+ setPostRequestElement('ok', $ret);
displayMessage('{%message,ADMIN_ACCOUNT_404=' . getCurrentAdminId() . '%}');
destroyAdminSession();
break;
case 'password': // Wrong password
- setPostRequestParameter('ok', $ret);
+ setPostRequestElement('ok', $ret);
displayMessage('{--WRONG_PASS--}');
destroyAdminSession();
break;
projects / mailer.git / blobdiff