Fix for missing array elements
[mailer.git] / inc / modules / admin.php
index b5b6b02582a31bbd2e46e69dcb736983b2a5b88d..7822bf081ffafcc12e37c2c6716ded7d0f16f7e7 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/31/2003 *
- * ===============                              Last change: 07/02/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 08/31/2003 *
+ * ===================                          Last change: 07/02/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : admin.php                                        *
  * -------------------------------------------------------------------- *
  * 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                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
-       $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&amp;action=login");
-}
+if (!defined('__SECURITY')) {
+       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'));
 
-// Is the logout empty?
-if (empty($_GET['logout'])) $_GET['logout'] = "";
+// Init return value
+$ret = 'init';
 
-if (!admin_registered)
-{
+// 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'] != "***"))
-       {
-               // Hash the password with our new generateHash() function
-               $hashedPass = generateHash($_POST['pass']);
+       if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('pass1')) || (strlen(postRequestParameter('pass1')) < 4) || (!isPostRequestParameterSet('pass2')) || (strlen(postRequestParameter('pass2')) < 4) || (postRequestParameter('pass1') != postRequestParameter('pass2')))) {
+               setPostRequestParameter('ok', '***');
+       } // END - if
 
-               // If the password has not been hashed we have to fall-back to md5()
-               if ($hashedPass == $_POST['pass']) $hashedPass = md5($hashedPass);
+       // Clear error message
+       $errorMessage = '';
 
