X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=7822bf081ffafcc12e37c2c6716ded7d0f16f7e7;hp=058b1f8f0ef42e08344990ab2f7b616a23624a8f;hb=d9f35786166902b9bc3f402d4f2abeed5ae0528d;hpb=b5912168d72ae511eb623c3d92540c82d31b93c5
diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 058b1f8f0e..7822bf081f 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -1,7 +1,7 @@
secureString(postRequestParameter('hash')),
+ 'login' => secureString(postRequestParameter('login'))
+ );
+
+ // Validation okay so display form for final password change
+ 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'));
+ }
+ } 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')));
+ } else {
+ // Validation failed
+ loadTemplate('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2'));
+ }
+ } else {
+ // Output reset password form
+ loadTemplate('admin_send_reset_link');
}
-}
- elseif ((empty($_SESSION['admin_login'])) || (empty($_SESSION['admin_md5'])) || (empty($_SESSION['admin_last'])) || (empty($_SESSION['admin_to'])) || (($_SESSION['admin_last'] + bigintval($_SESSION['admin_to']) * 3600 * 24) < time()))
-{
+} elseif ((!isSessionVariableSet('admin_login')) || (!isSessionVariableSet('admin_md5')) || (!isSessionVariableSet('admin_last'))) {
// At leat one administrator account was created
- if ((!empty($_SESSION['admin_login'])) && (!empty($_SESSION['admin_md5'])) && (!empty($_SESSION['admin_last'])) && (!empty($_SESSION['admin_to'])))
- {
+ if ((isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5')) && (isSessionVariableSet('admin_last'))) {
// Timeout for last login, we have to logout first!
- $URL = URL."/modules.php?module=admin&action=login&logout=1";
- LOAD_URL($URL);
- }
- if (!empty($_GET['register']))
- {
+ redirectToUrl('modules.php?module=admin&logout=1');
+ } // END - if
+
+ if (isGetRequestParameterSet('register')) {
// Registration of first admin is done
- if ($_GET['register'] == "done") OUTPUT_HTML("".ADMIN_REGISTER_DONE."");
- }
+ if (getRequestParameter('register') == 'done') loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REGISTER_DONE'));
+ } // END - if
// Check if the admin has submitted data or not
- $ret = "";
- if ((isset($_POST['ok'])) && ((empty($_POST['login'])) || (empty($_POST['pass'])) || (strlen($_POST['pass']) < 4))) $_POST['ok'] = "***";
- if ((isset($_POST['ok'])) && ($_POST['ok'] != "***"))
- {
+ if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('pass')) || (strlen(postRequestParameter('pass')) < 4))) {
+ setPostRequestParameter('ok', '***');
+ } // END - if
+
+ if ((isFormSent()) && (postRequestParameter('ok') != '***')) {
// All required data was entered so we check his account
- $ret = CHECK_ADMIN_LOGIN($_POST['login'], $_POST['pass']);
- switch ($ret)
- {
- case "done": // Admin and password are okay, so we log in now
- $TIMEOUT = time() + (3600 * 24 * $_POST['timeout']);
- if ((set_session("admin_md5", generatePassString(generateHash($_POST['pass'], __SALT)), $TIMEOUT, COOKIE_PATH)) && (set_session("admin_login", $_POST['login'], $TIMEOUT, COOKIE_PATH)) && (set_session("admin_last", time(), $TIMEOUT, COOKIE_PATH)) && (set_session("admin_to", $_POST['timeout'], $TIMEOUT, COOKIE_PATH)))
- {
+ $ret = ifAdminLoginDataIsValid(postRequestParameter('login'), postRequestParameter('pass'));
+
+ // Which status do we have?
+ switch ($ret) {
+ case 'done': // Admin and password are okay, so we log in now
// Construct URL and redirect
- $URL = URL."/modules.php?module=admin&";
+ $URL = 'modules.php?module=admin&';
// Rewrite overview module
- if ($GLOBALS['what'] == "overview") {
- $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
- }
+ if (getWhat() == 'overview') {
+ setAction(getActionFromModuleWhat(getModule(), getWhat()));
+ } // END - if
// Add data to URL
- if (!empty($GLOBALS['what'])) $URL .= "what=".$GLOBALS['what'];
- elseif (!empty($GLOBALS['action'])) $URL .= "action=".$GLOBALS['action'];
- elseif (!empty($_GET['area'])) $URL .= "area=".$_GET['area'];
-
- // Load URL
- LOAD_URL($URL);
- }
- else
- {
- OUTPUT_HTML("".ADMIN_LOGIN_FAILED."");
- ADD_FATAL(CANNOT_REGISTER_SESS);
- }
- break;
-
- case "404": // Administrator login not found
- $_POST['ok'] = $ret;
- $ret = ADMIN_NOT_FOUND;
- break;
-
- case "pass": // Wrong password
- $_POST['ok'] = $ret;
- $ret = WRONG_PASS;
- break;
- }
- }
- if ($ret != "done")
- {
- if (!empty($_POST['login']))
- {
- define('__LOGIN_VALUE', $_POST['login']);
- }
- else
- {
- define('__LOGIN_VALUE', "");
- }
-
- if (isset($_POST['ok']))
- {
+ if (isWhatSet()) $URL .= 'what='.getWhat();
+ elseif (isActionSet()) $URL .= 'action='.getAction();
+ elseif (isGetRequestParameterSet('area')) $URL .= 'area='.getRequestParameter('area');
+
+ // Load URL
+ redirectToUrl($URL);
+ break;
+
+ case '404': // Administrator login not found
+ setPostRequestParameter('ok', $ret);
+ $ret = getMaskedMessage('ADMIN_404', postRequestParameter('login'));
+ destroyAdminSession();
+ break;
+
+ case 'pass': // Wrong password
+ setPostRequestParameter('ok', $ret);
+ $ret = '{--WRONG_PASS--} [{--ADMIN_RESET_PASS--}]';
+ 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?
+ if ($ret != 'done') {
+ $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 = '';
- $MSG1 = ""; $MSG2 = "";
// No login entered?
- if (empty($_POST['login'])) $MSG1 = ADMIN_NO_LOGIN;
+ if (!isPostRequestParameterSet('login')) $loginMessage = getMessage('ADMIN_NO_LOGIN');
// An error comes back from login?
- if ((!empty($ret)) && ($_POST['ok'] == "404")) $MSG1 = $ret;
+ if ((!empty($ret)) && (postRequestParameter('ok') == '404')) $loginMessage = $ret;
// No password entered?
- if (empty($_POST['pass'])) $MSG2 = ADMIN_NO_PASS;
+ if (!isPostRequestParameterSet('pass')) $passwdMessage = getMessage('ADMIN_NO_PASS');
// Or password too short?
- if (strlen($_POST['pass']) < 4) $MSG2 = ADMIN_SHORT_PASS;
+ if (strlen(postRequestParameter('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
// An error comes back from login?
- if ((!empty($ret)) && ($_POST['ok'] == "pass")) $MSG2 = $ret;
+ if ((!empty($ret)) && (postRequestParameter('ok') == 'pass')) $passwdMessage = $ret;
// Load message template
- define('__MSG_LOGIN', LOAD_TEMPLATE("admin_login_msg", true, $MSG1));
- define('__MSG_PASS' , LOAD_TEMPLATE("admin_login_msg", true, $MSG2));
-
- // Reset variables
- $MSG1 = ""; $MSG2 = "";
- }
- 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 (!empty($GLOBALS['what']))
- {
+ if (isWhatSet()) {
// Restore old what value
- $content = array('target' => "what", 'value' => $GLOBALS['what']);
- }
- elseif (!empty($GLOBALS['action']))
- {
- if ($GLOBALS['action'] != "logout")
- {
+ $content = merge_array($content, array('target' => 'what', 'value' => getWhat()));
+ } elseif (isActionSet()) {
+ if (getAction() != 'logout') {
// Restore old action value
- $content = array('target' => "action", 'value' => $GLOBALS['action']);
- }
- else
- {
+ $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 (!empty($_GET['area']))
- {
+ } elseif (isGetRequestParameterSet('area')) {
// Restore old area value
- $content = array('target' => "area", 'value' => $_GET['area']);
- }
- else
- {
+ $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);
- }
-}
- elseif ($_GET['logout'] == "1")
-{
+ loadTemplate('admin_login_form', false, $content);
+ } // END - if
+} elseif (isGetRequestParameterSet('logout')) {
// Only try to remove cookies
- if (set_session("admin_login", "", (time() - 3600), COOKIE_PATH) && set_session("admin_md5", "", (time() - 3600), COOKIE_PATH) && set_session("admin_last", "", (time() - 3600), COOKIE_PATH) && set_session("admin_to", "", (time() - 3600), COOKIE_PATH))
- {
- // Also remove array elements
- unset($_SESSION['admin_login']);
- unset($_SESSION['admin_md5']);
- unset($_SESSION['admin_last']);
- unset($_SESSION['admin_to']);
-
- // Destroy session
- @session_destroy();
-
+ if (destroyAdminSession()) {
// Load logout template
- LOAD_TEMPLATE("admin_logout");
- }
- else
- {
+ if (isGetRequestParameterSet('register')) {
+ // Secure input
+ $register = getRequestParameter('register');
+
+ // Special logout redirect for installation of given extension
+ loadTemplate(sprintf("admin_logout_%s_install", $register));
+ } elseif (isGetRequestParameterSet('remove')) {
+ // Secure input
+ $remove = getRequestParameter('remove');
+
+ // Special logout redirect for removal of given extension
+ loadTemplate(sprintf("admin_logout_%s_remove", $remove));
+ } else {
+ // Logged out normally
+ loadTemplate('admin_logout');
+ }
+ } else {
// Something went wrong here...
- OUTPUT_HTML("".ADMIN_LOGOUT_FAILED."");
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_LOGOUT_FAILED--}
');
// Add fatal message
- ADD_FATAL(CANNOT_UNREG_SESS);
+ addFatalMessage(__FILE__, __LINE__, getMessage('CANNOT_UNREG_SESS'));
}
-}
- else
-{
+} else {
// Maybe an Admin want's to login?
- $ret = CHECK_ADMIN_COOKIES(SQL_ESCAPE($_SESSION['admin_login']), SQL_ESCAPE($_SESSION['admin_md5']));
- switch ($ret)
- {
- case "done":
- // Cookie-Data accepted
- $TIMEOUT = time() + bigintval($_SESSION['admin_to']);
- if ((set_session("admin_md5", SQL_ESCAPE($_SESSION['admin_md5']), $TIMEOUT, COOKIE_PATH)) && (set_session("admin_login", SQL_ESCAPE($_SESSION['admin_login']), $TIMEOUT, COOKIE_PATH)) && (set_session("admin_last", time(), $TIMEOUT, COOKIE_PATH)) && (set_session("admin_to", bigintval($_SESSION['admin_to']), $TIMEOUT, COOKIE_PATH)))
- {
- // Ok, Cookie-Update done
- if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2"))
- {
- // Check if action GET variable was set
- $act = SQL_ESCAPE($GLOBALS['action']);
- if (!empty($GLOBALS['what'])) {
- // Get action value by what-value
- $act = GET_ACTION("admin", $GLOBALS['what']);
- }
+ $ret = ifAdminCookiesAreValid(getSession('admin_login'), getSession('admin_md5'));
- // Check for access control line of current menu entry
- define('__ACL_ALLOW', ADMINS_CHECK_ACL($act, $GLOBALS['what']));
- }
- else
- {
- // Extension not installed so it's always allowed to access everywhere!
- define('__ACL_ALLOW', true);
- }
+ // Check status
+ switch ($ret) {
+ case 'done':
+ // 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 (empty($_CONFIG['admin_menu'])) $_CONFIG['admin_menu'] = "OLD";
+ if (!isConfigEntrySet('admin_menu')) setConfigEntry('admin_menu', 'OLD');
- // Check for version and switch between old menu system and new "intelligent menu system"
- if ((ADMIN_CHECK_MENU_MODE() == "NEW") && (file_exists(PATH."inc/modules/admin/la_sys-inc.php")))
- {
+ // 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";
+ $area = 'entrance';
// Check for similar URL variable
- if (!empty($_GET['area'])) $area = $_GET['area'];
+ if (isGetRequestParameterSet('area')) $area = getRequestParameter('area');
- // Load "logical-area menu-system" file
- require_once(PATH."inc/modules/admin/la_sys-inc.php");
+ // Load logical-area menu-system file
+ loadIncludeOnce('inc/modules/admin/lasys-inc.php');
- // Create new-style menu system will "logical areas"
- ADMIN_LOGICAL_AREA_SYSTEM($area, $act, $GLOBALS['what']);
- }
- else
- {
+ // Create new-style menu system will logical areas
+ doAdminLogicalArea($area, $action, getWhat());
+ } else {
// This little call constructs the whole default old and lacky menu system
- // on left side
- ADMIN_DO_ACTION($GLOBALS['what']);
+ // on left side. It also renders the content on right side
+ doAdminAction();
}
- }
- else
- {
- // Login failed (cookies enabled?)
- OUTPUT_HTML("".ADMIN_LOGIN_FAILED."");
- ADD_FATAL(CANNOT_RE_REGISTER_SESS);
- }
- break;
+ break;
- case "404": // Administrator login not found
- $_POST['ok'] = $ret;
- ADD_FATAL(ADMIN_NOT_FOUND);
- break;
+ case '404': // Administrator login not found
+ setPostRequestParameter('ok', $ret);
+ loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_404', getSession('admin_login')));
+ destroyAdminSession();
+ break;
- case "pass": // Wrong password
- $_POST['ok'] = $ret;
- ADD_FATAL(WRONG_PASS);
- break;
- }
-}
+ case 'pass': // Wrong password
+ setPostRequestParameter('ok', $ret);
+ loadTemplate('admin_settings_saved', false, getMessage('WRONG_PASS'));
+ destroyAdminSession();
+ break;
-if (admin_registered)
-{
- // Check config.php and inc directory for right access rights
- if (is_INCWritable("config")) ADD_FATAL(FATAL_CONFIG_WRITABLE);
- if (is_INCWritable("dummy")) ADD_FATAL(FATAL_INC_WRITABLE);
+ default: // Others will be logged
+ logDebugMessage(__FILE__, __LINE__, sprintf("Unknown return code %s from ifAdminCookiesAreValid()", $ret));
+ break;
+ } // END - switch
}
-//
+
+// [EOF]
?>