X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin.php;h=2d11145709e5a936fbfa73896d31cd8e6d51674a;hp=c144a4dc6adba17ccf7b12388c8f03f996c27b23;hb=c47144dd555bbab4acdf9085e4623900dedb0e7c;hpb=f9a9c09e1ae257449bfd98f8854e321efba1dc3c

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index c144a4dc6a..2d11145709 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -44,11 +44,15 @@ if ((empty($GLOBALS['action'])) && ($check == "admin_only")) {
 } // END - if
 
 // Load include file
-require_once(PATH."inc/modules/admin/admin-inc.php");
+LOAD_INC_ONCE("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'));
 
+// Init return value
+$ret = "init";
+
+// Is no 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'] = "***";
@@ -57,10 +61,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 		$hashedPass = md5($_POST['pass']);
 
 		// Kill maybe existing session variables
-		set_session('admin_login'	, "");
-		set_session('admin_md5'		, "");
-		set_session('admin_last'	, "");
-		set_session('admin_to'		, "");
+		DESTROY_ADMIN_SESSION(false);
 
 		// Do registration
 		$ret = REGISTER_ADMIN($_POST['login'], $hashedPass);
@@ -70,7 +71,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 			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&amp;action=login&register=done");
+				LOAD_URL("modules.php?module=admin&amp;action=login&register=done");
 			} else {
 				$ret = ADMIN_CANNOT_COMPLETE;
 			}
@@ -86,7 +87,9 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 				// Admin does already exists!
 				$ret = ADMIN_LOGIN_ALREADY_REG;
 			} else {
-				// Any other kind
+				// Any other kind will be logged and interpreted as 'done'
+				DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown return code %s from CHECK_ADMIN_LOGIN()", $ret));
+				// @TODO Why is this set to 'done'?
 				$ret = "done";
 			}
 
@@ -96,7 +99,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 				admin_WriteData(PATH."inc/config.php", "ADMIN-SETUP", "define('admin_registered', ", ");", "true", 0);
 
 				// Load URL for login
-				LOAD_URL(URL."/modules.php?module=admin&amp;action=login");
+				LOAD_URL("modules.php?module=admin&amp;action=login");
 			} // END - if
 			break;
 		}
@@ -167,7 +170,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 			LOAD_TEMPLATE("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);
+			LOAD_TEMPLATE("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'])) {
 		// Okay, we shall the admin password here. So first revalidate the hash
@@ -179,7 +182,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 			LOAD_TEMPLATE("admin_reset_pass_done", false, $OUT);
 		} else {
 			// Validation failed
-			LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2);
+			LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2'));
 		}
 	} else {
 		// Output reset password form
@@ -189,16 +192,15 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 	// 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!
-		LOAD_URL(URL."/modules.php?module=admin&amp;action=login&amp;logout=1");
+		LOAD_URL("modules.php?module=admin&amp;action=login&amp;logout=1");
 	} // END - if
 
 	if (!empty($_GET['register'])) {
 		// Registration of first admin is done
-		if ($_GET['register'] == "done") OUTPUT_HTML("<STRONG class=\"admin\">".ADMIN_REGISTER_DONE."</STRONG>");
+		if ($_GET['register'] == "done") LOAD_TEMPLATE("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
@@ -209,7 +211,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 		{
 		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") {
@@ -227,15 +229,19 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 
 		case "404": // Administrator login not found
 			$_POST['ok'] = $ret;
-			$ret = ADMIN_NOT_FOUND;
+			$ret = getMessage('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";
+			$ret = "{!WRONG_PASS!} [<a href=\"{!URL!}/modules.php?module=admin&amp;reset_pass=1\">{!ADMIN_RESET_PASS!}</a>]\n";
 			DESTROY_ADMIN_SESSION();
 			break;
+
+		default: // Others will be logged
+			DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown return code %s from CHECK_ADMIN_LOGIN()", $ret));
+			break;
 		} // END - switch
 	} // END - if
 
@@ -323,10 +329,10 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 		}
 	} else {
 		// Something went wrong here...
-		OUTPUT_HTML("<STRONG class=\"admin_fatal\">".ADMIN_LOGOUT_FAILED."</STRONG>");
+		LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_fatal\">".ADMIN_LOGOUT_FAILED."</div>");
 
 		// Add fatal message
-		ADD_FATAL(CANNOT_UNREG_SESS);
+		addFatalMessage(CANNOT_UNREG_SESS);
 	}
 } else {
 	// Maybe an Admin want's to login?
@@ -334,62 +340,46 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 	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']);
-				}
-
-				// 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 for access control line of current menu entry
+		define('__ACL_ALLOW', RUN_FILTER('check_admin_acl'));
 
-			// When type of admin menu is not set fallback to old menu system
-			if (getConfig('admin_menu') == null) getConfig('admin_menu') = "OLD";
+		// When type of admin menu is not set fallback to old menu system
+		if (getConfig('admin_menu') == null) $_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/lasys-inc.php"))) {
-				// Default area is the entrance, of course
-				$area = "entrance";
+		// 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/lasys-inc.php"))) {
+			// Default area is the entrance, of course
+			$area = "entrance";
 
-				// Check for similar URL variable
-				if (!empty($_GET['area'])) $area = SQL_ESCAPE($_GET['area']);
+			// Check for similar URL variable
+			if (!empty($_GET['area'])) $area = SQL_ESCAPE($_GET['area']);
 
-				// Load "logical-area menu-system" file
-				require_once(PATH."inc/modules/admin/lasys-inc.php");
+			// Load "logical-area menu-system" file
+			LOAD_INC_ONCE("inc/modules/admin/lasys-inc.php");
 
-				// Create new-style menu system will "logical areas"
-				ADMIN_LOGICAL_AREA_SYSTEM($area, $act, $GLOBALS['what']);
-			} else {
-				// This little call constructs the whole default old and lacky menu system
-				// on left side
-				ADMIN_DO_ACTION($GLOBALS['what']);
-			}
+			// Create new-style menu system will "logical areas"
+			ADMIN_LOGICAL_AREA_SYSTEM($area, $act, $GLOBALS['what']);
 		} else {
-			// Login failed (cookies enabled?)
-			OUTPUT_HTML("<STRONG class=\"admin_fatal\">".ADMIN_LOGIN_FAILED."</STRONG>");
-			ADD_FATAL(CANNOT_RE_REGISTER_SESS);
+			// This little call constructs the whole default old and lacky menu system
+			// on left side
+			ADMIN_DO_ACTION($GLOBALS['what']);
 		}
 		break;
 
 	case "404": // Administrator login not found
 		$_POST['ok'] = $ret;
 		DESTROY_ADMIN_SESSION();
-		ADD_FATAL(ADMIN_NOT_FOUND);
+		addFatalMessage(ADMIN_NOT_FOUND);
 		break;
 
 	case "pass": // Wrong password
 		$_POST['ok'] = $ret;
 		DESTROY_ADMIN_SESSION();
-		ADD_FATAL(WRONG_PASS);
+		addFatalMessage(WRONG_PASS);
+		break;
+
+	default: // Others will be logged
+		DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown return code %s from CHECK_ADMIN_COOKIES()", $ret));
 		break;
 	}
 }