<?php
/************************************************************************
- * MXChange v0.2.1 Start: 08/31/2003 *
- * =============== Last change: 07/02/2004 *
+ * Mailer v0.2.1-FINAL Start: 08/31/2003 *
+ * =================== Last change: 07/02/2004 *
* *
* -------------------------------------------------------------------- *
* File : admin.php *
* $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 - 2008 by Roland Haeder *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2003 - 2009 by Roland Haeder *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
// Some security stuff...
if (!defined('__SECURITY')) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
- require($INC);
-}
+ exit();
+} // END - if
// Load include file
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', 'admin_to'));
+fixDeletedCookies(array('admin_id', 'admin_md5', 'admin_last'));
// Init return value
$ret = 'init';
// Is no admin registered?
if (!isAdminRegistered()) {
// Admin is not registered so we have to inform the user
- if ((IS_FORM_SENT()) && ((!REQUEST_ISSET_POST(('login'))) || (!REQUEST_ISSET_POST(('pass'))) || (strlen(REQUEST_POST('pass')) < 4))) {
- REQUEST_SET_POST('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
- if ((IS_FORM_SENT()) && (REQUEST_POST('ok') != '***')) {
+ // Clear error message
+ $errorMessage = '';
+
+ if ((isFormSent()) && (postRequestElement('ok') != '***')) {
// Hash the password with the old function because we are here in install mode
- $hashedPass = md5(REQUEST_POST('pass'));
+ $hashedPass = md5(postRequestElement('admin_pass1'));
// Kill maybe existing session variables
destroyAdminSession(false);
// Do registration
- $ret = REGISTER_ADMIN(REQUEST_POST('login'), $hashedPass, constant('WEBMASTER'));
- switch ($ret)
- {
- case 'done':
- $done = changeDataInFile(constant('PATH') . 'inc/cache/config-local.php', "ADMIN-SETUP", "setConfigEntry('ADMIN_REGISTERED', \"", "\");", 'Y', 0);
- if ($done === true) {
- // Registering is done
- redirectToUrl('modules.php?module=admin&register=done');
- } else {
- $ret = getMessage('ADMIN_CANNOT_COMPLETE');
- }
- break;
-
- case 'failed':
- $ret = getMessage('ADMIN_REGISTER_FAILED');
- break;
-
- case 'already':
- default:
- if ($ret == 'already') {
- // Admin does already exists!
- $ret = getMessage('ADMIN_LOGIN_ALREADY_REG');
- } else {
- // Any other kind will be logged and interpreted as 'done'
- DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown return code %s from CHECK_ADMIN_LOGIN() and interpreted as 'done'!", $ret));
- // @TODO Why is this set to 'done'?
- $ret = 'done';
- }
-
- // Admin still not registered?
- if (!isAdminRegistered()) {
- // Write to config that registration is done
- changeDataInFile(constant('PATH') . 'inc/cache/config-local.php', "ADMIN-SETUP", "setConfigEntry('ADMIN_REGISTERED', \"", "\");", 'Y', 0);
-
- // Load URL for login
- redirectToUrl('modules.php?module=admin');
- } // END - if
- break;
- }
- }
+ $ret = addAdminAccount(postRequestElement('admin_login'), $hashedPass, getWebmaster());
+
+ // Check if registration wents fine
+ switch ($ret) {
+ case 'done':
+ // 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');
+ } else {
+ // Registration incomplete
+ $errorMessage = '{--ADMIN_CANNOT_COMPLETE--}';
+
+ // Set this to have our error message displayed
+ setPostRequestElement('ok', '***');
+ }
+ break;
+
+ case 'failed': // Registration has failed
+ $errorMessage = '{--ADMIN_REGISTER_FAILED--}';
+
+ // Set this to have our error message displayed
+ setPostRequestElement('ok', '***');
+ break;
+
+ case 'already': // Admin does already exists!
+ $errorMessage = '{--ADMIN_LOGIN_ALREADY_REG--}';
+
+ // Set this to have our error message displayed
+ setPostRequestElement('ok', '***');
+ break;
+
+ default:
+ // Any other kind will be logged
+ $errorMessage = sprintf("Unknown return code %s from ifAdminLoginDataIsValid().", $ret);
+ logDebugMessage(__FILE__, __LINE__, $errorMessage);
+
+ // Set this to have our error message displayed
+ setPostRequestElement('ok', '***');
+ break;
+ } // END - switch
+ } // END - if
// Whas that action okay?
if ($ret != 'done') {
- // Fixes another notice
- if (REQUEST_ISSET_POST(('login'))) {
- define('__LOGIN_VALUE', REQUEST_POST('login'));
- } else {
- define('__LOGIN_VALUE', '');
- }
+ // Init login name
+ $content['admin_login'] = '';
+ if (isPostRequestElementSet('admin_login')) {
+ $content['admin_login'] = postRequestElement('admin_login');
+ } // END - if
+
+ // Init array elements
+ $content['login_message'] = '';
+ $content['pass1_message'] = '';
+ $content['pass2_message'] = '';
+ $content['error_message'] = '';
// Yet-another notice-fix
- if ((IS_FORM_SENT()) && (REQUEST_POST('ok') == '***')) {
+ if ((isFormSent()) && (postRequestElement('ok') == '***')) {
+ // Init variables
+ $loginMessage = '';
+ $pass1Message = '';
+ $pass2Message = '';
+
// No login entered?
- if (!REQUEST_ISSET_POST(('login'))) $loginMessage = getMessage('ADMIN_NO_LOGIN');
+ if (empty($content['admin_login'])) {
+ $loginMessage = '{--ADMIN_NO_LOGIN--}';
+ } // END - if
// An error comes back from registration?
- if (!empty($ret)) $loginMessage = $ret;
+ if ((!empty($ret)) && ($ret != 'init')) {
+ $loginMessage = $errorMessage;
+ } // END - if
- // No password entered?
- if (!REQUEST_ISSET_POST(('pass'))) $passwdMessage = getMessage('ADMIN_NO_PASS');
+ // No password 1 entered or to short?
+ if (!isPostRequestElementSet('admin_pass1')) {
+ $pass1Message = '{--ADMIN_NO_PASSWORD1--}';
+ } elseif (strlen(postRequestElement('admin_pass1')) < getConfig('minium_admin_pass_length')) {
+ $pass1Message = '{--ADMIN_SHORT_PASSWORD1--}';
+ }
- // Or password too short?
- if (strlen(REQUEST_POST('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
+ // No password 2 entered or to short?
+ if (!isPostRequestElementSet('admin_pass2')) {
+ $pass2Message = '{--ADMIN_NO_PASSWORD2--}';
+ } elseif (strlen(postRequestElement('admin_pass2')) < getConfig('minium_admin_pass_length')) {
+ $pass2Message = '{--ADMIN_SHORT_PASSWORD2--}';
+ }
- // Output error messages
- define('__MSG_LOGIN', LOAD_TEMPLATE('admin_login_msg', true, $loginMessage));
- define('__MSG_PASS', LOAD_TEMPLATE('admin_login_msg', true, $passwdMessage));
+ // Both didn't match?
+ if (postRequestElement('admin_pass1') != postRequestElement('admin_pass2')) {
+ // No match
+ if (empty($pass1Message)) $pass1Message = '{--ADMIN_PASSWORD1_MISMATCH--}';
+ if (empty($pass2Message)) $pass2Message = '{--ADMIN_PASSWORD2_MISMATCH--}';
+ } // END - if
- // Reset variables
- $loginMessage = ''; $passwdMessage = '';
- } else {
- // Reset values to nothing
- define('__MSG_LOGIN', '');
- define('__MSG_PASS' , '');
- }
+ // Output error messages
+ $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
- LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NOT_REGISTERED'));
+ displayMessage('{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}');
// Load register template
- LOAD_TEMPLATE('admin_reg_form');
- }
-} elseif (REQUEST_ISSET_GET(('reset_pass'))) {
+ loadTemplate('admin_reg_form', false, $content);
+ } // END - if
+} elseif (isGetRequestElementSet('reset_pass')) {
// Is the form submitted?
- if ((REQUEST_ISSET_POST(('send_link'))) && (REQUEST_ISSET_POST(('email')))) {
- // Try to send the link out
- $OUT = ADMIN_SEND_PASSWORD_RESET_LINK(REQUEST_POST('email'));
-
+ if ((isPostRequestElementSet('send_link')) && (isPostRequestElementSet('email'))) {
// Output result
- LOAD_TEMPLATE('admin_settings_saved', false, $OUT);
- } elseif (REQUEST_ISSET_GET(('hash'))) {
+ displayMessage(sendAdminPasswordResetLink(postRequestElement('email')));
+ } elseif (isGetRequestElementSet('hash')) {
// Output form for hash validation
- LOAD_TEMPLATE('admin_validate_reset_hash_form', false, REQUEST_GET('hash'));
- } elseif ((REQUEST_ISSET_POST(('validate_hash'))) && (REQUEST_ISSET_POST(('login'))) && (REQUEST_ISSET_POST(('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 = ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN(REQUEST_POST('hash'), REQUEST_POST('login'));
+ $valid = adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('admin_login'));
// Valid?
if ($valid === true) {
// Prepare content first
$content = array(
- 'hash' => SQL_ESCAPE(REQUEST_POST('hash')),
- 'login' => SQL_ESCAPE(REQUEST_POST('login'))
+ 'hash' => postRequestElement('hash'),
+ 'admin_login' => postRequestElement('admin_login')
);
// Validation okay so display form for final password change
- LOAD_TEMPLATE('admin_reset_password_form', false, $content);
+ loadTemplate('admin_reset_password_form', false, $content);
} else {
// Cannot validate the login data and hash
- LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED'));
+ displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED--}');
}
- } elseif ((REQUEST_ISSET_POST(('reset_pass'))) && (REQUEST_ISSET_POST(('hash'))) && (REQUEST_ISSET_POST(('login'))) && (REQUEST_ISSET_POST(('pass1'))) && (REQUEST_POST('pass1') == REQUEST_POST('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 (ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN(REQUEST_POST('hash'), REQUEST_POST('login'))) {
- // Set the password now
- $OUT = ADMIN_RESET_PASSWORD(REQUEST_POST('login'), REQUEST_POST('pass1'));
-
+ if (adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('admin_login'))) {
// Output result
- LOAD_TEMPLATE('admin_reset_pass_done', false, $OUT);
+ loadTemplate('admin_reset_password_done', false, doResetAdminPassword(postRequestElement('admin_login'), postRequestElement('admin_pass1')));
} else {
// Validation failed
- LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2'));
+ displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}');
}
} else {
// Output reset password form
- LOAD_TEMPLATE('admin_send_reset_link');
+ loadTemplate('admin_reset_password_send_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_id')) || (!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_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 (REQUEST_ISSET_GET(('register'))) {
+ if (isGetRequestElementSet('register')) {
// Registration of first admin is done
- if (REQUEST_GET('register') == 'done') LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_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 ((IS_FORM_SENT()) && ((!REQUEST_ISSET_POST(('login'))) || (!REQUEST_ISSET_POST(('pass'))) || (strlen(REQUEST_POST('pass')) < 4))) {
- REQUEST_SET_POST('ok', '***');
+ if ((isFormSent()) && ((!isPostRequestElementSet('admin_login')) || (!isPostRequestElementSet('admin_password')) || (strlen(postRequestElement('admin_password')) < getConfig('minium_admin_pass_length')))) {
+ setPostRequestElement('login', '***');
} // END - if
- if ((IS_FORM_SENT()) && (REQUEST_POST('ok') != '***')) {
+ if ((isFormSent('login')) && (postRequestElement('login') != '***')) {
// All required data was entered so we check his account
- $ret = CHECK_ADMIN_LOGIN(REQUEST_POST('login'), REQUEST_POST('pass'));
+ $ret = ifAdminLoginDataIsValid(postRequestElement('admin_login'), postRequestElement('admin_password'));
// Which status do we have?
- switch ($ret)
- {
- case 'done': // Admin and password are okay, so we log in now
- // Construct URL and redirect
- $URL = 'modules.php?module=admin&';
-
- // Rewrite overview module
- if ($GLOBALS['what'] == 'overview') {
- $GLOBALS['action'] = getModeAction($GLOBALS['module'], $GLOBALS['what']);
- } // END - if
-
- // Add data to URL
- if (!empty($GLOBALS['what'])) $URL .= 'what='.$GLOBALS['what'];
- elseif (!empty($GLOBALS['action'])) $URL .= 'action='.$GLOBALS['action'];
- elseif (REQUEST_ISSET_GET('area')) $URL .= 'area='.REQUEST_GET('area');
-
- // Load URL
- redirectToUrl($URL);
- break;
-
- case '404': // Administrator login not found
- REQUEST_SET_POST('ok', $ret);
- $ret = getMessage('ADMIN_NOT_FOUND');
- destroyAdminSession();
- break;
-
- case 'pass': // Wrong password
- REQUEST_SET_POST('ok', $ret);
- $ret = '{--WRONG_PASS--} [<a href="{!URL!}/modules.php?module=admin&reset_pass=1">{--ADMIN_RESET_PASS--}</a>]';
- destroyAdminSession();
- break;
-
- default: // Others will be logged
- DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown return code %s from CHECK_ADMIN_LOGIN()", $ret));
- break;
+ switch ($ret) {
+ case 'done': // Admin and password are okay, so we log in now
+ // Load URL
+ redirectToUrl('modules.php?' . addAllGetRequestParameters());
+ break;
+
+ case '404': // Administrator login not found
+ setPostRequestElement('login', $ret);
+ $ret = '{%message,ADMIN_ACCOUNT_404=' . postRequestElement('admin_login') . '%}';
+ destroyAdminSession();
+ break;
+
+ case 'password': // Wrong password
+ setPostRequestElement('login', $ret);
+ $ret = '{--WRONG_PASS--} [<a href="{%url=modules.php?module=admin&reset_pass=1%}">{--ADMIN_RESET_PASS--}</a>]';
+ destroyAdminSession();
+ break;
+
+ default: // Others will be logged
+ logDebugMessage(__FILE__, __LINE__, sprintf("Unknown return code %s from ifAdminLoginDataIsValid()", $ret));
+ break;
} // END - switch
} // END - if
// Error detected?
- // @TODO Rewrite all these constants
if ($ret != 'done') {
- if (REQUEST_ISSET_POST(('login'))) {
- define('__LOGIN_VALUE', REQUEST_POST('login'));
- } else {
- define('__LOGIN_VALUE', '');
- }
+ $content['admin_login'] = '';
+ if (isPostRequestElementSet('admin_login')) {
+ $content['admin_login'] = postRequestElement('admin_login');
+ } // END - if
- if (IS_FORM_SENT()) {
- // Set messages to zero
- $loginMessage = ''; $passwdMessage = '';
+ // Init array elements
+ $content['login_message'] = '';
+ $content['pass_message'] = '';
- // No login entered?
- if (!REQUEST_ISSET_POST(('login'))) $loginMessage = getMessage('ADMIN_NO_LOGIN');
-
- // An error comes back from login?
- if ((!empty($ret)) && (REQUEST_POST('ok') == '404')) $loginMessage = $ret;
-
- // No password entered?
- if (!REQUEST_ISSET_POST(('pass'))) $passwdMessage = getMessage('ADMIN_NO_PASS');
-
- // Or password too short?
- if (strlen(REQUEST_POST('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
-
- // An error comes back from login?
- if ((!empty($ret)) && (REQUEST_POST('ok') == 'pass')) $passwdMessage = $ret;
+ if (isFormSent('login')) {
+ // Set messages to zero
+ $loginMessage = '';
+ $passwdMessage = '';
+
+ // Check for login
+ if (!isPostRequestElementSet('admin_login')) {
+ // No login entered?
+ $loginMessage = '{--ADMIN_NO_LOGIN--}';
+ } elseif ((!empty($ret)) && (postRequestElement('login') == '404')) {
+ // An error comes back from login?
+ $loginMessage = $ret;
+ }
- // Load message template
- define('__MSG_LOGIN', LOAD_TEMPLATE('admin_login_msg', true, $loginMessage));
- define('__MSG_PASS' , LOAD_TEMPLATE('admin_login_msg', true, $passwdMessage));
+ // Check for password
+ if (!isPostRequestElementSet('admin_password')) {
+ // No password entered?
+ $passwdMessage = '{--ADMIN_NO_PASS--}';
+ } elseif (strlen(postRequestElement('admin_password')) < getConfig('minium_admin_pass_length')) {
+ // Or password too short?
+ $passwdMessage = '{--ADMIN_SHORT_PASS--}';
+ } elseif ((!empty($ret)) && (postRequestElement('login') == 'password')) {
+ // An error comes back from login?
+ $passwdMessage = $ret;
+ }
- // Reset variables
- unset($loginMessage);
- unset($passwdMessage);
- } else {
- // Set constants to empty for hiding them
- define('__MSG_LOGIN', '');
- define('__MSG_PASS' , '');
- }
+ // 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
- if (!empty($GLOBALS['what'])) {
- // Restore old what value
- $content = array('target' => 'what', 'value' => $GLOBALS['what']);
- } elseif (!empty($GLOBALS['action'])) {
- if ($GLOBALS['action'] != 'logout') {
- // Restore old action value
- $content = array('target' => 'action', 'value' => $GLOBALS['action']);
- } else {
- // Set default values
- $content = array('target' => 'action', 'value' => 'login');
- }
- } elseif (REQUEST_ISSET_GET('area')) {
- // Restore old area value
- $content = array('target' => 'area', 'value' => REQUEST_GET('area'));
- } else {
- // Set default values
- $content = array('target' => 'action', 'value' => 'login');
- }
+ // Add all parameter
+ $content['all_parameter'] = addAllGetRequestParameters();
// Load login form template
- LOAD_TEMPLATE('admin_login_form', false, $content);
+ loadTemplate('admin_login_form', false, $content);
} // END - if
-} elseif (REQUEST_ISSET_GET(('logout'))) {
+} elseif (isGetRequestElementSet('logout')) {
// Only try to remove cookies
if (destroyAdminSession()) {
// Load logout template
- if (REQUEST_ISSET_GET(('register'))) {
+ if (isGetRequestElementSet('register')) {
// Secure input
- $register = REQUEST_GET(('register'));
+ $register = getRequestElement('register');
// Special logout redirect for installation of given extension
- LOAD_TEMPLATE(sprintf("admin_logout_%s_install", $register));
- } elseif (REQUEST_ISSET_GET('remove')) {
+ loadTemplate(sprintf("admin_logout_%s_install", $register));
+ } elseif (isGetRequestElementSet('remove')) {
// Secure input
- $remove = REQUEST_GET('remove');
+ $remove = getRequestElement('remove');
// Special logout redirect for removal of given extension
- LOAD_TEMPLATE(sprintf("admin_logout_%s_remove", $remove));
+ loadTemplate(sprintf("admin_logout_%s_remove", $remove));
} else {
// Logged out normally
- LOAD_TEMPLATE('admin_logout');
+ loadTemplate('admin_logout');
}
} else {
// Something went wrong here...
- LOAD_TEMPLATE('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 = CHECK_ADMIN_COOKIES(getSession('admin_login'), getSession('admin_md5'));
- switch ($ret)
- {
- case 'done':
- // Check for access control line of current menu entry
- $GLOBALS['acl_allow'] = runFilterChain('check_admin_acl');
+ $ret = ifAdminCookiesAreValid(getCurrentAdminId(), getAdminMd5());
- // When type of admin menu is not set fallback to old menu system
- if (!isConfigEntrySet('admin_menu')) setConfigEntry('admin_menu', 'OLD');
+ // Check status
+ switch ($ret) {
+ case 'done':
+ // Check for access control line of current menu entry
+ runFilterChain('check_admin_acl');
- // Check for version and switch between old menu system and new intelligent menu system
- if ((ADMIN_CHECK_MENU_MODE() == 'NEW') && (isIncludeReadable('inc/modules/admin/lasys-inc.php'))) {
- // Default area is the entrance, of course
- $area = 'entrance';
+ // Check for version and switch between old menu system and new intelligent menu system
+ if (adminGetMenuMode() == 'NEW') {
+ // Load include for admin AJAX
+ loadIncludeOnce('inc/ajax/ajax_admin.php');
- // Check for similar URL variable
- if (REQUEST_ISSET_GET('area')) $area = REQUEST_GET('area');
+ // Load main template
+ loadTemplate('admin_ajax_main');
+ } else {
+ /*
+ * This little call constructs the whole default old and lacky menu system
+ * on left side. It also renders the content on right side
+ */
+ doAdminAction();
+ }
+ break;
- // Load logical-area menu-system file
- loadIncludeOnce('inc/modules/admin/lasys-inc.php');
+ case '404': // Administrator login not found
+ setPostRequestElement('login', $ret);
+ displayMessage('{%message,ADMIN_ACCOUNT_404=' . getCurrentAdminId() . '%}');
+ destroyAdminSession();
+ break;
- // Create new-style menu system will logical areas
- ADMIN_LOGICAL_AREA_SYSTEM($area, $act, $GLOBALS['what']);
- } else {
- // This little call constructs the whole default old and lacky menu system
- // on left side. It also renders the content on right side
- ADMIN_DO_ACTION($GLOBALS['what']);
- }
- break;
-
- case '404': // Administrator login not found
- REQUEST_SET_POST('ok', $ret);
- destroyAdminSession();
- addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_NOT_FOUND'));
- break;
-
- case 'pass': // Wrong password
- REQUEST_SET_POST('ok', $ret);
- destroyAdminSession();
- addFatalMessage(__FILE__, __LINE__, getMessage('WRONG_PASS'));
- break;
-
- default: // Others will be logged
- DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown return code %s from CHECK_ADMIN_COOKIES()", $ret));
- break;
- }
+ case 'password': // Wrong password
+ setPostRequestElement('login', $ret);
+ displayMessage('{--WRONG_PASS--}');
+ destroyAdminSession();
+ break;
+
+ default: // Others will be logged
+ logDebugMessage(__FILE__, __LINE__, sprintf("Unknown return code %s from ifAdminCookiesAreValid()", $ret));
+ break;
+ } // END - switch
}
-//
+// [EOF]
?>
projects / mailer.git / blobdiff