Deprecated 'replacer' removed. Now we use EL code instead (there are a lot example...

[mailer.git] / inc / filters.php

diff --git a/inc/filters.php b/inc/filters.php
index fe1a36c00990c04e4831d5c539ca6c0d81e8110b..1bbede3a98313c2113f8d7b2b5dbc942d429b8cf 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -111,10 +109,10 @@ function FILTER_FLUSH_FILTERS () {
                // Update all counters
                foreach ($GLOBALS['cache_array']['filter']['counter'] as $filterName => $filterArray) {
                        // Walk through all filters
-                       foreach ($filterArray as $filterFunction => $cnt) {
+                       foreach ($filterArray as $filterFunction => $count) {
                                // Construct and add the query
                                addSql(sprintf("UPDATE `{?_MYSQL_PREFIX?}_filters` SET `filter_counter`=%s WHERE `filter_name`='%s' AND `filter_function`='%s' LIMIT 1",
-                                       bigintval($cnt),
+                                       bigintval($count),
                                        $filterName,
                                        $filterFunction
                                ));
@@ -139,7 +137,7 @@ function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($data) {
 
        // Handle failed logins here if not in guest
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "type=".$data['type'].",action=".getAction().",what=".getWhat().",level=".$data['access_level']."<br />");
-       if ((($data['type'] == 'what') || ($data['type'] == 'action') && ((!isWhatSet()) || (getWhat() == 'overview') || (getWhat() == getIndexHome()))) && ($data['access_level'] != 'guest') && ((isExtensionInstalledAndNewer('sql_patches', '0.4.7')) || (isExtensionInstalledAndNewer('admins', '0.7.0')))) {
+       if ((($data['type'] == 'what') || ($data['type'] == 'action') && ((!isWhatSet()) || (getWhat() == 'overview') || (getWhat() == getIndexHome()))) && ($data['access_level'] != 'guest') && ((isExtensionInstalledAndNewer('sql_patches', '0.4.7')) || (isExtensionInstalledAndNewer('admins', '0.7.6')))) {
                // Handle failure
                $content['content'] .= handleLoginFailures($data['access_level']);
        } // END - if
@@ -332,7 +330,7 @@ function FILTER_INIT_RANDOMIZER () {
        setConfigEntry('_PRIME', 591623);
 
        // Calculate "entropy" with the prime number (for code generation)
-       setConfigEntry('_ADD', (getPrime() * getPrime() / (pi() * getConfig('code_length') + 1)));
+       setConfigEntry('_ADD', (getPrime() * getPrime() / (pi() * getCodeLength() + 1)));
 
        // Simply init the randomizer with seed and _ADD value
        mt_srand(generateSeed() + getConfig('_ADD'));
@@ -356,7 +354,7 @@ function FILTER_REMOVE_UPDATES ($data) {
                        // Shall we remove this update?
                        if (in_array($ext_name, getExtensionRemovalList())) {
                                // Then remove this extension!
-                               removeExtensionUpdateDependency($ext_name);
+                               removeExtensionDependency($ext_name);
                        } // END - if
                } // END - foreach
        } // END - if
@@ -471,7 +469,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
                        $callback       = '';
                        $extraFunction  = '';
                        $extraFunction2 = '';
-                       $value          = '';
+                       $value          = null;
 
                        // Extract command and call-back
                        $cmdArray = explode(',', $cmd);
@@ -523,7 +521,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
                                $code = call_user_func($commandFunction, $data);
                        } else {
                                // Unsupported command detected
-                               debug_report_bug(__FUNCTION__, __LINE__, 'Command=' . $cmd . ', callback=' . $callback . ', extra=' . $extraFunction . ' is unsupported.');
+                               logDebugMessage(__FUNCTION__, __LINE__, 'Command cmd=' . $cmd . ', callback=' . $callback . ', extra=' . $extraFunction . ' is unsupported.');
                        }
                } // END - foreach
        } // END - if
@@ -582,7 +580,7 @@ function FILTER_RUN_RESET_INCLUDES () {
                $currMonth = getMonth();
 
                // Has it changed?
-               if ((getConfig('last_month') != $currMonth) || (isMonthlyResetDebugEnabled())) {
+               if ((getLastMonth() != $currMonth) || (isMonthlyResetDebugEnabled())) {
                        // Include monthly reset scripts
                        mergeIncludePool('reset', getArrayFromDirectory('inc/monthly/', 'monthly_'));
 
@@ -712,15 +710,15 @@ function FILTER_TRIGGER_SENDING_POOL () {
 }
 
 // Filter for checking and updating SVN revision
-function FILTER_CHECK_SVN_REVISION () {
+function FILTER_CHECK_REPOSITORY_REVISION () {
        // Only execute this filter if installed and all config entries are there
        if ((!isInstalled()) || (!isConfigEntrySet('patch_level'))) return;
 
        // Check for patch level differences between databases and current hard-coded
-       if ((getCurrSvnRevision() > getConfig('patch_level')) || (getConfig('patch_level') == 'CURR_SVN_REVISION') || (getConfig('patch_ctime') == 'UNIX_TIMES')) {
+       if ((getCurrentRepositoryRevision() > getConfig('patch_level')) || (getConfig('patch_level') == 'CURRENT_REPOSITORY_REVISION') || (getConfig('patch_ctime') == 'UNIX_TIMES')) {
                // Update database and CONFIG array
-               updateConfiguration(array('patch_level', 'patch_ctime'), array(getCurrSvnRevision(), 'UNIX_TIMESTAMP()'));
-               setConfigEntry('patch_level', getCurrSvnRevision());
+               updateConfiguration(array('patch_level', 'patch_ctime'), array(getCurrentRepositoryRevision(), 'UNIX_TIMESTAMP()'));
+               setConfigEntry('patch_level', getCurrentRepositoryRevision());
                setConfigEntry('patch_ctime', time());
        } // END - if
 }
@@ -775,7 +773,7 @@ function FILTER_INIT_RANDOM_NUMBER () {
                // Generate random number
                setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getMemberId(), ''));
        } else {
-               // Generate weak (!!!) code
+               // Generate *WEAK* code
                setConfigEntry('RAND_NUMBER', mt_rand(1000000, 9999999));
        }
 
@@ -939,13 +937,13 @@ function FILTER_RESET_USER_LOGIN_FAILURE () {
        } // END - if
 
        // Remmeber login failures if available
-       if (isExtensionInstalledAndNewer('sql_patches', '0.6.1')) {
+       if (isExtensionInstalledAndNewer('user', '0.3.7')) {
                // Reset login failures
                SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
 SET
        `login_failures`=0,
-       `last_failure`='0000-00-00 00:00:00'
+       `last_failure`=NULL
 WHERE
        `userid`=%s
 LIMIT 1",
@@ -1016,5 +1014,15 @@ function FILTER_CLEANUP_DNS_CACHE () {
        } // END - if
 }
 
+// Filter for setting CURRENT_DATE, this is required after initialization of extensions
+function FILTER_SET_CURRENT_DATE () {
+       // Set current date
+       setConfigEntry('CURRENT_DATE', generateDateTime(time(), '3'));
+
+       // Timestamp for yesterday, today ... all at 00:00 am
+       setConfigEntry('START_YDAY', makeTime(0, 0, 0, time() - getOneDay()));
+       setConfigEntry('START_TDAY', makeTime(0, 0, 0, time()));
+}
+
 // [EOF]
 ?>