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

diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php
index a24402a167..5a606fb93e 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                            *
@@ -113,7 +113,7 @@ class CacheSystem {
 			fwrite($this->pointer, "<?php\n");
 		} else {
 			// Cannot create file
-			addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".getMessage('CACHE_PROBLEMS_DETECTED'));
+			addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
 		}
 	}
 
@@ -137,11 +137,8 @@ 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
-					$v = base64_encode(serialize($v));
 				} elseif ($this->name == 'config') {
 					// Configuration
 					$GLOBALS['cache_array']['config'][$data['config']][$k] = $v;
@@ -168,7 +165,7 @@ class CacheSystem {
 					$GLOBALS['cache_array']['refsystem'][$k][$data['id']] = $v;
 				} elseif ($this->name == 'revision') {
 					// Revision data
-					$GLOBALS['cache_array']['revision'][$k] = $v;
+					$GLOBALS['cache_array']['revision'][$k][0] = $v;
 				} elseif ($this->name == 'themes') {
 					// Themes
 					if ($k == 'theme_path') {
@@ -176,6 +173,12 @@ 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;
+				} elseif (is_array($v)) {
+					// Serialize and BASE64-encode the array
+					$v = base64_encode(serialize($v));
 				} else {
 					// Finialize the cache and close it
 					$this->finalize();
@@ -192,7 +195,7 @@ class CacheSystem {
 			} // END - foreach
 		} else {
 			// Cannot create file
-			addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".getMessage('CACHE_PROBLEMS_DETECTED'));
+			addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
 		}
 	}
 
@@ -217,7 +220,7 @@ class CacheSystem {
 			// Remove pointer and status
 			unset($this->status[$this->name]);
 			$this->pointer = false;
-			//* DEBUG: */ outputHtml(__METHOD__."(<font color=\"#0000aa\">".__LINE__."</font>): {$this->name} - FINALIZED!<br />");
+			//* DEBUG: */ outputHtml(__METHOD__ . '(<font color="#0000aa">' . __LINE__."</font>): {$this->name} - FINALIZED!<br />");
 		} // END - if
 	}
 
@@ -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
 	}
@@ -343,7 +346,7 @@ class CacheSystem {
 			}
 		} else {
 			// Cannot write to cache!
-			addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".getMessage('CACHE_PROBLEMS_DETECTED'));
+			addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
 		}
 	}
 
@@ -367,7 +370,7 @@ class CacheSystem {
 			} // END - foreach
 		} else {
 			// Cannot write array!
-			addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".getMessage('CACHE_PROBLEMS_DETECTED'));
+			addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
 		}
 	}
 
@@ -404,7 +407,7 @@ class CacheSystem {
 			} // END - if
 		} else {
 			// Cannot write to cache!
-			addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".getMessage('CACHE_PROBLEMS_DETECTED'));
+			addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
 		}
 	}
 
@@ -417,16 +420,16 @@ 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 />");
+			//* DEBUG: */ outputHtml(__METHOD__ . '(<font color="#0000aa">' . __LINE__."</font>): {$this->name} - {$ext_name}={$ext_ver}<br />");
 		} else {
 			// Cannot create file
-			addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".getMessage('CACHE_PROBLEMS_DETECTED'));
+			addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
 		}
 	}
 
@@ -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";
@@ -488,6 +491,9 @@ class CacheSystem {
 				// False
 				$line = '$this->' . $prefix . "['".$this->name."']['" . $key . "']" . $extender . " = false;\n";
 			}
+		} elseif (isset($value[0])) {
+			// These lines needs fixing
+			debug_report_bug('Invalid entry with [0] found. key=' . $key);
 		} else {
 			// Non-string
 			$line = '$this->' . $prefix . "['".$this->name."']['" . $key . "']" . $extender . " = " . $value . ";\n";