X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=6d02e30e8409261650cab20ce3669268ccf6b6a2;hb=62b8f74ec2e1d527ea0c606e1137a82f099b284b;hp=098a2157f952ce2a53cd8b7a794d0a6c616f4012;hpb=81bfbcd72e424060ea1223b49ad92fcfa150f361;p=mailer.git

diff --git a/inc/filters.php b/inc/filters.php
index 098a2157f9..6d02e30e84 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Init "generic filter system"
-function INIT_FILTER_SYSTEM () {
+function initFilterSystem () {
 	// Is the filter already initialized?
 	if ((isset($GLOBALS['filters']['chains'])) && (is_array($GLOBALS['filters']['chains']))) {
 		// Then abort here
@@ -53,12 +53,9 @@ function INIT_FILTER_SYSTEM () {
 
 	// Init the filter system (just some ideas)
 	$GLOBALS['filters']['chains'] = array(
-		// Filters for pre-init phase
-		'preinit'   => array(),
-		// Filters for post-init phase
-		'postinit'  => array(),
-		// Filters for shutdown phase
-		'shutdown'  => array()
+		'preinit'   => array(), // Filters for pre-init phase
+		'postinit'  => array(), // Filters for post-init phase
+		'shutdown'  => array()  // Filters for shutdown phase
 	);
 
 	// Init loaded filters and counter
@@ -100,45 +97,45 @@ ORDER BY `filter_id` ASC", __FUNCTION__, __LINE__);
 				} // END - if
 			} // END - while
 		} // END - if
-	
+
 		// Free result
 		SQL_FREERESULT($result);
 	} // END - if
 
 	// Init filters
-	REGISTER_FILTER('init', 'UPDATE_LOGIN_DATA');
-	REGISTER_FILTER('init', 'INIT_RANDOMIZER');
+	registerFilter('init', 'UPDATE_LOGIN_DATA');
+	registerFilter('init', 'INIT_RANDOMIZER');
 
 	// Login failures handler
-	REGISTER_FILTER('post_youhere_line', 'CALL_HANDLER_LOGIN_FAILTURES');
+	registerFilter('post_youhere_line', 'CALL_HANDLER_LOGIN_FAILTURES');
 
 	// Filters for pre-extension-registration
-	REGISTER_FILTER('pre_extension_installed', 'RUN_SQLS');
+	registerFilter('pre_extension_installed', 'RUN_SQLS');
 
 	// Filters for post-extension-registration
-	REGISTER_FILTER('post_extension_installed', 'AUTO_ACTIVATE_EXTENSION');
-	REGISTER_FILTER('post_extension_installed', 'SOLVE_TASK');
-	REGISTER_FILTER('post_extension_installed', 'loadIncludeLUDES');
-	REGISTER_FILTER('post_extension_installed', 'REMOVE_UPDATES');
+	registerFilter('post_extension_installed', 'AUTO_ACTIVATE_EXTENSION');
+	registerFilter('post_extension_installed', 'SOLVE_TASK');
+	registerFilter('post_extension_installed', 'loadIncludeLUDES');
+	registerFilter('post_extension_installed', 'REMOVE_UPDATES');
 
 	// Solving tasks
-	REGISTER_FILTER('solve_task', 'SOLVE_TASK');
+	registerFilter('solve_task', 'SOLVE_TASK');
 
 	// Loading includes in general
-	REGISTER_FILTER('load_includes', 'loadIncludeLUDES');
+	registerFilter('load_includes', 'loadIncludeLUDES');
 
 	// Run SQLs
-	REGISTER_FILTER('run_sqls', 'RUN_SQLS');
+	registerFilter('run_sqls', 'RUN_SQLS');
 
 	// Admin ACL check
-	REGISTER_FILTER('check_admin_acl', 'CHECK_ADMIN_ACL');
+	registerFilter('check_admin_acl', 'CHECK_ADMIN_ACL');
 
 	// Register shutdown filters
-	REGISTER_FILTER('shutdown', 'FLUSH_FILTERS');
+	registerFilter('shutdown', 'FLUSH_FILTERS');
 }
 
 // "Registers" a new filter function
