X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=5f9fa665c497d402768a257adfa84ae2a8fc1b83;hb=30c4ffdadae5e5a2a39528fa9d8de4803055f123;hp=83438eab3ecbb3587dc0b9307c2ce7ac5d5d6c78;hpb=48b997e125d13e5184281449feb9f4c8caf48e56;p=mailer.git
diff --git a/inc/filters.php b/inc/filters.php
index 83438eab3e..5f9fa665c4 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -47,8 +47,7 @@ function initFilterSystem () {
// Is the filter already initialized?
if ((isset($GLOBALS['filters']['chains'])) && (is_array($GLOBALS['filters']['chains']))) {
// Then abort here
- addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FAILED_ALREADY_INIT'));
- return false;
+ debug_report_bug(getMessage('FILTER_FAILED_ALREADY_INIT'));
} // END - if
// Init the filter system (just some ideas)
@@ -63,7 +62,26 @@ function initFilterSystem () {
$GLOBALS['filters']['counter'] = array();
// Load all saved filers if sql_patches is updated
- if (GET_EXT_VERSION('sql_patches') >= '0.5.9') {
+ if (isset($GLOBALS['cache_array']['filter']['filter_name'])) {
+ // Found in cache so rewrite the array
+ $filterArray = array();
+ foreach ($GLOBALS['cache_array']['filter']['filter_name'] as $idx => $filterName) {
+ // Get filter function
+ $filterFunction = $GLOBALS['cache_array']['filter']['filter_function'][$idx];
+
+ // Add the element with mapped index
+ $filterArray['counter'][$filterName][$filterFunction] = $GLOBALS['cache_array']['filter']['filter_counter'][$idx];
+ $filterArray['loaded'][$filterName][$filterFunction] = true;
+ $filterArray['chains'][$filterName][$filterFunction] = $GLOBALS['cache_array']['filter']['filter_active'][$idx];
+ } // END - foreach
+
+ // Set the array
+ //die(''.print_r($filterArray, true).'
');
+ $GLOBALS['filters'] = $filterArray;
+
+ // Remove the cache
+ unset($GLOBALS['cache_array']['filter']);
+ } elseif (GET_EXT_VERSION('sql_patches') >= '0.5.9') {
// Init add
$add = '';
if (GET_EXT_VERSION('sql_patches') >= '0.6.0') $add = ", `filter_counter`";
@@ -100,7 +118,7 @@ ORDER BY `filter_id` ASC", __FUNCTION__, __LINE__);
// Free result
SQL_FREERESULT($result);
- } // END - if
+ }
// Init filters
registerFilter('init', 'UPDATE_LOGIN_DATA');
@@ -115,14 +133,14 @@ ORDER BY `filter_id` ASC", __FUNCTION__, __LINE__);
// Filters for post-extension-registration
registerFilter('post_extension_installed', 'AUTO_ACTIVATE_EXTENSION');
registerFilter('post_extension_installed', 'SOLVE_TASK');
- registerFilter('post_extension_installed', 'loadIncludeLUDES');
+ registerFilter('post_extension_installed', 'LOAD_INCLUDES');
registerFilter('post_extension_installed', 'REMOVE_UPDATES');
// Solving tasks
registerFilter('solve_task', 'SOLVE_TASK');
// Loading includes in general
- registerFilter('load_includes', 'loadIncludeLUDES');
+ registerFilter('load_includes', 'LOAD_INCLUDES');
// Run SQLs
registerFilter('run_sqls', 'RUN_SQLS');
@@ -142,7 +160,7 @@ function registerFilter ($filterName, $filterFunction, $silentAbort = true, $for
// Is that filter already there?
if ((isset($GLOBALS['filters']['chains'][$filterName][$filterFunction])) && (!$force)) {
// Then abort here
- if (!$silentAbort) {
+ if ($silentAbort === false) {
addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FAILED_ALREADY_ADDED'), array($filterFunction, $filterName));
} // END - if
@@ -180,22 +198,18 @@ function unregisterFilter ($filterName, $filterFunction, $force = false, $dry_ru
} // END - if
// Shall we remove? (default, not while just showing an extension removal)
- if (!$dry_run) {
+ if ($dry_run === false) {
// Mark for filter removal
- $GLOBALS['filters']['chains'][$filterName][$filterFunction] = "R";
- unset($GLOBALS['filters']['counter'][$filterName][$filterFunction]);
+ $GLOBALS['filters']['chains'][$filterName][$filterFunction] = 'R';
} // END - if
}
// "Runs" the given filters, data is optional and can be any type of data
-function runFilterChain ($filterName, $data = null, $silentAbort = true) {
+function runFilterChain ($filterName, $data = null) {
// Is that filter chain there?
if (!isset($GLOBALS['filters']['chains'][$filterName])) {
- // Then abort here (quick'N'dirty hack)
- if ((!$silentAbort) && (defined('FILTER_FAILED_NO_FILTER_FOUND'))) {
- // Add fatal message
- addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FAILED_NO_FILTER_FOUND'), $filterName);
- } // END - if
+ // We should find all these non-existing filter chains
+ DEBUG_LOG(__FUNCTION__, __LINE__, 'Filter chain ' . $filterName . ' not found!');
// Abort here
return false;
@@ -205,12 +219,12 @@ function runFilterChain ($filterName, $data = null, $silentAbort = true) {
$returnValue = $data;
// Then run all filters
- foreach ($GLOBALS['filters']['chains'][$filterName] as $filterFunction=>$active) {
+ foreach ($GLOBALS['filters']['chains'][$filterName] as $filterFunction => $active) {
// Debug message
- //* DEBUG: */ echo __FUNCTION__."(".__LINE__."): name={$filterName},func={$filterFunction},active={$active}
\n";
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Running: name={$filterName},func={$filterFunction},active={$active}");
// Is the filter active?
- if ($active == 'Y') {
+ if (($active == 'Y') || ((in_array($filterName, array('extension_remove', 'post_extension_run_sql'))) && ($active == 'R'))) {
// Is this filter there?
if (!function_exists($filterFunction)) {
// Unregister it
@@ -224,14 +238,29 @@ function runFilterChain ($filterName, $data = null, $silentAbort = true) {
$returnValue = call_user_func_array($filterFunction, array($returnValue));
// Update usage counter
- $GLOBALS['filters']['counter'][$filterName][$filterFunction]++;
- } // END - if
+ countFilterUsage($filterName, $filterFunction);
+ } elseif (isDebugModeEnabled()) {
+ // Debug message
+ DEBUG_LOG(__FUNCTION__, __LINE__, "Skipped: name={$filterName},func={$filterFunction},active={$active}");
+ }
} // END - foreach
// Return the filtered content
return $returnValue;
}
+// Count the filter usage
+function countFilterUsage ($filterName, $filterFunction) {
+ // Is it there?
+ if (isset($GLOBALS['filters']['counter'][$filterName][$filterFunction])) {
+ // Yes, then increase
+ $GLOBALS['filters']['counter'][$filterName][$filterFunction]++;
+ } else {
+ // No, then create
+ $GLOBALS['filters']['counter'][$filterName][$filterFunction] = 1;
+ }
+}
+
// -----------------------------------------------------------------------------
// Generic filter functions we always need
// -----------------------------------------------------------------------------
@@ -311,9 +340,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
@@ -329,8 +358,8 @@ function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($data) {
$content = $data;
// Handle failed logins here if not in guest
- //* DEBUG: */ print __FUNCTION__."(".__LINE__."):type={$data['type']},action={$GLOBALS['action']},what={$GLOBALS['what']},lvl={$data['access_level']}
\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__."(".__LINE__."):type={$data['type']},action={getAction()},what={getWhat()},lvl={$data['access_level']}
\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
@@ -386,7 +415,7 @@ function FILTER_SOLVE_TASK ($data) {
}
// Filter to load include files
-function FILTER_loadIncludeLUDES () {
+function FILTER_LOAD_INCLUDES () {
// Default is $data as inclusion list
$data = GET_INC_POOL();
@@ -468,23 +497,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,14 +531,14 @@ function FILTER_CHECK_ADMIN_ACL () {
// Ok, Cookie-Update done
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