if ((empty($GLOBALS['action'])) && ($check == "admin_only")) {
// Redirect to right URL
LOAD_URL("modules.php?module=admin&action=login");
-}
+} // END - if
// Load include file
require_once(PATH."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'));
-if (!defined('admin_registered')) {
+if (!isBooleanConstantAndTrue('admin_registered')) {
// 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'] != "***")) {
$ret = "done";
}
- if (!defined('admin_registered')) {
+ // Admin still not registered?
+ if (!isBooleanConstantAndTrue('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&action=login";
LOAD_URL($URL);
- }
+ } // END - if
break;
}
}
if ((isset($_POST['ok'])) && ($_POST['ok'] != "***")) {
// All required data was entered so we check his account
$ret = CHECK_ADMIN_LOGIN($_POST['login'], $_POST['pass']);
+
+ // Which status do we have?
switch ($ret)
{
case "done": // Admin and password are okay, so we log in now
case "404": // Administrator login not found
$_POST['ok'] = $ret;
$ret = ADMIN_NOT_FOUND;
+ DESTROY_ADMIN_SESSION();
break;
case "pass": // Wrong password
$_POST['ok'] = $ret;
$ret = WRONG_PASS." [<A href=\"".URL."/modules.php?module=admin&reset_pass=1\">".ADMIN_RESET_PASS."</A>]\n";
+ DESTROY_ADMIN_SESSION();
break;
}
}
}
} elseif (isset($_GET['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 (DESTROY_ADMIN_SESSION()) {
// Load logout template
if (isset($_GET['register'])) {
// Secure input
if (empty($_CONFIG['admin_menu'])) $_CONFIG['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"))) {
+ if ((ADMIN_CHECK_MENU_MODE() == "NEW") && (FILE_READABLE(PATH."inc/modules/admin/lasys-inc.php"))) {
// Default area is the entrance, of course
$area = "entrance";
// Check for similar URL variable
- if (!empty($_GET['area'])) $area = $_GET['area'];
+ if (!empty($_GET['area'])) $area = SQL_ESCAPE($_GET['area']);
// Load "logical-area menu-system" file
- require_once(PATH."inc/modules/admin/la_sys-inc.php");
+ require_once(PATH."inc/modules/admin/lasys-inc.php");
// Create new-style menu system will "logical areas"
ADMIN_LOGICAL_AREA_SYSTEM($area, $act, $GLOBALS['what']);
case "404": // Administrator login not found
$_POST['ok'] = $ret;
+ DESTROY_ADMIN_SESSION();
ADD_FATAL(ADMIN_NOT_FOUND);
break;
case "pass": // Wrong password
$_POST['ok'] = $ret;
+ DESTROY_ADMIN_SESSION();
ADD_FATAL(WRONG_PASS);
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);
-}
//
?>