X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffilters.php;h=6f213c8b65515f4f14a070bc1b705b62aacf2cca;hp=e5714e88b7017e4e2997ed51b7034428a821b842;hb=b16d1f640a44da05b1f018be13e8d0b803a74aeb;hpb=5071030af40e69ca4284642f44758964e18f5be8

diff --git a/inc/filters.php b/inc/filters.php
index e5714e88b7..6f213c8b65 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
@@ -106,39 +103,39 @@ ORDER BY `filter_id` ASC", __FUNCTION__, __LINE__);
 	} // 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;
@@ -344,7 +341,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'])) {
@@ -502,7 +499,7 @@ 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'])) {