From ab5d8d4e07bb3c8230d0285ef8902ef1979fce51 Mon Sep 17 00:00:00 2001 From: emkael Date: Thu, 18 Oct 2018 02:39:34 +0200 Subject: Updating Smarty --- .../sysplugins/smarty_internal_resource_php.php | 124 +++++++++++---------- 1 file changed, 63 insertions(+), 61 deletions(-) (limited to 'lib/smarty/sysplugins/smarty_internal_resource_php.php') diff --git a/lib/smarty/sysplugins/smarty_internal_resource_php.php b/lib/smarty/sysplugins/smarty_internal_resource_php.php index 7cd8bae..9d98ae1 100644 --- a/lib/smarty/sysplugins/smarty_internal_resource_php.php +++ b/lib/smarty/sysplugins/smarty_internal_resource_php.php @@ -2,113 +2,115 @@ /** * Smarty Internal Plugin Resource PHP - * * Implements the file system as resource for PHP templates * - * @package Smarty + * @package Smarty * @subpackage TemplateResources - * @author Uwe Tews - * @author Rodney Rehm + * @author Uwe Tews + * @author Rodney Rehm */ -class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled { +class Smarty_Internal_Resource_Php extends Smarty_Internal_Resource_File +{ /** - * container for short_open_tag directive's value before executing PHP templates - * @var string + * Flag that it's an uncompiled resource + * + * @var bool */ - protected $short_open_tag; + public $uncompiled = true; /** - * Create a new PHP Resource + * Resource does implement populateCompiledFilepath() method * + * @var bool */ - public function __construct() - { - $this->short_open_tag = ini_get( 'short_open_tag' ); - } + public $hasCompiledHandler = true; /** - * populate Source Object with meta data from Resource + * container for short_open_tag directive's value before executing PHP templates * - * @param Smarty_Template_Source $source source object - * @param Smarty_Internal_Template $_template template object - * @return void + * @var string */ - public function populate(Smarty_Template_Source $source, Smarty_Internal_Template $_template=null) - { - $source->filepath = $this->buildFilepath($source, $_template); - - if ($source->filepath !== false) { - if (is_object($source->smarty->security_policy)) { - $source->smarty->security_policy->isTrustedResourceDir($source->filepath); - } - - $source->uid = sha1($source->filepath); - if ($source->smarty->compile_check) { - $source->timestamp = @filemtime($source->filepath); - $source->exists = !!$source->timestamp; - } - } - } + protected $short_open_tag; /** - * populate Source Object with timestamp and exists from Resource - * - * @param Smarty_Template_Source $source source object - * @return void + * Create a new PHP Resource */ - public function populateTimestamp(Smarty_Template_Source $source) + public function __construct() { - $source->timestamp = @filemtime($source->filepath); - $source->exists = !!$source->timestamp; + $this->short_open_tag = function_exists('ini_get') ? ini_get('short_open_tag') : 1; } /** * Load template's source from file 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) { - if ($source->timestamp) { + if ($source->exists) { return ''; } throw new SmartyException("Unable to read template {$source->type} '{$source->name}'"); } + /** + * populate compiled object with compiled filepath + * + * @param Smarty_Template_Compiled $compiled compiled object + * @param Smarty_Internal_Template $_template template object (is ignored) + */ + public function populateCompiledFilepath(Smarty_Template_Compiled $compiled, Smarty_Internal_Template $_template) + { + $compiled->filepath = $_template->source->filepath; + $compiled->timestamp = $_template->source->timestamp; + $compiled->exists = $_template->source->exists; + $compiled->file_dependency[ $_template->source->uid ] = + array( + $compiled->filepath, + $compiled->timestamp, + $_template->source->type, + ); + } + /** * Render and output the template (without using the compiler) * - * @param Smarty_Template_Source $source source object + * @param Smarty_Template_Source $source source object * @param Smarty_Internal_Template $_template template object + * * @return void - * @throws SmartyException if template cannot be loaded or allow_php_templates is disabled + * @throws SmartyException if template cannot be loaded or allow_php_templates is disabled */ public function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template) { - $_smarty_template = $_template; - if (!$source->smarty->allow_php_templates) { - throw new SmartyException("PHP templates are disabled"); + throw new SmartyException('PHP templates are disabled'); } if (!$source->exists) { - if ($_template->parent instanceof Smarty_Internal_Template) { - $parent_resource = " in '{$_template->parent->template_resource}'"; - } else { - $parent_resource = ''; - } - throw new SmartyException("Unable to load template {$source->type} '{$source->name}'{$parent_resource}"); + throw new SmartyException( + "Unable to load template '{$source->type}:{$source->name}'" . + ($_template->_isSubTpl() ? " in '{$_template->parent->template_resource}'" : '') + ); } - // prepare variables extract($_template->getTemplateVars()); - // include PHP template with short open tags enabled - ini_set( 'short_open_tag', '1' ); - include($source->filepath); - ini_set( 'short_open_tag', $this->short_open_tag ); + if (function_exists('ini_set')) { + ini_set('short_open_tag', '1'); + } + /** + * + * + * @var Smarty_Internal_Template $_smarty_template + * used in included file + */ + $_smarty_template = $_template; + include $source->filepath; + if (function_exists('ini_set')) { + ini_set('short_open_tag', $this->short_open_tag); + } } } - -?> \ No newline at end of file -- cgit v1.2.3