Earning subscriptions introduced (unfinished):

[mailer.git] / inc / filter / cache_filter.php

diff --git a/inc/filter/cache_filter.php b/inc/filter/cache_filter.php
index dd9d22b7d8be6df9dde9e6f4d6e02dfd163ca0b5..be8b48cdd291e79ea5d6430dde877fb9032f6c8c 100644 (file)
--- a/inc/filter/cache_filter.php
+++ b/inc/filter/cache_filter.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Destroy the cache on extension changes
-function FILTER_CACHE_DESTROY_ON_EXT_CHANGE ($data) {
+function FILTER_CACHE_DESTROY_ON_EXT_CHANGE ($filterData) {
        // Return the data anyway if there is no cache extension
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
        if (!isCacheInstanceValid()) {
@@ -49,7 +49,7 @@ function FILTER_CACHE_DESTROY_ON_EXT_CHANGE ($data) {
        } // END - if
 
        // Remove cache
-       foreach (array('config','extension','filter','modules') as $cache) {
+       foreach (array('config', 'extension', 'filter', 'modules', 'earning') as $cache) {
                if ($GLOBALS['cache_instance']->loadCacheFile($cache)) {
                        $GLOBALS['cache_instance']->removeCacheFile();
                } // END - if
@@ -57,11 +57,11 @@ function FILTER_CACHE_DESTROY_ON_EXT_CHANGE ($data) {
 
        // Return it
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
-       return $data;
+       return $filterData;
 }
 
 // Destroy the cache on changing admin
-function FILTER_CACHE_DESTROY_ON_ADMIN_CHANGE ($data) {
+function FILTER_CACHE_DESTROY_ON_ADMIN_CHANGE ($filterData) {
        // Skip this step if the cache instance is not there
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
        if (!isCacheInstanceValid()) {
@@ -75,11 +75,11 @@ function FILTER_CACHE_DESTROY_ON_ADMIN_CHANGE ($data) {
 
        // Return the data
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
-       return $data;
+       return $filterData;
 }
 
 // Destroy all cache files
-function FILTER_CACHE_DESTROY_ALL ($data) {
+function FILTER_CACHE_DESTROY_ALL ($filterData) {
        // Skip this step if the cache instance is not there
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
        if (!isCacheInstanceValid()) {
@@ -87,7 +87,7 @@ function FILTER_CACHE_DESTROY_ALL ($data) {
        } // END - if
 
        // Remove cache files
-       foreach (array('admin','admin_acls','config','extension','modules','refdepths','refsystem','themes','filter','imprint') as $cache) {
+       foreach (array('admin', 'admin_acls', 'config', 'extension', 'earning', 'modules', 'refdepths', 'refsystem', 'themes', 'filter', 'imprint') as $cache) {
                // Is the cache file readable?
                // @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal.
                if ($GLOBALS['cache_instance']->loadCacheFile($cache)) {
@@ -97,14 +97,14 @@ function FILTER_CACHE_DESTROY_ALL ($data) {
        } // END - foreach
 
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
-       return $data;
+       return $filterData;
 }
 
 // Filter for purging 'filter' cache
-function FILTER_CACHE_DESTROY_FILTER ($data) {
+function FILTER_CACHE_DESTROY_FILTER ($filterData) {
        // Skip this step if the cache instance is not there
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
-       if ((!isCacheInstanceValid()) || (getConfig('update_filter_usage') != 'Y')) {
+       if ((!isCacheInstanceValid()) || ((isConfigEntrySet('update_filter_usage')) && (getConfig('update_filter_usage') != 'Y'))) {
                return false;
        } // END - if
 
@@ -114,7 +114,7 @@ function FILTER_CACHE_DESTROY_FILTER ($data) {
        } // END - if
 
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
-       return $data;
+       return $filterData;
 }
 
 // [EOF]