smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-04 10:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Added $smarty.template variable.

Browse Source 
- Fixed {include_php} tag when dynamic values were used for 'file' attribute.
This commit is contained in:
andrei
2002-04-03 16:31:59 +00:00
parent e1f8273788
commit dd56027476
5 changed files with 78 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
NEWS
View File

@@ -1,3 +1,6 @@
- fixed a problem with using dynamic values for 'file'
attribute of {include_php} tag. (Andrei)
- added $smarty.template variable. (Andrei)
- fixed several plugins that would not work if the plugin
directory was not the default one. (Andrei)
- implemented support for block functions. (Andrei)
@@ -339,4 +342,4 @@ Version 1.0
------------
- initial release
/* vim: set et tw=64: */
/* vim: set et tw=64 ft=changelog: */

27
Smarty.class.php
View File

@@ -1008,6 +1008,33 @@ function _generate_debug_output() {
}
}
/*======================================================================*\
Function: _smarty_include_php()
Purpose: called for included templates
\*======================================================================*/
function _smarty_include_php($_smarty_include_php_file, $_smarty_assign)
{
$this->_get_php_resource($_smarty_include_php_file, $_smarty_resource_type,
$_smarty_php_resource);
if (!empty($_smarty_assign)) {
ob_start();
if ($_smarty_resource_type == 'file') {
include_once($_smarty_php_resource);
} else {
eval($_smarty_php_resource);
}
$this->assign($_smarty_assign, ob_get_contents());
ob_end_clean();
} else {
if ($_smarty_resource_type == 'file') {
include_once($_smarty_php_resource);
} else {
eval($_smarty_php_resource);
}
}
}
/*======================================================================*\
Function: _config_load
Purpose: load configuration values

28
Smarty_Compiler.class.php
View File

@@ -633,26 +633,9 @@ class Smarty_Compiler extends Smarty {
$this->_syntax_error("missing 'file' attribute in include_php tag");
}
$this->_get_php_resource($this->_dequote($attrs['file']),
$resource_type, $php_resource);
$assign_var = $this->_dequote($attrs['assign']);
if (!empty($attrs['assign'])) {
$output = "<?php ob_start();\n";
if ($resource_type == 'file') {
$output .= 'include("' . $php_resource . '");'."\n";
} else {
$output .= $php_resource;
}
$output .= "\$this->assign(" . $attrs['assign'] . ", ob_get_contents()); ob_end_clean();\n?>";
} else {
if ($resource_type == 'file') {
$output = '<?php include("' . $php_resource . '"); ?>';
} else {
$output = '<?php ' . $php_resource . ' ?>';
}
}
return $output;
return "<?php \$this->_smarty_include_php($attrs[file], '$assign_var'); ?>";
}
@@ -1350,6 +1333,13 @@ class Smarty_Compiler extends Smarty {
case 'capture':
return null;
case 'template':
$compiled_ref = "'$this->_current_file'";
if (count($indexes) > 1) {
$this->_syntax_error('$smarty' . implode('', $indexes) .' is an invalid reference');
}
break;
default:
$this->_syntax_error('$smarty.' . $ref . ' is an unknown reference');
break;

27
libs/Smarty.class.php
View File

@@ -1008,6 +1008,33 @@ function _generate_debug_output() {
}
}
/*======================================================================*\
Function: _smarty_include_php()
Purpose: called for included templates
\*======================================================================*/
function _smarty_include_php($_smarty_include_php_file, $_smarty_assign)
{
$this->_get_php_resource($_smarty_include_php_file, $_smarty_resource_type,
$_smarty_php_resource);
if (!empty($_smarty_assign)) {
ob_start();
if ($_smarty_resource_type == 'file') {
include_once($_smarty_php_resource);
} else {
eval($_smarty_php_resource);
}
$this->assign($_smarty_assign, ob_get_contents());
ob_end_clean();
} else {
if ($_smarty_resource_type == 'file') {
include_once($_smarty_php_resource);
} else {
eval($_smarty_php_resource);
}
}
}
/*======================================================================*\
Function: _config_load
Purpose: load configuration values

28
libs/Smarty_Compiler.class.php
View File

@@ -633,26 +633,9 @@ class Smarty_Compiler extends Smarty {
$this->_syntax_error("missing 'file' attribute in include_php tag");
}
$this->_get_php_resource($this->_dequote($attrs['file']),
$resource_type, $php_resource);
$assign_var = $this->_dequote($attrs['assign']);
if (!empty($attrs['assign'])) {
$output = "<?php ob_start();\n";
if ($resource_type == 'file') {
$output .= 'include("' . $php_resource . '");'."\n";
} else {
$output .= $php_resource;
}
$output .= "\$this->assign(" . $attrs['assign'] . ", ob_get_contents()); ob_end_clean();\n?>";
} else {
if ($resource_type == 'file') {
$output = '<?php include("' . $php_resource . '"); ?>';
} else {
$output = '<?php ' . $php_resource . ' ?>';
}
}
return $output;
return "<?php \$this->_smarty_include_php($attrs[file], '$assign_var'); ?>";
}
@@ -1350,6 +1333,13 @@ class Smarty_Compiler extends Smarty {
case 'capture':
return null;
case 'template':
$compiled_ref = "'$this->_current_file'";
if (count($indexes) > 1) {
$this->_syntax_error('$smarty' . implode('', $indexes) .' is an invalid reference');
}
break;
default:
$this->_syntax_error('$smarty.' . $ref . ' is an unknown reference');
break;