X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fclasses%2Fcachesystem.class.php;h=4c23235ac20812d568c89b9d06066dcd36354f5e;hp=a24402a16709b91893d4b2b4fc00452b70c2a416;hb=70a70cc2bbf8942f89ef092e076289164bae7b4c;hpb=c9179c18d07c42f3d0e11b295b13f7a964225867

diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php
index a24402a167..4c23235ac2 100644
--- 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                            *
@@ -137,7 +137,7 @@ class CacheSystem {
 						$GLOBALS['cache_array']['extension'][$k][$data['ext_name']] = $v;
 					}
 					if (($k == 'ext_keep') && ($v == 'Y')) {
-						$GLOBALS['cache_array']['active_extensions'][$data['ext_name']] = $v;
+						$GLOBALS['cache_array']['always_active'][$data['ext_name']] = $v;
 					} // END - if
 				} elseif (is_array($v)) {
 					// Serialize and BASE64-encode the array
@@ -176,6 +176,9 @@ class CacheSystem {
 					} else {
 						$GLOBALS['cache_array']['themes'][$k][$data['theme_path']] = $v;
 					}
+				} elseif ($this->name == 'imprint') {
+					// Imprint
+					$GLOBALS['cache_array']['imprint'][$k][$data['imprint_id']] = $v;
 				} else {
 					// Finialize the cache and close it
 					$this->finalize();
@@ -231,7 +234,7 @@ class CacheSystem {
 		// Is the cache file there?
 		if ($this->isCacheReadable()) {
 			// Load cache file
-			require($this->fqfn);
+			include($this->fqfn);
 
 			// Is there an array?
 			if (isset($this->data[$this->name])) {
@@ -257,7 +260,7 @@ class CacheSystem {
 		} 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));
+			addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".getMaskedMessage('CACHE_CANNOT_LOAD', $this->fqfn));
 
 			// Try to remove it
 			$this->removeCacheFile();
@@ -312,7 +315,7 @@ class CacheSystem {
 				$this->rebuilt[$this->name] = true;
 			} else {
 				// Not removed!
-				addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".sprintf(getMessage('CACHE_CANNOT_UNLINK'), $this->fqfn));
+				addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".getMaskedMessage('CACHE_CANNOT_UNLINK', $this->fqfn));
 			}
 		} // END - if
 	}
@@ -417,11 +420,11 @@ class CacheSystem {
 				// Get extension version
 				$ext_ver = getExtensionVersion($ext_name);
 
-				// Write cache line to file
-				fwrite($this->pointer, $this->rewriteEntry($ext_name, $ext_ver, 'version', true));
-
 				// Add the extension version to object (DO NOT REMOVE IT! Endless loop...)
 				$this->version[$this->name][$ext_name] = $ext_ver;
+
+				// Write cache line to file
+				fwrite($this->pointer, $this->rewriteEntry($ext_name, $ext_ver, 'version', true));
 			} // END - if
 			//* DEBUG: */ outputHtml(__METHOD__."(<font color=\"#0000aa\">".__LINE__."</font>): {$this->name} - {$ext_name}={$ext_ver}<br />");
 		} else {
@@ -475,7 +478,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";