X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=d416353943a48b21069446b62bd7d3bfbfd76d22;hp=a117d14b8970864db74e0f9614b4f0a2520fa90e;hb=feda50ff73c05935417ed33164d30caf966ba854;hpb=c45b1827a16928c65ecc1aea6a9d7a504c4874d4

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index a117d14b89..d416353943 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
@@ -41,7 +41,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 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");
@@ -90,6 +90,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 				$ret = "done";
 			}
 
+			// 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);
@@ -97,7 +98,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 				// Load URL for login
 				$URL = URL."/modules.php?module=admin&action=login";
 				LOAD_URL($URL);
-			}
+			} // END - if
 			break;
 		}
 	}
@@ -203,6 +204,8 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 	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
@@ -226,11 +229,13 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 		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&amp;reset_pass=1\">".ADMIN_RESET_PASS."</A>]\n";
+			DESTROY_ADMIN_SESSION();
 			break;
 		}
 	}
@@ -297,16 +302,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 	}
 } 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
@@ -359,15 +355,15 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 			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_exists(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']);
@@ -385,21 +381,17 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 
 	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);
-}
 //
 ?>