X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=74d7c43e5df2d416a693964723b7291f9ffa0be3;hb=d005c37ef992007d9ccad4acb9e0ce15ee6a9c9a;hp=72c61a02c4d26ecb681240151bdc4993a961f7a3;hpb=5ae157f2010b3aae3c6f2ecdc6ec7c30b305be4a;p=mailer.git
diff --git a/inc/filters.php b/inc/filters.php
index 72c61a02c4..74d7c43e5d 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Funktionen fuer Filter-System *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: 856 $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009) $ *
+ * $Tag:: 0.2.1-FINAL $ *
+ * $Author:: stelzi $ *
+ * Needs to be in all Files and every File needs "svn propset *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2008 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
@@ -39,17 +44,15 @@ if (!defined('__SECURITY')) {
// Init "generic filter system"
function INIT_FILTER_SYSTEM () {
- global $filters, $loadedFilters, $counter;
-
// Is the filter already initialized?
- if ((isset($filters)) && (is_array($filters))) {
+ if ((isset($GLOBALS['filters']['chains'])) && (is_array($GLOBALS['filters']['chains']))) {
// Then abort here
- addFatalMessage(getMessage('FILTER_FAILED_ALREADY_INIT'));
+ addFatalMessage(__FUNCTION__, __LINE__, 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 +62,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") {
@@ -71,7 +74,7 @@ function INIT_FILTER_SYSTEM () {
// Load all active filers
$result = SQL_QUERY("SELECT `filter_name`, `filter_function`, `filter_active`".$ADD."
FROM `{!_MYSQL_PREFIX!}_filters`
-ORDER BY `filter_id` ASC", __FILE__, __LINE__);
+ORDER BY `filter_id` ASC", __FUNCTION__, __LINE__);
// Are there entries?
if (SQL_NUMROWS($result) > 0) {
@@ -82,18 +85,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
@@ -135,16 +138,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) {
- addFatalMessage(getMessage('FILTER_FAILED_ALREADY_ADDED'), array($filterFunction, $filterName));
+ addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FAILED_ALREADY_ADDED'), array($filterFunction, $filterName));
} // END - if
// Abort here
@@ -154,52 +155,48 @@ function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $fo
// Is the function there?
if (!function_exists($filterFunction)) {
// Then abort here
- addFatalMessage(getMessage('FILTER_FAILED_NOT_FOUND'), array($filterFunction, $filterName));
+ addFatalMessage(__FUNCTION__, __LINE__, 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
- addFatalMessage(getMessage('FILTER_FAILED_NOT_REMOVED'), array($filterFunction, $filterName));
+ addFatalMessage(__FUNCTION__, __LINE__, 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;
-
+function runFilterChain ($filterName, $data = null, $silentAbort = true) {
// 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
- addFatalMessage(getMessage('FILTER_FAILED_NO_FILTER_FOUND'), $filterName);
+ addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FAILED_NO_FILTER_FOUND'), $filterName);
} // END - if
// Abort here
@@ -210,7 +207,7 @@ 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";
@@ -229,7 +226,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
@@ -243,15 +240,19 @@ function RUN_FILTER ($filterName, $data = null, $silentAbort = true) {
// Filter for flushing all new filters to the database
function FILTER_FLUSH_FILTERS () {
- global $filters, $counter, $loadedFilters, $SQLs;
-
// Clear all previous SQL queries
- $SQLs = array();
+ INIT_SQLS();
+
+ // Are we installing?
+ if (isInstalling()) {
+ // Then silently skip this filter
+ return true;
+ } // END - if
// Is a database link here and not in installation mode?
- if ((!SQL_IS_LINK_UP()) && (!isBooleanConstantAndTrue('mxchange_installing'))) {
+ if ((!SQL_IS_LINK_UP()) && (!isInstalling())) {
// Abort here
- addFatalMessage(getMessage('FILTER_FLUSH_FAILED_NO_DATABASE'), array($filterFunction, $filterName));
+ addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FLUSH_FAILED_NO_DATABASE'));
return false;
} // END - if
@@ -269,11 +270,11 @@ function FILTER_FLUSH_FILTERS () {
$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++;
@@ -291,7 +292,7 @@ function FILTER_FLUSH_FILTERS () {
$insertSQL = substr($insertSQL, 0, -1);
// And run it
- $SQLs[] = $insertSQL;
+ ADD_SQL($insertSQL);
} // END - if
// Something has been removed?
@@ -300,27 +301,27 @@ function FILTER_FLUSH_FILTERS () {
$removeSQL = substr($removeSQL, 0, -2) . "LIMIT ".$removed;
// And run it
- $SQLs[] = $removeSQL;
+ ADD_SQL($removeSQL);
} // END - if
// 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",
+ 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
- );
+ ));
} // END - foreach
} // END - foreach
} // END - if
// Run the run_sqls filter in non-dry mode
- RUN_FILTER('run_sqls', array('dry_run' => false, 'sqls' => $SQLs));
+ runFilterChain('run_sqls');
}
// Filter for calling the handler for login failures
@@ -356,10 +357,8 @@ function FILTER_REDIRECT_TO_LOGOUT_SQL_PATCHES () {
// Filter for auto-activation of a extension
function FILTER_AUTO_ACTIVATE_EXTENSION ($data) {
- global $EXT_ALWAYS_ACTIVE;
-
// Is this extension always activated?
- if ($EXT_ALWAYS_ACTIVE == "Y") {
+ if (EXT_GET_ALWAYS_ACTIVE() == "Y") {
// Then activate the extension
//* DEBUG: */ echo __FUNCTION__."(".__LINE__."): ext_name={$data['ext_name']}
\n";
ACTIVATE_EXTENSION($data['ext_name']);
@@ -395,8 +394,7 @@ function FILTER_LOAD_INCLUDES ($data) {
// Is it an array?
if ((!isset($data)) || (!is_array($data))) {
// Then abort here
- DEBUG_LOG(__FILE__, __LINE__, "INC_POOL is no array!");
- return $data;
+ debug_report_bug(sprintf("INC_POOL is no array! Type: %s", gettype($INC_POOL)));
} elseif (isset($data['inc_pool'])) {
// Use this as new inclusion pool!
$INC_POOL = $data['inc_pool'];
@@ -419,29 +417,41 @@ function FILTER_LOAD_INCLUDES ($data) {
// Filter for running SQL commands
function FILTER_RUN_SQLS ($data) {
+ // Debug message
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, " - Entered!");
+
// Is the array there?
- if ((isset($data['sqls'])) && ((!isset($data['dry_run'])) || ($data['dry_run'] == false))) {
+ if ((IS_SQLS_VALID()) && ((!isset($data['dry_run'])) || ($data['dry_run'] == false))) {
// Run SQL commands
- foreach ($data['sqls'] as $sql) {
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, " - Found ".COUNT_SQLS()." queries to run.");
+ foreach (GET_SQLS() as $sql) {
+ // Trim spaces away
$sql = trim($sql);
+
+ // Is there still a query left?
if (!empty($sql)) {
// Do we have an "ALTER TABLE" command?
if (substr(strtolower($sql), 0, 11) == "alter table") {
// Analyse the alteration command
- SQL_ALTER_TABLE($sql, __FILE__, __LINE__);
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Alterting table: {$sql}");
+ SQL_ALTER_TABLE($sql, __FUNCTION__, __LINE__);
} else {
// Run regular SQL command
- $result = SQL_QUERY($sql, __FILE__, __LINE__, false);
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Running regular query: {$sql}");
+ $result = SQL_QUERY($sql, __FUNCTION__, __LINE__, false);
}
} // END - if
} // END - foreach
} // END - if
+
+ // Debug message
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, " - Left!");
}
// Filter for updating/validating login data
function FILTER_UPDATE_LOGIN_DATA () {
- global $LAST;
- if (!is_array($LAST)) $LAST = array();
+ // Add missing array
+ if ((!isset($GLOBALS['last'])) || (!is_array($GLOBALS['last']))) $GLOBALS['last'] = array();
// Recheck if logged in
if (!IS_MEMBER()) return false;
@@ -451,7 +461,7 @@ function FILTER_UPDATE_LOGIN_DATA () {
// 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__);
+ array($GLOBALS['userid']), __FUNCTION__, __LINE__);
// Entry found?
if (SQL_NUMROWS($result) == 1) {
@@ -462,8 +472,8 @@ function FILTER_UPDATE_LOGIN_DATA () {
if (empty($mod)) $mod = "login";
// This will be displayed on welcome page! :-)
- if (empty($LAST['module'])) {
- $LAST['module'] = $mod; $LAST['online'] = $onl;
+ if (empty($GLOBALS['last']['module'])) {
+ $GLOBALS['last']['module'] = $mod; $GLOBALS['last']['online'] = $onl;
} // END - if
// "what" not set?
@@ -475,7 +485,7 @@ function FILTER_UPDATE_LOGIN_DATA () {
// 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__);
+ array($GLOBALS['what'], GET_REMOTE_ADDR(), $GLOBALS['userid']), __FUNCTION__, __LINE__);
} else {
// Destroy session, we cannot update!
destroy_user_session();