mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 06:38:00 +02:00
Code Issues Releases Wiki Activity

Cache Fixes. Core update-check fixed. Core-update via Scheduled Task fixed.

Browse Source
This commit is contained in:
Cameron
2016-12-22 17:59:29 -08:00
parent a4f3fc2886
commit 38dae889e2
8 changed files with 163 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
e107_handlers/cache_handler.php
View File

@@ -122,21 +122,24 @@ class ecache {
}
/**
* @return string
* @param string $query
* @param int $MaximumAge the time in minutes before the cache file 'expires'
* @param Forced check if cache is disabled.
* @desc Returns the data from the cache file associated with $query, else it returns false if there is no cache for $query.
* @scope public
*/
* Retrieve Cache data.
* @param $CacheTag
* @param bool|int $MaximumAge the time in minutes before the cache file 'expires'
* @param bool $ForcedCheck check even if cache pref is disabled.
* @param bool $syscache set to true when checking sys cache.
* @return string
* @desc Returns the data from the cache file associated with $query, else it returns false if there is no cache for $query.
* @scope public
*/
public function retrieve($CacheTag, $MaximumAge = false, $ForcedCheck = false, $syscache = false)
{
if(($ForcedCheck != false ) || ($syscache == false && $this->UserCacheActive) || ($syscache == true && $this->SystemCacheActive) && !e107::getParser()->checkHighlighting())
{
$cache_file = (isset($this) && $this instanceof ecache ? $this->cache_fname($CacheTag, $syscache) : self::cache_fname($CacheTag, $syscache));
if (file_exists($cache_file))
if(file_exists($cache_file))
{
if ($MaximumAge != false && (filemtime($cache_file) + ($MaximumAge * 60)) < time()) {
if ($MaximumAge !== false && (filemtime($cache_file) + ($MaximumAge * 60)) < time()) {
unlink($cache_file);
return false;
}
@@ -147,13 +150,16 @@ class ecache {
{
$ret = substr($ret, strlen(self::CACHE_PREFIX));
}
else
elseif(substr($ret,0,5) == '<?php')
{
$ret = substr($ret, 5); // Handle the history for now
}
return $ret;
}
} else {
}
else
{
// e107::getDebug()->log("Couldn't find cache file: ".json_encode($cache_file));
return false;
}
}
@@ -234,6 +240,7 @@ class ecache {
*/
public function clear($CacheTag = '', $syscache = false, $related = false)
{
$file = ($CacheTag) ? preg_replace("#\W#", "_", $CacheTag)."*.cache.php" : "*.cache.php";
e107::getEvent()->triggerAdminEvent('cache_clear', "cachetag=$CacheTag&file=$file&syscache=$syscache");
$ret = self::delete(e_CACHE_CONTENT, $file, $syscache);
@@ -255,6 +262,8 @@ class ecache {
*/
function clear_sys($CacheTag = '', $related = false)
{
if(isset($this) && $this instanceof ecache)
{
return $this->clear($CacheTag, true, $related);