// 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)
$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('<pre>'.print_r($filterArray, true).'</pre>');
+ $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`";
// Free result
SQL_FREERESULT($result);
- } // END - if
+ }
// Init filters
registerFilter('init', 'UPDATE_LOGIN_DATA');
registerFilter('init', 'INIT_RANDOMIZER');
+ registerFilter('init', 'DETERMINE_USERNAME');
// Login failures handler
registerFilter('post_youhere_line', 'CALL_HANDLER_LOGIN_FAILTURES');
// 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');
// 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
} // 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;
$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__."(<font color=\"#0000aa\">".__LINE__."</font>): name={$filterName},func={$filterFunction},active={$active}<br />\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
$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
// -----------------------------------------------------------------------------
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
}
// Filter to load include files
-function FILTER_loadIncludeLUDES () {
+function FILTER_LOAD_INCLUDES () {
// Default is $data as inclusion list
$data = GET_INC_POOL();
} // END - if
}
+// Determines username for current user state
+function FILTER_DETERMINE_USERNAME () {
+ global $username;
+
+ // Check if logged in
+ if (IS_MEMBER()) {
+ // Is still logged in so we welcome him with his name
+ $result = SQL_QUERY_ESC("SELECT `surname`, `family` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
+ array(getUserId()), __FILE__, __LINE__);
+ if (SQL_NUMROWS($result) == 1) {
+ // Load surname and family's name and build the username
+ list($s, $f) = SQL_FETCHROW($result);
+ $username = $s . ' ' . $f;
+
+ // Additionally admin?
+ if (IS_ADMIN()) {
+ // Add it
+ $username .= ' ({--_ADMIN_SHORT--})';
+ } // END - if
+ } else {
+ // Hmmm, logged in and no valid userid?
+ $username = '<em>{--_UNKNOWN--}</em>';
+
+ // Destroy session
+ destroyUserSession();
+
+ // Kill userid
+ setUserId(0);
+ }
+
+ // Free memory
+ SQL_FREERESULT($result);
+ } elseif (IS_ADMIN()) {
+ // Admin is there
+ $username = getMessage('_ADMIN');
+ } else {
+ // He's a guest, hello there... ;-)
+ $username = getMessage('_GUEST');
+ }
+}
+
//
?>