X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclasses%2Fcachesystem.class.php;h=41a5cdb3b7d0a44a7f733dc63d5579edaa13a2e1;hb=b1f1d6878ad781f5be5c8e2e4c0e5b2def3a0c0d;hp=f160a6cfdbcede2062f8ce21fe3a14fa40db0858;hpb=cb20090aa0558f1b74f0e9f925f29819e8bb3a45;p=mailer.git
diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php
index f160a6cfdb..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,17 +81,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')).'
');
+ //* 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]).'
');
+ //* DEBUG: */ debugOutput('cacheName='.$cacheName.',status='.intval($this->status[$cacheName]));
// Return status
return $this->status[$cacheName];
@@ -108,13 +106,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, "' . __LINE__ . '): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
+ addFatalMessage(__METHOD__, __LINE__, '(' . __LINE__ . '): {--CACHE_PROBLEMS_DETECTED');
}
}
@@ -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
@@ -188,7 +186,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 +194,7 @@ class CacheSystem {
} // END - foreach
} else {
// Cannot create file
- addFatalMessage(__METHOD__, __LINE__, '(' . __LINE__ . '): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
+ addFatalMessage(__METHOD__, __LINE__, '(' . __LINE__ . '): {--CACHE_PROBLEMS_DETECTED');
}
}
@@ -221,7 +219,7 @@ class CacheSystem {
// Remove pointer and status
unset($this->status[$this->name]);
$this->pointer = false;
- //* DEBUG: */ outputHtml(__METHOD__ . '(' . __LINE__."): {$this->name} - FINALIZED!
");
+ //* DEBUG: */ debugOutput(__METHOD__ . '(' . __LINE__.'): '.$this->name.' - FINALIZED!');
} // END - if
}
@@ -260,7 +258,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__, '(' . __LINE__ . '): ' . getMaskedMessage('CACHE_CANNOT_LOAD', $this->fqfn));
// Try to remove it
@@ -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
@@ -347,7 +345,7 @@ class CacheSystem {
}
} else {
// Cannot write to cache!
- addFatalMessage(__METHOD__, __LINE__, '(' . __LINE__ . '): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
+ addFatalMessage(__METHOD__, __LINE__, '(' . __LINE__ . '): {--CACHE_PROBLEMS_DETECTED');
}
}
@@ -371,7 +369,7 @@ class CacheSystem {
} // END - foreach
} else {
// Cannot write array!
- addFatalMessage(__METHOD__, __LINE__, '(' . __LINE__ . '): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
+ addFatalMessage(__METHOD__, __LINE__, '(' . __LINE__ . '): {--CACHE_PROBLEMS_DETECTED');
}
}
@@ -408,7 +406,7 @@ class CacheSystem {
} // END - if
} else {
// Cannot write to cache!
- addFatalMessage(__METHOD__, __LINE__, '(' . __LINE__ . '): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
+ addFatalMessage(__METHOD__, __LINE__, '(' . __LINE__ . '): {--CACHE_PROBLEMS_DETECTED');
}
}
@@ -427,41 +425,47 @@ class CacheSystem {
// Write cache line to file
fwrite($this->pointer, $this->rewriteEntry($ext_name, $ext_ver, 'version', true));
} // END - if
- //* DEBUG: */ outputHtml(__METHOD__ . '(' . __LINE__."): {$this->name} - {$ext_name}={$ext_ver}
");
+ //* DEBUG: */ debugOutput(__METHOD__ . '(' . __LINE__ . '): '.$this->name.' - '.$ext_name.'='.$ext_ver);
} else {
// Cannot create file
- addFatalMessage(__METHOD__, __LINE__, '(' . __LINE__ . '): ' . getMessage('CACHE_PROBLEMS_DETECTED'));
+ addFatalMessage(__METHOD__, __LINE__, '(' . __LINE__ . '): {--CACHE_PROBLEMS_DETECTED');
}
}
// Checks wether versions from cache and extension matches
function extensionVersionMatches ($ext_name) {
- // Default is not matching
- $matches = false;
-
- // Compare only if installed
- if (isExtensionInstalled($ext_name)) {
- // Get extension version
- $ext_ver = getExtensionVersion($ext_name);
-
- // Debug messages
- if (isset($this->version[$this->name][$ext_name])) {
- // Does it match?
- $matches = ((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...");
-
- // Remove the cache file
- $this->removeCacheFile(true);
+ // Check cache
+ if (!isset($GLOBALS[__METHOD__][$ext_name])) {
+ // Does never match by default
+ $GLOBALS[__METHOD__][$ext_name] = false;
+
+ // Compare only if installed
+ if (isExtensionInstalled($ext_name)) {
+ // Get extension version
+ $ext_ver = getExtensionVersion($ext_name);
+
+ // Debug messages
+ if (isset($this->version[$this->name][$ext_name])) {
+ // 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!
+ logDebugMessage(__METHOD__, __LINE__, 'Cache ' . $this->name . ' has missing version entry for extension ' . $ext_name . '! Purging cache...');
+
+ // Remove the cache file
+ $this->removeCacheFile(true);
+ }
+ } else {
+ // Not installed, does always match
+ $GLOBALS[__METHOD__][$ext_name] = true;
}
} else {
- // Not installed, does always match
- $matches = true;
+ // Cache entry found, log debug message
+ //* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, 'ext_name=' . $ext_name . ', matches=' . intval($GLOBALS[__METHOD__][$ext_name]));
}
// Compare both
- return $matches;
+ return $GLOBALS[__METHOD__][$ext_name];
}
// Rewrit the entry so it can be stored in cache file
@@ -479,25 +483,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