X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fcache_functions.php;h=ca0aee8331aebeb06611e7661d97b930e790755e;hb=98077af43126dd7c274fe57f6ea0494e906e8943;hp=d1cc8d28537b2d760adfe3e112f5e371cfd0af1a;hpb=3af8b17c962e094e3eaffbd6d111290cdb286c92;p=mailer.git
diff --git a/inc/libs/cache_functions.php b/inc/libs/cache_functions.php
index d1cc8d2853..ca0aee8331 100644
--- a/inc/libs/cache_functions.php
+++ b/inc/libs/cache_functions.php
@@ -38,54 +38,61 @@
// Some security stuff...
if (!defined('__SECURITY')) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+ $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
require($INC);
}
// Caching class
class CacheSystem {
// Define variables
- var $ret = "init";
- var $path = "";
- var $inc = "";
- var $fqfn = "";
+ var $ret = 'init';
+ var $path = '';
+ var $inc = '';
+ var $fqfn = '';
var $pointer = false;
var $data = array();
var $version = array();
- var $name = "";
+ var $name = '';
var $rebuilt = array();
+ var $extension = '.cache';
+ var $statusDone = 'done';
// Constructor
function CacheSystem ($interval, $path, $tested) {
// Failed is the default
- $this->ret = "failed";
+ $this->ret = 'failed';
// Remeber path
$this->path = $path;
// Check if path exists
- if ((isDirectory($path)) && (!$tested)) {
+ if ((isDirectory($path)) && ($tested === false)) {
+ // Make FQFN for dummy file
+ $fqfn = $path . 'dummy.tmp';
+
// Check if we can create a file inside the path
- touch($path."dummy.tmp", 'w');
- if (FILE_READABLE($path."dummy.tmp")) {
+ touch($fqfn, 'w');
+
+ // Is the file there?
+ if (isFileReadable($fqfn)) {
// Yes, we can do. So let's remove it
- unlink($path."dummy.tmp");
+ removeFile($fqfn);
// Is there a .htaccess file?
- if (FILE_READABLE($path.".htaccess")) {
+ if (isFileReadable($path . '.htaccess')) {
// Update database that we have tested it
- UPDATE_CONFIG("cache_tested", 1);
+ updateConfiguration('cache_tested', 1);
// All done!
- $this->ret = "done";
+ $this->ret = $this->statusDone;
} else {
// Stop! Set a .htaccess file first
- $this->ret = "htaccess";
+ $this->ret = 'htaccess';
}
}
} elseif ($tested) {
// System already tested
- $this->ret = "done";
+ $this->ret = $this->statusDone;
}
}
@@ -94,14 +101,14 @@ class CacheSystem {
// Remember cache file
$this->name = $cacheName;
- // Construct include filename for LOAD_INC_ONCE() call
- $this->inc = $this->path . $cacheName . ".cache";
+ // Construct include filename for loadIncludeOnce() call
+ $this->inc = $this->path . $cacheName . $this->extension;
// Construct FQFN (full qualified file name)
$this->fqfn = constant('PATH') . $this->inc;
// Check if file exists and if version matches
- $status = ($this->isCacheReadable() && (is_writeable($this->fqfn)) && ($this->extensionVersionMatches("cache")));
+ $status = ($this->isCacheReadable() && (is_writeable($this->fqfn)) && ($this->extensionVersionMatches('cache')));
// Return status
return $status;
@@ -110,16 +117,16 @@ class CacheSystem {
// Initializes the cache file
function init () {
// This will destory an existing cache file!
- if ($this->ret == "done") {
+ if ($this->ret == $this->statusDone) {
// Create file
- if ($this->isCacheReadable()) chmod($this->fqfn, 0666);
+ if ($this->isCacheReadable()) changeMode($this->fqfn, 0666);
$this->pointer = fopen($this->fqfn, 'w') or app_die(__METHOD__, __LINE__, "Cannot write to cache ".$this->fqfn." !");
// Add open PHP tag
fwrite($this->pointer, "storeExtensionVersion("cache");
+ $this->storeExtensionVersion('cache');
} else {
// Cannot create file
addFatalMessage(__METHOD__, __LINE__, "(".__LINE__."): ".getMessage('CACHE_PROBLEMS_DETECTED'));
@@ -132,13 +139,13 @@ class CacheSystem {
// Write every array element to cache file
foreach ($data as $k => $v) {
// Write global cache array for immediate access
- if ((substr($k, 0, 4) == "ext_") && (isset($data['ext_name'])) && (isset($data['ext_id']))) {
- if ($k != "ext_name") {
+ if ((substr($k, 0, 4) == 'ext_') && (isset($data['ext_name'])) && (isset($data['ext_id']))) {
+ if ($k != 'ext_name') {
$GLOBALS['cache_array']['extensions'][$k][$data['ext_name']] = $v;
} else {
$GLOBALS['cache_array']['extensions'][$k][$data['ext_id']] = $v;
}
- if (($k == "ext_keep") && ($v == "Y")) {
+ if (($k == 'ext_keep') && ($v == 'Y')) {
$GLOBALS['cache_array']['active_extensions'][$data['ext_name']] = $v;
} // END - if
} elseif (is_array($v)) {
@@ -165,7 +172,7 @@ class CacheSystem {
fclose($this->pointer);
// Set rights
- if ($this->isCacheReadable()) chmod($this->fqfn, 0666);
+ if ($this->isCacheReadable()) changeMode($this->fqfn, 0666);
// Remove pointer
$this->pointer = false;
@@ -219,16 +226,44 @@ class CacheSystem {
}
// Destroy an existing cache file
- function destroyCacheFile () {
+ function destroyCacheFile ($removeArray = false) {
+ // Only run in regular output mode
+ if (getOutputMode() != 0) {
+ // Debug message if allowed
+ if (isDebugModeEnabled()) {
+ // Debug message
+ DEBUG_LOG(__METHOD__, __LINE__, 'Not removing cache ' . $this->name . ' in output_mode=' . getOutputMode());
+ } // END - if
+
+ // Abort here
+ return;
+ } // END - if
+
// Is the cache file there?
if ((!isset($this->rebuilt[$this->name])) && ($this->isCacheReadable())) {
// Close cache
$this->finalize();
+ // Debug-mode enabled?
+ if (isDebugModeEnabled()) {
+ // Log removal of cache
+ DEBUG_LOG(__METHOD__, __LINE__, 'removing cache: ' . $this->name);
+ } // END - if
+
// Remove cache file from system
- //* DEBUG: */ print __METHOD__."(".__LINE__."): {$this->name} - DESTROYED!
\n";
- unlink($this->fqfn);
- // @TODO remove from $GLOBALS['cache_array']!!!
+ removeFile($this->fqfn);
+
+ // Shall we remove the array from memory?
+ if ($removeArray === true) {
+ // Debug message if allowed
+ if (isDebugModeEnabled()) {
+ // Debug message
+ DEBUG_LOG(__METHOD__, __LINE__, 'removing array!');
+ } // END - if
+
+ // Remove it from memory
+ unset($GLOBALS['cache_array'][$this->name]);
+ } // END - if
// Is the file there?
if (!$this->isCacheReadable()) {
@@ -278,7 +313,7 @@ class CacheSystem {
foreach ($array as $k => $v) {
if (is_array($v)) {
// Multi line(s) found
- $LINE = "";
+ $LINE = '';
foreach($v as $k2 => $v2) {
// Put every array element in a row...
$LINE .= $this->rewriteEntry($k, $v2);
@@ -377,7 +412,7 @@ class CacheSystem {
// @TODO Add support for more types which break in last else-block
function rewriteEntry ($key, $value) {
// Init line
- $line = "";
+ $line = '';
// String or non-string? ;-)
if (is_string($value)) {
@@ -411,17 +446,20 @@ class CacheSystem {
// Checks wether the current cache file is readable
function isCacheReadable () {
- return INCLUDE_READABLE($this->inc);
+ return isIncludeReadable($this->inc);
}
} // END - class
// Destroy the cache on extension changes
function FILTER_CACHE_DESTROY_ON_EXT_CHANGE ($data) {
+ // Return the data anyway if there is no cache extension
+ if (!isCacheInstanceValid()) return $data;
+
// Remove cache
- if ($GLOBALS['cache_instance']->loadCacheFile("config")) $GLOBALS['cache_instance']->destroyCacheFile();
- if ($GLOBALS['cache_instance']->loadCacheFile("extensions")) $GLOBALS['cache_instance']->destroyCacheFile();
- if ($GLOBALS['cache_instance']->loadCacheFile("modreg")) $GLOBALS['cache_instance']->destroyCacheFile();
+ if ($GLOBALS['cache_instance']->loadCacheFile('config')) $GLOBALS['cache_instance']->destroyCacheFile(false);
+ if ($GLOBALS['cache_instance']->loadCacheFile('extensions')) $GLOBALS['cache_instance']->destroyCacheFile(false);
+ if ($GLOBALS['cache_instance']->loadCacheFile('modreg')) $GLOBALS['cache_instance']->destroyCacheFile(false);
// Return it
return $data;
@@ -429,28 +467,36 @@ function FILTER_CACHE_DESTROY_ON_EXT_CHANGE ($data) {
// Destroy the cache on changing admin
function FILTER_CACHE_DESTROY_ON_ADMIN_CHANGE () {
+ // Skip this step if the cache instance is not there
+ if (!isCacheInstanceValid()) return false;
+
// Remove cache
- if ($GLOBALS['cache_instance']->loadCacheFile("admins")) $GLOBALS['cache_instance']->destroyCacheFile();
+ if ($GLOBALS['cache_instance']->loadCacheFile('admins')) $GLOBALS['cache_instance']->destroyCacheFile(false);
}
// Destroy all cache files
function FILTER_CACHE_DESTROY_ALL () {
+ // Skip this step if the cache instance is not there
+ DEBUG_LOG(__FUNCTION__, __LINE__, 'Called!');
+ if (!isCacheInstanceValid()) return false;
+
// Remove cache files
- if ($GLOBALS['cache_instance']->loadCacheFile("admins")) $GLOBALS['cache_instance']->destroyCacheFile();
- if ($GLOBALS['cache_instance']->loadCacheFile("admins_acls")) $GLOBALS['cache_instance']->destroyCacheFile();
- if ($GLOBALS['cache_instance']->loadCacheFile("config")) $GLOBALS['cache_instance']->destroyCacheFile();
- if ($GLOBALS['cache_instance']->loadCacheFile("extensions")) $GLOBALS['cache_instance']->destroyCacheFile();
- if ($GLOBALS['cache_instance']->loadCacheFile("modreg")) $GLOBALS['cache_instance']->destroyCacheFile();
- if ($GLOBALS['cache_instance']->loadCacheFile("refdepths")) $GLOBALS['cache_instance']->destroyCacheFile();
- if ($GLOBALS['cache_instance']->loadCacheFile("refsystem")) $GLOBALS['cache_instance']->destroyCacheFile();
- if ($GLOBALS['cache_instance']->loadCacheFile("themes")) $GLOBALS['cache_instance']->destroyCacheFile();
- if ($GLOBALS['cache_instance']->loadCacheFile("revision")) $GLOBALS['cache_instance']->destroyCacheFile();
+ if ($GLOBALS['cache_instance']->loadCacheFile('admins')) $GLOBALS['cache_instance']->destroyCacheFile(false);
+ if ($GLOBALS['cache_instance']->loadCacheFile('admins_acls')) $GLOBALS['cache_instance']->destroyCacheFile(false);
+ if ($GLOBALS['cache_instance']->loadCacheFile('config')) $GLOBALS['cache_instance']->destroyCacheFile(false);
+ if ($GLOBALS['cache_instance']->loadCacheFile('extensions')) $GLOBALS['cache_instance']->destroyCacheFile(false);
+ if ($GLOBALS['cache_instance']->loadCacheFile('modreg')) $GLOBALS['cache_instance']->destroyCacheFile(false);
+ if ($GLOBALS['cache_instance']->loadCacheFile('refdepths')) $GLOBALS['cache_instance']->destroyCacheFile(false);
+ if ($GLOBALS['cache_instance']->loadCacheFile('refsystem')) $GLOBALS['cache_instance']->destroyCacheFile(false);
+ if ($GLOBALS['cache_instance']->loadCacheFile('themes')) $GLOBALS['cache_instance']->destroyCacheFile(false);
+ if ($GLOBALS['cache_instance']->loadCacheFile('revision')) $GLOBALS['cache_instance']->destroyCacheFile(false);
+ DEBUG_LOG(__FUNCTION__, __LINE__, 'Done!');
}
// Filter for purging entire admin menu cache
function FILTER_CACHE_PURGE_ADMIN_MENU () {
// Just call the function
- CACHE_PURGE_ADMIN_MENU();
+ cachePurgeAdminMenu();
}
//