X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fcachesystem.class.php;h=ed67f4a32789ad60ce93fc3491e8fd924a2b52d5;hb=c0e9c79a518fbb3249e4c6f76607a8c361a8a2e7;hp=61a6fe31458002ceeb7b05dd936df47e39297add;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git
diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php
index 61a6fe3145..ed67f4a327 100644
--- a/inc/classes/cachesystem.class.php
+++ b/inc/classes/cachesystem.class.php
@@ -1,7 +1,7 @@
ret = $this->statusDone;
- } else {
- // Stop! Set a .htaccess file first
- $this->ret = 'htaccess';
- }
- } // END - if
+ if (isDirectory(getCachePath())) {
+ // Is there a .htaccess file?
+ if (isFileReadable(getCachePath() . '.htaccess')) {
+ // All done!
+ $this->ret = $this->statusDone;
+ } else {
+ // Stop! Set a .htaccess file first
+ $this->ret = 'htaccess';
+ }
} // END - if
}
@@ -94,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()).'/'.(is_writeable($this->fqfn)).'/'.($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];
@@ -114,22 +101,44 @@ class CacheSystem {
function init () {
// This will destory an existing cache file!
if ($this->ret == $this->statusDone) {
- // Mark it as no longer readable
- unset($this->readable[$this->name]);
- unset($GLOBALS['file_readable'][$this->fqfn]);
+ // Reset read status
+ $this->resetCacheReadStatus();
// 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, "writeLine('".__LINE__."): ".getMessage('CACHE_PROBLEMS_DETECTED'));
+ addFatalMessage(__METHOD__, __LINE__, '(' . __LINE__ . '): {--CACHE_PROBLEMS_DETECTED');
+ }
+ }
+
+ /**
+ * Writes a line to the pointer and adds a \n (new-line) to the end
+ *
+ * @access private
+ */
+ function writeLine ($line) {
+ // Is the pointer a valid resource?
+ if (is_resource($this->pointer)) {
+ // Write the line
+ fwrite($this->pointer, $line . "\n");
+ } else {
+ // Something bad happened
+ debug_report_bug(__METHOD__, __LINE__, 'Pointer type is ' . gettype($this->pointer) . ', expected is resource.');
}
}
+ // Reset the read status
+ function resetCacheReadStatus () {
+ unset($this->readable[$this->name]);
+ unset($GLOBALS['file_readable'][$this->fqfn]);
+ unset($this->status[$this->name]);
+ }
+
function addRow ($data) {
// Is the pointe rvalid?
if (is_resource($this->pointer)) {
@@ -143,19 +152,65 @@ class CacheSystem {
$GLOBALS['cache_array']['extension'][$k][$data['ext_name']] = $v;
}
if (($k == 'ext_keep') && ($v == 'Y')) {
- $GLOBALS['cache_array']['active_extensions'][$data['ext_name']] = $v;
+ $GLOBALS['cache_array']['always_active'][$data['ext_name']] = $v;
} // END - if
+ } elseif ($this->name == 'config') {
+ // Configuration
+ $GLOBALS['cache_array']['config'][$data['config']][$k] = $v;
+ } elseif ($this->name == 'filter') {
+ // Filter
+ $GLOBALS['cache_array']['filter']['chains'][$data['filter_name']][$data['filter_function']] = $data['filter_active'];
+ $GLOBALS['cache_array']['filter']['counter'][$data['filter_name']][$data['filter_function']] = $data['filter_counter'];
+ $GLOBALS['cache_array']['filter']['loaded'][$data['filter_name']][$data['filter_function']] = true;
+ } elseif ($this->name == 'modules') {
+ // Modules
+ $GLOBALS['cache_array']['modules'][$k][$data['module']] = $v;
+ } elseif ($this->name == 'admin') {
+ // 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
+ $GLOBALS['cache_array']['refdepths'][$k][$data['id']] = $v;
+ } elseif ($this->name == 'refsystem') {
+ // Referal system
+ $GLOBALS['cache_array']['refsystem'][$k][$data['id']] = $v;
+ } elseif ($this->name == 'revision') {
+ // Revision data
+ $GLOBALS['cache_array']['revision'][$k][0] = $v;
+ } elseif ($this->name == 'themes') {
+ // Themes
+ if ($k == 'theme_path') {
+ $GLOBALS['cache_array']['themes'][$k][$data['id']] = $v;
+ } else {
+ $GLOBALS['cache_array']['themes'][$k][$data['theme_path']] = $v;
+ }
+ } elseif ($this->name == 'imprint') {
+ // Imprint
+ $GLOBALS['cache_array']['imprint'][$k][$data['imprint_id']] = $v;
} elseif (is_array($v)) {
// Serialize and BASE64-encode the array
$v = base64_encode(serialize($v));
+ } else {
+ // Finialize the cache and close it
+ $this->finalize();
+
+ // Remove cache
+ $this->removeCacheFile(true);
+
+ // Unsupported cache found!
+ debug_report_bug(__METHOD__, __LINE__, 'Unsupported cache ' . $this->name . ' detected.');
}
// Write cache line to file
- fwrite($this->pointer, $this->rewriteEntry($k, $v));
- }
+ $this->writeLine($this->rewriteEntry($k, $v));
+ } // END - foreach
} else {
// Cannot create file
- addFatalMessage(__METHOD__, __LINE__, "(".__LINE__."): ".getMessage('CACHE_PROBLEMS_DETECTED'));
+ addFatalMessage(__METHOD__, __LINE__, '(' . __LINE__ . '): {--CACHE_PROBLEMS_DETECTED');
}
}
@@ -166,18 +221,21 @@ class CacheSystem {
$this->storeExtensionVersion('cache');
// Write footer
- fwrite($this->pointer, "?>\n");
+ $this->writeLine('?>');
// Close file add destroy handler
fclose($this->pointer);
+ // Reset readable status
+ $this->resetCacheReadStatus();
+
// Set rights
if ($this->isCacheReadable()) changeMode($this->fqfn, 0666);
// 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
}
@@ -191,7 +249,7 @@ class CacheSystem {
// Is the cache file there?
if ($this->isCacheReadable()) {
// Load cache file
- require($this->fqfn);
+ include($this->fqfn);
// Is there an array?
if (isset($this->data[$this->name])) {
@@ -216,23 +274,33 @@ class CacheSystem {
} // END - if
} else {
// Cache file not found or not readable
- addFatalMessage(__METHOD__, __LINE__, "(".__LINE__."): ".sprintf(getMessage('CACHE_CANNOT_LOAD'), $this->fqfn));
+ debug_report_bug(__METHOD__, __LINE__, $this->name);
+ addFatalMessage(__METHOD__, __LINE__, '(' . __LINE__ . '): ' . getMaskedMessage('CACHE_CANNOT_LOAD', $this->fqfn));
+
+ // Try to remove it
+ $this->removeCacheFile();
}
+
+ // Always return an empty array if we have trouble or no data
+ return array();
}
// Destroy an existing cache file
- function removeCacheFile ($removeArray = false, $force = false) {
+ function removeCacheFile ($force = false) {
+ // Reset read status
+ $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
- debug_report_bug('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
@@ -251,20 +319,8 @@ class CacheSystem {
// Remove cache file from system
removeFile($this->fqfn);
- // No longer readable!
- unset($this->readable[$this->name]);
-
- // Shall we remove the array from memory?
- if ($removeArray === true) {
- // Debug message if allowed
- if (isDebugModeEnabled()) {
- // Debug message
- logDebugMessage(__METHOD__, __LINE__, 'removing array!');
- } // END - if
-
- // Remove it from memory
- unset($GLOBALS['cache_array'][$this->name]);
- } // END - if
+ // Reset read status
+ $this->resetCacheReadStatus();
// Is the file there?
if (!$this->isCacheReadable()) {
@@ -274,7 +330,7 @@ class CacheSystem {
$this->rebuilt[$this->name] = true;
} else {
// Not removed!
- addFatalMessage(__METHOD__, __LINE__, "(".__LINE__."): ".sprintf(getMessage('CACHE_CANNOT_UNLINK'), $this->fqfn));
+ addFatalMessage(__METHOD__, __LINE__, '(' . __LINE__ . '): ' . getMaskedMessage('CACHE_CANNOT_UNLINK', $this->fqfn));
}
} // END - if
}
@@ -305,7 +361,7 @@ class CacheSystem {
}
} else {
// Cannot write to cache!
- addFatalMessage(__METHOD__, __LINE__, "(".__LINE__."): ".getMessage('CACHE_PROBLEMS_DETECTED'));
+ addFatalMessage(__METHOD__, __LINE__, '(' . __LINE__ . '): {--CACHE_PROBLEMS_DETECTED');
}
}
@@ -325,11 +381,11 @@ class CacheSystem {
}
// Write line(s)
- fwrite($this->pointer, $LINE);
+ $this->writeLine($LINE);
} // END - foreach
} else {
// Cannot write array!
- addFatalMessage(__METHOD__, __LINE__, "(".__LINE__."): ".getMessage('CACHE_PROBLEMS_DETECTED'));
+ addFatalMessage(__METHOD__, __LINE__, '(' . __LINE__ . '): {--CACHE_PROBLEMS_DETECTED');
}
}
@@ -366,7 +422,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');
}
}
@@ -379,47 +435,53 @@ class CacheSystem {
// Get extension version
$ext_ver = getExtensionVersion($ext_name);
- // Write cache line to file
- fwrite($this->pointer, $this->rewriteEntry($ext_name, $ext_ver, 'version', true));
-
// Add the extension version to object (DO NOT REMOVE IT! Endless loop...)
$this->version[$this->name][$ext_name] = $ext_ver;
+
+ // Write cache line to file
+ $this->writeLine($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(false, 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
@@ -429,7 +491,9 @@ class CacheSystem {
$extender = '[]';
// Add only for single array entry?
- if ($single === true) $extender = '';
+ if ($single === true) {
+ $extender = '';
+ } // END - if
// Init line
$line = '';
@@ -437,22 +501,25 @@ class CacheSystem {
// String or non-string? ;-)
if (is_string($value)) {
// String...
- $line = '$this->' . $prefix . "['".$this->name."']['" . $key . "']" . $extender . " = '" . smartAddSlashes($value) . "';\n";
+ $line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . " = '" . escapeQuotes($value) . "';";
} elseif (is_null($value)) {
// Null
- $line = '$this->' . $prefix . "['".$this->name."']['" . $key . "']" . $extender . " = null;\n";
+ $line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . ' = null;';
} 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;';
} else {
// False
- $line = '$this->' . $prefix . "['".$this->name."']['" . $key . "']" . $extender . " = false;\n";
+ $line = '$this->' . $prefix . "['" . $this->name . "']['" . $key . "']" . $extender . ' = false;';
}
+ } elseif (isset($value[0])) {
+ // These lines needs fixing
+ 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 . ';';
}
// Return line
@@ -476,6 +543,11 @@ class CacheSystem {
return $this->readable[$this->name];
}
+ // Cloning not allowed
+ function __clone () {
+ // Please do not clone this class
+ debug_report_bug(__METHOD__, __LINE__, 'Cloning of this class is not allowed.');
+ }
} // END - class
// [EOF]