From ab5d8d4e07bb3c8230d0285ef8902ef1979fce51 Mon Sep 17 00:00:00 2001 From: emkael Date: Thu, 18 Oct 2018 02:39:34 +0200 Subject: Updating Smarty --- lib/smarty/sysplugins/smarty_resource_custom.php | 39 +++++++++++------------- 1 file changed, 18 insertions(+), 21 deletions(-) (limited to 'lib/smarty/sysplugins/smarty_resource_custom.php') diff --git a/lib/smarty/sysplugins/smarty_resource_custom.php b/lib/smarty/sysplugins/smarty_resource_custom.php index 9ec1f35..8d66be3 100644 --- a/lib/smarty/sysplugins/smarty_resource_custom.php +++ b/lib/smarty/sysplugins/smarty_resource_custom.php @@ -2,21 +2,20 @@ /** * Smarty Resource Plugin * - * @package Smarty + * @package Smarty * @subpackage TemplateResources - * @author Rodney Rehm + * @author Rodney Rehm */ /** * Smarty Resource Plugin - * * Wrapper Implementation for custom resource plugins * - * @package Smarty + * @package Smarty * @subpackage TemplateResources */ -abstract class Smarty_Resource_Custom extends Smarty_Resource { - +abstract class Smarty_Resource_Custom extends Smarty_Resource +{ /** * fetch template and its modification time from data source * @@ -24,15 +23,15 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource { * @param string &$source template source * @param integer &$mtime template modification timestamp (epoch) */ - protected abstract function fetch($name, &$source, &$mtime); + abstract protected function fetch($name, &$source, &$mtime); /** * Fetch template's modification timestamp from data source - * * {@internal implementing this method is optional. * Only implement it if modification times can be accessed faster than loading the complete template source.}} * * @param string $name template name + * * @return integer|boolean timestamp (epoch) the template was modified, or false if not found */ protected function fetchTimestamp($name) @@ -46,19 +45,19 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource { * @param Smarty_Template_Source $source source object * @param Smarty_Internal_Template $_template template object */ - public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) + public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template = null) { - $source->filepath = strtolower($source->type . ':' . $source->name); + $source->filepath = $source->type . ':' . substr(preg_replace('/[^A-Za-z0-9.]/', '', $source->name), 0, 25); $source->uid = sha1($source->type . ':' . $source->name); - $mtime = $this->fetchTimestamp($source->name); if ($mtime !== null) { $source->timestamp = $mtime; } else { $this->fetch($source->name, $content, $timestamp); $source->timestamp = isset($timestamp) ? $timestamp : false; - if( isset($content) ) + if (isset($content)) { $source->content = $content; + } } $source->exists = !!$source->timestamp; } @@ -67,8 +66,9 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource { * Load template's source into current template object * * @param Smarty_Template_Source $source source object - * @return string template source - * @throws SmartyException if source cannot be loaded + * + * @return string template source + * @throws SmartyException if source cannot be loaded */ public function getContent(Smarty_Template_Source $source) { @@ -76,7 +76,6 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource { if (isset($content)) { return $content; } - throw new SmartyException("Unable to read template {$source->type} '{$source->name}'"); } @@ -84,13 +83,11 @@ abstract class Smarty_Resource_Custom extends Smarty_Resource { * Determine basename for compiled filename * * @param Smarty_Template_Source $source source object - * @return string resource's basename + * + * @return string resource's basename */ - protected function getBasename(Smarty_Template_Source $source) + public function getBasename(Smarty_Template_Source $source) { - return basename($source->name); + return basename(substr(preg_replace('/[^A-Za-z0-9.]/', '', $source->name), 0, 25)); } - } - -?> \ No newline at end of file -- cgit v1.2.3