X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fcachesystem.class.php;h=bee80767ac0581e642d07d739a122fb64e47f2db;hb=34b1f5b69205b08c760d6dcc87ef6a2d1c291261;hp=ed67f4a32789ad60ce93fc3491e8fd924a2b52d5;hpb=c0e9c79a518fbb3249e4c6f76607a8c361a8a2e7;p=mailer.git

diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php
index ed67f4a327..bee80767ac 100644
--- a/inc/classes/cachesystem.class.php
+++ b/inc/classes/cachesystem.class.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -42,35 +42,48 @@ if (!defined('__SECURITY')) {
 
 // Caching class
 class CacheSystem {
-	// Define variables
-	var $ret = 'init';
+	// Status code
+	var $statusCode = 'init';
+
+	// Full-qualified filename
 	var $fqfn = '';
+
+	// Resource to cache file
 	var $pointer = false;
+
+	// Data array from cache
 	var $data = array();
+
+	// Version data from cache
 	var $version = array();
+
+	// Cache name
 	var $name = '';
 	var $rebuilt = array();
+
+	// File extension
 	var $extension = '.cache';
-	var $statusDone = 'done';
 	var $status = array();
 	var $readable = array();
+	var $fullPath = '';
 
 	// Constructor
 	function CacheSystem () {
-		// Failed is the default
-		$this->ret = 'failed';
+		// Construct full path
+		$this->fullPath = getPath() . getCachePath();
 
-		// Remeber path
+		// Failed is the default
+		$this->setStatusCode('failed');
 
 		// Check if path exists
-		if (isDirectory(getCachePath())) {
+		if (isDirectory($this->fullPath)) {
 			// Is there a .htaccess file?
-			if (isFileReadable(getCachePath() . '.htaccess')) {
+			if (isFileReadable($this->fullPath . '.htaccess')) {
 				// All done!
-				$this->ret = $this->statusDone;
+				$this->setStatusCode('done');
 			} else {
 				// Stop! Set a .htaccess file first
-				$this->ret = 'htaccess';
+				$this->setStatusCode('htaccess');
 			}
 		} // END - if
 	}
@@ -81,7 +94,7 @@ class CacheSystem {
 		$this->name = $cacheName;
 
 		// Construct FQFN (full qualified file name)
-		$this->fqfn = getCachePath() . $cacheName . $this->extension;
+		$this->fqfn = $this->fullPath . $cacheName . $this->extension;
 
 		// Check if file exists and if version matches
 		if (!isset($this->status[$cacheName])) {
@@ -100,7 +113,7 @@ class CacheSystem {
 	// Initializes the cache file
 	function init () {
 		// This will destory an existing cache file!
-		if ($this->ret == $this->statusDone) {
+		if ($this->getStatusCode() == 'done') {
 			// Reset read status
 			$this->resetCacheReadStatus();
 
@@ -201,7 +214,7 @@ class CacheSystem {
 					// Remove cache
 					$this->removeCacheFile(true);
 
-					// Unsupported cache found!
+					// Unsupported/unhandled cache detected
 					debug_report_bug(__METHOD__, __LINE__, 'Unsupported cache ' . $this->name . ' detected.');
 				}
 
@@ -337,7 +350,7 @@ class CacheSystem {
 
 	// Unused method:
 	function removeEntry ($search, $data, $array) {
-		if ($this->status[$this->name] == $this->statusDone) {
+		if ($this->status[$this->name] == 'done') {
 			// Load cache into dummy array
 			$dummy = $this->getArrayFromCache();
 
@@ -371,10 +384,10 @@ class CacheSystem {
 				if (is_array($v)) {
 					// Multi line(s) found
 					$LINE = '';
-					foreach($v as $k2 => $v2) {
+					foreach ($v as $k2 => $v2) {
 						// Put every array element in a row...
 						$LINE .= $this->rewriteEntry($k, $v2);
-					}
+					} // END - foreach
 				} else {
 					// Single line found
 					$LINE = $this->rewriteEntry($k, $v);
@@ -391,7 +404,7 @@ class CacheSystem {
 
 	// Unused method
 	function replaceEntry ($search, $replace, $search_key, $array) {
-		if ($this->status[$this->name] == $this->statusDone) {
+		if ($this->status[$this->name] == 'done') {
 			// Load cache into dummy array
 			$dummy = $this->getArrayFromCache();
 
@@ -465,7 +478,7 @@ class CacheSystem {
 					// Does it match?
 					$GLOBALS[__METHOD__][$ext_name] = ((isset($this->version[$this->name][$ext_name])) && ($this->version[$this->name][$ext_name] == $ext_ver));
 				} elseif ($this->isCacheReadable()) {
-					// No cache version found!
+					// No cache version found
 					logDebugMessage(__METHOD__, __LINE__, 'Cache ' . $this->name . ' has missing version entry for extension ' . $ext_name . '! Purging cache...');
 	
 					// Remove the cache file
@@ -526,9 +539,14 @@ class CacheSystem {
 		return $line;
 	}
 
-	// Getter for cache status
-	function getStatus () {
-		return $this->ret;
+	// Getter for cache status code
+	function getStatusCode () {
+		return $this->statusCode;
+	}
+
+	// Setter for cache status code
+	function setStatusCode ($status) {
+		$this->statusCode = $status;
 	}
 
 	// Checks wether the current cache file is readable