destroyAdminSession(false);
// Do registration
- $ret = addAdminAccount(postRequestParameter('login'), $hashedPass, getConfig('WEBMASTER'));
+ $ret = addAdminAccount(postRequestParameter('login'), $hashedPass, getWebmaster());
// Check if registration wents fine
switch ($ret) {
case 'done':
- $done = changeDataInInclude(getCachePath() . 'config-local.php', 'ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
+ // Change ADMIN_REGISTERED entry
+ $done = changeDataInLocalConfigurationFile('ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
+
+ // Was it successfull?
if ($done === true) {
// Registering is done
redirectToUrl('modules.php?module=admin&register=done');
} // END - if
// Init array elements
- $content['login_message'] = '';
- $content['pass1_message'] = '';
- $content['pass2_message'] = '';
+ $content['login_message'] = '';
+ $content['pass1_message'] = '';
+ $content['pass2_message'] = '';
+ $content['error_message'] = '';
// Yet-another notice-fix
if ((isFormSent()) && (postRequestParameter('ok') == '***')) {
$pass2Message = '';
// No login entered?
- if (empty($content['login'])) $loginMessage = '{--ADMIN_NO_LOGIN--}';
+ if (empty($content['login'])) {
+ $loginMessage = '{--ADMIN_NO_LOGIN--}';
+ } // END - if
// An error comes back from registration?
- if ((!empty($ret)) && ($ret != 'init')) $loginMessage = $errorMessage;
+ if ((!empty($ret)) && ($ret != 'init')) {
+ $loginMessage = $errorMessage;
+ } // END - if
// No password 1 entered or to short?
- if (!isPostRequestParameterSet('pass1')) $pass1Message = '{--ADMIN_NO_PASS1--}';
- elseif (strlen(postRequestParameter('pass1')) < 4) $pass1Message = '{--ADMIN_SHORT_PASS1--}';
+ if (!isPostRequestParameterSet('pass1')) {
+ $pass1Message = '{--ADMIN_NO_PASS1--}';
+ } elseif (strlen(postRequestParameter('pass1')) < 4) {
+ $pass1Message = '{--ADMIN_SHORT_PASS1--}';
+ }
// No password 2 entered or to short?
- if (!isPostRequestParameterSet('pass2')) $pass2Message = '{--ADMIN_NO_PASS2--}';
- elseif (strlen(postRequestParameter('pass2')) < 4) $pass2Message = '{--ADMIN_SHORT_PASS2--}';
+ if (!isPostRequestParameterSet('pass2')) {
+ $pass2Message = '{--ADMIN_NO_PASS2--}';
+ } elseif (strlen(postRequestParameter('pass2')) < 4) {
+ $pass2Message = '{--ADMIN_SHORT_PASS2--}';
+ }
// Both didn't match?
if (postRequestParameter('pass1') != postRequestParameter('pass2')) {
$content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);
$content['pass1_message'] = loadTemplate('admin_login_msg', true, $pass1Message);
$content['pass2_message'] = loadTemplate('admin_login_msg', true, $pass2Message);
+ $content['error_message'] = loadTemplate('admin_login_msg', true, $errorMessage);
} // END - if
// Output message in seperate template
- loadTemplate('admin_settings_saved', false, '{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}');
+ displayMessage('{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}');
// Load register template
loadTemplate('admin_reg_form', false, $content);
// Is the form submitted?
if ((isPostRequestParameterSet('send_link')) && (isPostRequestParameterSet('email'))) {
// Output result
- loadTemplate('admin_settings_saved', false, sendAdminPasswordResetLink(postRequestParameter('email')));
+ displayMessage(sendAdminPasswordResetLink(postRequestParameter('email')));
} elseif (isGetRequestParameterSet('hash')) {
// Output form for hash validation
loadTemplate('admin_validate_reset_hash_form', false, getRequestParameter('hash'));
);
// Validation okay so display form for final password change
- loadTemplate('form_reset_password_form', false, $content);
+ loadTemplate('admin_reset_password_form', false, $content);
} else {
// Cannot validate the login data and hash
- loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED--}');
+ displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED--}');
}
} 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(postRequestParameter('hash'), postRequestParameter('login'))) {
// Output result
- loadTemplate('form_reset_pass_done', false, doResetAdminPassword(postRequestParameter('login'), postRequestParameter('pass1')));
+ loadTemplate('admin_reset_password_done', false, doResetAdminPassword(postRequestParameter('login'), postRequestParameter('pass1')));
} else {
// Validation failed
- loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}');
+ displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}');
}
} else {
// Output reset password form
- loadTemplate('admin_send_reset_link');
+ loadTemplate('admin_reset_password_send_link');
}
} elseif ((!isSessionVariableSet('admin_id')) || (!isSessionVariableSet('admin_md5')) || (!isSessionVariableSet('admin_last'))) {
// At leat one administrator account was created
if (isGetRequestParameterSet('register')) {
// Registration of first admin is done
- if (getRequestParameter('register') == 'done') loadTemplate('admin_settings_saved', false, '{--ADMIN_REGISTER_DONE--}');
+ if (getRequestParameter('register') == 'done') {
+ // Regisration done!
+ displayMessage('{--ADMIN_REGISTER_DONE--}');
+ } // END - if
} // END - if
// Check if the admin has submitted data or not
} // END - if
// Add data to URL
- if (isWhatSet()) $url .= 'what='.getWhat();
- elseif (isActionSet()) $url .= 'action='.getAction();
- elseif (isGetRequestParameterSet('area')) $url .= 'area='.getRequestParameter('area');
+ if (isWhatSet()) {
+ $url .= 'what=' . getWhat();
+ } elseif (isActionSet()) {
+ $url .= 'action=' . getAction();
+ } elseif (isGetRequestParameterSet('area')) {
+ $url .= 'area=' . getRequestParameter('area');
+ }
- // Load URL
- redirectToUrl($url);
- break;
+ // Load URL
+ redirectToUrl($url);
+ break;
case '404': // Administrator login not found
setPostRequestParameter('ok', $ret);
if (isFormSent()) {
// Set messages to zero
- $loginMessage = ''; $passwdMessage = '';
+ $loginMessage = '';
+ $passwdMessage = '';
// No login entered?
- if (!isPostRequestParameterSet('login')) $loginMessage = '{--ADMIN_NO_LOGIN--}';
+ if (!isPostRequestParameterSet('login')) {
+ $loginMessage = '{--ADMIN_NO_LOGIN--}';
+ } // END - if
// An error comes back from login?
- if ((!empty($ret)) && (postRequestParameter('ok') == '404')) $loginMessage = $ret;
+ if ((!empty($ret)) && (postRequestParameter('ok') == '404')) {
+ $loginMessage = $ret;
+ } // END - if
// No password entered?
- if (!isPostRequestParameterSet('password')) $passwdMessage = '{--ADMIN_NO_PASS--}';
+ if (!isPostRequestParameterSet('password')) {
+ $passwdMessage = '{--ADMIN_NO_PASS--}';
+ } // END - if
// Or password too short?
- if (strlen(postRequestParameter('password')) < 4) $passwdMessage = '{--ADMIN_SHORT_PASS--}';
+ if (strlen(postRequestParameter('password')) < 4) {
+ $passwdMessage = '{--ADMIN_SHORT_PASS--}';
+ } // END - if
// An error comes back from login?
- if ((!empty($ret)) && (postRequestParameter('ok') == 'password')) $passwdMessage = $ret;
+ if ((!empty($ret)) && (postRequestParameter('ok') == 'password')) {
+ $passwdMessage = $ret;
+ } // END - if
// Load message template
$content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);
case '404': // Administrator login not found
setPostRequestParameter('ok', $ret);
- loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_ACCOUNT_404', getCurrentAdminId()));
+ displayMessage(getMaskedMessage('ADMIN_ACCOUNT_404', getCurrentAdminId()));
destroyAdminSession();
break;
case 'password': // Wrong password
setPostRequestParameter('ok', $ret);
- loadTemplate('admin_settings_saved', false, '{--WRONG_PASS--}');
+ displayMessage('{--WRONG_PASS--}');
destroyAdminSession();
break;
projects / mailer.git / blobdiff