X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffilters.php;h=d409525f8ee1a69e759dcbfe46b7ed0b398456e2;hp=16b5020e5a82ad002f1048928cc3c3ac82c5cc4f;hb=d016e24dd4686f613a17733b96bc28fac936a4ac;hpb=6b83b0487a376b0f8dd76871cdfa470a137b2166
diff --git a/inc/filters.php b/inc/filters.php
index 16b5020e5a..d409525f8e 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -38,18 +38,16 @@ if (!defined('__SECURITY')) {
}
// Init "generic filter system"
-function INIT_FILTER_SYSTEM() {
- global $filters, $loadedFilters, $counter;
-
+function INIT_FILTER_SYSTEM () {
// Is the filter already initialized?
- if ((isset($filters)) && (is_array($filters))) {
+ if ((isset($GLOBALS['filters']['chains'])) && (is_array($GLOBALS['filters']['chains']))) {
// Then abort here
- ADD_FATAL(FILTER_FAILED_ALREADY_INIT);
+ addFatalMessage(getMessage('FILTER_FAILED_ALREADY_INIT'));
return false;
} // END - if
// Init the filter system (just some ideas)
- $filters = array(
+ $GLOBALS['filters']['chains'] = array(
// Filters for pre-init phase
'preinit' => array(),
// Filters for post-init phase
@@ -59,8 +57,8 @@ function INIT_FILTER_SYSTEM() {
);
// Init loaded filters and counter
- $loadedFilters = array();
- $counter = array();
+ $GLOBALS['filters']['loaded'] = array();
+ $GLOBALS['filters']['counter'] = array();
// Load all saved filers if sql_patches is updated
if (GET_EXT_VERSION("sql_patches") >= "0.5.9") {
@@ -70,7 +68,7 @@ function INIT_FILTER_SYSTEM() {
// Load all active filers
$result = SQL_QUERY("SELECT `filter_name`, `filter_function`, `filter_active`".$ADD."
-FROM `"._MYSQL_PREFIX."_filters`
+FROM `{!_MYSQL_PREFIX!}_filters`
ORDER BY `filter_id` ASC", __FILE__, __LINE__);
// Are there entries?
@@ -82,18 +80,18 @@ ORDER BY `filter_id` ASC", __FILE__, __LINE__);
$filterFunction = $filterArray['filter_function'];
// Set counter to default
- $counter[$filterName][$filterFunction] = 0;
+ $GLOBALS['filters']['counter'][$filterName][$filterFunction] = 0;
// Mark this filter as loaded (from database)
- $loadedFilters[$filterName][$filterFunction] = true;
+ $GLOBALS['filters']['loaded'][$filterName][$filterFunction] = true;
// Set this filter
- $filters[$filterName][$filterFunction] = $filterArray['filter_active'];
+ $GLOBALS['filters']['chains'][$filterName][$filterFunction] = $filterArray['filter_active'];
// Is the array element for counter there?
if (isset($filterArray['filter_counter'])) {
// Then use this value!
- $counter[$filterName][$filterFunction] = $filterArray['filter_counter'];
+ $GLOBALS['filters']['counter'][$filterName][$filterFunction] = $filterArray['filter_counter'];
} // END - if
} // END - while
} // END - if
@@ -104,8 +102,9 @@ ORDER BY `filter_id` ASC", __FILE__, __LINE__);
// Init filters
REGISTER_FILTER('init', 'UPDATE_LOGIN_DATA');
+ REGISTER_FILTER('init', 'INIT_RANDOMIZER');
- // Login failtures handler
+ // Login failures handler
REGISTER_FILTER('post_youhere_line', 'CALL_HANDLER_LOGIN_FAILTURES');
// Filters for pre-extension-registration
@@ -134,16 +133,14 @@ ORDER BY `filter_id` ASC", __FILE__, __LINE__);
// "Registers" a new filter function
function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $force = false, $dry_run = false) {
- global $filters, $counter;
-
// Extend the filter function name
$filterFunction = sprintf("FILTER_%s", strtoupper($filterFunction));
// Is that filter already there?
- if ((isset($filters[$filterName][$filterFunction])) && (!$force)) {
+ if ((isset($GLOBALS['filters']['chains'][$filterName][$filterFunction])) && (!$force)) {
// Then abort here
if (!$silentAbort) {
- ADD_FATAL(sprintf(FILTER_FAILED_ALREADY_ADDED, $filterFunction, $filterName));
+ addFatalMessage(getMessage('FILTER_FAILED_ALREADY_ADDED'), array($filterFunction, $filterName));
} // END - if
// Abort here
@@ -153,52 +150,48 @@ function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $fo
// Is the function there?
if (!function_exists($filterFunction)) {
// Then abort here
- ADD_FATAL(sprintf(FILTER_FAILED_NOT_FOUND, $filterFunction, $filterName));
+ addFatalMessage(getMessage('FILTER_FAILED_NOT_FOUND'), array($filterFunction, $filterName));
return false;
} // END - if
// Shall we add it?
if (!$dry_run) {
// Simply add it to the array
- $filters[$filterName][$filterFunction] = "Y";
- $counter[$filterName][$filterFunction] = 0;
+ $GLOBALS['filters']['chains'][$filterName][$filterFunction] = "Y";
+ $GLOBALS['filters']['counter'][$filterName][$filterFunction] = 0;
} // END - if
}
// "Unregisters" a filter from the given chain
function UNREGISTER_FILTER ($filterName, $filterFunction, $force = false, $dry_run = false) {
- global $filters, $counter, $loadedFilters;
-
// Extend the filter function name only if not loaded from database
- if (!isset($loadedFilters[$filterName][$filterFunction])) {
+ if (!isset($GLOBALS['filters']['loaded'][$filterName][$filterFunction])) {
$filterFunction = sprintf("FILTER_%s", strtoupper($filterFunction));
} // END - if
// Is that filter there?
- if ((!isset($filters[$filterName][$filterFunction])) && (!$force)) {
+ if ((!isset($GLOBALS['filters']['chains'][$filterName][$filterFunction])) && (!$force)) {
// Not found, so abort here
- ADD_FATAL(sprintf(FILTER_FAILED_NOT_REMOVED, $filterFunction, $filterName));
+ addFatalMessage(getMessage('FILTER_FAILED_NOT_REMOVED'), array($filterFunction, $filterName));
return false;
} // END - if
// Shall we remove? (default, not while just showing an extension removal)
if (!$dry_run) {
// Mark for filter removal
- $filters[$filterName][$filterFunction] = "R";
- unset($counter[$filterName][$filterFunction]);
+ $GLOBALS['filters']['chains'][$filterName][$filterFunction] = "R";
+ unset($GLOBALS['filters']['counter'][$filterName][$filterFunction]);
} // END - if
}
// "Runs" the given filters, data is optional and can be any type of data
function RUN_FILTER ($filterName, $data = null, $silentAbort = true) {
- global $filters, $counter;
-
// Is that filter chain there?
- if (!isset($filters[$filterName])) {
+ if (!isset($GLOBALS['filters']['chains'][$filterName])) {
// Then abort here (quick'N'dirty hack)
if ((!$silentAbort) && (defined('FILTER_FAILED_NO_FILTER_FOUND'))) {
// Add fatal message
- ADD_FATAL(sprintf(FILTER_FAILED_NO_FILTER_FOUND, $filterName));
+ addFatalMessage(getMessage('FILTER_FAILED_NO_FILTER_FOUND'), $filterName);
} // END - if
// Abort here
@@ -209,9 +202,9 @@ function RUN_FILTER ($filterName, $data = null, $silentAbort = true) {
$returnValue = $data;
// Then run all filters
- foreach ($filters[$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: */ echo __FUNCTION__."(".__LINE__."): name={$filterName},func={$filterFunction},active={$active}
\n";
// Is the filter active?
if ($active == "Y") {
@@ -228,7 +221,7 @@ function RUN_FILTER ($filterName, $data = null, $silentAbort = true) {
$returnValue = call_user_func_array($filterFunction, array($returnValue));
// Update usage counter
- $counter[$filterName][$filterFunction]++;
+ $GLOBALS['filters']['counter'][$filterName][$filterFunction]++;
} // END - if
} // END - foreach
@@ -242,15 +235,15 @@ function RUN_FILTER ($filterName, $data = null, $silentAbort = true) {
// Filter for flushing all new filters to the database
function FILTER_FLUSH_FILTERS () {
- global $filters, $counter, $link, $loadedFilters, $SQLs;
+ global $SQLs;
// Clear all previous SQL queries
$SQLs = array();
// Is a database link here and not in installation mode?
- if ((!is_resource($link)) && (!isBooleanConstantAndTrue('mxchange_installing'))) {
+ if ((!SQL_IS_LINK_UP()) && (!isBooleanConstantAndTrue('mxchange_installing'))) {
// Abort here
- ADD_FATAL(sprintf(FILTER_FLUSH_FAILED_NO_DATABASE, $filterFunction, $filterName));
+ addFatalMessage(getMessage('FILTER_FLUSH_FAILED_NO_DATABASE'), array($filterFunction, $filterName));
return false;
} // END - if
@@ -264,15 +257,15 @@ function FILTER_FLUSH_FILTERS () {
$inserted = 0; $removed = 0;
// Prepare SQL queries
- $insertSQL = "INSERT INTO `"._MYSQL_PREFIX."_filters` (`filter_name`,`filter_function`,`filter_active`) VALUES";
- $removeSQL = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_filters` WHERE";
+ $insertSQL = "INSERT INTO `{!_MYSQL_PREFIX!}_filters` (`filter_name`,`filter_function`,`filter_active`) VALUES";
+ $removeSQL = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_filters` WHERE";
// Write all filters to database
- foreach ($filters as $filterName => $filterArray) {
+ foreach ($GLOBALS['filters']['chains'] as $filterName => $filterArray) {
// Walk through all filters
foreach ($filterArray as $filterFunction => $active) {
// Is this filter loaded?
- if (!isset($loadedFilters[$filterName][$filterFunction])) {
+ if (!isset($GLOBALS['filters']['loaded'][$filterName][$filterFunction])) {
// Add this filter (all filters are active by default)
$insertSQL .= sprintf("('%s','%s','Y'),", $filterName, $filterFunction);
$inserted++;
@@ -305,11 +298,11 @@ function FILTER_FLUSH_FILTERS () {
// Shall we update usage counters (ONLY FOR DEBUGGING!)
if (getConfig('update_filter_usage') == "Y") {
// Update all counters
- foreach ($counter as $filterName => $filterArray) {
+ foreach ($GLOBALS['filters']['counter'] as $filterName => $filterArray) {
// Walk through all filters
foreach ($filterArray as $filterFunction => $cnt) {
// Construct and add the query
- $SQLs[] = sprintf("UPDATE `"._MYSQL_PREFIX."_filters` SET `filter_counter`=%s WHERE `filter_name`='%s' AND `filter_function`='%s' LIMIT 1",
+ $SQLs[] = sprintf("UPDATE `{!_MYSQL_PREFIX!}_filters` SET `filter_counter`=%s WHERE `filter_name`='%s' AND `filter_function`='%s' LIMIT 1",
bigintval($cnt),
$filterName,
$filterFunction
@@ -319,10 +312,10 @@ function FILTER_FLUSH_FILTERS () {
} // END - if
// Run the run_sqls filter in non-dry mode
- RUN_FILTER('run_sqls', false);
+ RUN_FILTER('run_sqls', array('dry_run' => false, 'sqls' => $SQLs));
}
-// Filter for calling the handler for login failtures
+// Filter for calling the handler for login failures
function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($data) {
// Init content
$content = $data;
@@ -330,7 +323,7 @@ function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($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"))) {
- // Handle failture
+ // Handle failure
$content['content'] .= HANDLE_LOGIN_FAILTURES($data['access_level']);
} // END - if
@@ -346,7 +339,7 @@ function FILTER_REDIRECT_TO_LOGOUT_SQL_PATCHES () {
// Is the element set?
if (isset($GLOBALS['ext_load_mode'])) {
// Redirect here
- LOAD_URL("modules.php?module=admin&logout=1&".$GLOBALS['ext_load_mode']."=sql_patches");
+ LOAD_URL("modules.php?module=admin&logout=1&".$GLOBALS['ext_load_mode']."=sql_patches");
} // END - if
// This should not happen!
@@ -355,6 +348,7 @@ function FILTER_REDIRECT_TO_LOGOUT_SQL_PATCHES () {
// Filter for auto-activation of a extension
function FILTER_AUTO_ACTIVATE_EXTENSION ($data) {
+ // @TODO Try to rewrite this
global $EXT_ALWAYS_ACTIVE;
// Is this extension always activated?
@@ -388,35 +382,40 @@ function FILTER_SOLVE_TASK ($data) {
// Filter to load include files
function FILTER_LOAD_INCLUDES ($data) {
- global $CSS;
+ // Default is $data as inclusion list
+ $INC_POOL = $data;
// Is it an array?
if ((!isset($data)) || (!is_array($data))) {
// Then abort here
DEBUG_LOG(__FILE__, __LINE__, "INC_POOL is no array!");
- return;
- } // END - if
+ return $data;
+ } elseif (isset($data['inc_pool'])) {
+ // Use this as new inclusion pool!
+ $INC_POOL = $data['inc_pool'];
+ }
// Check for added include files
- if (count($data) > 0) {
+ if (count($INC_POOL) > 0) {
// Loads every include file
- foreach ($data as $FQFN) {
- require_once($FQFN);
+ foreach ($INC_POOL as $FQFN) {
+ LOAD_INC_ONCE($FQFN);
} // END - foreach
// Reset array
- $data = array();
+ if (isset($data['inc_pool'])) $data['inc_pool'] = array();
} // END - if
+
+ // Continue with processing
+ return $data;
}
// Filter for running SQL commands
-function FILTER_RUN_SQLS ($dry_run) {
- global $SQLs;
-
+function FILTER_RUN_SQLS ($data) {
// Is the array there?
- if ((is_array($SQLs)) && (!$dry_run)) {
+ if ((isset($data['sqls'])) && ((!isset($data['dry_run'])) || ($data['dry_run'] == false))) {
// Run SQL commands
- foreach ($SQLs as $sql) {
+ foreach ($data['sqls'] as $sql) {
$sql = trim($sql);
if (!empty($sql)) {
// Do we have an "ALTER TABLE" command?
@@ -429,16 +428,12 @@ function FILTER_RUN_SQLS ($dry_run) {
}
} // END - if
} // END - foreach
- } elseif (GET_EXT_VERSION("sql_patches") == "") {
- // Remove SQLs if extension is not installed
- $SQLs = array();
- }
+ } // END - if
}
// Filter for updating/validating login data
function FILTER_UPDATE_LOGIN_DATA () {
- global $LAST;
- if (!is_array($LAST)) $LAST = array();
+ if (!is_array($GLOBALS['last'])) $GLOBALS['last'] = array();
// Recheck if logged in
if (!IS_MEMBER()) return false;
@@ -446,40 +441,40 @@ function FILTER_UPDATE_LOGIN_DATA () {
// Secure user ID
$GLOBALS['userid'] = bigintval(get_session('userid'));
- // Extract last online time (life) and how long is auto-login valid (time)
- $newl = time() + bigintval(get_session('lifetime'));
-
// 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", array($GLOBALS['userid']), __FILE__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT last_module, last_online FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+ array($GLOBALS['userid']), __FILE__, __LINE__);
+
+ // Entry found?
if (SQL_NUMROWS($result) == 1) {
// Load last module and online time
list($mod, $onl) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
// Maybe first login time?
if (empty($mod)) $mod = "login";
- if (set_session("userid", $GLOBALS['userid'], $newl, COOKIE_PATH) && set_session("u_hash", get_session('u_hash'), $newl, COOKIE_PATH) && set_session("lifetime", bigintval(get_session('lifetime')), $newl, COOKIE_PATH)) {
- // This will be displayed on welcome page! :-)
- if (empty($LAST['module'])) {
- $LAST['module'] = $mod; $LAST['online'] = $onl;
- } // END - if
+ // 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'])) {
- // Fix it to default
- $GLOBALS['what'] = "welcome";
- if (getConfig('index_home') != "") $GLOBALS['what'] = getConfig('index_home');
- } // END - if
+ // "what" not set?
+ if (empty($GLOBALS['what'])) {
+ // Fix it to default
+ $GLOBALS['what'] = "welcome";
+ if (getConfig('index_home') != "") $GLOBALS['what'] = getConfig('index_home');
+ } // END - if
- // Update last module / online time
- $result = 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'], GET_REMOTE_ADDR(), $GLOBALS['userid']), __FILE__, __LINE__);
- }
+ // 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'], GET_REMOTE_ADDR(), $GLOBALS['userid']), __FILE__, __LINE__);
} else {
// Destroy session, we cannot update!
destroy_user_session();
}
+
+ // Free the result
+ SQL_FREERESULT($result);
}
// Filter for checking admin ACL
@@ -488,7 +483,7 @@ function FILTER_CHECK_ADMIN_ACL () {
$ret = true;
// Ok, Cookie-Update done
- if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) {
+ if (GET_EXT_VERSION("admins") >= "0.3") {
// Check if action GET variable was set
$action = SQL_ESCAPE($GLOBALS['action']);
if (!empty($GLOBALS['what'])) {
@@ -504,5 +499,11 @@ function FILTER_CHECK_ADMIN_ACL () {
return $ret;
}
+// Filter for initializing randomizer
+function FILTER_INIT_RANDOMIZER () {
+ // Simply init the randomizer with seed and _ADD value
+ mt_srand(generateSeed() + constant('_ADD'));
+}
+
//
?>