X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=b9b59ece5f405ce696c877bf469619881f8cb448;hp=7578e6c7d582c34c36c21f59b84888d217df7b57;hb=7c15ca79161bf475e958810a5b585bce869a2af9;hpb=e6e3183f794b385f5acc38b371c220cc35cdac38 diff --git a/inc/modules/admin.php b/inc/modules/admin.php index 7578e6c7d5..b9b59ece5f 100644 --- a/inc/modules/admin.php +++ b/inc/modules/admin.php @@ -10,9 +10,14 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Administrationsmodul * * -------------------------------------------------------------------- * - * * + * $Revision:: $ * + * $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 * + * Copyright (c) 2003 - 2009 by Roland Haeder * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -33,372 +38,352 @@ // Some security stuff... if (!defined('__SECURITY')) { - $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php"; - require($INC); -} - -// Login is default -if ((empty($GLOBALS['action'])) && ($check == "admin_only")) { - // Redirect to right URL - LOAD_URL("modules.php?module=admin&action=login"); -} + die(); +} // END - if // Load include file -require_once(PATH."inc/modules/admin/admin-inc.php"); +loadIncludeOnce('inc/modules/admin/admin-inc.php'); // Fix "deleted" cookies in PHP4 (PHP5 does remove them, PHP4 sets them to deleted!) -FIX_DELETED_COOKIES(array('admin_login', 'admin_md5', 'admin_last', 'admin_to')); +fixDeletedCookies(array('admin_login', 'admin_md5', 'admin_last', 'admin_to')); -if (!defined('admin_registered')) { +// Init return value +$ret = 'init'; + +// Is no admin registered? +if (!isAdminRegistered()) { // Admin is not registered so we have to inform the user - if ((isset($_POST['ok'])) && ((empty($_POST['login'])) || (empty($_POST['pass'])) || (strlen($_POST['pass']) < 4))) $_POST['ok'] = "***"; - if ((isset($_POST['ok'])) && ($_POST['ok'] != "***")) { + if ((isFormSent()) && ((!isPostRequestElementSet('login')) || (!isPostRequestElementSet('pass')) || (strlen(postRequestElement('pass')) < 4))) { + setRequestPostElement('ok', '***'); + } // END - if + + if ((isFormSent()) && (postRequestElement('ok') != '***')) { // Hash the password with the old function because we are here in install mode - $hashedPass = md5($_POST['pass']); + $hashedPass = md5(postRequestElement('pass')); // Kill maybe existing session variables - set_session('admin_login' , ""); - set_session('admin_md5' , ""); - set_session('admin_last' , ""); - set_session('admin_to' , ""); + destroyAdminSession(false); // Do registration - $ret = REGISTER_ADMIN($_POST['login'], $hashedPass); - switch ($ret) - { - case "done": - admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0); - if (!_FATAL) { - // Registering is done - LOAD_URL(URL."/modules.php?module=admin&action=login®ister=done"); - } else { - $ret = ADMIN_CANNOT_COMPLETE; - } - break; - - case "failed": - $ret = ADMIN_REGISTER_FAILED; - break; - - case "already": - default: - if ($ret == "already") { - // Admin does already exists! - $ret = ADMIN_LOGIN_ALREADY_REG; - } else { - // Any other kind - $ret = "done"; - } + $ret = addAdminAccount(postRequestElement('login'), $hashedPass, getConfig('WEBMASTER')); + + // Check if registration wents fine + switch ($ret) { + case 'done': + $done = changeDataInFile(getConfig('CACHE_PATH') . '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' + logDebugMessage(__FILE__, __LINE__, sprintf("Unknown return code %s from ifAdminLoginDataIsValid() and interpreted as 'done'!", $ret)); + // @TODO Why is this set to 'done'? + $ret = 'done'; + } - if (!defined('admin_registered')) { - // Write to config that registration is done - admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0); + // Admin still not registered? + if (!isAdminRegistered()) { + // Write to config that registration is done + changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', 'ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0); - // Load URL for login - $URL = URL."/modules.php?module=admin&action=login"; - LOAD_URL($URL); - } - break; - } + // Load URL for login + redirectToUrl('admin.php'); + } // END - if + break; + } // END - switch } // Whas that action okay? - if ($ret != "done") { - // Fixes another "Notice" - if (!empty($_POST['login'])) { - define('__LOGIN_VALUE', $_POST['login']); - } else { - define('__LOGIN_VALUE', ""); - } - - // Yet-another "Notice" fix - if ((!empty($_POST['ok'])) && ($_POST['ok'] == "***")) { + if ($ret != 'done') { + // Fixes another notice + $content['login'] = ''; + if (isPostRequestElementSet('login')) { + $content['login'] = postRequestElement('login'); + } // END - if + + // Init array elements + $content['login_message'] = ''; + $content['pass_message'] = ''; + + // Yet-another notice-fix + if ((isFormSent()) && (postRequestElement('ok') == '***')) { // No login entered? - if (empty($_POST['login'])) $MSG1 = ADMIN_NO_LOGIN; + if (!isPostRequestElementSet('login')) $loginMessage = getMessage('ADMIN_NO_LOGIN'); // An error comes back from registration? - if (!empty($ret)) $MSG1 = $ret; + if (!empty($ret)) $loginMessage = $ret; // No password entered? - if (empty($_POST['pass'])) $MSG2 = ADMIN_NO_PASS; + if (!isPostRequestElementSet('pass')) $passwdMessage = getMessage('ADMIN_NO_PASS'); // Or password too short? - if (strlen($_POST['pass']) < 4) $MSG2 = ADMIN_SHORT_PASS; + if (strlen(postRequestElement('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS'); // Output error messages - define('__MSG_LOGIN', LOAD_TEMPLATE("admin_login_msg", true, $MSG1)); - define('__MSG_PASS', LOAD_TEMPLATE("admin_login_msg", true, $MSG2)); + $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage); + $content['pass_message'] = loadTemplate('admin_login_msg', true, $passwdMessage); // Reset variables - $MSG1 = ""; $MSG2 = ""; - } else { - // Reset values to nothing - define('__MSG_LOGIN', ""); - define('__MSG_PASS' , ""); - } + $loginMessage = ''; $passwdMessage = ''; + } // END - if + + // Output message in seperate template + loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NOT_REGISTERED')); // Load register template - LOAD_TEMPLATE("admin_reg_form"); + loadTemplate('admin_reg_form', false, $content); } -} elseif (isset($_GET['reset_pass'])) { +} elseif (isGetRequestElementSet('reset_pass')) { // Is the form submitted? - if ((isset($_POST['send_link'])) && (!empty($_POST['email']))) { - // Try to send the link out - $OUT = ADMIN_SEND_PASSWORD_RESET_LINK($_POST['email']); - + if ((isPostRequestElementSet('send_link')) && (isPostRequestElementSet('email'))) { // Output result - LOAD_TEMPLATE("admin_settings_saved", false, $OUT); - } elseif (!empty($_GET['hash'])) { + loadTemplate('admin_settings_saved', false, sendAdminPasswordResetLink(postRequestElement('email'))); + } elseif (isGetRequestElementSet('hash')) { // Output form for hash validation - LOAD_TEMPLATE("admin_validate_reset_hash_form", false, $_GET['hash']); - } elseif ((isset($_POST['validate_hash'])) && (!empty($_POST['login'])) && (!empty($_POST['hash']))) { + loadTemplate('admin_validate_reset_hash_form', false, getRequestElement('hash')); + } elseif ((isPostRequestElementSet('validate_hash')) && (isPostRequestElementSet('login')) && (isPostRequestElementSet('hash'))) { // Validate the login data and hash - $valid = ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN($_POST['hash'], $_POST['login']); + $valid = adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('login')); // Valid? - if ($valid) { + if ($valid === true) { // Prepare content first $content = array( - 'hash' => SQL_ESCAPE($_POST['hash']), - 'login' => SQL_ESCAPE($_POST['login']) + 'hash' => SQL_ESCAPE(postRequestElement('hash')), + 'login' => SQL_ESCAPE(postRequestElement('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, ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED); + loadTemplate('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED')); } - } elseif ((isset($_POST['reset_pass'])) && (!empty($_POST['hash'])) && (!empty($_POST['login'])) && (!empty($_POST['pass1'])) && ($_POST['pass1'] == $_POST['pass2'])) { + } elseif ((isPostRequestElementSet('reset_pass')) && (isPostRequestElementSet('hash')) && (isPostRequestElementSet('login')) && (isPostRequestElementSet('pass1')) && (postRequestElement('pass1') == postRequestElement('pass2'))) { // Okay, we shall the admin password here. So first revalidate the hash - if (ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN($_POST['hash'], $_POST['login'])) { - // Set the password now - $OUT = ADMIN_RESET_PASSWORD($_POST['login'], $_POST['pass1']); - + if (adminResetValidateHashLogin(postRequestElement('hash'), postRequestElement('login'))) { // Output result - LOAD_TEMPLATE("admin_reset_pass_done", false, $OUT); + loadTemplate('admin_reset_pass_done', false, doResetAdminPassword(postRequestElement('login'), postRequestElement('pass1'))); } else { // Validation failed - LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2); + loadTemplate('admin_settings_saved', false, getMessage('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')) || ((get_session('admin_last') + bigintval(get_session('admin_to')) * 3600 * 24) < time())) { +} elseif ((!isSessionVariableSet('admin_login')) || (!isSessionVariableSet('admin_md5')) || (!isSessionVariableSet('admin_last')) || (!isSessionVariableSet('admin_to')) || ((getSession('admin_last') + bigintval(getSession('admin_to')) * 3600 * 24) < time())) { // At leat one administrator account was created if ((isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5')) && (isSessionVariableSet('admin_last')) && (isSessionVariableSet('admin_to'))) { // 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 (isGetRequestElementSet('register')) { // Registration of first admin is done - if ($_GET['register'] == "done") OUTPUT_HTML("".ADMIN_REGISTER_DONE.""); + if (getRequestElement('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'] != "***")) { - // 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 - // Construct URL and redirect - $URL = URL."/modules.php?module=admin&"; - - // Rewrite overview module - if ($GLOBALS['what'] == "overview") { - $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']); - } + if ((isFormSent()) && ((!isPostRequestElementSet('login')) || (!isPostRequestElementSet('pass')) || (strlen(postRequestElement('pass')) < 4))) { + setRequestPostElement('ok', '***'); + } // 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']; + if ((isFormSent()) && (postRequestElement('ok') != '***')) { + // All required data was entered so we check his account + $ret = ifAdminLoginDataIsValid(postRequestElement('login'), postRequestElement('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 = '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; + + case '404': // Administrator login not found + setRequestPostElement('ok', $ret); + $ret = sprintf(getMessage('ADMIN_404'), postRequestElement('login')); + destroyAdminSession(); + break; + + case 'pass': // Wrong password + setRequestPostElement('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 - // Load URL - LOAD_URL($URL); - break; + // Error detected? + if ($ret != 'done') { + $content['login'] = ''; + if (isPostRequestElementSet('login')) { + $content['login'] = postRequestElement('login'); + } // END - if - case "404": // Administrator login not found - $_POST['ok'] = $ret; - $ret = ADMIN_NOT_FOUND; - break; + // Init array elements + $content['login_message'] = ''; + $content['pass_message'] = ''; - case "pass": // Wrong password - $_POST['ok'] = $ret; - $ret = WRONG_PASS." [".ADMIN_RESET_PASS."]\n"; - break; - } - } - if ($ret != "done") { - if (!empty($_POST['login'])) { - define('__LOGIN_VALUE', $_POST['login']); - } else { - define('__LOGIN_VALUE', ""); - } - - if (isset($_POST['ok'])) { + if (isFormSent()) { // Set messages to zero + $loginMessage = ''; $passwdMessage = ''; - $MSG1 = ""; $MSG2 = ""; // No login entered? - if (empty($_POST['login'])) $MSG1 = ADMIN_NO_LOGIN; + if (!isPostRequestElementSet('login')) $loginMessage = getMessage('ADMIN_NO_LOGIN'); // An error comes back from login? - if ((!empty($ret)) && ($_POST['ok'] == "404")) $MSG1 = $ret; + if ((!empty($ret)) && (postRequestElement('ok') == '404')) $loginMessage = $ret; // No password entered? - if (empty($_POST['pass'])) $MSG2 = ADMIN_NO_PASS; + if (!isPostRequestElementSet('pass')) $passwdMessage = getMessage('ADMIN_NO_PASS'); // Or password too short? - if (strlen($_POST['pass']) < 4) $MSG2 = ADMIN_SHORT_PASS; + if (strlen(postRequestElement('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS'); // An error comes back from login? - if ((!empty($ret)) && ($_POST['ok'] == "pass")) $MSG2 = $ret; + if ((!empty($ret)) && (postRequestElement('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)); + $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage); + $content['pass_message'] = loadTemplate('admin_login_msg', true, $passwdMessage); // Reset variables - $MSG1 = ""; $MSG2 = ""; - } else { - // Set constants to empty for hiding them - define('__MSG_LOGIN', ""); - define('__MSG_PASS' , ""); - } + unset($loginMessage); + unset($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']); + $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 (isGetRequestElementSet('area')) { // Restore old area value - $content = array('target' => "area", 'value' => $_GET['area']); + $content = merge_array($content, array('target' => 'area', 'value' => getRequestElement('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 (isset($_GET['logout'])) { + loadTemplate('admin_login_form', false, $content); + } // END - if +} elseif (isGetRequestElementSet('logout')) { // Only try to remove cookies - if (set_session("admin_login", "") && set_session("admin_md5", "") && set_session("admin_last", "") && set_session("admin_to", "")) { - // Also remove array elements - set_session('admin_login', ""); - set_session('admin_md5' , ""); - set_session('admin_last' , ""); - set_session('admin_to' , ""); - - // Destroy session - @session_destroy(); - + if (destroyAdminSession()) { // Load logout template - if (isset($_GET['register'])) { + if (isGetRequestElementSet('register')) { // Secure input - $register = SQL_ESCAPE($_GET['register']); + $register = getRequestElement('register'); // Special logout redirect for installation of given extension - LOAD_TEMPLATE(sprintf("admin_logout_%s_install", $register)); - } elseif (isset($_GET['remove'])) { + loadTemplate(sprintf("admin_logout_%s_install", $register)); + } elseif (isGetRequestElementSet('remove')) { // Secure input - $remove = SQL_ESCAPE($_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... - 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 { // Maybe an Admin want's to login? - $ret = CHECK_ADMIN_COOKIES(get_session('admin_login'), get_session('admin_md5')); - switch ($ret) - { - case "done": - // Cookie-Data accepted - if ((set_session("admin_md5", get_session('admin_md5'))) && (set_session("admin_login", get_session('admin_login'))) && (set_session("admin_last", time())) && (set_session("admin_to", bigintval(get_session('admin_to'))))) { - // 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_READABLE(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 (isGetRequestElementSet('area')) $area = getRequestElement('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']); + // 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 + setRequestPostElement('ok', $ret); + loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_404'), getSession('admin_login'))); + destroyAdminSession(); + break; - case "pass": // Wrong password - $_POST['ok'] = $ret; - ADD_FATAL(WRONG_PASS); - break; - } -} + case 'pass': // Wrong password + setRequestPostElement('ok', $ret); + loadTemplate('admin_settings_saved', false, getMessage('WRONG_PASS')); + destroyAdminSession(); + break; -if (isBooleanConstantAndTrue('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] ?>