X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin.php;h=8571dfe0c362d4f902b32c37cb77caeb76cce2d5;hb=449003a0cf1cf2434ef63e4b7d39685ba3804786;hp=3b196b40d1292cfb5bd02c4c70e68012d70586b1;hpb=98e388b809fe0f6d5dbe2a02273a11e6816fb333;p=mailer.git diff --git a/inc/modules/admin.php b/inc/modules/admin.php index 3b196b40d1..8571dfe0c3 100644 --- a/inc/modules/admin.php +++ b/inc/modules/admin.php @@ -1,7 +1,7 @@ SQL_ESCAPE(REQUEST_POST('hash')), - 'login' => SQL_ESCAPE(REQUEST_POST('login')) + 'hash' => secureString(postRequestParameter('hash')), + 'login' => secureString(postRequestParameter('login')) ); // Validation okay so display form for final password change - LOAD_TEMPLATE('admin_reset_password_form', false, $content); + loadTemplate('form_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')); + loadTemplate('admin_settings_saved', false, '{--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 ((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 (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(postRequestParameter('hash'), postRequestParameter('login'))) { // Output result - LOAD_TEMPLATE('admin_reset_pass_done', false, $OUT); + loadTemplate('form_reset_pass_done', false, doResetAdminPassword(postRequestParameter('login'), postRequestParameter('pass1'))); } else { // Validation failed - LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}'); } } else { // Output reset password form - LOAD_TEMPLATE('admin_send_reset_link'); + loadTemplate('admin_send_reset_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 (isGetRequestParameterSet('register')) { // Registration of first admin is done - if (REQUEST_GET('register') == 'done') LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_REGISTER_DONE')); + if (getRequestParameter('register') == 'done') loadTemplate('admin_settings_saved', false, '{--ADMIN_REGISTER_DONE--}'); } // END - if // Check if the admin has submitted data or not - if ((isFormSent()) && ((!REQUEST_ISSET_POST('login')) || (!REQUEST_ISSET_POST('pass')) || (strlen(REQUEST_POST('pass')) < 4))) { - REQUEST_SET_POST('ok', '***'); + if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('password')) || (strlen(postRequestParameter('password')) < 4))) { + setPostRequestParameter('ok', '***'); } // END - if - if ((isFormSent()) && (REQUEST_POST('ok') != '***')) { + if ((isFormSent()) && (postRequestParameter('ok') != '***')) { // All required data was entered so we check his account - $ret = CHECK_ADMIN_LOGIN(REQUEST_POST('login'), REQUEST_POST('pass')); + $ret = ifAdminLoginDataIsValid(postRequestParameter('login'), postRequestParameter('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&'; + $url = 'modules.php?module=admin&'; // Rewrite overview module if (getWhat() == 'overview') { - setAction(getModeAction(getModule(), getWhat())); + setAction(getActionFromModuleWhat(getModule(), getWhat())); } // END - if // Add data to URL - if (isWhatSet()) $URL .= 'what='.getWhat(); - elseif (isActionSet()) $URL .= 'action='.getAction(); - elseif (REQUEST_ISSET_GET('area')) $URL .= 'area='.REQUEST_GET('area'); + if (isWhatSet()) $url .= 'what='.getWhat(); + elseif (isActionSet()) $url .= 'action='.getAction(); + elseif (isGetRequestParameterSet('area')) $url .= 'area='.getRequestParameter('area'); // Load URL - redirectToUrl($URL); + redirectToUrl($url); break; case '404': // Administrator login not found - REQUEST_SET_POST('ok', $ret); - $ret = getMessage('ADMIN_NOT_FOUND'); + setPostRequestParameter('ok', $ret); + $ret = getMaskedMessage('ADMIN_ACCOUNT_404', postRequestParameter('login')); destroyAdminSession(); break; - case 'pass': // Wrong password - REQUEST_SET_POST('ok', $ret); - $ret = '{--WRONG_PASS--} [{--ADMIN_RESET_PASS--}]'; + case 'password': // Wrong password + setPostRequestParameter('ok', $ret); + $ret = '{--WRONG_PASS--} [{--ADMIN_RESET_PASS--}]'; destroyAdminSession(); break; default: // Others will be logged - DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown return code %s from CHECK_ADMIN_LOGIN()", $ret)); + 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['login'] = ''; + if (isPostRequestParameterSet('login')) { + $content['login'] = postRequestParameter('login'); + } // END - if + + // Init array elements + $content['login_message'] = ''; + $content['pass_message'] = ''; if (isFormSent()) { // Set messages to zero $loginMessage = ''; $passwdMessage = ''; // No login entered? - if (!REQUEST_ISSET_POST('login')) $loginMessage = getMessage('ADMIN_NO_LOGIN'); + if (!isPostRequestParameterSet('login')) $loginMessage = '{--ADMIN_NO_LOGIN--}'; // An error comes back from login? - if ((!empty($ret)) && (REQUEST_POST('ok') == '404')) $loginMessage = $ret; + if ((!empty($ret)) && (postRequestParameter('ok') == '404')) $loginMessage = $ret; // No password entered? - if (!REQUEST_ISSET_POST('pass')) $passwdMessage = getMessage('ADMIN_NO_PASS'); + if (!isPostRequestParameterSet('password')) $passwdMessage = '{--ADMIN_NO_PASS--}'; // Or password too short? - if (strlen(REQUEST_POST('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS'); + if (strlen(postRequestParameter('password')) < 4) $passwdMessage = '{--ADMIN_SHORT_PASS--}'; // An error comes back from login? - if ((!empty($ret)) && (REQUEST_POST('ok') == 'pass')) $passwdMessage = $ret; + if ((!empty($ret)) && (postRequestParameter('ok') == 'password')) $passwdMessage = $ret; // Load message template - define('__MSG_LOGIN', LOAD_TEMPLATE('admin_login_msg', true, $loginMessage)); - define('__MSG_PASS' , LOAD_TEMPLATE('admin_login_msg', true, $passwdMessage)); - - // Reset variables - unset($loginMessage); - unset($passwdMessage); - } else { - // Set constants to empty for hiding them - define('__MSG_LOGIN', ''); - define('__MSG_PASS' , ''); - } + $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage); + $content['pass_message'] = loadTemplate('admin_login_msg', true, $passwdMessage); + } // END - if // Load login form if (isWhatSet()) { // Restore old what value - $content = array('target' => 'what', 'value' => getWhat()); + $content = merge_array($content, array('target' => 'what', 'value' => getWhat())); } elseif (isActionSet()) { if (getAction() != 'logout') { // Restore old action value - $content = array('target' => 'action', 'value' => getAction()); + $content = merge_array($content, array('target' => 'action', 'value' => getAction())); } else { // Set default values - $content = array('target' => 'action', 'value' => 'login'); + $content = merge_array($content, array('target' => 'action', 'value' => 'login')); } - } elseif (REQUEST_ISSET_GET('area')) { + } elseif (isGetRequestParameterSet('area')) { // Restore old area value - $content = array('target' => 'area', 'value' => REQUEST_GET('area')); + $content = merge_array( + $content, + array( + 'target' => 'area', + 'value' => getRequestParameter('area') + ) + ); } else { // Set default values - $content = array('target' => 'action', 'value' => 'login'); + $content = merge_array($content, array('target' => 'action', 'value' => 'login')); } // 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 (isGetRequestParameterSet('logout')) { // Only try to remove cookies if (destroyAdminSession()) { // Load logout template - if (REQUEST_ISSET_GET('register')) { + if (isGetRequestParameterSet('register')) { // Secure input - $register = REQUEST_GET('register'); + $register = getRequestParameter('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 (isGetRequestParameterSet('remove')) { // Secure input - $remove = REQUEST_GET('remove'); + $remove = getRequestParameter('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, '