X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=1807ee960f078b3e1f691302decddf6655442831;hp=806035c74ae95e6d2492c8aef705485dc34e4186;hb=e5527fd38a6585c8466dc28d013f12d21eb7c07a;hpb=258bb8c82f21617f7f90bff8023602a11b986f7e diff --git a/inc/modules/admin.php b/inc/modules/admin.php index 806035c74a..1807ee960f 100644 --- a/inc/modules/admin.php +++ b/inc/modules/admin.php @@ -1,7 +1,7 @@ secureString(postRequestElement('hash')), - 'login' => secureString(postRequestElement('login')) + 'hash' => postRequestElement('hash'), + 'admin_login' => postRequestElement('admin_login') ); // Validation okay so display form for final password change - loadTemplate('admin_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, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED')); + displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED--}'); } - } elseif ((isPostRequestElementSet('reset_pass')) && (isPostRequestElementSet('hash')) && (isPostRequestElementSet('login')) && (isPostRequestElementSet('pass1')) && (postRequestElement('pass1') == postRequestElement('pass2'))) { + } elseif ((isPostRequestElementSet('reset_pass')) && (isPostRequestElementSet('hash')) && (isPostRequestElementSet('admin_login')) && (isPostRequestElementSet('admin_password1')) && (postRequestElement('admin_password1') == postRequestElement('admin_password2'))) { // Okay, we shall the admin password here. So first revalidate the hash - if (adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('login'))) { + if (adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('admin_login'))) { // Output result - loadTemplate('admin_reset_pass_done', false, doResetAdminPassword(postRequestElement('login'), postRequestElement('pass1'))); + loadTemplate('admin_reset_password_done', FALSE, doResetAdminPassword(postRequestElement('admin_login'), postRequestElement('admin_password1'))); } else { // Validation failed - loadTemplate('admin_settings_saved', false, getMessage('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 (isGetRequestElementSet('register')) { + if (isGetRequestElementSet('setup')) { // Registration of first admin is done - if (getRequestElement('register') == 'done') loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REGISTER_DONE')); + if (getRequestElement('setup') == 'done') { + // Regisration done! + displayMessage('{--ADMIN_REGISTER_DONE--}'); + } // END - if } // END - if // Check if the admin has submitted data or not - if ((isFormSent()) && ((!isPostRequestElementSet('login')) || (!isPostRequestElementSet('pass')) || (strlen(postRequestElement('pass')) < 4))) { - setRequestPostElement('ok', '***'); + if ((isFormSent()) && ((!isPostRequestElementSet('admin_login')) || (!isPostRequestElementSet('admin_password')) || (strlen(postRequestElement('admin_password')) < getConfig('minium_admin_pass_length')))) { + setPostRequestElement('login', '***'); } // END - if - if ((isFormSent()) && (postRequestElement('ok') != '***')) { + if ((isFormSent('login')) && (postRequestElement('login') != '***')) { // All required data was entered so we check his account - $ret = ifAdminLoginDataIsValid(postRequestElement('login'), postRequestElement('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 (getWhat() == 'overview') { - setAction(getModeAction(getModule(), getWhat())); - } // END - if - - // Add data to URL - if (isWhatSet()) $URL .= 'what='.getWhat(); - elseif (isActionSet()) $URL .= 'action='.getAction(); - elseif (isGetRequestElementSet('area')) $URL .= 'area='.getRequestElement('area'); - - // Load URL - redirectToUrl($URL); - break; + // Load URL + redirectToUrl('modules.php?' . addAllGetRequestParameters()); + break; case '404': // Administrator login not found - setRequestPostElement('ok', $ret); - $ret = sprintf(getMessage('ADMIN_404'), postRequestElement('login')); - destroyAdminSession(); + setPostRequestElement('login', $ret); + $ret = '{%message,ADMIN_ACCOUNT_404=' . postRequestElement('admin_login') . '%}'; + destroyAdminSession(TRUE); break; - case 'pass': // Wrong password - setRequestPostElement('ok', $ret); - $ret = '{--WRONG_PASS--} [{--ADMIN_RESET_PASS--}]'; - destroyAdminSession(); + case 'password': // Wrong password + setPostRequestElement('login', $ret); + $ret = '{--WRONG_PASS--} [{--ADMIN_RESET_PASS--}]'; + destroyAdminSession(TRUE); break; default: // Others will be logged - logDebugMessage(__FILE__, __LINE__, sprintf("Unknown return code %s from ifAdminLoginDataIsValid()", $ret)); + logDebugMessage(__FILE__, __LINE__, sprintf('Unknown return code %s from ifAdminLoginDataIsValid()', $ret)); break; } // END - switch } // END - if // Error detected? if ($ret != 'done') { - $content['login'] = ''; - if (isPostRequestElementSet('login')) { - $content['login'] = postRequestElement('login'); + $content['admin_login'] = ''; + if (isPostRequestElementSet('admin_login')) { + $content['admin_login'] = postRequestElement('admin_login'); } // END - if // Init array elements $content['login_message'] = ''; $content['pass_message'] = ''; - if (isFormSent()) { + if (isFormSent('login')) { // Set messages to zero - $loginMessage = ''; $passwdMessage = ''; - - // No login entered? - if (!isPostRequestElementSet('login')) $loginMessage = getMessage('ADMIN_NO_LOGIN'); - - // An error comes back from login? - if ((!empty($ret)) && (postRequestElement('ok') == '404')) $loginMessage = $ret; - - // No password entered? - if (!isPostRequestElementSet('pass')) $passwdMessage = getMessage('ADMIN_NO_PASS'); - - // Or password too short? - if (strlen(postRequestElement('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS'); - - // An error comes back from login? - if ((!empty($ret)) && (postRequestElement('ok') == 'pass')) $passwdMessage = $ret; + $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 - $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage); - $content['pass_message'] = loadTemplate('admin_login_msg', true, $passwdMessage); + // Check for password + if (!isPostRequestElementSet('admin_password')) { + // No password entered? + $passwdMessage = '{--ADMIN_NO_PASSWORD--}'; + } elseif ((!empty($ret)) && (postRequestElement('login') == 'password')) { + // An error comes back from login? + $passwdMessage = $ret; + } - // Reset variables - unset($loginMessage); - unset($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 - if (isWhatSet()) { - // Restore old what value - $content = merge_array($content, array('target' => 'what', 'value' => getWhat())); - } elseif (isActionSet()) { - if (getAction() != 'logout') { - // Restore old action value - $content = merge_array($content, array('target' => 'action', 'value' => getAction())); - } else { - // Set default values - $content = merge_array($content, array('target' => 'action', 'value' => 'login')); - } - } elseif (isGetRequestElementSet('area')) { - // Restore old area value - $content = merge_array($content, array('target' => 'area', 'value' => getRequestElement('area'))); - } else { - // Set default values - $content = merge_array($content, array('target' => 'action', 'value' => 'login')); - } + // Add all parameter + $content['all_parameter'] = addAllGetRequestParameters(); // Load login form template - loadTemplate('admin_login_form', false, $content); + loadTemplate('admin_login_form', FALSE, $content); } // END - if } elseif (isGetRequestElementSet('logout')) { // Only try to remove cookies - if (destroyAdminSession()) { + if (destroyAdminSession(TRUE)) { // Load logout template - if (isGetRequestElementSet('register')) { + if (isGetRequestElementSet('setup')) { // Secure input - $register = getRequestElement('register'); + $register = getRequestElement('setup'); // Special logout redirect for installation of given extension - loadTemplate(sprintf("admin_logout_%s_install", $register)); + loadTemplate(sprintf('admin_logout_%s_install', $register)); } elseif (isGetRequestElementSet('remove')) { // Secure input $remove = getRequestElement('remove'); // Special logout redirect for removal of given extension - loadTemplate(sprintf("admin_logout_%s_remove", $remove)); + loadTemplate(sprintf('admin_logout_%s_remove', $remove)); } else { // Logged out normally loadTemplate('admin_logout'); } } else { // Something went wrong here... - loadTemplate('admin_settings_saved', false, '
{--ADMIN_LOGOUT_FAILED--}
'); + displayErrorMessage('{--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) { @@ -344,43 +227,42 @@ if (!isAdminRegistered()) { // 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 - $area = 'entrance'; - - // Check for similar URL variable - if (isGetRequestElementSet('area')) $area = getRequestElement('area'); + if (adminGetMenuMode() == 'NEW') { + // Load include for admin AJAX + loadIncludeOnce('inc/ajax/ajax_admin.php'); - // Load logical-area menu-system file - loadIncludeOnce('inc/modules/admin/lasys-inc.php'); - - // Create new-style menu system will logical areas - doAdminLogicalArea($area, $action, getWhat()); + // 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 + /* + * 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; case '404': // Administrator login not found - setRequestPostElement('ok', $ret); - loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_404'), getSession('admin_login'))); - destroyAdminSession(); + setPostRequestElement('login', $ret); + displayMessage('{%message,ADMIN_ACCOUNT_404=' . getCurrentAdminId() . '%}'); + destroyAdminSession(TRUE); + break; + + case 'password': // Wrong password + setPostRequestElement('login', $ret); + displayMessage('{--WRONG_PASS--}'); + destroyAdminSession(TRUE); break; - case 'pass': // Wrong password - setRequestPostElement('ok', $ret); - loadTemplate('admin_settings_saved', false, getMessage('WRONG_PASS')); - destroyAdminSession(); + case 'session': // Invalid admin session + setPostRequestElement('login', $ret); + displayMessage('{--INVALID_ADMIN_SESSION--}'); + destroyAdminSession(TRUE); break; default: // Others will be logged - logDebugMessage(__FILE__, __LINE__, sprintf("Unknown return code %s from ifAdminCookiesAreValid()", $ret)); + logDebugMessage(__FILE__, __LINE__, sprintf('Unknown return code %s from ifAdminCookiesAreValid()', $ret)); break; } // END - switch }