Fixes for HTML in extension menu SQLs. :(

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

diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php
index 69ce20fef1eecdde14c9a5d0180cdf00a2808831..2d02b62a215d1237d890f16dd0966ff7125f9113 100644 (file)
--- a/inc/classes/cachesystem.class.php
+++ b/inc/classes/cachesystem.class.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/22/2009 *
- * ===============                              Last change: 10/22/2009 *
+ * Mailer v0.2.1-FINAL                                Start: 10/22/2009 *
+ * ===================                          Last change: 10/22/2009 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : cachesystem.class.php                            *
@@ -65,26 +65,14 @@ class CacheSystem {
 
                // Check if path exists
                if (isDirectory(getConfig('CACHE_PATH'))) {
-                       // Make FQFN for dummy file
-                       $FQFN = getConfig('CACHE_PATH') . 'dummy.tmp';
-
-                       // Check if we can create a file inside the path
-                       touch($FQFN, 'w');
-
-                       // Is the file there?
-                       if (isFileReadable($FQFN)) {
-                               // Yes, we can do. So let's remove it
-                               removeFile($FQFN);
-
-                               // Is there a .htaccess file?
-                               if (isFileReadable(getConfig('CACHE_PATH') . '.htaccess')) {
-                                       // All done!
-                                       $this->ret = $this->statusDone;
-                               } else {
-                                       // Stop! Set a .htaccess file first
-                                       $this->ret = 'htaccess';
-                               }
-                       } // END - if
+                       // Is there a .htaccess file?
+                       if (isFileReadable(getConfig('CACHE_PATH') . '.htaccess')) {
+                               // All done!
+                               $this->ret = $this->statusDone;
+                       } else {
+                               // Stop! Set a .htaccess file first
+                               $this->ret = 'htaccess';
+                       }
                } // END - if
        }
 
@@ -154,11 +142,54 @@ class CacheSystem {
                                } elseif (is_array($v)) {
                                        // Serialize and BASE64-encode the array
                                        $v = base64_encode(serialize($v));
+                               } elseif ($this->name == 'config') {
+                                       // Configuration
+                                       $GLOBALS['cache_array']['config'][$data['config']][$k] = $v;
+                               } elseif ($this->name == 'filter') {
+                                       // Filter
+                                       $GLOBALS['cache_array']['filter']['chains'][$data['filter_name']][$data['filter_function']] = $data['filter_active'];
+                                       $GLOBALS['cache_array']['filter']['counter'][$data['filter_name']][$data['filter_function']] = $data['filter_counter'];
+                                       $GLOBALS['cache_array']['filter']['loaded'][$data['filter_name']][$data['filter_function']] = true;
+                               } elseif ($this->name == 'modules') {
+                                       // Modules
+                                       $GLOBALS['cache_array']['modules'][$k][$data['module']] = $v;
+                               } elseif ($this->name == 'admin') {
+                                       // Modules
+                                       if ($k == 'login') {
+                                               $GLOBALS['cache_array']['admin'][$k][$data['admin_id']] = $v;
+                                       } else {
+                                               $GLOBALS['cache_array']['admin'][$k][$data['login']] = $v;
+                                       }
+                               } elseif ($this->name == 'refdepths') {
+                                       // Referal levels
+                                       $GLOBALS['cache_array']['refdepths'][$k][$data['id']] = $v;
+                               } elseif ($this->name == 'refsystem') {
+                                       // Referal system
+                                       $GLOBALS['cache_array']['refsystem'][$k][$data['id']] = $v;
+                               } elseif ($this->name == 'revision') {
+                                       // Revision data
+                                       $GLOBALS['cache_array']['revision'][$k] = $v;
+                               } elseif ($this->name == 'themes') {
+                                       // Themes
+                                       if ($k == 'theme_path') {
+                                               $GLOBALS['cache_array']['themes'][$k][$data['id']] = $v;
+                                       } else {
+                                               $GLOBALS['cache_array']['themes'][$k][$data['theme_path']] = $v;
+                                       }
+                               } else {
+                                       // Finialize the cache and close it
+                                       $this->finalize();
+
+                                       // Remove cache
+                                       $this->removeCacheFile(true);
+
+                                       // Unsupported cache found!
+                                       debug_report_bug('Unsupported cache ' . $this->name . ' detected.');
                                }
 
                                // Write cache line to file
                                fwrite($this->pointer, $this->rewriteEntry($k, $v));
-                       }
+                       } // END - foreach
                } else {
                        // Cannot create file
                        addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".getMessage('CACHE_PROBLEMS_DETECTED'));
@@ -237,7 +268,7 @@ class CacheSystem {
        }
 
        // Destroy an existing cache file
-       function removeCacheFile ($removeArray = false, $force = false) {
+       function removeCacheFile ($force = false) {
                // Reset read status
                $this->resetCacheReadStatus();
 
@@ -251,7 +282,7 @@ class CacheSystem {
                                // Debug message if allowed
                                if (isDebugModeEnabled()) {
                                        // Debug message
-                                       debug_report_bug('Not removing cache ' . $this->name . ' in output_mode=' . getOutputMode());
+                                       logDebugMessage(__METHOD__, __LINE__, 'Not removing cache ' . $this->name . ' in output_mode=' . getOutputMode());
                                } // END - if
 
                                // Abort here
@@ -273,18 +304,6 @@ class CacheSystem {
                        // Reset read status
                        $this->resetCacheReadStatus();
 
-                       // Shall we remove the array from memory?
-                       if ($removeArray === true) {
-                               // Debug message if allowed
-                               if (isDebugModeEnabled()) {
-                                       // Debug message
-                                       logDebugMessage(__METHOD__, __LINE__, 'removing array!');
-                               } // END - if
-
-                               // Remove it from memory
-                               unset($GLOBALS['cache_array'][$this->name]);
-                       } // END - if
-
                        // Is the file there?
                        if (!$this->isCacheReadable()) {
                                // The cache does no longer exist so kill the content
@@ -430,7 +449,7 @@ class CacheSystem {
                                logDebugMessage(__METHOD__, __LINE__, "Cache {$this->name} has missing version entry for extension {$ext_name}! Purging cache...");
 
                                // Remove the cache file
-                               $this->removeCacheFile(false, true);
+                               $this->removeCacheFile(true);
                        }
                } else {
                        // Not installed, does always match
@@ -456,7 +475,7 @@ class CacheSystem {
                // String or non-string? ;-)
                if (is_string($value)) {
                        // String...
-                       $line = '$this->' . $prefix . "['".$this->name."']['" . $key . "']" . $extender . " = '" . smartAddSlashes($value) . "';\n";
+                       $line = '$this->' . $prefix . "['".$this->name."']['" . $key . "']" . $extender . " = '" . escapeQuotes($value) . "';\n";
                } elseif (is_null($value)) {
                        // Null
                        $line = '$this->' . $prefix . "['".$this->name."']['" . $key . "']" . $extender . " = null;\n";