X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffilters.php;h=b1784834747acc3e5cd82a9be03b740917f589c8;hp=6d02e30e8409261650cab20ce3669268ccf6b6a2;hb=d1637dad0b2ca0e5fb411ee0843f01bfb4cc94e0;hpb=03f62d0b89aa9276ac37f4d616d940fae184d850
diff --git a/inc/filters.php b/inc/filters.php
index 6d02e30e84..b178483474 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,11 +118,12 @@ ORDER BY `filter_id` ASC", __FUNCTION__, __LINE__);
// 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');
@@ -115,14 +134,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 +161,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 +199,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 +220,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 +239,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
// -----------------------------------------------------------------------------
@@ -277,7 +307,7 @@ function FILTER_FLUSH_FILTERS () {
// Add this filter (all filters are active by default)
$insertSQL .= sprintf("('%s','%s','Y'),", $filterName, $filterFunction);
$inserted++;
- } elseif ($active == "R") {
+ } elseif ($active == 'R') {
// Remove this filter
$removeSQL .= sprintf(" (`filter_name`='%s' AND `filter_function`='%s') OR", $filterName, $filterFunction);
$removed++;
@@ -297,7 +327,7 @@ function FILTER_FLUSH_FILTERS () {
// Something has been removed?
if ($removed > 0) {
// Finish SQL command
- $removeSQL = substr($removeSQL, 0, -2) . "LIMIT ".$removed;
+ $removeSQL = substr($removeSQL, 0, -2) . 'LIMIT '.$removed;
// And run it
ADD_SQL($removeSQL);
@@ -311,9 +341,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,7 +359,7 @@ 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={getAction()},what={getWhat()},lvl={$data['access_level']}
\n";
+ //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(".__LINE__."):type={$data['type']},action={getAction()},what={getWhat()},lvl={$data['access_level']}
");
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']);
@@ -359,7 +389,7 @@ function FILTER_AUTO_ACTIVATE_EXTENSION ($data) {
// Is this extension always activated?
if (EXT_GET_ALWAYS_ACTIVE() == 'Y') {
// Then activate the extension
- //* DEBUG: */ echo __FUNCTION__."(".__LINE__."): ext_name={$data['ext_name']}
\n";
+ //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(".__LINE__."): ext_name={$data['ext_name']}
");
ACTIVATE_EXTENSION($data['ext_name']);
} // END - if
@@ -386,7 +416,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();
@@ -417,12 +447,12 @@ function FILTER_loadIncludeLUDES () {
// Filter for running SQL commands
function FILTER_RUN_SQLS ($data) {
// Debug message
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, " - Entered!");
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "- Entered!");
// Is the array there?
if ((IS_SQLS_VALID()) && ((!isset($data['dry_run'])) || ($data['dry_run'] == false))) {
// Run SQL commands
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, " - Found ".COUNT_SQLS()." queries to run.");
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "- Found ".COUNT_SQLS()." queries to run.");
foreach (GET_SQLS() as $sql) {
// Trim spaces away
$sql = trim($sql);
@@ -444,7 +474,7 @@ function FILTER_RUN_SQLS ($data) {
} // END - if
// Debug message
- //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, " - Left!");
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "- Left!");
}
// Filter for updating/validating login data
@@ -459,20 +489,20 @@ function FILTER_UPDATE_LOGIN_DATA () {
setUserId(getSession('userid'));
// Load last module and last online time
- $result = SQL_QUERY_ESC("SELECT last_module, last_online FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT `last_module`, `last_online` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
array(getUserId()), __FUNCTION__, __LINE__);
// Entry found?
if (SQL_NUMROWS($result) == 1) {
// Load last module and online time
- list($mod, $onl) = SQL_FETCHROW($result);
+ $DATA = SQL_FETCHARRAY($result);
// Maybe first login time?
- if (empty($mod)) $mod = 'login';
+ if (empty($DATA['last_module'])) $DATA['last_module'] = 'login';
// This will be displayed on welcome page! :-)
if (empty($GLOBALS['last']['module'])) {
- $GLOBALS['last']['module'] = $mod; $GLOBALS['last']['online'] = $onl;
+ $GLOBALS['last']['module'] = $DATA['last_module']; $GLOBALS['last']['online'] = $DATA['last_online'];
} // END - if
// 'what' not set?
@@ -483,8 +513,12 @@ function FILTER_UPDATE_LOGIN_DATA () {
} // 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(getWhat(), detectRemoteAddr(), getUserId()), __FUNCTION__, __LINE__);
+ 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(
+ getWhat(),
+ detectRemoteAddr(),
+ getUserId()
+ ), __FUNCTION__, __LINE__);
} else {
// Destroy session, we cannot update!
destroyUserSession();
@@ -546,5 +580,48 @@ function FILTER_REMOVE_UPDATES () {
} // 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
+ $content = SQL_FETCHARRAY($result);
+
+ // Prepare username
+ $username = $content['surname'] . ' ' . $content['family'];
+
+ // Additionally admin?
+ if (IS_ADMIN()) {
+ // Add it
+ $username .= ' ({--_ADMIN_SHORT--})';
+ } // END - if
+ } else {
+ // Hmmm, logged in and no valid userid?
+ $username = '{--_UNKNOWN--}';
+
+ // 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');
+ }
+}
+
//
?>