Some typos fixed

[mailer.git] / inc / libs / cache_functions.php

diff --git a/inc/libs/cache_functions.php b/inc/libs/cache_functions.php
index 15adc4680619d683518bb041cddce11807b4e788..bb5db58000437a062c22366339b8590ab85638f6 100644 (file)
--- a/inc/libs/cache_functions.php
+++ b/inc/libs/cache_functions.php
@@ -112,7 +112,7 @@ class CacheSystem {
                        $this->storeExtensionVersion("cache");
                } else {
                        // Cannot create file
-                       ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
+                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
                }
        }
 
@@ -142,7 +142,7 @@ class CacheSystem {
                        }
                } else {
                        // Cannot create file
-                       ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
+                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
                }
        }
 
@@ -205,7 +205,7 @@ class CacheSystem {
                        }
                } else {
                        // Cache file not found or not readable
-                       ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_CANNOT_LOAD_1.$this->inc.CACHE_CANNOT_LOAD_2);
+                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_CANNOT_LOAD_1.$this->inc.CACHE_CANNOT_LOAD_2);
                }
        }
 
@@ -228,12 +228,9 @@ class CacheSystem {
                                $this->rebuilt[$this->name] = true;
                        } else {
                                // Not removed!
-                               ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_CANNOT_UNLINK_1.$this->inc.CACHE_CANNOT_UNLINK_2);
+                               addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_CANNOT_UNLINK_1.$this->inc.CACHE_CANNOT_UNLINK_2);
                        }
-               } else {
-                       // Does not exist!
-                       ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
-               }
+               } // END - if
        }
 
        // Unused method:
@@ -262,7 +259,7 @@ class CacheSystem {
                        }
                } else {
                        // Cannot write to cache!
-                       ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
+                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
                }
        }
 
@@ -286,7 +283,7 @@ class CacheSystem {
                        } // END - foreach
                } else {
                        // Cannot write array!
-                       ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
+                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
                }
        }
 
@@ -323,7 +320,7 @@ class CacheSystem {
                        } // END - if
                } else {
                        // Cannot write to cache!
-                       ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
+                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
                }
        }
 
@@ -341,7 +338,7 @@ class CacheSystem {
                        //* DEBUG: */ print __METHOD__."(<font color=\"#0000aa\">".__LINE__."</font>): {$this->name} - {$ext_name}={$ext_ver}<br />\n";
                } else {
                        // Cannot create file
-                       ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
+                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
                }
        }
 
@@ -397,22 +394,25 @@ class CacheSystem {
 }
 
 // Destroy the cache on extension changes
-function FILTER_CACHE_DESTROY_ON_EXT_CHANGE () {
+function FILTER_CACHE_DESTROY_ON_EXT_CHANGE ($data) {
        global $cacheInstance;
 
-       // Update cache
+       // Remove cache
        if (EXT_IS_ACTIVE("cache")) {
                if ($cacheInstance->loadCacheFile("config"))     $cacheInstance->destroyCacheFile();
                if ($cacheInstance->loadCacheFile("extensions")) $cacheInstance->destroyCacheFile();
                if ($cacheInstance->loadCacheFile("mod_reg"))    $cacheInstance->destroyCacheFile();
        } // END - if
+
+       // Return it
+       return $data;
 }
 
 // Destroy the cache on changing admin
 function FILTER_CACHE_DESTROY_ON_ADMIN_CHANGE () {
        global $cacheInstance;
 
-       // Update cache
+       // Remove cache
        if (EXT_IS_ACTIVE("cache")) {
                if ($cacheInstance->loadCacheFile("admins")) $cacheInstance->destroyCacheFile();
        } // END - if
@@ -424,15 +424,22 @@ function FILTER_CACHE_DESTROY_ALL () {
 
        // Remove cache
        if (EXT_IS_ACTIVE("cache")) {
-               if ($cacheInstance->loadCacheFile("admins"))     $cacheInstance->destroyCacheFile();
-               if ($cacheInstance->loadCacheFile("config"))     $cacheInstance->destroyCacheFile();
-               if ($cacheInstance->loadCacheFile("extensions")) $cacheInstance->destroyCacheFile();
-               if ($cacheInstance->loadCacheFile("mod_reg"))    $cacheInstance->destroyCacheFile();
-               if ($cacheInstance->loadCacheFile("refdepths"))  $cacheInstance->destroyCacheFile();
-               if ($cacheInstance->loadCacheFile("refsystem"))  $cacheInstance->destroyCacheFile();
-               if ($cacheInstance->loadCacheFile("themes"))     $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("admins"))      $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("admins_acls")) $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("config"))      $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("extensions"))  $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("mod_reg"))     $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("refdepths"))   $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("refsystem"))   $cacheInstance->destroyCacheFile();
+               if ($cacheInstance->loadCacheFile("themes"))      $cacheInstance->destroyCacheFile();
        } // END - if
 }
 
+// Filter for purging entire admin menu cache
+function FILTER_CACHE_PURGE_ADMIN_MENU () {
+       // Just call the function
+       CACHE_PURGE_ADMIN_MENU();
+}
+
 //
 ?>