-               // 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)
-                       {
-                               $URL = URL."/modules.php?module=admin&amp;action=login&register=done";
-                               LOAD_URL($URL);
-                               die($URL);
-                       }
-                        else
-                       {
-                               $ret = ADMIN_CANNOT_COMPLETE;
-                       }
-                       break;
+       if ((isFormSent()) && (postRequestParameter('ok') != '***')) {
+               // Hash the password with the old function because we are here in install mode
+               $hashedPass = md5(postRequestParameter('pass1'));
 
-               case "failed":
-                       $ret = ADMIN_REGISTER_FAILED;
-                       break;
+               // Kill maybe existing session variables
+               destroyAdminSession(false);
 
-               case "already":
-               default:
-                       if ($ret == "already")
-                       {
-                               // Admin does already exists!
-                               $ret = ADMIN_LOGIN_ALREADY_REG;
-                       }
-                        else
-                       {
-                               // Any other kind
-                               $ret = "done";
-                       }
-                       if (!admin_registered)
-                       {
-                               // Write to config that registration is done
-                               admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define ('admin_registered', ", ");", "true", 0);
-
-                               // Load URL for login
-                               $URL = URL."/modules.php?module=admin&amp;action=login";
-                               LOAD_URL($URL);
-                       }
-                       break;
-               }
-       }
-       if ($ret != "done")
-       {
-               // Fixes another "Notice"
-               if (!empty($_POST['login'])) {
-                       define('__LOGIN_VALUE', $_POST['login']);
-               } else {
-                       define('__LOGIN_VALUE', "");
-               }
+               // Do registration
+               $ret = addAdminAccount(postRequestParameter('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&amp;register=done');
+                               } else {
+                                       // Registration incomplete
+                                       $errorMessage = getMessage('ADMIN_CANNOT_COMPLETE');
+
+                                       // Set this to have our error message displayed
+                                       setPostRequestParameter('ok', '***');
+                               }
+                               break;
+
+                       case 'failed': // Registration has failed
+                               $errorMessage = getMessage('ADMIN_REGISTER_FAILED');
+
+                               // Set this to have our error message displayed
+                               setPostRequestParameter('ok', '***');
+                               break;
+
+                       case 'already': // Admin does already exists!
+                               $errorMessage = getMessage('ADMIN_LOGIN_ALREADY_REG');
+
+                               // Set this to have our error message displayed
+                               setPostRequestParameter('ok', '***');
+                               break;
+
+                       default:
+                               // Any other kind will be logged
+                               $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
+
+       // Whas that action okay?
+       if ($ret != 'done') {
+               // Init login name
+               $content['login'] = '';
+               if (isPostRequestParameterSet('login')) {
+                       $content['login'] = postRequestParameter('login');
+               } // END - if
+
+               // Init array elements
+               $content['login_message']   = '';
+               $content['pass1_message']    = '';
+               $content['pass2_message']    = '';
+
+               // Yet-another notice-fix
+               if ((isFormSent()) && (postRequestParameter('ok') == '***')) {
+                       // Init variables
+                       $loginMessage = '';
+                       $pass1Message = '';
+                       $pass2Message = '';
 
-               // Yet-another "Notice" fix
-               if ((!empty($_POST['ok'])) && ($_POST['ok'] == "***"))
-               {
                        // No login entered?
-                       if (empty($_POST['login'])) $MSG1 = ADMIN_NO_LOGIN;
+                       if (empty($content['login'])) $loginMessage = getMessage('ADMIN_NO_LOGIN');
 
                        // An error comes back from registration?
-                       if (!empty($ret)) $MSG1 = $ret;
+                       if ((!empty($ret)) && ($ret != 'init')) $loginMessage = $errorMessage;
 
-                       // No password entered?
-                       if (empty($_POST['pass'])) $MSG2 = ADMIN_NO_PASS;
+                       // 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');
 
-                       // Or password too short?
-                       if (strlen($_POST['pass']) < 4) $MSG2 = ADMIN_SHORT_PASS;
+                       // 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');
+
+                       // 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');
+                       } // END - if
 
                        // Output error messages
-                       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
-               {
-                       // Reset values to nothing
-                       define('__MSG_LOGIN', "");
-                       define('__MSG_PASS' , "");
-               }
+                       $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);
+               } // 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);
+       } // 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')));
+       } elseif (isGetRequestParameterSet('hash')) {
+               // Output form for hash validation
+               loadTemplate('admin_validate_reset_hash_form', false, getRequestParameter('hash'));
+       } elseif ((isPostRequestParameterSet('validate_hash')) && (isPostRequestParameterSet('login')) && (isPostRequestParameterSet('hash'))) {
+               // Validate the login data and hash
+               $valid = adminResetValidateHashLogin(postRequestParameter('hash'), postRequestParameter('login'));
+
+               // Valid?
+               if ($valid === true) {
+                       // Prepare content first
+                       $content = array(
+                               'hash'  => 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($_COOKIE['admin_login'])) || (empty($_COOKIE['admin_md5'])) || (empty($_COOKIE['admin_last'])) || (empty($_COOKIE['admin_to'])) || (($_COOKIE['admin_last'] + bigintval($_COOKIE['admin_to']) * 3600 * 24) < time()))
-{
+} elseif ((!isSessionVariableSet('admin_login')) || (!isSessionVariableSet('admin_md5')) || (!isSessionVariableSet('admin_last'))) {
        // At leat one administrator account was created
-       if ((!empty($_COOKIE['admin_login'])) && (!empty($_COOKIE['admin_md5'])) && (!empty($_COOKIE['admin_last'])) && (!empty($_COOKIE['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&amp;action=login&amp;logout=1";
-               LOAD_URL($URL);
-       }
-       if (!empty($_GET['register']))
-       {
+               redirectToUrl('modules.php?module=admin&amp;logout=1');
+       } // END - if
+
+       if (isGetRequestParameterSet('register')) {
                // Registration of first admin is done
-               if ($_GET['register'] == "done") OUTPUT_HTML("<STRONG class=\"admin\">".ADMIN_REGISTER_DONE."</STRONG>");
-       }
+               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 ((@setcookie("admin_md5", generatePassString(generateHash($_POST['pass'], __SALT)), $TIMEOUT, COOKIE_PATH)) && (@setcookie("admin_login", $_POST['login'], $TIMEOUT, COOKIE_PATH)) && (@setcookie("admin_last", time(), $TIMEOUT, COOKIE_PATH)) && (@setcookie("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&amp;";
+                               $URL = 'modules.php?module=admin&amp;';
 
                                // 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("<STRONG class=\"admin_fatal\">".ADMIN_LOGIN_FAILED."</STRONG>");
-                               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--} [<a href="{%url=modules.php?module=admin&amp;reset_pass=1%}">{--ADMIN_RESET_PASS--}</a>]';
+                               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 (@setcookie("admin_login", "", (time() - 3600), COOKIE_PATH) && @setcookie("admin_md5", "", (time() - 3600), COOKIE_PATH) && @setcookie("admin_last", "", (time() - 3600), COOKIE_PATH) && @setcookie("admin_to", "", (time() - 3600), COOKIE_PATH))
-       {
-               // Also remove array elements
-               unset($_COOKIE['admin_login']);
-               unset($_COOKIE['admin_md5']);
-               unset($_COOKIE['admin_last']);
-               unset($_COOKIE['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("<STRONG class=\"admin_fatal\">".ADMIN_LOGOUT_FAILED."</STRONG>");
+               loadTemplate('admin_settings_saved', false, '<div class="admin_fatal">{--ADMIN_LOGOUT_FAILED--}</div>');
 
                // 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($_COOKIE['admin_login']), SQL_ESCAPE($_COOKIE['admin_md5']));
-       switch ($ret)
-       {
-       case "done":
-               // Cookie-Data accepted
-               $TIMEOUT = time() + bigintval($_COOKIE['admin_to']);
-               if ((@setcookie("admin_md5", SQL_ESCAPE($_COOKIE['admin_md5']), $TIMEOUT, COOKIE_PATH)) && (@setcookie("admin_login", SQL_ESCAPE($_COOKIE['admin_login']), $TIMEOUT, COOKIE_PATH)) && (@setcookie("admin_last", time(), $TIMEOUT, COOKIE_PATH)) && (@setcookie("admin_to", bigintval($_COOKIE['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("<STRONG class=\"admin_fatal\">".ADMIN_LOGIN_FAILED."</STRONG>");
-                       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]
 ?>