smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-03 09:54:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reworking, simplifying, and speeding up cache implementation.

Browse Source 
Fixing the infelicity where you couldn't have '|' and ':' inside
quoted modifier arguments.
This commit is contained in:
andrey
2001-01-31 22:42:05 +00:00
parent 95879edfa5
commit e66a4ac648
12 changed files with 321 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Config_File.class.php
View File

@@ -5,7 +5,7 @@ require_once "PEAR.php";
/** /**
* Config_File class. * Config_File class.
* *
* @version 1.2.2 * @version 1.2.3
* @author Andrei Zmievski <andrei@ispi.net> * @author Andrei Zmievski <andrei@ispi.net>
* @access public * @access public
* *

11
NEWS
View File

@@ -1,9 +1,12 @@
- modifier arguments can now contain | and : characters inside quoted
strings. (Andrei)
Version 1.2.2 Version 1.2.2
------------- -------------
- fixed bug that would not respect nested template directories and would - fixed bug that would not respect nested template directories and would
put all compiled files into top-level one. (Andrei) put all compiled files into top-level one. (Andrei)
- fixed bug using $PHP_VERSION instead of environment var PHP_VERSION. - fixed bug using $PHP_VERSION instead of environment var PHP_VERSION.
- couple small warning fixes - couple small warning fixes
Version 1.2.1 Version 1.2.1
------------- -------------

6
README
View File

@@ -2,7 +2,7 @@ NAME:
Smarty - the PHP compiling template engine Smarty - the PHP compiling template engine
VERSION: 1.2.2 VERSION: 1.2.3
AUTHORS: AUTHORS:
@@ -10,8 +10,8 @@ AUTHORS:
Andrei Zmievski <andrei@ispi.net> Andrei Zmievski <andrei@ispi.net>
MAILING LIST: MAILING LIST:
We have a mailing list for you to share your ideas or ask questions. We have a mailing list for you to share your ideas or ask questions.
send a blank e-mail message to subscribe-smarty@lists.ispi.net send a blank e-mail message to subscribe-smarty@lists.ispi.net
SYNOPSIS: SYNOPSIS:

4
Smarty.addons.php
View File

@@ -4,8 +4,8 @@
* Project: Smarty: the PHP compiled template engine * Project: Smarty: the PHP compiled template engine
* File: Smarty.addons.php * File: Smarty.addons.php
* Author: Monte Ohrt <monte@ispi.net> * Author: Monte Ohrt <monte@ispi.net>
* Andrei Zmievski <andrei@ispi.net> * Andrei Zmievski <andrei@ispi.net>
* Version: 1.2.2 * Version: 1.2.3
* Copyright: 2001 ispi of Lincoln, Inc. * Copyright: 2001 ispi of Lincoln, Inc.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or

281
Smarty.class.php
View File

@@ -5,7 +5,7 @@
* Author: Monte Ohrt <monte@ispi.net> * Author: Monte Ohrt <monte@ispi.net>
* Andrei Zmievski <andrei@ispi.net> * Andrei Zmievski <andrei@ispi.net>
* *
* Version: 1.2.2 * Version: 1.2.3
* Copyright: 2001 ispi of Lincoln, Inc. * Copyright: 2001 ispi of Lincoln, Inc.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@@ -43,59 +43,57 @@ class Smarty
{ {
// public vars // public vars
var $compile_check = true; // whether to check for compiling step or not: var $compile_check = true; // whether to check for compiling step or not:
// This is generally set to false once the // This is generally set to false once the
// application is entered into production and // application is entered into production and
// initially compiled. Leave set to true // initially compiled. Leave set to true
// during development. true/false // during development. true/false
var $compile_force = false; // force templates to compile every time. var $force_compile = false; // force templates to compile every time.
// overrides compile_check. true/false // overrides compile_check. true/false
var $allow_url_compile = true; // allow forced recompile from URL ?compile_force=1
// NOTE: all cache directives override // NOTE: all cache directives override
// compiling directives. If a cached version // compiling directives. If a cached version
// is available, that will be used regardless // is available, that will be used regardless
// of compile settings. // of compile settings.
var $cache_engine = true; // whether to use caching or not. true/false var $caching = true; // whether to use caching or not. true/false
var $cache_expire = 3600; // number of seconds cached content will expire. var $cache_lifetime = 3600; // number of seconds cached content will persist.
// 0 = never expires. default is one hour (3600) // 0 = never expires. default is one hour (3600)
var $cache_force = false; // force caches to expire every time. true/false
var $allow_url_cache = true; // allow forced cache expire from URL ?cache_force=1
var $template_dir = "./templates"; // name of directory for templates var $template_dir = "./templates"; // name of directory for templates
var $compile_dir = "./templates_c"; // name of directory for compiled templates var $compile_dir = "./templates_c"; // name of directory for compiled templates
var $cache_dir = "./cache"; // name of directory for template cache var $cache_dir = "./cache"; // name of directory for template cache
var $tpl_file_ext = ".tpl"; // template file extentions var $tpl_file_ext = ".tpl"; // template file extentions
var $allow_php = false; // whether or not to allow embedded php var $allow_php = false; // whether or not to allow embedded php
// in the templates. By default, php tags // in the templates. By default, php tags
// are escaped. true/false // are escaped. true/false
var $left_delimiter = "{"; // template tag delimiters.
var $right_delimiter = "}";
var $config_dir = "./configs"; // directory where config files are located var $left_delimiter = "{"; // template tag delimiters.
var $right_delimiter = "}";
var $custom_funcs = array( 'html_options' => 'smarty_func_html_options', var $config_dir = "./configs"; // directory where config files are located
'html_select_date' => 'smarty_func_html_select_date'
); var $custom_funcs = array( 'html_options' => 'smarty_func_html_options',
'html_select_date' => 'smarty_func_html_select_date'
);
var $custom_mods = array( 'lower' => 'strtolower', var $custom_mods = array( 'lower' => 'strtolower',
'upper' => 'strtoupper', 'upper' => 'strtoupper',
'capitalize' => 'ucwords', 'capitalize' => 'ucwords',
'escape' => 'smarty_mod_escape', 'escape' => 'smarty_mod_escape',
'truncate' => 'smarty_mod_truncate', 'truncate' => 'smarty_mod_truncate',
'spacify' => 'smarty_mod_spacify', 'spacify' => 'smarty_mod_spacify',
'date_format' => 'smarty_mod_date_format', 'date_format' => 'smarty_mod_date_format',
'string_format' => 'smarty_mod_string_format', 'string_format' => 'smarty_mod_string_format',
'replace' => 'smarty_mod_replace', 'replace' => 'smarty_mod_replace',
'strip_tags' => 'smarty_mod_strip_tags', 'strip_tags' => 'smarty_mod_strip_tags',
'default' => 'smarty_mod_default' 'default' => 'smarty_mod_default'
); );
var $global_assign = array( 'SCRIPT_NAME' var $global_assign = array( 'SCRIPT_NAME'
); );
// internal vars // internal vars
var $_error_msg = false; // error messages. true/false var $_error_msg = false; // error messages. true/false
@@ -198,58 +196,64 @@ class Smarty
function display($tpl_file) function display($tpl_file)
{ {
print $this->fetch($tpl_file); $this->fetch($tpl_file, true);
} }
/*======================================================================*\ /*======================================================================*\
Function: fetch() Function: fetch()
Purpose: executes & returns the template results Purpose: executes & returns or displays the template results
\*======================================================================*/ \*======================================================================*/
function fetch($tpl_file) function fetch($tpl_file, $display = false)
{ {
global $HTTP_GET_VARS,$PHP_SELF; global $PHP_SELF;
if($this->cache_engine) if($this->caching) {
{
if($this->allow_url_cache && $HTTP_GET_VARS["cache_force"])
$this->cache_force = true;
// cache id = template path + the invoked script // cache id = template path + the invoked script
$cache_file = $this->cache_dir."/".urlencode($tpl_file."@".$PHP_SELF).".che"; $cache_file = $this->cache_dir."/".urlencode($tpl_file."@".$PHP_SELF).".cache";
if(!$this->cache_force && if(!$this->cache_force &&
(file_exists($cache_file) && (file_exists($cache_file) &&
($this->cache_expire == 0 || ($this->cache_lifetime == 0 ||
(mktime() - filectime($cache_file) <= $this->cache_expire) (mktime() - filemtime($cache_file) <= $this->cache_lifetime)
))) ))) {
{
$results = $this->_read_file($cache_file); $results = $this->_read_file($cache_file);
$results = $this->_process_cached_inserts($results); $results = $this->_process_cached_inserts($results);
return $results; if ($display) {
} print $results;
return;
} else
return $results;
}
} }
if($this->allow_url_compile && $HTTP_GET_VARS["compile_force"]) // compile files
$this->compile_force = true; $this->_compile($this->template_dir);
//assemble compile directory path to file
$_compile_file = $this->compile_dir."/".$tpl_file.".php";
ob_start(); extract($this->_tpl_vars);
// compile files
$this->_compile($this->template_dir);
//assemble compile directory path to file
$_compile_file = $this->compile_dir."/".$tpl_file.".php";
extract($this->_tpl_vars); // if we just need to display the results, don't perform output
include($_compile_file); // buferring - for speed
$results = ob_get_contents(); if ($display && !$this->caching)
ob_end_clean(); include($_compile_file);
else {
ob_start();
include($_compile_file);
$results = ob_get_contents();
ob_end_clean();
}
if($this->cache_engine) if($this->caching) {
{ $this->_write_file($cache_file, $results);
$this->_write_file($cache_file,$results);
$results = $this->_process_cached_inserts($results); $results = $this->_process_cached_inserts($results);
} }
return $results; if ($display) {
print $results;
return;
} else
return $results;
} }
/*======================================================================*\ /*======================================================================*\
@@ -259,7 +263,7 @@ class Smarty
function _compile($tpl_dir) function _compile($tpl_dir)
{ {
if($this->compile_check || $this->compile_force) if($this->compile_check || $this->force_compile)
{ {
if($this->_traverse_files($tpl_dir, 0)) if($this->_traverse_files($tpl_dir, 0))
return true; return true;
@@ -288,11 +292,11 @@ class Smarty
$filepath = $tpl_dir."/".$curr_file; $filepath = $tpl_dir."/".$curr_file;
if(is_readable($filepath)) { if(is_readable($filepath)) {
if(is_file($filepath) && substr($curr_file,-strlen($this->tpl_file_ext)) == $this->tpl_file_ext) { if(is_file($filepath) && substr($curr_file, -strlen($this->tpl_file_ext)) == $this->tpl_file_ext) {
if(!$this->_process_file($filepath)) if(!$this->_process_file($filepath))
return false; return false;
} else if(is_dir($filepath)) { } else if (is_dir($filepath)) {
if(!$this->_traverse_files($filepath, $depth + 1)) if (!$this->_traverse_files($filepath, $depth + 1))
return false; return false;
} else { } else {
// invalid file type, skipping // invalid file type, skipping
@@ -338,11 +342,11 @@ class Smarty
} }
} }
// compile the template file if none exists or has been modified or compile_force // compile the template file if none exists or has been modified or recompile is forced
if (!file_exists($compile_dir."/".$tpl_file_name) || $this->compile_force || if ($this->force_compile || !file_exists($compile_dir."/".$tpl_file_name) ||
($this->_modified_file($filepath, $compile_dir."/".$tpl_file_name))) { ($this->_modified_file($filepath, $compile_dir."/".$tpl_file_name))) {
if (!$this->_compile_file($filepath, $compile_dir."/".$tpl_file_name)) if (!$this->_compile_file($filepath, $compile_dir."/".$tpl_file_name))
return false; return false;
} else { } else {
// no compilation needed // no compilation needed
return true; return true;
@@ -432,37 +436,28 @@ class Smarty
function _process_cached_inserts($results) function _process_cached_inserts($results)
{ {
preg_match_all('!\{\{\{insert_cache (.*)\}\}\}!Uis', $results, $match);
preg_match_all("/\{\{\{insert_cache name=([^ ]+) (.*)\}\}\}/Uis",$results,$match);
$fulltags = $match[0]; list($cached_inserts, $insert_args) = $match;
$names = $match[1];
$args = $match[2];
for($curr_tag = 0; $curr_tag < count($fulltags); $curr_tag++) for ($i = 0; $i < count($cached_inserts); $i++) {
{ $attrs = $this->_parse_attrs($insert_args[$i], false);
$attrs = $this->_parse_attrs($args[$curr_tag]); $name = $this->_dequote($attrs['name']);
$name = substr($attrs['name'], 1, -1);
if (empty($names[$curr_tag])) { if (empty($name)) {
$this->_syntax_error("missing insert name"); $this->_syntax_error("missing insert name");
} }
$arg_list = array();
foreach ($attrs as $arg_name => $arg_value) { foreach ($attrs as $arg_name => $arg_value) {
if ($arg_name == 'name') continue; if ($arg_name == 'name') continue;
if (is_bool($arg_value)) $arg_list[$arg_name] = $arg_value;
$arg_value = $arg_value ? 'true' : 'false';
$arg_list[] = "'$arg_name' => $arg_value";
} }
$evalcode = "print insert_".$names[$curr_tag]."(array(".implode(',', (array)$arg_list)."));"; $function_name = 'insert_' . $name;
$replace = $function_name($arg_list);
ob_start(); $results = str_replace($cached_inserts[$i], $replace, $results);
eval($evalcode);
$replace = ob_get_contents();
ob_end_clean();
$results = str_replace($fulltags[$curr_tag],$replace,$results);
} }
return $results; return $results;
@@ -474,9 +469,11 @@ class Smarty
if ($template_tag{0} == '*' && $template_tag{strlen($template_tag)-1} == '*') if ($template_tag{0} == '*' && $template_tag{strlen($template_tag)-1} == '*')
return ""; return "";
$qstr_regexp = '"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'';
/* Split tag into two parts: command and the arguments. */ /* Split tag into two parts: command and the arguments. */
preg_match('/^( preg_match('/^(
(?:"[^"\\\\]*(?:\\\\.[^"\\\\]*)*" | \'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\' | (?>[^"\'\s]+))+ (?: ' . $qstr_regexp . ' | (?>[^"\'\s]+))+
) )
(?:\s+(.*))? (?:\s+(.*))?
/xs', $template_tag, $match); /xs', $template_tag, $match);
@@ -484,9 +481,9 @@ class Smarty
/* If the tag name matches a variable or section property definition, /* If the tag name matches a variable or section property definition,
we simply process it. */ we simply process it. */
if (preg_match('!^\$(\w+/)*\w+(?>\.\w+)*(?>\|@?\w+(:[^|]+)?)*$!', $tag_command) || // if a variable if (preg_match('!^\$(\w+/)*\w+(?>\.\w+)*(?>\|@?\w+(:(' . $qstr_regexp . '|[^|]+))?)*$!', $tag_command) || // if a variable
preg_match('!^#(\w+)#(?>\|@?\w+(:[^|]+)?)*$!', $tag_command) || // or a configuration variable preg_match('!^#(\w+)#(?>\|@?\w+(:(' . $qstr_regexp . '|[^|]+))?)*$!', $tag_command) || // or a configuration variable
preg_match('!^%\w+\.\w+%(?>\|@?\w+(:[^|]+)?)*$!', $tag_command)) { // or a section property preg_match('!^%\w+\.\w+%(?>\|@?\w+(:(' . $qstr_regexp . '|[^|]+))?)*$!', $tag_command)) { // or a section property
settype($tag_command, 'array'); settype($tag_command, 'array');
$this->_parse_vars_props($tag_command); $this->_parse_vars_props($tag_command);
return "<?php print $tag_command[0]; ?>"; return "<?php print $tag_command[0]; ?>";
@@ -571,13 +568,13 @@ class Smarty
$attrs = $this->_parse_attrs($tag_args); $attrs = $this->_parse_attrs($tag_args);
$name = substr($attrs['name'], 1, -1); $name = substr($attrs['name'], 1, -1);
if($this->cache_engine)
return "<?php print \"{{{insert_cache ".addslashes($tag_args)."}}}\"; ?>";
if (empty($name)) { if (empty($name)) {
$this->_syntax_error("missing insert name"); $this->_syntax_error("missing insert name");
} }
if($this->caching)
return "{{{insert_cache $tag_args}}}";
foreach ($attrs as $arg_name => $arg_value) { foreach ($attrs as $arg_name => $arg_value) {
if ($arg_name == 'name') continue; if ($arg_name == 'name') continue;
if (is_bool($arg_value)) if (is_bool($arg_value))
@@ -855,7 +852,7 @@ class Smarty
return $tokens; return $tokens;
} }
function _parse_attrs($tag_args) function _parse_attrs($tag_args, $quote = true)
{ {
/* Tokenize tag attributes. */ /* Tokenize tag attributes. */
preg_match_all('/(?:"[^"\\\\]*(?:\\\\.[^"\\\\]*)*" | preg_match_all('/(?:"[^"\\\\]*(?:\\\\.[^"\\\\]*)*" |
@@ -868,9 +865,9 @@ class Smarty
$attrs = array(); $attrs = array();
/* Parse state: /* Parse state:
0 - expecting attr name 0 - expecting attribute name
1 - expecting '=' or another attr name 1 - expecting '='
2 - expecting attr value (not '=') */ 2 - expecting attribute value (not '=') */
$state = 0; $state = 0;
foreach ($tokens as $token) { foreach ($tokens as $token) {
@@ -886,12 +883,7 @@ class Smarty
break; break;
case 1: case 1:
/* If the token is a valid identifier, the previously set /* If the token is '=', then we go to state 2. */
attribute name does not need an argument. We put it in
the attrs array, set the new attribute name to the
current token and don't switch state.
If the token is '=', then we go to state 2. */
if ($token == '=') { if ($token == '=') {
$state = 2; $state = 2;
} else } else
@@ -911,7 +903,7 @@ class Smarty
/* If the token is not variable (doesn't start with /* If the token is not variable (doesn't start with
'$', '#', or '%') and not enclosed in single or '$', '#', or '%') and not enclosed in single or
double quotes we single-quote it. */ double quotes we single-quote it. */
else if (!in_array($token{0}, $var_delims) && else if ($quote && !in_array($token{0}, $var_delims) &&
!(($token{0} == '"' || $token[0] == "'") && !(($token{0} == '"' || $token[0] == "'") &&
$token{strlen($token)-1} == $token{0})) $token{strlen($token)-1} == $token{0}))
$token = "'".$token."'"; $token = "'".$token."'";
@@ -943,17 +935,19 @@ class Smarty
function _parse_vars_props(&$tokens) function _parse_vars_props(&$tokens)
{ {
$qstr_regexp = '"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'';
/* preg_grep() was fixed to return keys properly in 4.0.4 and later. To /* preg_grep() was fixed to return keys properly in 4.0.4 and later. To
allow people to use older versions of PHP we emulate preg_grep() and allow people to use older versions of PHP we emulate preg_grep() and
use the version check to see what function to call. */ use the version check to see what function to call. */
if (strnatcmp(PHP_VERSION, '4.0.4') >= 0) { if (strnatcmp(PHP_VERSION, '4.0.4') >= 0) {
$var_exprs = preg_grep('!^\$(\w+/)*\w+(?>\.\w+)*(?>\|@?\w+(:[^|]+)?)*$!', $tokens); $var_exprs = preg_grep('!^\$(\w+/)*\w+(?>\.\w+)*(?>\|@?\w+(:(' . $qstr_regexp . '|[^|]+))?)*$!', $tokens);
$conf_var_exprs = preg_grep('!^#(\w+)#(?>\|@?\w+(:[^|]+)?)*$!', $tokens); $conf_var_exprs = preg_grep('!^#(\w+)#(?>\|@?\w+(:(' . $qstr_regexp . '|[^|]+))?)*$!', $tokens);
$sect_prop_exprs = preg_grep('!^%\w+\.\w+%(?>\|@?\w+(:[^|]+)?)*$!', $tokens); $sect_prop_exprs = preg_grep('!^%\w+\.\w+%(?>\|@?\w+(:(' . $qstr_regexp . '|[^|]+))?)*$!', $tokens);
} else { } else {
$var_exprs = $this->_preg_grep('!^\$(\w+/)*\w+(?>\.\w+)*(?>\|@?\w+(:[^|]+)?)*$!', $tokens); $var_exprs = $this->_preg_grep('!^\$(\w+/)*\w+(?>\.\w+)*(?>\|@?\w+(:(' . $qstr_regexp . '|[^|]+))?)*$!', $tokens);
$conf_var_exprs = $this->_preg_grep('!^#(\w+)#(?>\|@?\w+(:[^|]+)?)*$!', $tokens); $conf_var_exprs = $this->_preg_grep('!^#(\w+)#(?>\|@?\w+(:(' . $qstr_regexp . '|[^|]+))?)*$!', $tokens);
$sect_prop_exprs = $this->_preg_grep('!^%\w+\.\w+%(?>\|@?\w+(:[^|]+)?)*$!', $tokens); $sect_prop_exprs = $this->_preg_grep('!^%\w+\.\w+%(?>\|@?\w+(:(' . $qstr_regexp . '|[^|]+))?)*$!', $tokens);
} }
if (count($var_exprs)) { if (count($var_exprs)) {
@@ -977,9 +971,9 @@ class Smarty
function _parse_var($var_expr) function _parse_var($var_expr)
{ {
$modifiers = explode('|', substr($var_expr, 1)); list($var_ref, $modifiers) = explode('|', substr($var_expr, 1), 2);
$sections = explode('/', array_shift($modifiers)); $sections = explode('/', $var_ref);
$props = explode('.', array_pop($sections)); $props = explode('.', array_pop($sections));
$var_name = array_shift($props); $var_name = array_shift($props);
@@ -999,9 +993,9 @@ class Smarty
function _parse_conf_var($conf_var_expr) function _parse_conf_var($conf_var_expr)
{ {
$modifiers = explode('|', $conf_var_expr); list($var_ref, $modifiers) = explode('|', $conf_var_expr, 2);
$var_name = substr(array_shift($modifiers), 1, -1); $var_name = substr($var_ref, 1, -1);
$output = "\$_config['$var_name']"; $output = "\$_config['$var_name']";
@@ -1012,9 +1006,9 @@ class Smarty
function _parse_section_prop($section_prop_expr) function _parse_section_prop($section_prop_expr)
{ {
$modifiers = explode('|', $section_prop_expr); list($var_ref, $modifiers) = explode('|', $section_prop_expr, 2);
preg_match('!%(\w+)\.(\w+)%!', array_shift($modifiers), $match); preg_match('!%(\w+)\.(\w+)%!', $var_ref, $match);
$section_name = $match[1]; $section_name = $match[1];
$prop_name = $match[2]; $prop_name = $match[2];
@@ -1025,11 +1019,16 @@ class Smarty
return $output; return $output;
} }
function _parse_modifiers(&$output, $modifiers) function _parse_modifiers(&$output, $modifier_string)
{ {
foreach ($modifiers as $modifier) { $qstr_regexp = '"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'';
$modifier = explode(':', $modifier); preg_match_all('!\|@?(\w+)((?::(?:'. $qstr_regexp . '|[^|]+))*)!', '|' . $modifier_string, $match);
$modifier_name = array_shift($modifier); list(, $modifiers, $modifier_arg_strings) = $match;
for ($i = 0; $i < count($modifiers); $i++) {
$modifier_name = $modifiers[$i];
preg_match_all('!:(' . $qstr_regexp . '|[^|]+)!', $modifier_arg_strings[$i], $match);
$modifier_args = $match[1];
if ($modifier_name{0} == '@') { if ($modifier_name{0} == '@') {
$map_array = 'false'; $map_array = 'false';
@@ -1050,10 +1049,10 @@ class Smarty
if (!isset($mod_func_name)) if (!isset($mod_func_name))
$mod_func_name = $modifier_name; $mod_func_name = $modifier_name;
$this->_parse_vars_props($modifier); $this->_parse_vars_props($modifier_args);
if (count($modifier) > 0) if (count($modifier_args) > 0)
$modifier_args = ', '.implode(', ', $modifier); $modifier_args = ', '.implode(', ', $modifier_args);
else else
$modifier_args = ''; $modifier_args = '';
@@ -1071,6 +1070,8 @@ class Smarty
if (($string{0} == "'" || $string{0} == '"') && if (($string{0} == "'" || $string{0} == '"') &&
$string{strlen($string)-1} == $string{0}) $string{strlen($string)-1} == $string{0})
return substr($string, 1, -1); return substr($string, 1, -1);
else
return $string;
} }

11
demo/index.php
View File

@@ -4,7 +4,9 @@ require("Smarty.class.php");
$smarty = new Smarty; $smarty = new Smarty;
$smarty->cache_engine = false; $smarty->caching = false;
$smarty->assign(now, time());
$smarty->assign("Name","Fred Irving Johnathan Bradley Peppergill"); $smarty->assign("Name","Fred Irving Johnathan Bradley Peppergill");
$smarty->assign("FirstName",array("John","Mary","James","Henry")); $smarty->assign("FirstName",array("John","Mary","James","Henry"));
@@ -19,4 +21,11 @@ $smarty->assign("now",time());
$smarty->display("index.tpl"); $smarty->display("index.tpl");
function insert_foo($args)
{
extract($args);
return "test $arg1";
}
?> ?>

2
demo/templates/index.tpl
View File

@@ -48,3 +48,5 @@ testing strip tags
</PRE> </PRE>
test: {$now|date_format:"%I:%M %p"} test: {$now|date_format:"%I:%M %p"}
{insert name = foo arg1=5}

2
docs.sgml
View File

@@ -14,7 +14,7 @@
<address><email>andrei@ispi.net</email></address> <address><email>andrei@ispi.net</email></address>
</affiliation> </affiliation>
</author> </author>
<edition>Version 1.2.2</edition> <edition>Version 1.2.3</edition>
<copyright><year>2001</year><holder>ispi of Lincoln, Inc.</holder></copyright> <copyright><year>2001</year><holder>ispi of Lincoln, Inc.</holder></copyright>
</bookinfo> </bookinfo>
<chapter> <chapter>

11
index.php
View File

@@ -4,7 +4,9 @@ require("Smarty.class.php");
$smarty = new Smarty; $smarty = new Smarty;
$smarty->cache_engine = false; $smarty->caching = false;
$smarty->assign(now, time());
$smarty->assign("Name","Fred Irving Johnathan Bradley Peppergill"); $smarty->assign("Name","Fred Irving Johnathan Bradley Peppergill");
$smarty->assign("FirstName",array("John","Mary","James","Henry")); $smarty->assign("FirstName",array("John","Mary","James","Henry"));
@@ -19,4 +21,11 @@ $smarty->assign("now",time());
$smarty->display("index.tpl"); $smarty->display("index.tpl");
function insert_foo($args)
{
extract($args);
return "test $arg1";
}
?> ?>

2
libs/Config_File.class.php
View File

@@ -5,7 +5,7 @@ require_once "PEAR.php";
/** /**
* Config_File class. * Config_File class.
* *
* @version 1.2.2 * @version 1.2.3
* @author Andrei Zmievski <andrei@ispi.net> * @author Andrei Zmievski <andrei@ispi.net>
* @access public * @access public
* *

281
libs/Smarty.class.php
View File

@@ -5,7 +5,7 @@
* Author: Monte Ohrt <monte@ispi.net> * Author: Monte Ohrt <monte@ispi.net>
* Andrei Zmievski <andrei@ispi.net> * Andrei Zmievski <andrei@ispi.net>
* *
* Version: 1.2.2 * Version: 1.2.3
* Copyright: 2001 ispi of Lincoln, Inc. * Copyright: 2001 ispi of Lincoln, Inc.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@@ -43,59 +43,57 @@ class Smarty
{ {
// public vars // public vars
var $compile_check = true; // whether to check for compiling step or not: var $compile_check = true; // whether to check for compiling step or not:
// This is generally set to false once the // This is generally set to false once the
// application is entered into production and // application is entered into production and
// initially compiled. Leave set to true // initially compiled. Leave set to true
// during development. true/false // during development. true/false
var $compile_force = false; // force templates to compile every time. var $force_compile = false; // force templates to compile every time.
// overrides compile_check. true/false // overrides compile_check. true/false
var $allow_url_compile = true; // allow forced recompile from URL ?compile_force=1
// NOTE: all cache directives override // NOTE: all cache directives override
// compiling directives. If a cached version // compiling directives. If a cached version
// is available, that will be used regardless // is available, that will be used regardless
// of compile settings. // of compile settings.
var $cache_engine = true; // whether to use caching or not. true/false var $caching = true; // whether to use caching or not. true/false
var $cache_expire = 3600; // number of seconds cached content will expire. var $cache_lifetime = 3600; // number of seconds cached content will persist.
// 0 = never expires. default is one hour (3600) // 0 = never expires. default is one hour (3600)
var $cache_force = false; // force caches to expire every time. true/false
var $allow_url_cache = true; // allow forced cache expire from URL ?cache_force=1
var $template_dir = "./templates"; // name of directory for templates var $template_dir = "./templates"; // name of directory for templates
var $compile_dir = "./templates_c"; // name of directory for compiled templates var $compile_dir = "./templates_c"; // name of directory for compiled templates
var $cache_dir = "./cache"; // name of directory for template cache var $cache_dir = "./cache"; // name of directory for template cache
var $tpl_file_ext = ".tpl"; // template file extentions var $tpl_file_ext = ".tpl"; // template file extentions
var $allow_php = false; // whether or not to allow embedded php var $allow_php = false; // whether or not to allow embedded php
// in the templates. By default, php tags // in the templates. By default, php tags
// are escaped. true/false // are escaped. true/false
var $left_delimiter = "{"; // template tag delimiters.
var $right_delimiter = "}";
var $config_dir = "./configs"; // directory where config files are located var $left_delimiter = "{"; // template tag delimiters.
var $right_delimiter = "}";
var $custom_funcs = array( 'html_options' => 'smarty_func_html_options', var $config_dir = "./configs"; // directory where config files are located
'html_select_date' => 'smarty_func_html_select_date'
); var $custom_funcs = array( 'html_options' => 'smarty_func_html_options',
'html_select_date' => 'smarty_func_html_select_date'
);
var $custom_mods = array( 'lower' => 'strtolower', var $custom_mods = array( 'lower' => 'strtolower',
'upper' => 'strtoupper', 'upper' => 'strtoupper',
'capitalize' => 'ucwords', 'capitalize' => 'ucwords',
'escape' => 'smarty_mod_escape', 'escape' => 'smarty_mod_escape',
'truncate' => 'smarty_mod_truncate', 'truncate' => 'smarty_mod_truncate',
'spacify' => 'smarty_mod_spacify', 'spacify' => 'smarty_mod_spacify',
'date_format' => 'smarty_mod_date_format', 'date_format' => 'smarty_mod_date_format',
'string_format' => 'smarty_mod_string_format', 'string_format' => 'smarty_mod_string_format',
'replace' => 'smarty_mod_replace', 'replace' => 'smarty_mod_replace',
'strip_tags' => 'smarty_mod_strip_tags', 'strip_tags' => 'smarty_mod_strip_tags',
'default' => 'smarty_mod_default' 'default' => 'smarty_mod_default'
); );
var $global_assign = array( 'SCRIPT_NAME' var $global_assign = array( 'SCRIPT_NAME'
); );
// internal vars // internal vars
var $_error_msg = false; // error messages. true/false var $_error_msg = false; // error messages. true/false
@@ -198,58 +196,64 @@ class Smarty
function display($tpl_file) function display($tpl_file)
{ {
print $this->fetch($tpl_file); $this->fetch($tpl_file, true);
} }
/*======================================================================*\ /*======================================================================*\
Function: fetch() Function: fetch()
Purpose: executes & returns the template results Purpose: executes & returns or displays the template results
\*======================================================================*/ \*======================================================================*/
function fetch($tpl_file) function fetch($tpl_file, $display = false)
{ {
global $HTTP_GET_VARS,$PHP_SELF; global $PHP_SELF;
if($this->cache_engine) if($this->caching) {
{
if($this->allow_url_cache && $HTTP_GET_VARS["cache_force"])
$this->cache_force = true;
// cache id = template path + the invoked script // cache id = template path + the invoked script
$cache_file = $this->cache_dir."/".urlencode($tpl_file."@".$PHP_SELF).".che"; $cache_file = $this->cache_dir."/".urlencode($tpl_file."@".$PHP_SELF).".cache";
if(!$this->cache_force && if(!$this->cache_force &&
(file_exists($cache_file) && (file_exists($cache_file) &&
($this->cache_expire == 0 || ($this->cache_lifetime == 0 ||
(mktime() - filectime($cache_file) <= $this->cache_expire) (mktime() - filemtime($cache_file) <= $this->cache_lifetime)
))) ))) {
{
$results = $this->_read_file($cache_file); $results = $this->_read_file($cache_file);
$results = $this->_process_cached_inserts($results); $results = $this->_process_cached_inserts($results);
return $results; if ($display) {
} print $results;
return;
} else
return $results;
}
} }
if($this->allow_url_compile && $HTTP_GET_VARS["compile_force"]) // compile files
$this->compile_force = true; $this->_compile($this->template_dir);
//assemble compile directory path to file
$_compile_file = $this->compile_dir."/".$tpl_file.".php";
ob_start(); extract($this->_tpl_vars);
// compile files
$this->_compile($this->template_dir);
//assemble compile directory path to file
$_compile_file = $this->compile_dir."/".$tpl_file.".php";
extract($this->_tpl_vars); // if we just need to display the results, don't perform output
include($_compile_file); // buferring - for speed
$results = ob_get_contents(); if ($display && !$this->caching)
ob_end_clean(); include($_compile_file);
else {
ob_start();
include($_compile_file);
$results = ob_get_contents();
ob_end_clean();
}
if($this->cache_engine) if($this->caching) {
{ $this->_write_file($cache_file, $results);
$this->_write_file($cache_file,$results);
$results = $this->_process_cached_inserts($results); $results = $this->_process_cached_inserts($results);
} }
return $results; if ($display) {
print $results;
return;
} else
return $results;
} }
/*======================================================================*\ /*======================================================================*\
@@ -259,7 +263,7 @@ class Smarty
function _compile($tpl_dir) function _compile($tpl_dir)
{ {
if($this->compile_check || $this->compile_force) if($this->compile_check || $this->force_compile)
{ {
if($this->_traverse_files($tpl_dir, 0)) if($this->_traverse_files($tpl_dir, 0))
return true; return true;
@@ -288,11 +292,11 @@ class Smarty
$filepath = $tpl_dir."/".$curr_file; $filepath = $tpl_dir."/".$curr_file;
if(is_readable($filepath)) { if(is_readable($filepath)) {
if(is_file($filepath) && substr($curr_file,-strlen($this->tpl_file_ext)) == $this->tpl_file_ext) { if(is_file($filepath) && substr($curr_file, -strlen($this->tpl_file_ext)) == $this->tpl_file_ext) {
if(!$this->_process_file($filepath)) if(!$this->_process_file($filepath))
return false; return false;
} else if(is_dir($filepath)) { } else if (is_dir($filepath)) {
if(!$this->_traverse_files($filepath, $depth + 1)) if (!$this->_traverse_files($filepath, $depth + 1))
return false; return false;
} else { } else {
// invalid file type, skipping // invalid file type, skipping
@@ -338,11 +342,11 @@ class Smarty
} }
} }
// compile the template file if none exists or has been modified or compile_force // compile the template file if none exists or has been modified or recompile is forced
if (!file_exists($compile_dir."/".$tpl_file_name) || $this->compile_force || if ($this->force_compile || !file_exists($compile_dir."/".$tpl_file_name) ||
($this->_modified_file($filepath, $compile_dir."/".$tpl_file_name))) { ($this->_modified_file($filepath, $compile_dir."/".$tpl_file_name))) {
if (!$this->_compile_file($filepath, $compile_dir."/".$tpl_file_name)) if (!$this->_compile_file($filepath, $compile_dir."/".$tpl_file_name))
return false; return false;
} else { } else {
// no compilation needed // no compilation needed
return true; return true;
@@ -432,37 +436,28 @@ class Smarty
function _process_cached_inserts($results) function _process_cached_inserts($results)
{ {
preg_match_all('!\{\{\{insert_cache (.*)\}\}\}!Uis', $results, $match);
preg_match_all("/\{\{\{insert_cache name=([^ ]+) (.*)\}\}\}/Uis",$results,$match);
$fulltags = $match[0]; list($cached_inserts, $insert_args) = $match;
$names = $match[1];
$args = $match[2];
for($curr_tag = 0; $curr_tag < count($fulltags); $curr_tag++) for ($i = 0; $i < count($cached_inserts); $i++) {
{ $attrs = $this->_parse_attrs($insert_args[$i], false);
$attrs = $this->_parse_attrs($args[$curr_tag]); $name = $this->_dequote($attrs['name']);
$name = substr($attrs['name'], 1, -1);
if (empty($names[$curr_tag])) { if (empty($name)) {
$this->_syntax_error("missing insert name"); $this->_syntax_error("missing insert name");
} }
$arg_list = array();
foreach ($attrs as $arg_name => $arg_value) { foreach ($attrs as $arg_name => $arg_value) {
if ($arg_name == 'name') continue; if ($arg_name == 'name') continue;
if (is_bool($arg_value)) $arg_list[$arg_name] = $arg_value;
$arg_value = $arg_value ? 'true' : 'false';
$arg_list[] = "'$arg_name' => $arg_value";
} }
$evalcode = "print insert_".$names[$curr_tag]."(array(".implode(',', (array)$arg_list)."));"; $function_name = 'insert_' . $name;
$replace = $function_name($arg_list);
ob_start(); $results = str_replace($cached_inserts[$i], $replace, $results);
eval($evalcode);
$replace = ob_get_contents();
ob_end_clean();
$results = str_replace($fulltags[$curr_tag],$replace,$results);
} }
return $results; return $results;
@@ -474,9 +469,11 @@ class Smarty
if ($template_tag{0} == '*' && $template_tag{strlen($template_tag)-1} == '*') if ($template_tag{0} == '*' && $template_tag{strlen($template_tag)-1} == '*')
return ""; return "";
$qstr_regexp = '"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'';
/* Split tag into two parts: command and the arguments. */ /* Split tag into two parts: command and the arguments. */
preg_match('/^( preg_match('/^(
(?:"[^"\\\\]*(?:\\\\.[^"\\\\]*)*" | \'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\' | (?>[^"\'\s]+))+ (?: ' . $qstr_regexp . ' | (?>[^"\'\s]+))+
) )
(?:\s+(.*))? (?:\s+(.*))?
/xs', $template_tag, $match); /xs', $template_tag, $match);
@@ -484,9 +481,9 @@ class Smarty
/* If the tag name matches a variable or section property definition, /* If the tag name matches a variable or section property definition,
we simply process it. */ we simply process it. */
if (preg_match('!^\$(\w+/)*\w+(?>\.\w+)*(?>\|@?\w+(:[^|]+)?)*$!', $tag_command) || // if a variable if (preg_match('!^\$(\w+/)*\w+(?>\.\w+)*(?>\|@?\w+(:(' . $qstr_regexp . '|[^|]+))?)*$!', $tag_command) || // if a variable
preg_match('!^#(\w+)#(?>\|@?\w+(:[^|]+)?)*$!', $tag_command) || // or a configuration variable preg_match('!^#(\w+)#(?>\|@?\w+(:(' . $qstr_regexp . '|[^|]+))?)*$!', $tag_command) || // or a configuration variable
preg_match('!^%\w+\.\w+%(?>\|@?\w+(:[^|]+)?)*$!', $tag_command)) { // or a section property preg_match('!^%\w+\.\w+%(?>\|@?\w+(:(' . $qstr_regexp . '|[^|]+))?)*$!', $tag_command)) { // or a section property
settype($tag_command, 'array'); settype($tag_command, 'array');
$this->_parse_vars_props($tag_command); $this->_parse_vars_props($tag_command);
return "<?php print $tag_command[0]; ?>"; return "<?php print $tag_command[0]; ?>";
@@ -571,13 +568,13 @@ class Smarty
$attrs = $this->_parse_attrs($tag_args); $attrs = $this->_parse_attrs($tag_args);
$name = substr($attrs['name'], 1, -1); $name = substr($attrs['name'], 1, -1);
if($this->cache_engine)
return "<?php print \"{{{insert_cache ".addslashes($tag_args)."}}}\"; ?>";
if (empty($name)) { if (empty($name)) {
$this->_syntax_error("missing insert name"); $this->_syntax_error("missing insert name");
} }
if($this->caching)
return "{{{insert_cache $tag_args}}}";
foreach ($attrs as $arg_name => $arg_value) { foreach ($attrs as $arg_name => $arg_value) {
if ($arg_name == 'name') continue; if ($arg_name == 'name') continue;
if (is_bool($arg_value)) if (is_bool($arg_value))
@@ -855,7 +852,7 @@ class Smarty
return $tokens; return $tokens;
} }
function _parse_attrs($tag_args) function _parse_attrs($tag_args, $quote = true)
{ {
/* Tokenize tag attributes. */ /* Tokenize tag attributes. */
preg_match_all('/(?:"[^"\\\\]*(?:\\\\.[^"\\\\]*)*" | preg_match_all('/(?:"[^"\\\\]*(?:\\\\.[^"\\\\]*)*" |
@@ -868,9 +865,9 @@ class Smarty
$attrs = array(); $attrs = array();
/* Parse state: /* Parse state:
0 - expecting attr name 0 - expecting attribute name
1 - expecting '=' or another attr name 1 - expecting '='
2 - expecting attr value (not '=') */ 2 - expecting attribute value (not '=') */
$state = 0; $state = 0;
foreach ($tokens as $token) { foreach ($tokens as $token) {
@@ -886,12 +883,7 @@ class Smarty
break; break;
case 1: case 1:
/* If the token is a valid identifier, the previously set /* If the token is '=', then we go to state 2. */
attribute name does not need an argument. We put it in
the attrs array, set the new attribute name to the
current token and don't switch state.
If the token is '=', then we go to state 2. */
if ($token == '=') { if ($token == '=') {
$state = 2; $state = 2;
} else } else
@@ -911,7 +903,7 @@ class Smarty
/* If the token is not variable (doesn't start with /* If the token is not variable (doesn't start with
'$', '#', or '%') and not enclosed in single or '$', '#', or '%') and not enclosed in single or
double quotes we single-quote it. */ double quotes we single-quote it. */
else if (!in_array($token{0}, $var_delims) && else if ($quote && !in_array($token{0}, $var_delims) &&
!(($token{0} == '"' || $token[0] == "'") && !(($token{0} == '"' || $token[0] == "'") &&
$token{strlen($token)-1} == $token{0})) $token{strlen($token)-1} == $token{0}))
$token = "'".$token."'"; $token = "'".$token."'";
@@ -943,17 +935,19 @@ class Smarty
function _parse_vars_props(&$tokens) function _parse_vars_props(&$tokens)
{ {
$qstr_regexp = '"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'';
/* preg_grep() was fixed to return keys properly in 4.0.4 and later. To /* preg_grep() was fixed to return keys properly in 4.0.4 and later. To
allow people to use older versions of PHP we emulate preg_grep() and allow people to use older versions of PHP we emulate preg_grep() and
use the version check to see what function to call. */ use the version check to see what function to call. */
if (strnatcmp(PHP_VERSION, '4.0.4') >= 0) { if (strnatcmp(PHP_VERSION, '4.0.4') >= 0) {
$var_exprs = preg_grep('!^\$(\w+/)*\w+(?>\.\w+)*(?>\|@?\w+(:[^|]+)?)*$!', $tokens); $var_exprs = preg_grep('!^\$(\w+/)*\w+(?>\.\w+)*(?>\|@?\w+(:(' . $qstr_regexp . '|[^|]+))?)*$!', $tokens);
$conf_var_exprs = preg_grep('!^#(\w+)#(?>\|@?\w+(:[^|]+)?)*$!', $tokens); $conf_var_exprs = preg_grep('!^#(\w+)#(?>\|@?\w+(:(' . $qstr_regexp . '|[^|]+))?)*$!', $tokens);
$sect_prop_exprs = preg_grep('!^%\w+\.\w+%(?>\|@?\w+(:[^|]+)?)*$!', $tokens); $sect_prop_exprs = preg_grep('!^%\w+\.\w+%(?>\|@?\w+(:(' . $qstr_regexp . '|[^|]+))?)*$!', $tokens);
} else { } else {
$var_exprs = $this->_preg_grep('!^\$(\w+/)*\w+(?>\.\w+)*(?>\|@?\w+(:[^|]+)?)*$!', $tokens); $var_exprs = $this->_preg_grep('!^\$(\w+/)*\w+(?>\.\w+)*(?>\|@?\w+(:(' . $qstr_regexp . '|[^|]+))?)*$!', $tokens);
$conf_var_exprs = $this->_preg_grep('!^#(\w+)#(?>\|@?\w+(:[^|]+)?)*$!', $tokens); $conf_var_exprs = $this->_preg_grep('!^#(\w+)#(?>\|@?\w+(:(' . $qstr_regexp . '|[^|]+))?)*$!', $tokens);
$sect_prop_exprs = $this->_preg_grep('!^%\w+\.\w+%(?>\|@?\w+(:[^|]+)?)*$!', $tokens); $sect_prop_exprs = $this->_preg_grep('!^%\w+\.\w+%(?>\|@?\w+(:(' . $qstr_regexp . '|[^|]+))?)*$!', $tokens);
} }
if (count($var_exprs)) { if (count($var_exprs)) {
@@ -977,9 +971,9 @@ class Smarty
function _parse_var($var_expr) function _parse_var($var_expr)
{ {
$modifiers = explode('|', substr($var_expr, 1)); list($var_ref, $modifiers) = explode('|', substr($var_expr, 1), 2);
$sections = explode('/', array_shift($modifiers)); $sections = explode('/', $var_ref);
$props = explode('.', array_pop($sections)); $props = explode('.', array_pop($sections));
$var_name = array_shift($props); $var_name = array_shift($props);
@@ -999,9 +993,9 @@ class Smarty
function _parse_conf_var($conf_var_expr) function _parse_conf_var($conf_var_expr)
{ {
$modifiers = explode('|', $conf_var_expr); list($var_ref, $modifiers) = explode('|', $conf_var_expr, 2);
$var_name = substr(array_shift($modifiers), 1, -1); $var_name = substr($var_ref, 1, -1);
$output = "\$_config['$var_name']"; $output = "\$_config['$var_name']";
@@ -1012,9 +1006,9 @@ class Smarty
function _parse_section_prop($section_prop_expr) function _parse_section_prop($section_prop_expr)
{ {
$modifiers = explode('|', $section_prop_expr); list($var_ref, $modifiers) = explode('|', $section_prop_expr, 2);
preg_match('!%(\w+)\.(\w+)%!', array_shift($modifiers), $match); preg_match('!%(\w+)\.(\w+)%!', $var_ref, $match);
$section_name = $match[1]; $section_name = $match[1];
$prop_name = $match[2]; $prop_name = $match[2];
@@ -1025,11 +1019,16 @@ class Smarty
return $output; return $output;
} }
function _parse_modifiers(&$output, $modifiers) function _parse_modifiers(&$output, $modifier_string)
{ {
foreach ($modifiers as $modifier) { $qstr_regexp = '"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'';
$modifier = explode(':', $modifier); preg_match_all('!\|@?(\w+)((?::(?:'. $qstr_regexp . '|[^|]+))*)!', '|' . $modifier_string, $match);
$modifier_name = array_shift($modifier); list(, $modifiers, $modifier_arg_strings) = $match;
for ($i = 0; $i < count($modifiers); $i++) {
$modifier_name = $modifiers[$i];
preg_match_all('!:(' . $qstr_regexp . '|[^|]+)!', $modifier_arg_strings[$i], $match);
$modifier_args = $match[1];
if ($modifier_name{0} == '@') { if ($modifier_name{0} == '@') {
$map_array = 'false'; $map_array = 'false';
@@ -1050,10 +1049,10 @@ class Smarty
if (!isset($mod_func_name)) if (!isset($mod_func_name))
$mod_func_name = $modifier_name; $mod_func_name = $modifier_name;
$this->_parse_vars_props($modifier); $this->_parse_vars_props($modifier_args);
if (count($modifier) > 0) if (count($modifier_args) > 0)
$modifier_args = ', '.implode(', ', $modifier); $modifier_args = ', '.implode(', ', $modifier_args);
else else
$modifier_args = ''; $modifier_args = '';
@@ -1071,6 +1070,8 @@ class Smarty
if (($string{0} == "'" || $string{0} == '"') && if (($string{0} == "'" || $string{0} == '"') &&
$string{strlen($string)-1} == $string{0}) $string{strlen($string)-1} == $string{0})
return substr($string, 1, -1); return substr($string, 1, -1);
else
return $string;
} }

2
templates/index.tpl
View File

@@ -48,3 +48,5 @@ testing strip tags
</PRE> </PRE>
test: {$now|date_format:"%I:%M %p"} test: {$now|date_format:"%I:%M %p"}
{insert name = foo arg1=5}