commit 3.1 into the trunk

This commit is contained in:
monte.ohrt
2011-09-16 14:19:56 +00:00
parent 5693de91f5
commit 8842e79107
136 changed files with 14349 additions and 7805 deletions
@@ -8,119 +8,101 @@
* @package Smarty
* @subpackage TemplateResources
* @author Uwe Tews
* @author Rodney Rehm
*/
/**
* Smarty Internal Plugin Resource PHP
*/
class Smarty_Internal_Resource_PHP {
class Smarty_Internal_Resource_PHP extends Smarty_Resource_Uncompiled {
/**
* Class constructor, enable short open tags
* container for short_open_tag directive's value before executing PHP templates
* @var string
*/
public function __construct($smarty)
protected $short_open_tag;
/**
* Create a new PHP Resource
*
*/
public function __construct()
{
$this->smarty = $smarty;
ini_set('short_open_tag', '1');
$this->short_open_tag = ini_get( 'short_open_tag' );
}
// properties
public $usesCompiler = false;
public $isEvaluated = false;
/**
* populate Source Object with meta data from Resource
*
* @param Smarty_Template_Source $source source object
* @param Smarty_Internal_Template $_template template object
* @return void
*/
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;
}
}
}
/**
* populate Source Object with timestamp and exists from Resource
*
* @param Smarty_Template_Source $source source object
* @return void
*/
public function populateTimestamp(Smarty_Template_Source $source)
{
$source->timestamp = @filemtime($source->filepath);
$source->exists = !!$source->timestamp;
}
/**
* Return flag if template source is existing
* Load template's source from file into current template object
*
* @return boolean true
* @param Smarty_Template_Source $source source object
* @return string template source
* @throws SmartyException if source cannot be loaded
*/
public function isExisting($template)
public function getContent(Smarty_Template_Source $source)
{
if ($template->getTemplateFilepath() === false) {
return false;
} else {
return true;
}
if ($source->timestamp) {
return '';
}
throw new SmartyException("Unable to read template {$source->type} '{$source->name}'");
}
/**
* Get filepath to template source
*
* @param object $_template template object
* @return string filepath to template source file
* Render and output the template (without using the compiler)
*
* @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
*/
public function getTemplateFilepath($_template)
public function renderUncompiled(Smarty_Template_Source $source, Smarty_Internal_Template $_template)
{
$_filepath = $_template->buildTemplateFilepath ();
if (is_object($_template->smarty->security_policy)) {
$_template->smarty->security_policy->isTrustedResourceDir($_filepath);
}
$_template->templateUid = sha1($_filepath);
return $_filepath;
}
/**
* Get timestamp to template source
*
* @param object $_template template object
* @return integer timestamp of template source file
*/
public function getTemplateTimestamp($_template)
{
return filemtime($_template->getTemplateFilepath());
}
/**
* Read template source from file
*
* @param object $_template template object
* @return string content of template source file
*/
public function getTemplateSource($_template)
{
if (file_exists($_tfp = $_template->getTemplateFilepath())) {
$_template->template_source = file_get_contents($_tfp);
return true;
} else {
return false;
}
}
/**
* Get filepath to compiled template
*
* @param object $_template template object
* @return boolean return false as compiled template is not stored
*/
public function getCompiledFilepath($_template)
{
// no filepath for PHP templates
return false;
}
/**
* renders the PHP template
*/
public function renderUncompiled($_smarty_template)
{
if (!$this->smarty->allow_php_templates) {
$_smarty_template = $_template;
if (!$source->smarty->allow_php_templates) {
throw new SmartyException("PHP templates are disabled");
}
if ($this->getTemplateFilepath($_smarty_template) === false) {
throw new SmartyException("Unable to load template \"{$_smarty_template->resource_type} : {$_smarty_template->resource_name}\"");
if (!$source->exists) {
throw new SmartyException("Unable to load template \"{$source->type} : {$source->name}\"");
}
// prepare variables
$_smarty_ptr = $_smarty_template;
do {
foreach ($_smarty_ptr->tpl_vars as $_smarty_var => $_smarty_var_object) {
if (isset($_smarty_var_object->value)) {
$$_smarty_var = $_smarty_var_object->value;
}
}
$_smarty_ptr = $_smarty_ptr->parent;
} while ($_smarty_ptr != null);
unset ($_smarty_var, $_smarty_var_object, $_smarty_ptr);
// include PHP template
include($this->getTemplateFilepath($_smarty_template));
return;
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 );
}
}