X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fcachesystem.class.php;h=b3d9154c8cbc22716283aafed81e83ca4b96555b;hb=8fba2c387c8d589a4dd63ae1f1fc3ca8de8c95ed;hp=1c3950bbd0964ca75c3cc98c5a44888bc40d3677;hpb=6facc4166f2c190c28656fce5d10f171187b312f;p=mailer.git

diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php
index 1c3950bbd0..b3d9154c8c 100644
--- a/inc/classes/cachesystem.class.php
+++ b/inc/classes/cachesystem.class.php
@@ -65,9 +65,9 @@ class CacheSystem {
 		// Remeber path
 
 		// Check if path exists
-		if (isDirectory(getConfig('CACHE_PATH'))) {
+		if (isDirectory(getCachePath())) {
 			// Is there a .htaccess file?
-			if (isFileReadable(getConfig('CACHE_PATH') . '.htaccess')) {
+			if (isFileReadable(getCachePath() . '.htaccess')) {
 				// All done!
 				$this->ret = $this->statusDone;
 			} else {
@@ -83,17 +83,17 @@ class CacheSystem {
 		$this->name = $cacheName;
 
 		// Construct FQFN (full qualified file name)
-		$this->fqfn = getConfig('CACHE_PATH') . $cacheName . $this->extension;
+		$this->fqfn = getCachePath() . $cacheName . $this->extension;
 
 		// Check if file exists and if version matches
 		if (!isset($this->status[$cacheName])) {
 			// Pre-fetch cache here if found
 			if ($this->isCacheReadable()) $this->getArrayFromCache();
 
-			//* DEBUG: */ print($cacheName.'='.intval($this->isCacheReadable()).'/'.intval(is_writeable($this->fqfn)).'/'.intval($this->extensionVersionMatches('cache')).'<br />');
+			//* DEBUG: */ debugOutput('cacheName='.$cacheName.',isCacheReadable='.intval($this->isCacheReadable()).',is_writeable='.intval(is_writeable($this->fqfn)).',extensionMatches='.intval($this->extensionVersionMatches('cache')));
 			$this->status[$cacheName] = ($this->isCacheReadable() && (is_writeable($this->fqfn)) && ($this->extensionVersionMatches('cache')));
 		} // END - if
-		//* DEBUG: */ print($cacheName.'='.intval($this->status[$cacheName]).'<br />');
+		//* DEBUG: */ debugOutput('cacheName='.$cacheName.',status='.intval($this->status[$cacheName]));
 
 		// Return status
 		return $this->status[$cacheName];
@@ -108,13 +108,13 @@ class CacheSystem {
 
 			// Create file
 			if ($this->isCacheReadable()) changeMode($this->fqfn, 0666);
-			$this->pointer = fopen($this->fqfn, 'w') or app_die(__METHOD__, __LINE__, "Cannot write to cache ".$this->fqfn." !");
+			$this->pointer = fopen($this->fqfn, 'w') or debug_report_bug(__METHOD__, __LINE__, 'Cannot write to cache ' . $this->fqfn . ' !');
 
 			// Add open PHP tag
 			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>): {--CACHE_PROBLEMS_DETECTED');
 		}
 	}
 
@@ -152,11 +152,11 @@ class CacheSystem {
 					// 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 {
+					// Admin logins
+					if ($k == 'admin_id') {
 						$GLOBALS['cache_array']['admin'][$k][$data['login']] = $v;
+					} else {
+						$GLOBALS['cache_array']['admin'][$k][$data['admin_id']] = $v;
 					}
 				} elseif ($this->name == 'refdepths') {
 					// Referal levels
@@ -188,7 +188,7 @@ class CacheSystem {
 					$this->removeCacheFile(true);
 
 					// Unsupported cache found!
-					debug_report_bug('Unsupported cache ' . $this->name . ' detected.');
+					debug_report_bug(__METHOD__, __LINE__, 'Unsupported cache ' . $this->name . ' detected.');
 				}
 
 				// Write cache line to file
@@ -196,7 +196,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>): {--CACHE_PROBLEMS_DETECTED');
 		}
 	}
 
@@ -221,7 +221,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: */ debugOutput(__METHOD__ . '(<font color="#0000aa">' . __LINE__.'</font>): '.$this->name.' - FINALIZED!');
 		} // END - if
 	}
 
@@ -260,7 +260,7 @@ class CacheSystem {
 			} // END - if
 		} else {
 			// Cache file not found or not readable
-			debug_report_bug($this->name);
+			debug_report_bug(__METHOD__, __LINE__, $this->name);
 			addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMaskedMessage('CACHE_CANNOT_LOAD', $this->fqfn));
 
 			// Try to remove it
@@ -282,11 +282,11 @@ class CacheSystem {
 		// Is the cache file not yet rebuilt?
 		if ((!isset($this->rebuilt[$this->name])) && ($this->isCacheReadable())) {
 			// Only run in regular output mode
-			if ((getOutputMode() != 0) && ($force === false)) {
+			if ((!isHtmlOutputMode()) && ($force === false)) {
 				// Debug message if allowed
 				if (isDebugModeEnabled()) {
 					// Debug message
-					logDebugMessage(__METHOD__, __LINE__, 'Not removing cache ' . $this->name . ' in output_mode=' . getOutputMode());
+					logDebugMessage(__METHOD__, __LINE__, 'Not removing cache ' . $this->name . ' in output_mode=' . getScriptOutputMode());
 				} // END - if
 
 				// Abort here
@@ -347,7 +347,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>): {--CACHE_PROBLEMS_DETECTED');
 		}
 	}
 
@@ -371,7 +371,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>): {--CACHE_PROBLEMS_DETECTED');
 		}
 	}
 
@@ -408,7 +408,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>): {--CACHE_PROBLEMS_DETECTED');
 		}
 	}
 
