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

make config vars compile statically

Browse Source
This commit is contained in:
mohrt
2003-06-11 21:52:09 +00:00
parent 03922f14bb
commit 621629cd44
4 changed files with 125 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -1,3 +1,4 @@
- make config vars compile statically (Monte)
- added block-methods for registered objects (Bharat Mediratta, messju) - added block-methods for registered objects (Bharat Mediratta, messju)
- ignore one char resource names like c:foo.tpl (Monte) - ignore one char resource names like c:foo.tpl (Monte)
- added default_resource_type feature (Monte) - added default_resource_type feature (Monte)

24
libs/Smarty.class.php
View File

@@ -1483,6 +1483,7 @@ class Smarty
$smarty_compiler->_tpl_vars = &$this->_tpl_vars; $smarty_compiler->_tpl_vars = &$this->_tpl_vars;
$smarty_compiler->default_modifiers = $this->default_modifiers; $smarty_compiler->default_modifiers = $this->default_modifiers;
$smarty_compiler->compile_id = $this->_compile_id; $smarty_compiler->compile_id = $this->_compile_id;
$smarty_compiler->_config = $this->_config;
if ($smarty_compiler->_compile_file($tpl_file, $template_source, $template_compiled)) { if ($smarty_compiler->_compile_file($tpl_file, $template_source, $template_compiled)) {
return true; return true;
@@ -1499,22 +1500,19 @@ class Smarty
* @param array|null $map_array * @param array|null $map_array
* @return string result of modifiers * @return string result of modifiers
*/ */
function _run_mod_handler() function _run_mod_handler($_modifier_name, $_map_array, $_modifier_args)
{ {
$args = func_get_args(); $_func_name = $this->_plugins['modifier'][$_modifier_name][0];
list($modifier_name, $map_array) = array_splice($args, 0, 2); $_var = $_modifier_args[0];
list($func_name, $tpl_file, $tpl_line) =
$this->_plugins['modifier'][$modifier_name];
$var = $args[0];
if ($map_array && is_array($var)) { if ($_map_array && is_array($_var)) {
foreach ($var as $key => $val) { foreach ($_var as $_key => $_val) {
$args[0] = $val; $_modifier_args[0] = $_val;
$var[$key] = call_user_func_array($func_name, $args); $_var[$_key] = call_user_func_array($_func_name, $_modifier_args);
} }
return $var; return $_var;
} else { } else {
return call_user_func_array($func_name, $args); return call_user_func_array($_func_name, $_modifier_args);
} }
} }

134
libs/Smarty_Compiler.class.php
View File

@@ -60,6 +60,7 @@ class Smarty_Compiler extends Smarty {
var $_plugin_info = array(); // keeps track of plugins to load var $_plugin_info = array(); // keeps track of plugins to load
var $_init_smarty_vars = false; var $_init_smarty_vars = false;
var $_permitted_tokens = array('true','false','yes','no','on','off','null'); var $_permitted_tokens = array('true','false','yes','no','on','off','null');
var $_output_type = 'php';
var $_db_qstr_regexp = null; // regexps are setup in the constructor var $_db_qstr_regexp = null; // regexps are setup in the constructor
var $_si_qstr_regexp = null; var $_si_qstr_regexp = null;
var $_qstr_regexp = null; var $_qstr_regexp = null;
@@ -213,6 +214,7 @@ class Smarty_Compiler extends Smarty {
*/ */
function _compile_file($tpl_file, $template_source, &$template_compiled) function _compile_file($tpl_file, $template_source, &$template_compiled)
{ {
if ($this->security) { if ($this->security) {
// do not allow php syntax to be executed unless specified // do not allow php syntax to be executed unless specified
if ($this->php_handling == SMARTY_PHP_ALLOW && if ($this->php_handling == SMARTY_PHP_ALLOW &&
@@ -372,6 +374,8 @@ class Smarty_Compiler extends Smarty {
*/ */
function _compile_tag($template_tag) function _compile_tag($template_tag)
{ {
// default to php output
$this->_output_type = 'php';
/* Matched comment. */ /* Matched comment. */
if ($template_tag{0} == '*' && $template_tag{strlen($template_tag) - 1} == '*') if ($template_tag{0} == '*' && $template_tag{strlen($template_tag) - 1} == '*')
@@ -389,14 +393,16 @@ class Smarty_Compiler extends Smarty {
$tag_modifier = isset($match[2]) ? $match[2] : null; $tag_modifier = isset($match[2]) ? $match[2] : null;
$tag_args = isset($match[3]) ? $match[3] : null; $tag_args = isset($match[3]) ? $match[3] : null;
/* If the tag name is a variable or object, we process it. */
if (preg_match('!^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '$!', $tag_command)) { if (preg_match('!^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '$!', $tag_command)) {
/* tag name is a variable or object */
$_return = $this->_parse_var_props($tag_command . $tag_modifier, $this->_parse_attrs($tag_args)); $_return = $this->_parse_var_props($tag_command . $tag_modifier, $this->_parse_attrs($tag_args));
if(isset($_tag_attrs['assign'])) { if(isset($_tag_attrs['assign'])) {
return "<?php \$this->assign('" . $this->_dequote($_tag_attrs['assign']) . "', $_return ); ?>\n"; return "<?php \$this->assign('" . $this->_dequote($_tag_attrs['assign']) . "', $_return ); ?>\n";
} else { } elseif ($this->_output_type == 'php') {
return "<?php echo $_return; ?>\n"; return "<?php echo $_return; ?>\n";
} else {
// static
return $_return;
} }
} }
@@ -1422,7 +1428,6 @@ class Smarty_Compiler extends Smarty {
*/ */
function _parse_var_props($val, $tag_attrs = null) function _parse_var_props($val, $tag_attrs = null)
{ {
$val = trim($val); $val = trim($val);
if(preg_match('!^(' . $this->_obj_call_regexp . '|' . $this->_dvar_regexp . ')(?:' . $this->_mod_regexp . '*)$!', $val)) { if(preg_match('!^(' . $this->_obj_call_regexp . '|' . $this->_dvar_regexp . ')(?:' . $this->_mod_regexp . '*)$!', $val)) {
@@ -1448,6 +1453,7 @@ class Smarty_Compiler extends Smarty {
} }
elseif(preg_match('!^' . $this->_cvar_regexp . '(?:' . $this->_mod_regexp . '*)$!', $val)) { elseif(preg_match('!^' . $this->_cvar_regexp . '(?:' . $this->_mod_regexp . '*)$!', $val)) {
// config var // config var
$this->_output_type = 'static';
return $this->_parse_conf_var($val); return $this->_parse_conf_var($val);
} }
elseif(preg_match('!^' . $this->_svar_regexp . '(?:' . $this->_mod_regexp . '*)$!', $val)) { elseif(preg_match('!^' . $this->_svar_regexp . '(?:' . $this->_mod_regexp . '*)$!', $val)) {
@@ -1487,16 +1493,19 @@ class Smarty_Compiler extends Smarty {
} }
/** /**
* parse variable expression into PHP code * parse variable expression into PHP code or static value
* *
* @param string $var_expr * @param string $var_expr
* @return string * @return string
*/ */
function _parse_var($var_expr) function _parse_var($var_expr)
{ {
// inform the calling expression the return type (php, static)
$this->_output_type = 'php';
preg_match('!(' . $this->_obj_call_regexp . '|' . $this->_var_regexp . ')(' . $this->_mod_regexp . '*)$!', $var_expr, $match); preg_match('!(' . $this->_obj_call_regexp . '|' . $this->_var_regexp . ')(' . $this->_mod_regexp . '*)$!', $var_expr, $match);
$var_ref = substr($match[1],1); $_var_ref = substr($match[1],1);
$modifiers = $match[2]; $modifiers = $match[2];
if(!empty($this->default_modifiers) && !preg_match('!(^|\|)smarty:nodefaults($|\|)!',$modifiers)) { if(!empty($this->default_modifiers) && !preg_match('!(^|\|)smarty:nodefaults($|\|)!',$modifiers)) {
@@ -1505,64 +1514,64 @@ class Smarty_Compiler extends Smarty {
} }
// get [foo] and .foo and ->foo and (...) pieces // get [foo] and .foo and ->foo and (...) pieces
preg_match_all('!(?:^\w+)|' . $this->_obj_params_regexp . '|(?:' . $this->_var_bracket_regexp . ')|->\w+|\.\$?\w+|\S+!', $var_ref, $match); preg_match_all('!(?:^\w+)|' . $this->_obj_params_regexp . '|(?:' . $this->_var_bracket_regexp . ')|->\w+|\.\$?\w+|\S+!', $_var_ref, $match);
$indexes = $match[0]; $_indexes = $match[0];
$var_name = array_shift($indexes); $_var_name = array_shift($_indexes);
/* Handle $smarty.* variable references as a special case. */ /* Handle $smarty.* variable references as a special case. */
if ($var_name == 'smarty') { if ($_var_name == 'smarty') {
/* /*
* If the reference could be compiled, use the compiled output; * If the reference could be compiled, use the compiled output;
* otherwise, fall back on the $smarty variable generated at * otherwise, fall back on the $smarty variable generated at
* run-time. * run-time.
*/ */
if (($smarty_ref = $this->_compile_smarty_ref($indexes)) !== null) { if (($smarty_ref = $this->_compile_smarty_ref($_indexes)) !== null) {
$output = $smarty_ref; $_output = $smarty_ref;
} else { } else {
$var_name = substr(array_shift($indexes), 1); $_var_name = substr(array_shift($_indexes), 1);
$output = "\$this->_smarty_vars['$var_name']"; $_output = "\$this->_smarty_vars['$_var_name']";
} }
} else { } else {
$output = "\$this->_tpl_vars['$var_name']"; $_output = "\$this->_tpl_vars['$_var_name']";
} }
foreach ($indexes as $index) { foreach ($_indexes as $_index) {
if ($index{0} == '[') { if ($_index{0} == '[') {
$index = substr($index, 1, -1); $_index = substr($_index, 1, -1);
if (is_numeric($index)) { if (is_numeric($_index)) {
$output .= "[$index]"; $_output .= "[$_index]";
} elseif ($index{0} == '$') { } elseif ($_index{0} == '$') {
$output .= "[\$this->_tpl_vars['" . substr($index, 1) . "']]"; $_output .= "[\$this->_tpl_vars['" . substr($_index, 1) . "']]";
} else { } else {
$parts = explode('.', $index); $_var_parts = explode('.', $_index);
$section = $parts[0]; $_var_section = $_var_parts[0];
$section_prop = isset($parts[1]) ? $parts[1] : 'index'; $_var_section_prop = isset($_var_parts[1]) ? $_var_parts[1] : 'index';
$output .= "[\$this->_sections['$section']['$section_prop']]"; $_output .= "[\$this->_sections['$_var_section']['$_var_section_prop']]";
} }
} else if ($index{0} == '.') { } else if ($_index{0} == '.') {
if ($index{1} == '$') if ($_index{1} == '$')
$output .= "[\$this->_tpl_vars['" . substr($index, 2) . "']]"; $_output .= "[\$this->_tpl_vars['" . substr($_index, 2) . "']]";
else else
$output .= "['" . substr($index, 1) . "']"; $_output .= "['" . substr($_index, 1) . "']";
} else if (substr($index,0,2) == '->') { } else if (substr($_index,0,2) == '->') {
if(substr($index,2,2) == '__') { if(substr($_index,2,2) == '__') {
$this->_syntax_error('call to internal object members is not allowed', E_USER_ERROR, __FILE__, __LINE__); $this->_syntax_error('call to internal object members is not allowed', E_USER_ERROR, __FILE__, __LINE__);
} elseif($this->security && substr($index,2,1) == '_') { } elseif($this->security && substr($_index, 2, 1) == '_') {
$this->_syntax_error('(secure) call to private object member is not allowed', E_USER_ERROR, __FILE__, __LINE__); $this->_syntax_error('(secure) call to private object member is not allowed', E_USER_ERROR, __FILE__, __LINE__);
} }
$output .= $index; $_output .= $_index;
} elseif ($index{0} == '(') { } elseif ($_index{0} == '(') {
$index = $this->_parse_parenth_args($index); $_index = $this->_parse_parenth_args($_index);
$output .= $index; $_output .= $_index;
} else { } else {
$output .= $index; $_output .= $_index;
} }
} }
$this->_parse_modifiers($output, $modifiers); $this->_parse_modifiers($_output, $modifiers);
return $output; return $_output;
} }
/** /**
@@ -1596,7 +1605,7 @@ class Smarty_Compiler extends Smarty {
$var_name = substr($var_ref, 1, -1); $var_name = substr($var_ref, 1, -1);
$output = "\$this->_config[0]['vars']['$var_name']"; $output = isset($this->_config[0]['vars'][$var_name]) ? $this->_config[0]['vars'][$var_name] : '';
$this->_parse_modifiers($output, $modifiers); $this->_parse_modifiers($output, $modifiers);
@@ -1637,8 +1646,10 @@ class Smarty_Compiler extends Smarty {
*/ */
function _parse_modifiers(&$output, $modifier_string) function _parse_modifiers(&$output, $modifier_string)
{ {
// match each modifier and its arguments
preg_match_all('!\|(@?\w+)((?>:(?:'. $this->_qstr_regexp . '|[^|]+))*)!', '|' . $modifier_string, $_match); preg_match_all('!\|(@?\w+)((?>:(?:'. $this->_qstr_regexp . '|[^|]+))*)!', '|' . $modifier_string, $_match);
list(, $_modifiers, $modifier_arg_strings) = $_match; list(, $_modifiers, $_modifiers_argstrings) = $_match;
for ($_i = 0, $_for_max = count($_modifiers); $_i < $_for_max; $_i++) { for ($_i = 0, $_for_max = count($_modifiers); $_i < $_for_max; $_i++) {
$_modifier_name = $_modifiers[$_i]; $_modifier_name = $_modifiers[$_i];
@@ -1648,17 +1659,23 @@ class Smarty_Compiler extends Smarty {
continue; continue;
} }
preg_match_all('!:(' . $this->_qstr_regexp . '|[^:]+)!', $modifier_arg_strings[$_i], $_match); // split up all the args
preg_match_all('!:(' . $this->_qstr_regexp . '|[^:]+)!', $_modifiers_argstrings[$_i], $_match);
$_modifier_args = $_match[1]; $_modifier_args = $_match[1];
if ($_modifier_name{0} == '@') { if ($_modifier_name{0} == '@') {
// apply modifier to entire array
$_map_array = 'false'; $_map_array = 'false';
$_modifier_name = substr($_modifier_name, 1); $_modifier_name = substr($_modifier_name, 1);
} else { } else {
// apply modifier to each individual array element
$_map_array = 'true'; $_map_array = 'true';
} }
$this->_add_plugin('modifier', $_modifier_name); if($this->_output_type == 'php') {
// add to list of modifiers to load into the template
$this->_add_plugin('modifier', $_modifier_name);
}
$this->_parse_vars_props($_modifier_args); $this->_parse_vars_props($_modifier_args);
if($_modifier_name == 'default') { if($_modifier_name == 'default') {
@@ -1670,12 +1687,27 @@ class Smarty_Compiler extends Smarty {
$_modifier_args[0] = '@' . $_modifier_args[0]; $_modifier_args[0] = '@' . $_modifier_args[0];
} }
} }
if (count($_modifier_args) > 0)
$_modifier_args = ', '.implode(', ', $_modifier_args);
else
$_modifier_args = '';
$output = "\$this->_run_mod_handler('$_modifier_name', $_map_array, $output$_modifier_args)"; if($this->_output_type == 'php') {
if (count($_modifier_args) > 0) {
$_modifier_args = $output . ',' . implode(',', $_modifier_args);
} else {
$_modifier_args = $output;
}
$output = "\$this->_run_mod_handler('$_modifier_name', $_map_array, array($_modifier_args))";
} else {
// static output
foreach($_modifier_args as $_key => $_val) {
// get rid of quotes around static values
$_modifier_args[$_key] = $this->_dequote($_val);
}
if(!isset($this->_plugins['modifier'][$_modifier_name])) {
$_params = array('plugins' => array(array('modifier', $_modifier_name, null, null, false)));
$this->_execute_core_function('load_plugins', $_params);
}
array_unshift($_modifier_args, $output);
$output = $this->_run_mod_handler($_modifier_name, $_map_array, $_modifier_args);
}
} }
} }
@@ -1786,7 +1818,9 @@ class Smarty_Compiler extends Smarty {
break; break;
case 'config': case 'config':
$compiled_ref = "\$this->_config[0]['vars']"; array_shift($indexes);
$compiled_ref = isset($this->_config[0]['vars'][substr($indexes[0],1)]) ? $this->_config[0]['vars'][substr($indexes[0],1)] : '';
$this->_output_type = 'static';
$_max_index = 2; $_max_index = 2;
break; break;

51
libs/plugins/function.config_load.php
View File

@@ -61,48 +61,18 @@ function smarty_function_config_load($params, &$smarty)
$_config_dir = $_params['new_file_path']; $_config_dir = $_params['new_file_path'];
} }
$_file_path = str_replace('//', '/' ,$_config_dir . '/' . $_file); if(!is_object($smarty->_conf_obj)) {
require_once SMARTY_DIR . $smarty->config_class . '.class.php';
// get path to compiled object file $smarty->_conf_obj = new $smarty->config_class($_config_dir);
if(isset($_section)) { $smarty->_conf_obj->overwrite = $smarty->config_overwrite;
$_compile_file = $smarty->_get_auto_filename($smarty->compile_dir, $_section . ' ' . $_file); $smarty->_conf_obj->booleanize = $smarty->config_booleanize;
} else { $smarty->_conf_obj->read_hidden = $smarty->config_read_hidden;
$_compile_file = $smarty->_get_auto_filename($smarty->compile_dir, $_file); $smarty->_conf_obj->fix_newlines = $smarty->config_fix_newlines;
$smarty->_conf_obj->set_path = $_config_dir;
} }
// need to compile config file? $_config_vars = array_merge($smarty->_conf_obj->get($_file),
if($smarty->force_compile || !file_exists($_compile_file) || $smarty->_conf_obj->get($_file, $_section));
($smarty->compile_check &&
file_exists($_file_path) &&
( filemtime($_compile_file) != filemtime($_file_path) ))) {
$_compile_config = true;
} else {
include($_compile_file);
$_compile_config = empty($_config_vars);
}
if($_compile_config) {
if(!is_object($smarty->_conf_obj)) {
require_once SMARTY_DIR . $smarty->config_class . '.class.php';
$smarty->_conf_obj = new $smarty->config_class($_config_dir);
$smarty->_conf_obj->overwrite = $smarty->config_overwrite;
$smarty->_conf_obj->booleanize = $smarty->config_booleanize;
$smarty->_conf_obj->read_hidden = $smarty->config_read_hidden;
$smarty->_conf_obj->fix_newlines = $smarty->config_fix_newlines;
$smarty->_conf_obj->set_path = $_config_dir;
}
if($_config_vars = array_merge($smarty->_conf_obj->get($_file),
$smarty->_conf_obj->get($_file, $_section))) {
if(function_exists('var_export')) {
$_compile_data = '<?php $_config_vars = ' . var_export($_config_vars, true) . '; return true; ?>';
} else {
$_compile_data = '<?php $_config_vars = unserialize(\'' . str_replace('\'','\\\'', serialize($_config_vars)) . '\'); return true; ?>';
}
$_params = array('filename' => $_compile_file, 'contents' => $_compile_data, 'create_dirs' => true);
$smarty->_execute_core_function('write_file', $_params);
touch($_compile_file,filemtime($_file_path));
}
}
if ($smarty->caching) { if ($smarty->caching) {
$smarty->_cache_info['config'][$_file] = true; $smarty->_cache_info['config'][$_file] = true;
@@ -128,7 +98,6 @@ function smarty_function_config_load($params, &$smarty)
'depth' => $smarty->_inclusion_depth, 'depth' => $smarty->_inclusion_depth,
'exec_time' => $smarty->_execute_core_function('get_microtime', $_params) - $_debug_start_time); 'exec_time' => $smarty->_execute_core_function('get_microtime', $_params) - $_debug_start_time);
} }
} }
/* vim: set expandtab: */ /* vim: set expandtab: */