Several rewrites/renames, fixes for installation. Resolves #104

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

diff --git a/inc/libs/cache_functions.php b/inc/libs/cache_functions.php
index 121cfc096a79f08c32c6f8b53d09b3ce1b426281..81a695e9cd5a20314562c20f069becaa9d2745e7 100644 (file)
--- a/inc/libs/cache_functions.php
+++ b/inc/libs/cache_functions.php
@@ -44,8 +44,8 @@ class CacheSystem {
        var $path = "";
        var $inc = "";
        var $pointer = false;
-       var $data = "";
-       var $version = "";
+       var $data = array();
+       var $version = array();
        var $name = "";
        var $rebuilt = array();
 
@@ -112,25 +112,24 @@ class CacheSystem {
                        $this->storeExtensionVersion("cache");
                } else {
                        // Cannot create file
-                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
+                       addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
                }
        }
 
        function addRow ($data) {
-               global $cacheArray;
-
+               // Is the pointe rvalid?
                if (is_resource($this->pointer)) {
                        // Write every array element to cache file
                        foreach ($data as $k => $v) {
                                // Write global cache array for immediate access
                                if ((substr($k, 0, 4) == "ext_") && (isset($data['ext_name'])) && (isset($data['ext_id']))) {
                                        if ($k != "ext_name") {
-                                               $cacheArray['extensions'][$k][$data['ext_name']] = $v;
+                                               $GLOBALS['cache_array']['extensions'][$k][$data['ext_name']] = $v;
                                        } else {
-                                               $cacheArray['extensions'][$k][$data['ext_id']] = $v;
+                                               $GLOBALS['cache_array']['extensions'][$k][$data['ext_id']] = $v;
                                        }
                                        if (($k == "ext_keep") && ($v == "Y")) {
-                                               $cacheArray['active_extensions'][$data['ext_name']] = $v;
+                                               $GLOBALS['cache_array']['active_extensions'][$data['ext_name']] = $v;
                                        } // END - if
                                } elseif (is_array($v)) {
                                        // Serialize and BASE64-encode the array
@@ -142,7 +141,7 @@ class CacheSystem {
                        }
                } else {
                        // Cannot create file
-                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
+                       addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
                }
        }
 
@@ -205,7 +204,7 @@ class CacheSystem {
                        }
                } else {
                        // Cache file not found or not readable
-                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_CANNOT_LOAD_1.$this->inc.CACHE_CANNOT_LOAD_2);
+                       addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_CANNOT_LOAD_1.$this->inc.CACHE_CANNOT_LOAD_2);
                }
        }
 
@@ -228,7 +227,7 @@ class CacheSystem {
                                $this->rebuilt[$this->name] = true;
                        } else {
                                // Not removed!
-                               addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_CANNOT_UNLINK_1.$this->inc.CACHE_CANNOT_UNLINK_2);
+                               addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_CANNOT_UNLINK_1.$this->inc.CACHE_CANNOT_UNLINK_2);
                        }
                } // END - if
        }
@@ -259,7 +258,7 @@ class CacheSystem {
                        }
                } else {
                        // Cannot write to cache!
-                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
+                       addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
                }
        }
 
@@ -283,7 +282,7 @@ class CacheSystem {
                        } // END - foreach
                } else {
                        // Cannot write array!
-                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
+                       addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
                }
        }
 
@@ -320,7 +319,7 @@ class CacheSystem {
                        } // END - if
                } else {
                        // Cannot write to cache!
-                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
+                       addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
                }
        }
 
@@ -338,7 +337,7 @@ class CacheSystem {
                        //* DEBUG: */ print __METHOD__."(<font color=\"#0000aa\">".__LINE__."</font>): {$this->name} - {$ext_name}={$ext_ver}<br />\n";
                } else {
                        // Cannot create file
-                       addFatalMessage(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
+                       addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
                }
        }
 
@@ -395,13 +394,11 @@ class CacheSystem {
 
 // Destroy the cache on extension changes
 function FILTER_CACHE_DESTROY_ON_EXT_CHANGE ($data) {
-       global $cacheInstance;
-
        // 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();
+               if ($GLOBALS['cache_instance']->loadCacheFile("config"))     $GLOBALS['cache_instance']->destroyCacheFile();
+               if ($GLOBALS['cache_instance']->loadCacheFile("extensions")) $GLOBALS['cache_instance']->destroyCacheFile();
+               if ($GLOBALS['cache_instance']->loadCacheFile("modreg"))     $GLOBALS['cache_instance']->destroyCacheFile();
        } // END - if
 
        // Return it
@@ -410,28 +407,24 @@ function FILTER_CACHE_DESTROY_ON_EXT_CHANGE ($data) {
 
 // Destroy the cache on changing admin
 function FILTER_CACHE_DESTROY_ON_ADMIN_CHANGE () {
-       global $cacheInstance;
-
        // Remove cache
        if (EXT_IS_ACTIVE("cache")) {
-               if ($cacheInstance->loadCacheFile("admins")) $cacheInstance->destroyCacheFile();
+               if ($GLOBALS['cache_instance']->loadCacheFile("admins")) $GLOBALS['cache_instance']->destroyCacheFile();
        } // END - if
 }
 
 // Destroy all cache files
 function FILTER_CACHE_DESTROY_ALL () {
-       global $cacheInstance;
-
        // Remove cache
        if (EXT_IS_ACTIVE("cache")) {
-               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();
+               if ($GLOBALS['cache_instance']->loadCacheFile("admins"))      $GLOBALS['cache_instance']->destroyCacheFile();
+               if ($GLOBALS['cache_instance']->loadCacheFile("admins_acls")) $GLOBALS['cache_instance']->destroyCacheFile();
+               if ($GLOBALS['cache_instance']->loadCacheFile("config"))      $GLOBALS['cache_instance']->destroyCacheFile();
+               if ($GLOBALS['cache_instance']->loadCacheFile("extensions"))  $GLOBALS['cache_instance']->destroyCacheFile();
+               if ($GLOBALS['cache_instance']->loadCacheFile("modreg"))      $GLOBALS['cache_instance']->destroyCacheFile();
+               if ($GLOBALS['cache_instance']->loadCacheFile("refdepths"))   $GLOBALS['cache_instance']->destroyCacheFile();
+               if ($GLOBALS['cache_instance']->loadCacheFile("refsystem"))   $GLOBALS['cache_instance']->destroyCacheFile();
+               if ($GLOBALS['cache_instance']->loadCacheFile("themes"))      $GLOBALS['cache_instance']->destroyCacheFile();
        } // END - if
 }