- major update including some API changes

This commit is contained in:
uwe.tews@googlemail.com
2010-11-11 21:34:36 +00:00
parent 93686c695d
commit f044178bad
62 changed files with 3249 additions and 3204 deletions

View File

@@ -14,6 +14,11 @@
* Smarty Internal Plugin Compile Insert Class
*/
class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
// attribute definitions
public $required_attributes = array('file');
public $shorttag_order = array('file');
public $optional_attributes = array('once', 'assign');
/**
* Compiles code for the {include_php} tag
*
@@ -23,30 +28,46 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
*/
public function compile($args, $compiler)
{
if (!$compiler->smarty->allow_php_tag) {
throw new SmartyException("{include_php} is deprecated, set allow_php_tag = true to enable");
}
$this->compiler = $compiler;
$this->required_attributes = array('file');
$this->optional_attributes = array('once', 'assign');
// check and get attributes
$_attr = $this->_get_attributes($args);
$_output = '<?php ';
$_smarty_tpl = $compiler->template;
$_filepath = false;
eval('$_file = ' . $_attr['file'] . ';');
$_file = realpath($_file);
if ($this->compiler->smarty->security) {
$this->compiler->smarty->security_handler->isTrustedPHPDir($_file);
if (!isset($this->compiler->smarty->security_policy) && file_exists($_file)) {
$_filepath = $_file;
} else {
if (isset($this->compiler->smarty->security_policy)) {
$_dir = $this->compiler->smarty->security_policy->trusted_dir;
} else {
$_dir = $this->compiler->smarty->trusted_dir;
}
if (!empty($_dir)) {
foreach((array)$_dir as $_script_dir) {
if (strpos('/\\', substr($_script_dir, -1)) === false) {
$_script_dir .= DS;
}
if (file_exists($_script_dir . $_file)) {
$_filepath = $_script_dir . $_file;
break;
}
}
}
}
if ($_filepath == false) {
$this->compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", $this->compiler->lex->taglineno);
}
if ($_file === false) {
$this->compiler->trigger_template_error('include_php: file "' . $_attr['file'] . '" is not readable');
if (isset($this->compiler->smarty->security_policy)) {
$this->compiler->smarty->security_policy->isTrustedPHPDir($_filepath);
}
if ($this->compiler->smarty->security) {
$this->compiler->smarty->security_handler->isTrustedPHPDir($_file);
}
if (isset($_attr['assign'])) {
// output will be stored in a smarty variable instead of being displayed
$_assign = $_attr['assign'];
@@ -59,9 +80,9 @@ class Smarty_Internal_Compile_Include_Php extends Smarty_Internal_CompileBase {
}
if (isset($_assign)) {
return "<?php ob_start(); include{$_once} ('{$_file}'); \$_smarty_tpl->assign({$_assign},ob_get_contents()); ob_end_clean();?>";
return "<?php ob_start(); include{$_once} ('{$_filepath}'); \$_smarty_tpl->assign({$_assign},ob_get_contents()); ob_end_clean();?>";
} else {
return "<?php include{$_once} ('{$_file}');?>\n";
return "<?php include{$_once} ('{$_filepath}');?>\n";
}
}
}