webapp/postfixadmin
1
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-08-07 17:42:53 +03:00
Code Activity

update Smarty to v3.1.33 - "This release does cover security issue CVE-2018-16831, other bug fixes (see changelog.txt) and adds a new feature of the {capture} tag (see NEW_FEATURES.txt)."

Browse Source
This commit is contained in:
David Goodwin
2019-09-25 13:55:07 +01:00
parent 7360407b73
commit 907bd7ee46
199 changed files with 5335 additions and 4857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/smarty/libs/sysplugins/smarty_template_cached.php
View File

@@ -92,7 +92,7 @@ class Smarty_Template_Cached extends Smarty_Template_Resource_Base
$this->cache_id = $_template->cache_id;
$this->source = $_template->source;
if (!class_exists('Smarty_CacheResource', false)) {
require SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
include SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
}
$this->handler = Smarty_CacheResource::load($_template->smarty);
}
@@ -102,7 +102,7 @@ class Smarty_Template_Cached extends Smarty_Template_Resource_Base
*
* @return Smarty_Template_Cached
*/
static function load(Smarty_Internal_Template $_template)
public static function load(Smarty_Internal_Template $_template)
{
$_template->cached = new Smarty_Template_Cached($_template);
$_template->cached->handler->populate($_template->cached, $_template);
@@ -118,7 +118,7 @@ class Smarty_Template_Cached extends Smarty_Template_Resource_Base
* Render cache template
*
* @param \Smarty_Internal_Template $_template
* @param bool $no_output_filter
* @param bool $no_output_filter
*
* @throws \Exception
*/
@@ -163,14 +163,14 @@ class Smarty_Template_Cached extends Smarty_Template_Resource_Base
} else {
$this->valid = true;
}
if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_CURRENT &&
$_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)
if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_CURRENT
&& $_template->cache_lifetime >= 0 && time() > ($this->timestamp + $_template->cache_lifetime)
) {
// lifetime expired
$this->valid = false;
}
if ($this->valid && $_template->compile_check === Smarty::COMPILECHECK_ON &&
$_template->source->getTimeStamp() > $this->timestamp
if ($this->valid && $_template->compile_check === Smarty::COMPILECHECK_ON
&& $_template->source->getTimeStamp() > $this->timestamp
) {
$this->valid = false;
}
@@ -204,9 +204,9 @@ class Smarty_Template_Cached extends Smarty_Template_Resource_Base
} else {
return $this->valid;
}
if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED &&
$_template->cached->cache_lifetime >= 0 &&
(time() > ($_template->cached->timestamp + $_template->cached->cache_lifetime))
if ($this->valid && $_template->caching === Smarty::CACHING_LIFETIME_SAVED
&& $_template->cached->cache_lifetime >= 0
&& (time() > ($_template->cached->timestamp + $_template->cached->cache_lifetime))
) {
$this->valid = false;
}