X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fcachesystem.class.php;h=41a5cdb3b7d0a44a7f733dc63d5579edaa13a2e1;hb=b1f1d6878ad781f5be5c8e2e4c0e5b2def3a0c0d;hp=929b8cbb7d82906fb8de55f7e1256bf1d6c47374;hpb=cb0ddf186efd5b223638476e74cffb2d3c415407;p=mailer.git

diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php
index 929b8cbb7d..41a5cdb3b7 100644
--- a/inc/classes/cachesystem.class.php
+++ b/inc/classes/cachesystem.class.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -65,9 +63,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,7 +81,7 @@ 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])) {
@@ -152,11 +150,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
@@ -277,16 +275,16 @@ class CacheSystem {
 		$this->resetCacheReadStatus();
 
 		// Debug message
-		/* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, sprintf("%s should be removed.", $this->name));
+		//* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, sprintf("%s should be removed.", $this->name));
 
 		// 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
@@ -452,7 +450,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);