@@ -427,10 +427,10 @@ class CacheSystem {
 				// 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: */ debugOutput(__METHOD__ . '(<font color="#0000aa">' . __LINE__ . '</font>): '.$this->name.' - '.$ext_name.'='.$ext_ver);
 		} else {
 			// Cannot create file
-			addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
+			addFatalMessage(__METHOD__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): {--CACHE_PROBLEMS_DETECTED');
 		}
 	}
 
@@ -452,7 +452,7 @@ class CacheSystem {
 					$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!
-					logDebugMessage(__METHOD__, __LINE__, "Cache {$this->name} has missing version entry for extension {$ext_name}! Purging cache...");
+					logDebugMessage(__METHOD__, __LINE__, 'Cache ' . $this->name . ' has missing version entry for extension ' . $ext_name . '! Purging cache...');
 	
 					// Remove the cache file
 					$this->removeCacheFile(true);
@@ -485,25 +485,25 @@ class CacheSystem {
 		// String or non-string? ;-)
 		if (is_string($value)) {
 			// String...
-			$line = '$this->' . $prefix . "['".$this->name."']['" . $key . "']" . $extender . " = '" . escapeQuotes($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";
+			$line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . " = null;\n";
 		} elseif (is_bool($value)) {
 			// Boolean value
 			if ($value === true) {
 				// True
-				$line = '$this->' . $prefix . "['".$this->name."']['" . $key . "']" . $extender . " = true;\n";
+				$line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . " = true;\n";
 			} else {
 				// False
-				$line = '$this->' . $prefix . "['".$this->name."']['" . $key . "']" . $extender . " = false;\n";
+				$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);
+			debug_report_bug(__METHOD__, __LINE__, 'Invalid entry with [0] found. key=' . $key);
 		} else {
 			// Non-string
-			$line = '$this->' . $prefix . "['".$this->name."']['" . $key . "']" . $extender . " = " . $value . ";\n";
+			$line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . ' = ' . $value . ";\n";
 		}
 
 		// Return line