Mailer project rwritten:

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

diff --git a/inc/filter/cache_filter.php b/inc/filter/cache_filter.php
index b1887a91f19e4d16525616abc14a3c0e15f28ec4..d675aa43bef46ab82edb495e5f5de5685609f864 100644 (file)
--- a/inc/filter/cache_filter.php
+++ b/inc/filter/cache_filter.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -45,12 +45,14 @@ 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()) {
-               return false;
+               return FALSE;
        } // END - if
 
        // Remove cache
        foreach (array('config', 'extension', 'filter', 'modules', 'earning', 'points_data') as $cache) {
+               // Is this cache there?
                if ($GLOBALS['cache_instance']->loadCacheFile($cache)) {
+                       // Yes, then remove it
                        $GLOBALS['cache_instance']->removeCacheFile();
                } // END - if
        } // END - foreach
@@ -65,7 +67,7 @@ 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()) {
-               return false;
+               return FALSE;
        } // END - if
 
        // Remove cache
@@ -83,11 +85,11 @@ function FILTER_CACHE_DESTROY_ALL ($filterData) {
        // Skip this step if the cache instance is not there
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
        if (!isCacheInstanceValid()) {
-               return false;
+               return FALSE;
        } // END - if
 
        // Remove cache files
-       foreach (array('admin', 'admin_acls', 'config', 'extension', 'earning', 'filter', 'imprint', 'modules', 'points_data', 'refdepths', 'refsystem', 'themes') as $cache) {
+       foreach (array('admin', 'admin_acls', 'config', 'extension', 'earning', 'filter', 'imprint', 'modules', 'payments', 'points_data', 'refdepths', 'refsystem', 'themes') 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)) {
@@ -105,13 +107,11 @@ function FILTER_CACHE_DESTROY_FILTER ($filterData) {
        // Skip this step if the cache instance is not there
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called!');
        if ((!isCacheInstanceValid()) || ((isConfigEntrySet('update_filter_usage')) && (getConfig('update_filter_usage') != 'Y'))) {
-               return false;
+               return FALSE;
        } // END - if
 
        // Remove cache files
-       if ($GLOBALS['cache_instance']->loadCacheFile('filter')) {
-               $GLOBALS['cache_instance']->removeCacheFile();
-       } // END - if
+       rebuildCache('filter', 'filter');
 
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
        return $filterData;