X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=572888450ffb638c05c6e4ca6cd53ec2a0d5ff1f;hb=e17685c65d1a48c061b7c4f64c7a23c165430460;hp=b12271915ce446d9ba9a2ccbc35b31ccdd65d413;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git diff --git a/inc/modules/admin.php b/inc/modules/admin.php index b12271915c..572888450f 100644 --- a/inc/modules/admin.php +++ b/inc/modules/admin.php @@ -14,11 +14,9 @@ * $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 * @@ -46,7 +44,7 @@ if (!defined('__SECURITY')) { 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'; @@ -54,10 +52,13 @@ $ret = 'init'; // Is no admin registered? if (!isAdminRegistered()) { // Admin is not registered so we have to inform the user - if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('pass1')) || (strlen(postRequestParameter('pass1')) < 4) || (!isPostRequestParameterSet('pass2')) || (strlen(postRequestParameter('pass2')) < 4) || (postRequestParameter('pass1') != postRequestParameter('pass2')))) { + if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('pass1')) || (strlen(postRequestParameter('pass1')) < getConfig('minium_admin_pass_length')) || (!isPostRequestParameterSet('pass2')) || (strlen(postRequestParameter('pass2')) < getConfig('minium_admin_pass_length')) || (postRequestParameter('pass1') != postRequestParameter('pass2')))) { setPostRequestParameter('ok', '***'); } // END - if + // Clear error message + $errorMessage = ''; + if ((isFormSent()) && (postRequestParameter('ok') != '***')) { // Hash the password with the old function because we are here in install mode $hashedPass = md5(postRequestParameter('pass1')); @@ -66,31 +67,48 @@ if (!isAdminRegistered()) { 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'); } else { - $ret = getMessage('ADMIN_CANNOT_COMPLETE'); + // Registration incomplete + $errorMessage = '{--ADMIN_CANNOT_COMPLETE--}'; + + // Set this to have our error message displayed + setPostRequestParameter('ok', '***'); } break; case 'failed': // Registration has failed - $ret = getMessage('ADMIN_REGISTER_FAILED'); + $errorMessage = '{--ADMIN_REGISTER_FAILED--}'; + + // Set this to have our error message displayed + setPostRequestParameter('ok', '***'); break; case 'already': // Admin does already exists! - $ret = getMessage('ADMIN_LOGIN_ALREADY_REG'); + $errorMessage = '{--ADMIN_LOGIN_ALREADY_REG--}'; + + // Set this to have our error message displayed + setPostRequestParameter('ok', '***'); break; default: // Any other kind will be logged - logDebugMessage(__FILE__, __LINE__, sprintf("Unknown return code %s from ifAdminLoginDataIsValid().", $ret)); + $errorMessage = sprintf("Unknown return code %s from ifAdminLoginDataIsValid().", $ret); + logDebugMessage(__FILE__, __LINE__, $errorMessage); + + // Set this to have our error message displayed + setPostRequestParameter('ok', '***'); break; } // END - switch } // END - if @@ -104,9 +122,10 @@ if (!isAdminRegistered()) { } // 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') == '***')) { @@ -116,43 +135,54 @@ if (!isAdminRegistered()) { $pass2Message = ''; // No login entered? - if (empty($content['login'])) $loginMessage = getMessage('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 = $ret; + if ((!empty($ret)) && ($ret != 'init')) { + $loginMessage = $errorMessage; + } // END - if // No password 1 entered or to short? - if (!isPostRequestParameterSet('pass1')) $pass1Message = getMessage('ADMIN_NO_PASS1'); - elseif (strlen(postRequestParameter('pass1')) < 4) $pass1Message = getMessage('ADMIN_SHORT_PASS1'); + if (!isPostRequestParameterSet('pass1')) { + $pass1Message = '{--ADMIN_NO_PASS1--}'; + } elseif (strlen(postRequestParameter('pass1')) < getConfig('minium_admin_pass_length')) { + $pass1Message = '{--ADMIN_SHORT_PASS1--}'; + } // No password 2 entered or to short? - if (!isPostRequestParameterSet('pass2')) $pass2Message = getMessage('ADMIN_NO_PASS2'); - elseif (strlen(postRequestParameter('pass2')) < 4) $pass2Message = getMessage('ADMIN_SHORT_PASS2'); + if (!isPostRequestParameterSet('pass2')) { + $pass2Message = '{--ADMIN_NO_PASS2--}'; + } elseif (strlen(postRequestParameter('pass2')) < getConfig('minium_admin_pass_length')) { + $pass2Message = '{--ADMIN_SHORT_PASS2--}'; + } // Both didn't match? if (postRequestParameter('pass1') != postRequestParameter('pass2')) { // No match - if (empty($pass1Message)) $pass1Message = getMessage('ADMIN_PASS1_MISMATCH'); - if (empty($pass2Message)) $pass2Message = getMessage('ADMIN_PASS2_MISMATCH'); + if (empty($pass1Message)) $pass1Message = '{--ADMIN_PASS1_MISMATCH--}'; + if (empty($pass2Message)) $pass2Message = '{--ADMIN_PASS2_MISMATCH--}'; } // END - if // 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 - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NOT_REGISTERED')); + displayMessage('{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}'); // Load register template loadTemplate('admin_reg_form', false, $content); - } + } // END - if } elseif (isGetRequestParameterSet('reset_pass')) { // 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')); @@ -172,47 +202,50 @@ if (!isAdminRegistered()) { 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 ((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, 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 (isGetRequestParameterSet('register')) { // Registration of first admin is done - if (getRequestParameter('register') == 'done') loadTemplate('admin_settings_saved', false, getMessage('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')) < getConfig('minium_admin_pass_length')))) { 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) { 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') { @@ -220,21 +253,25 @@ if (!isAdminRegistered()) { } // 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); - $ret = getMaskedMessage('ADMIN_404', postRequestParameter('login')); + $ret = getMaskedMessage('ADMIN_ACCOUNT_404', postRequestParameter('login')); destroyAdminSession(); break; - case 'pass': // Wrong password + case 'password': // Wrong password setPostRequestParameter('ok', $ret); $ret = '{--WRONG_PASS--} [{--ADMIN_RESET_PASS--}]'; destroyAdminSession(); @@ -259,26 +296,37 @@ if (!isAdminRegistered()) { if (isFormSent()) { // Set messages to zero - $loginMessage = ''; $passwdMessage = ''; - - // No login entered? - if (!isPostRequestParameterSet('login')) $loginMessage = getMessage('ADMIN_NO_LOGIN'); - - // An error comes back from login? - if ((!empty($ret)) && (postRequestParameter('ok') == '404')) $loginMessage = $ret; - - // No password entered? - if (!isPostRequestParameterSet('pass')) $passwdMessage = getMessage('ADMIN_NO_PASS'); - - // Or password too short? - if (strlen(postRequestParameter('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS'); + $loginMessage = ''; + $passwdMessage = ''; + + // Check for login + if (!isPostRequestParameterSet('login')) { + // No login entered? + $loginMessage = '{--ADMIN_NO_LOGIN--}'; + } elseif ((!empty($ret)) && (postRequestParameter('ok') == '404')) { + // An error comes back from login? + $loginMessage = $ret; + } - // An error comes back from login? - if ((!empty($ret)) && (postRequestParameter('ok') == 'pass')) $passwdMessage = $ret; + // Check for password + if (!isPostRequestParameterSet('password')) { + // No password entered? + $passwdMessage = '{--ADMIN_NO_PASS--}'; + } elseif (strlen(postRequestParameter('password')) < getConfig('minium_admin_pass_length')) { + // Or password too short? + $passwdMessage = '{--ADMIN_SHORT_PASS--}'; + } elseif ((!empty($ret)) && (postRequestParameter('ok') == 'password')) { + // An error comes back from login? + $passwdMessage = $ret; + } - // Load message template - $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage); - $content['pass_message'] = loadTemplate('admin_login_msg', true, $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 @@ -295,7 +343,13 @@ if (!isAdminRegistered()) { } } elseif (isGetRequestParameterSet('area')) { // Restore old area value - $content = merge_array($content, array('target' => 'area', 'value' => getRequestParameter('area'))); + $content = merge_array( + $content, + array( + 'target' => 'area', + 'value' => getRequestParameter('area') + ) + ); } else { // Set default values $content = merge_array($content, array('target' => 'action', 'value' => 'login')); @@ -326,14 +380,14 @@ if (!isAdminRegistered()) { } } else { // Something went wrong here... - loadTemplate('admin_settings_saved', false, '
{--ADMIN_LOGOUT_FAILED--}
'); + 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) { @@ -341,9 +395,6 @@ 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 @@ -366,13 +417,13 @@ if (!isAdminRegistered()) { case '404': // Administrator login not found setPostRequestParameter('ok', $ret); - loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_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, getMessage('WRONG_PASS')); + displayMessage('{--WRONG_PASS--}'); destroyAdminSession(); break;