Fixes for typos and cache problems

[mailer.git] / inc / classes / cachesystem.class.php

diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php
index 61a6fe31458002ceeb7b05dd936df47e39297add..69ce20fef1eecdde14c9a5d0180cdf00a2808831 100644 (file)
--- a/inc/classes/cachesystem.class.php
+++ b/inc/classes/cachesystem.class.php
@@ -101,7 +101,7 @@ class CacheSystem {
                        // Pre-fetch cache here if found
                        if ($this->isCacheReadable()) $this->getArrayFromCache();
 
-                       //* DEBUG: */ print($cacheName.'='.intval($this->isCacheReadable()).'/'.(is_writeable($this->fqfn)).'/'.($this->extensionVersionMatches('cache')).'<br />');
+                       //* DEBUG: */ print($cacheName.'='.intval($this->isCacheReadable()).'/'.intval(is_writeable($this->fqfn)).'/'.intval($this->extensionVersionMatches('cache')).'<br />');
                        $this->status[$cacheName] = ($this->isCacheReadable() && (is_writeable($this->fqfn)) && ($this->extensionVersionMatches('cache')));
                } // END - if
                //* DEBUG: */ print($cacheName.'='.intval($this->status[$cacheName]).'<br />');
@@ -114,9 +114,8 @@ class CacheSystem {
        function init () {
                // This will destory an existing cache file!
                if ($this->ret == $this->statusDone) {
-                       // Mark it as no longer readable
-                       unset($this->readable[$this->name]);
-                       unset($GLOBALS['file_readable'][$this->fqfn]);
+                       // Reset read status
+                       $this->resetCacheReadStatus();
 
                        // Create file
                        if ($this->isCacheReadable()) changeMode($this->fqfn, 0666);
@@ -130,6 +129,13 @@ class CacheSystem {
                }
        }
 
+       // Reset the read status
+       function resetCacheReadStatus () {
+               unset($this->readable[$this->name]);
+               unset($GLOBALS['file_readable'][$this->fqfn]);
+               unset($this->status[$this->name]);
+       }
+
        function addRow ($data) {
                // Is the pointe rvalid?
                if (is_resource($this->pointer)) {
@@ -171,6 +177,9 @@ class CacheSystem {
                        // Close file add destroy handler
                        fclose($this->pointer);
 
+                       // Reset readable status
+                       $this->resetCacheReadStatus();
+
                        // Set rights
                        if ($this->isCacheReadable()) changeMode($this->fqfn, 0666);
 
@@ -216,12 +225,22 @@ class CacheSystem {
                        } // END - if
                } else {
                        // Cache file not found or not readable
+                       debug_report_bug($this->name);
                        addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".sprintf(getMessage('CACHE_CANNOT_LOAD'), $this->fqfn));
+
+                       // Try to remove it
+                       $this->removeCacheFile();
                }
+
+               // Always return an empty array if we have trouble or no data
+               return array();
        }
 
        // Destroy an existing cache file
        function removeCacheFile ($removeArray = false, $force = false) {
+               // Reset read status
+               $this->resetCacheReadStatus();
+
                // Debug message
                /* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, sprintf("%s should be removed.", $this->name));
 
@@ -251,8 +270,8 @@ class CacheSystem {
                        // Remove cache file from system
                        removeFile($this->fqfn);
 
-                       // No longer readable!
-                       unset($this->readable[$this->name]);
+                       // Reset read status
+                       $this->resetCacheReadStatus();
 
                        // Shall we remove the array from memory?
                        if ($removeArray === true) {