// Is no admin registered?
if (!isAdminRegistered()) {
// Admin is not registered so we have to inform the user
- if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('pass1')) || (strlen(postRequestParameter('pass1')) < 4) || (!isPostRequestParameterSet('pass2')) || (strlen(postRequestParameter('pass2')) < 4) || (postRequestParameter('pass1') != postRequestParameter('pass2')))) {
+ if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('pass1')) || (strlen(postRequestParameter('pass1')) < getConfig('minium_admin_pass_length')) || (!isPostRequestParameterSet('pass2')) || (strlen(postRequestParameter('pass2')) < getConfig('minium_admin_pass_length')) || (postRequestParameter('pass1') != postRequestParameter('pass2')))) {
setPostRequestParameter('ok', '***');
} // END - if
// No password 1 entered or to short?
if (!isPostRequestParameterSet('pass1')) {
$pass1Message = '{--ADMIN_NO_PASS1--}';
- } elseif (strlen(postRequestParameter('pass1')) < 4) {
+ } elseif (strlen(postRequestParameter('pass1')) < getConfig('minium_admin_pass_length')) {
$pass1Message = '{--ADMIN_SHORT_PASS1--}';
}
// No password 2 entered or to short?
if (!isPostRequestParameterSet('pass2')) {
$pass2Message = '{--ADMIN_NO_PASS2--}';
- } elseif (strlen(postRequestParameter('pass2')) < 4) {
+ } elseif (strlen(postRequestParameter('pass2')) < getConfig('minium_admin_pass_length')) {
$pass2Message = '{--ADMIN_SHORT_PASS2--}';
}
if ($valid === true) {
// Prepare content first
$content = array(
- 'hash' => secureString(postRequestParameter('hash')),
- 'login' => secureString(postRequestParameter('login'))
+ 'hash' => postRequestParameter('hash'),
+ 'login' => postRequestParameter('login')
);
// Validation okay so display form for final password change
} // END - if
// Check if the admin has submitted data or not
- if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('password')) || (strlen(postRequestParameter('password')) < 4))) {
+ if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('password')) || (strlen(postRequestParameter('password')) < getConfig('minium_admin_pass_length')))) {
setPostRequestParameter('ok', '***');
} // END - if
case '404': // Administrator login not found
setPostRequestParameter('ok', $ret);
- $ret = getMaskedMessage('ADMIN_ACCOUNT_404', postRequestParameter('login'));
+ $ret = '{%message,ADMIN_ACCOUNT_404=' . postRequestParameter('login') . '%}';
destroyAdminSession();
break;
$loginMessage = '';
$passwdMessage = '';
- // No login entered?
+ // Check for login
if (!isPostRequestParameterSet('login')) {
+ // No login entered?
$loginMessage = '{--ADMIN_NO_LOGIN--}';
- } // END - if
-
- // An error comes back from login?
- if ((!empty($ret)) && (postRequestParameter('ok') == '404')) {
+ } elseif ((!empty($ret)) && (postRequestParameter('ok') == '404')) {
+ // An error comes back from login?
$loginMessage = $ret;
- } // END - if
+ }
- // No password entered?
+ // Check for password
if (!isPostRequestParameterSet('password')) {
+ // No password entered?
$passwdMessage = '{--ADMIN_NO_PASS--}';
- } // END - if
-
- // Or password too short?
- if (strlen(postRequestParameter('password')) < 4) {
+ } elseif (strlen(postRequestParameter('password')) < getConfig('minium_admin_pass_length')) {
+ // Or password too short?
$passwdMessage = '{--ADMIN_SHORT_PASS--}';
- } // END - if
-
- // An error comes back from login?
- if ((!empty($ret)) && (postRequestParameter('ok') == 'password')) {
+ } elseif ((!empty($ret)) && (postRequestParameter('ok') == 'password')) {
+ // An error comes back from login?
$passwdMessage = $ret;
- } // END - if
+ }
- // Load message template
- $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);
- $content['pass_message'] = loadTemplate('admin_login_msg', true, $passwdMessage);
+ // Load message templates if the messages have been set
+ if (!empty($loginMessage)) {
+ $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);
+ } // END - if
+ if (!empty($passwdMessage)) {
+ $content['pass_message'] = loadTemplate('admin_login_msg', true, $passwdMessage);
+ } // END - if
} // END - if
// Load login form
case '404': // Administrator login not found
setPostRequestParameter('ok', $ret);
- displayMessage(getMaskedMessage('ADMIN_ACCOUNT_404', getCurrentAdminId()));
+ displayMessage('{%message,ADMIN_ACCOUNT_404=' . getCurrentAdminId() . '%}');
destroyAdminSession();
break;