* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 by Mailer Developer Team *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
loadIncludeOnce('inc/modules/admin/admin-inc.php');
// Fix "deleted" cookies in PHP4 (PHP5 does remove them, PHP4 sets them to deleted!)
-fixDeletedCookies(array('admin_login', 'admin_md5', 'admin_last'));
+fixDeletedCookies(array('admin_id', 'admin_md5', 'admin_last'));
// Init return value
$ret = 'init';
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 = changeDataInFile(getConfig('CACHE_PATH') . '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'));
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('admin_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_login')) || (!isSessionVariableSet('admin_md5')) || (!isSessionVariableSet('admin_last'))) {
+} elseif ((!isSessionVariableSet('admin_id')) || (!isSessionVariableSet('admin_md5')) || (!isSessionVariableSet('admin_last'))) {
// At leat one administrator account was created
- if ((isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5')) && (isSessionVariableSet('admin_last'))) {
+ if ((isSessionVariableSet('admin_id')) && (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 (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
- if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('pass')) || (strlen(postRequestParameter('pass')) < 4))) {
+ if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('password')) || (strlen(postRequestParameter('password')) < 4))) {
setPostRequestParameter('ok', '***');
} // END - if
if ((isFormSent()) && (postRequestParameter('ok') != '***')) {
// All required data was entered so we check his account
- $ret = ifAdminLoginDataIsValid(postRequestParameter('login'), postRequestParameter('pass'));
+ $ret = ifAdminLoginDataIsValid(postRequestParameter('login'), postRequestParameter('password'));
// Which status do we have?
switch ($ret) {
} // 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);
destroyAdminSession();
break;
- case 'pass': // Wrong password
+ case 'password': // Wrong password
setPostRequestParameter('ok', $ret);
$ret = '{--WRONG_PASS--} [<a href="{%url=modules.php?module=admin&reset_pass=1%}">{--ADMIN_RESET_PASS--}</a>]';
destroyAdminSession();
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('pass')) $passwdMessage = '{--ADMIN_NO_PASS--}';
+ if (!isPostRequestParameterSet('password')) {
+ $passwdMessage = '{--ADMIN_NO_PASS--}';
+ } // END - if
// Or password too short?
- if (strlen(postRequestParameter('pass')) < 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') == 'pass')) $passwdMessage = $ret;
+ if ((!empty($ret)) && (postRequestParameter('ok') == 'password')) {
+ $passwdMessage = $ret;
+ } // END - if
// Load message template
$content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);
}
} else {
// Something went wrong here...
- loadTemplate('admin_settings_saved', false, '<div class="admin_fatal">{--ADMIN_LOGOUT_FAILED--}</div>');
+ loadTemplate('admin_settings_unsaved', false, '{--ADMIN_LOGOUT_FAILED--}');
// Add fatal message
- addFatalMessage(__FILE__, __LINE__, getMessage('CANNOT_UNREG_SESS'));
+ addFatalMessage(__FILE__, __LINE__, '{--CANNOT_UNREG_SESS--}');
}
} else {
// Maybe an Admin want's to login?
- $ret = ifAdminCookiesAreValid(getSession('admin_login'), getSession('admin_md5'));
+ $ret = ifAdminCookiesAreValid(getCurrentAdminId(), getAdminMd5());
// Check status
switch ($ret) {
// Check for access control line of current menu entry
runFilterChain('check_admin_acl');
- // When type of admin menu is not set fallback to old menu system
- if (!isConfigEntrySet('admin_menu')) setConfigEntry('admin_menu', 'OLD');
-
// Check for version and switch between old menu system and new intelligent menu system
if ((adminGetMenuMode() == 'NEW') && (isIncludeReadable('inc/modules/admin/lasys-inc.php'))) {
// Default area is the entrance, of course
case '404': // Administrator login not found
setPostRequestParameter('ok', $ret);
- loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_ACCOUNT_404', getSession('admin_login')));
+ displayMessage(getMaskedMessage('ADMIN_ACCOUNT_404', getCurrentAdminId()));
destroyAdminSession();
break;
- case 'pass': // Wrong password
+ case 'password': // Wrong password
setPostRequestParameter('ok', $ret);
- loadTemplate('admin_settings_saved', false, '{--WRONG_PASS--}');
+ displayMessage('{--WRONG_PASS--}');
destroyAdminSession();
break;
projects / mailer.git / blobdiff