-function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $force = false, $dry_run = false) {
+function registerFilter ($filterName, $filterFunction, $silentAbort = true, $force = false, $dry_run = false) {
 	// Extend the filter function name
 	$filterFunction = sprintf("FILTER_%s", strtoupper($filterFunction));
 
@@ -169,7 +166,7 @@ function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $fo
 }
 
 // "Unregisters" a filter from the given chain
-function UNREGISTER_FILTER ($filterName, $filterFunction, $force = false, $dry_run = false) {
+function unregisterFilter ($filterName, $filterFunction, $force = false, $dry_run = false) {
 	// Extend the filter function name only if not loaded from database
 	if (!isset($GLOBALS['filters']['loaded'][$filterName][$filterFunction])) {
 		$filterFunction = sprintf("FILTER_%s", strtoupper($filterFunction));
@@ -217,7 +214,7 @@ function runFilterChain ($filterName, $data = null, $silentAbort = true) {
 			// Is this filter there?
 			if (!function_exists($filterFunction)) {
 				// Unregister it
-				UNREGISTER_FILTER($filterName, $filterFunction);
+				unregisterFilter($filterName, $filterFunction);
 
 				// Skip this entry
 				continue;
@@ -264,7 +261,8 @@ function FILTER_FLUSH_FILTERS () {
 	} // END - if
 
 	// Nothing is added/remove by default
-	$inserted = 0; $removed = 0;
+	$inserted = 0;
+	$removed = 0;
 
 	// Prepare SQL queries
 	$insertSQL = "INSERT INTO `{!_MYSQL_PREFIX!}_filters` (`filter_name`,`filter_function`,`filter_active`) VALUES";
@@ -313,9 +311,9 @@ function FILTER_FLUSH_FILTERS () {
 			foreach ($filterArray as $filterFunction => $cnt) {
 				// Construct and add the query
 				ADD_SQL(sprintf("UPDATE `{!_MYSQL_PREFIX!}_filters` SET `filter_counter`=%s WHERE `filter_name`='%s' AND `filter_function`='%s' LIMIT 1",
-					bigintval($cnt),
-					$filterName,
-					$filterFunction
+				bigintval($cnt),
+				$filterName,
+				$filterFunction
 				));
 			} // END - foreach
 		} // END - foreach
@@ -331,8 +329,8 @@ function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($data) {
 	$content = $data;
 
 	// Handle failed logins here if not in guest
-	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):type={$data['type']},action={$GLOBALS['action']},what={$GLOBALS['what']},lvl={$data['access_level']}<br />\n";
-	if ((($data['type'] == "what") || ($data['type'] == "action") && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview") || ($GLOBALS['what'] == getConfig('index_home')))) && ($data['access_level'] != 'guest') && ((GET_EXT_VERSION('sql_patches') >= '0.4.7') || (GET_EXT_VERSION('admins') >= '0.7.0'))) {
+	//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):type={$data['type']},action={getAction()},what={getWhat()},lvl={$data['access_level']}<br />\n";
+	if ((($data['type'] == 'what') || ($data['type'] == 'action') && ((!isWhatSet()) || (getWhat() == 'overview') || (getWhat() == getConfig('index_home')))) && ($data['access_level'] != 'guest') && ((GET_EXT_VERSION('sql_patches') >= '0.4.7') || (GET_EXT_VERSION('admins') >= '0.7.0'))) {
 		// Handle failure
 		$content['content'] .= HANDLE_LOGIN_FAILTURES($data['access_level']);
 	} // END - if
@@ -344,7 +342,7 @@ function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($data) {
 // Filter for redirecting to logout if sql_patches has been installed
 function FILTER_REDIRECT_TO_LOGOUT_SQL_PATCHES () {
 	// Remove this filter
-	UNREGISTER_FILTER('shutdown', __FUNCTION__);
+	unregisterFilter('shutdown', __FUNCTION__);
 
 	// Is the element set?
 	if (isset($GLOBALS['ext_load_mode'])) {
@@ -470,23 +468,23 @@ function FILTER_UPDATE_LOGIN_DATA () {
 		list($mod, $onl) = SQL_FETCHROW($result);
 
 		// Maybe first login time?
-		if (empty($mod)) $mod = "login";
+		if (empty($mod)) $mod = 'login';
 
 		// This will be displayed on welcome page! :-)
 		if (empty($GLOBALS['last']['module'])) {
 			$GLOBALS['last']['module'] = $mod; $GLOBALS['last']['online'] = $onl;
 		} // END - if
 
-		// "what" not set?
-		if (empty($GLOBALS['what'])) {
+		// 'what' not set?
+		if (!isWhatSet()) {
 			// Fix it to default
-		 	$GLOBALS['what'] = "welcome";
-		 	if (getConfig('index_home') != '') $GLOBALS['what'] = getConfig('index_home');
+			setWhat('welcome');
+			if (getConfig('index_home') != '') setWhatFromConfig('index_home');
 		} // END - if
 
 		// Update last module / online time
 		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `last_module`='%s', last_online=UNIX_TIMESTAMP(), REMOTE_ADDR='%s' WHERE userid=%s LIMIT 1",
-			array($GLOBALS['what'], detectRemoteAddr(), getUserId()), __FUNCTION__, __LINE__);
+			array(getWhat(), detectRemoteAddr(), getUserId()), __FUNCTION__, __LINE__);
 	}  else {
 		// Destroy session, we cannot update!
 		destroyUserSession();
@@ -502,16 +500,16 @@ function FILTER_CHECK_ADMIN_ACL () {
 	$ret = true;
 
 	// Ok, Cookie-Update done
-	if (GET_EXT_VERSION('admins') >= '0.3.0') {
+	if ((GET_EXT_VERSION('admins') >= '0.3.0') && (EXT_IS_ACTIVE('admins'))) {
 		// Check if action GET variable was set
-		$action = SQL_ESCAPE($GLOBALS['action']);
-		if (!empty($GLOBALS['what'])) {
+		$action = getAction();
+		if (isWhatSet()) {
 			// Get action value by what-value
-			$action = getModeAction('admin', $GLOBALS['what']);
+			$action = getModeAction('admin', getWhat());
 		} // END - if
 
 		// Check for access control line of current menu entry
-		$ret = adminsCheckAdminAcl($action, $GLOBALS['what']);
+		$ret = adminsCheckAdminAcl($action, getWhat());
 	} // END - if
 
 	// Return result