X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fcache_functions.php;h=d5b3639477adb24ff08b65b35794b764c33a3bc3;hb=249af9b67343a73df780d95982ccc32d81e564ab;hp=ba490d57c7a0f22f4cac0937606ae10c3c6e0c80;hpb=7f104f6fe558bb56b4205241435a2357c2feece1;p=mailer.git

diff --git a/inc/libs/cache_functions.php b/inc/libs/cache_functions.php
index ba490d57c7..d5b3639477 100644
--- a/inc/libs/cache_functions.php
+++ b/inc/libs/cache_functions.php
@@ -49,6 +49,7 @@ class mxchange_cache
 	var $cache_pointer = false;
 	var $cache_data = "";
 	var $cache_version = "";
+	var $cache_file = "";
 
 	// Constructor
 	function mxchange_cache($interval, $path, $tested) {
@@ -64,10 +65,10 @@ class mxchange_cache
 		// Check if path exists
 		if ((is_dir($path)) && (!$tested)) {
 			// Check if we can create a file inside the path
-			@touch($path."dummy.tmp", 'w');
+			touch($path."dummy.tmp", 'w');
 			if (FILE_READABLE($path."dummy.tmp")) {
 				// Yes, we can do. So let's remove it
-				@unlink($path."dummy.tmp");
+				unlink($path."dummy.tmp");
 
 				// Is there a .htaccess file?
 				if (FILE_READABLE($path.".htaccess")) {
@@ -87,8 +88,11 @@ class mxchange_cache
 		}
 	}
 
-	function cache_file($file, $ignore_ctime=false) {
-		global $INC;
+	// Checks validity of cache file and if content is given
+	function cache_file ($file, $forceContent = false) {
+		// Remember cache file
+		$this->cache_file = $file;
+
 		// Construct FQFN (full qualified file name)
 		$inc = $this->cache_path.$file.".cache";
 
@@ -109,9 +113,12 @@ class mxchange_cache
 		$this->cache_ctime = $ctime;
 
 		// Is the cache file outdated?
-		if (((time() - $ctime) >= $this->update_interval) && (!$ignore_ctime)) {
+		if (($status) && ((time() - $ctime) >= $this->update_interval)) {
 			// Ok, we need an update!
 			$status = false;
+		} elseif ($status) {
+			// Check on 'cache' extension
+			$status = $this->ext_version_matches("cache");
 		}
 
 		// Return status
@@ -122,14 +129,14 @@ class mxchange_cache
 		// This will destory an existing cache file!
 		if ($this->ret == "done") {
 			// Create file
-			if (FILE_READABLE($this->cache_inc)) @chmod($this->cache_inc, 0666);
-			$fp = @fopen($this->cache_inc, 'w') or mxchange_die("Cannot write to cache ".$this->cache_inc." !");
+			if (FILE_READABLE($this->cache_inc)) chmod($this->cache_inc, 0666);
+			$this->cache_pointer = fopen($this->cache_inc, 'w') or mxchange_die("Cannot write to cache ".$this->cache_inc." !");
 
 			// Begin of cache file
-			fwrite($fp, "\$ARRAY = \"".$array."\";\n\n");
+			fwrite($this->cache_pointer, "<?php\n\$ARRAY = \"".$array."\";\n\n");
 
-			// Remember file pointer
-			$this->cache_pointer = $fp;
+			// Add default depency
+			$this->store_extension_version("cache");
 		} else {
 			// Cannot create file
 			ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
@@ -158,7 +165,7 @@ class mxchange_cache
 				}
 
 				// Write cache line to file
-				@fwrite($this->cache_pointer, $this->add_raw_row($k, $v));
+				fwrite($this->cache_pointer, $this->add_raw_row($k, $v));
 			}
 		} else {
 			// Cannot create file
@@ -166,29 +173,34 @@ class mxchange_cache
 		}
 	}
 
-	function cache_close()
-	{
+	function cache_close() {
 		// Quit function when no pointer is set
 		if (empty($this->cache_pointer)) return;
-		if ($this->cache_pointer)
-		{
+		if (is_resource($this->cache_pointer)) {
+			// Write footer
+			fwrite($this->cache_pointer, "?>\n");
+
 			// Close file add destroy handler
-			@fclose($this->cache_pointer);
+			fclose($this->cache_pointer);
 
 			// Set rights
-			if (FILE_READABLE($this->cache_inc)) @chmod($this->cache_inc, 0666);
+			if (FILE_READABLE($this->cache_inc)) chmod($this->cache_inc, 0666);
 
 			// Remove pointer
 			unset($this->cache_pointer);
-		}
-		else
-		{
+		} else {
 			// Cannot create file
 			ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
 		}
 	}
 
 	function cache_load() {
+		// Is the cache already loaded?
+		if (isset($this->cache_data[$this->cache_file])) {
+			// Return it's content!
+			return $this->cache_data[$this->cache_file];
+		} // END - if
+
 		// Is the cache file there?
 		if (FILE_READABLE($this->cache_inc)) {
 			// Prepare temporary array
@@ -196,23 +208,27 @@ class mxchange_cache
 			$cache_version = null;
 
 			// Load cache file
-			$this->cache_data = implode("", file($this->cache_inc));
-
-			// Execute cache file
-			eval($this->cache_data);
+			require_once($this->cache_inc);
 
+			// Is there an array?
 			if (is_array($data)) {
 				// Cache data
-				$this->cache_data = $data;
+				$this->cache_data[$this->cache_file] = $data;
 
 				// Cache version found?
-				if ((isset($cache_version)) && (is_array($cache_version))) {
+				if ((is_array($cache_version)) && (count($cache_version) > 0)) {
 					// Remember it as well...
-					$this->cache_version = $cache_version;
-				} // END - if
+					$this->cache_version[$this->cache_file] = $cache_version;
+				} else {
+					// Invalid cache so destroy it
+					$this->cache_destroy();
+
+					// Clear cached data
+					$this->cache_data[$this->cache_file] = array();
+				}
 
 				// Return cache
-				return $this->cache_data;
+				return $this->cache_data[$this->cache_file];
 			} else {
 				// Cache problem detected!
 				$this->cache_destroy();
@@ -228,7 +244,7 @@ class mxchange_cache
 		// Is the cache file there?
 		if (FILE_READABLE($this->cache_inc)) {
 			// Remove cache file from system
-			@unlink($this->cache_inc);
+			unlink($this->cache_inc);
 			if (!FILE_READABLE($this->cache_inc)) {
 				// Close cache automatically (we don't need it anymore!)
 				$this->cache_close();
@@ -242,8 +258,7 @@ class mxchange_cache
 		}
 	}
 
-	function cache_remove($search, $data, $array)
-	{
+	function cache_remove($search, $data, $array) {
 		global $ARRAY;
 		if ((FILE_READABLE($this->cache_inc)) && (is_writeable($this->cache_inc))) {
 			// Load cache into dummy array
@@ -259,27 +274,13 @@ class mxchange_cache
 				}
 
 				// Flush array to cache file
-				$fp = fopen($this->cache_inc, 'w');
-				fwrite($fp, "\$ARRAY = \"".$ARRAY."\";\n");
-				foreach ($dummy as $k => $v) {
-					if (is_array($v)) {
-						// Multi line(s) found
-						$LINE = "";
-						foreach($v as $k2 => $v2) {
-							// Put every array element in a row...
-							$LINE .= $this->add_raw_row($k, $v2);
-						}
-					} else {
-						// Single line found
-						$LINE = $this->add_raw_row($k, $v);
-					}
+				$this->cache_init($ARRAY);
 
-					// Write line(s)
-					fwrite($fp, $LINE);
-				}
+				// Write array out
+				$this->cache_write_array($dummy);
 
 				// Close cache file
-				fclose($fp);
+				$this->cache_close();
 			}
 		} else {
 			// Cannot write to cache!
@@ -287,11 +288,33 @@ class mxchange_cache
 		}
 	}
 
-	function cache_replace($search, $replace, $search_key, $array)
-	{
+	function cache_write_array ($array) {
+		if (is_resource($this->cache_pointer)) {
+			foreach ($array as $k => $v) {
+				if (is_array($v)) {
+					// Multi line(s) found
+					$LINE = "";
+					foreach($v as $k2 => $v2) {
+						// Put every array element in a row...
+						$LINE .= $this->add_raw_row($k, $v2);
+					}
+				} else {
+					// Single line found
+					$LINE = $this->add_raw_row($k, $v);
+				}
+
+				// Write line(s)
+				fwrite($this->cache_pointer, $LINE);
+			} // END - foreach
+		} else {
+			// Cannot write array!
+			ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
+		}
+	}
+
+	function cache_replace($search, $replace, $search_key, $array) {
 		global $ARRAY;
-		if ((FILE_READABLE($this->cache_inc)) && (is_writeable($this->cache_inc)))
-		{
+		if ((FILE_READABLE($this->cache_inc)) && (is_writeable($this->cache_inc))) {
 			// Load cache into dummy array
 			$dummy = $this->cache_load();
 
@@ -311,27 +334,13 @@ class mxchange_cache
 					}
 
 					// Flush array to cache file
-					$fp = fopen($this->cache_inc, 'w');
-					fwrite($fp, "\$dummy = \"".$ARRAY."\";\n");
-					foreach ($dummy as $k => $v) {
-						if (is_array($v)) {
-							// Multi line(s) found
-							$LINE = "";
-							foreach($v as $k2 => $v2) {
-								// Put every array element in a row...
-								$LINE .= $this->add_raw_row($k, $v2);
-							}
-						} else {
-							// Single line found
-							$LINE = $this->add_raw_row($k, $v);
-						}
+					$this->cache_init($ARRAY);
 
-						// Write line(s)
-						fwrite($fp, $LINE);
-					}
+					// Write array out
+					$this->cache_write_array($dummy);
 
 					// Close cache file
-					fclose($fp);
+					$this->cache_close();
 				}
 			}
 		} else {
@@ -347,7 +356,7 @@ class mxchange_cache
 			$ext_ver = GET_EXT_VERSION($ext_name);
 
 			// Write cache line to file
-			@fwrite($this->cache_pointer, "\$cache_version['".$ext_name."'] = \"".$ext_ver."\";\n");
+			fwrite($this->cache_pointer, "\$cache_version['".$ext_name."'] = \"".$ext_ver."\";\n");
 		} else {
 			// Cannot create file
 			ADD_FATAL(__FILE__."(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_PROBLEMS_DETECTED);
@@ -361,9 +370,8 @@ class mxchange_cache
 		// Get extension version
 		$ext_ver = GET_EXT_VERSION($ext_name);
 
-		//* DEBUG: */ echo __METHOD__.": ext_name={$ext_name},ext_ver={$ext_ver},cache_version={$this->cache_version}<br />\n";
 		// Compare both
-		return ((isset($this->cache_version[$ext_name])) && ($this->cache_version[$ext_name] == $ext_ver));
+		return ((isset($this->cache_version[$this->cache_file][$ext_name])) && ($this->cache_version[$this->cache_file][$ext_name] == $ext_ver));
 	}
 
 	function add_raw_row ($key, $value) {
@@ -371,7 +379,7 @@ class mxchange_cache
 		$line = "";
 
 		// String or non-string? ;-)
-		if (is_string($value)) {
+		if ((is_string($value)) || (is_null($value))) {
 			// String...
 			$line = "\$data['".$key."'][] = \"".$value."\";\n";
 		} else {