From ab5d8d4e07bb3c8230d0285ef8902ef1979fce51 Mon Sep 17 00:00:00 2001 From: emkael Date: Thu, 18 Oct 2018 02:39:34 +0200 Subject: Updating Smarty --- ...y_internal_compile_private_print_expression.php | 195 +++++++++++---------- 1 file changed, 100 insertions(+), 95 deletions(-) (limited to 'lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php') diff --git a/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php b/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php index a371195..23cae8a 100644 --- a/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php +++ b/lib/smarty/sysplugins/smarty_internal_compile_private_print_expression.php @@ -1,156 +1,161 @@ getAttributes($compiler, $args); - // nocache option - if ($_attr['nocache'] === true) { - $compiler->tag_nocache = true; - } - // filter handling - if ($_attr['nofilter'] === true) { - $_filter = 'false'; - } else { - $_filter = 'true'; + $output = $parameter[ 'value' ]; + // tag modifier + if (!empty($parameter[ 'modifierlist' ])) { + $output = $compiler->compileTag( + 'private_modifier', + array(), + array( + 'modifierlist' => $parameter[ 'modifierlist' ], + 'value' => $output + ) + ); } - if (isset($_attr['assign'])) { + if (isset($_attr[ 'assign' ])) { // assign output to variable - $output = "assign({$_attr['assign']},{$parameter['value']});?>"; + return "assign({$_attr['assign']},{$output});?>"; } else { // display value - $output = $parameter['value']; - // tag modifier - if (!empty($parameter['modifierlist'])) { - $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $parameter['modifierlist'], 'value' => $output)); - } - if (!$_attr['nofilter']) { + if (!$_attr[ 'nofilter' ]) { // default modifier if (!empty($compiler->smarty->default_modifiers)) { if (empty($compiler->default_modifier_list)) { $modifierlist = array(); foreach ($compiler->smarty->default_modifiers as $key => $single_default_modifier) { - preg_match_all('/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/', $single_default_modifier, $mod_array); - for ($i = 0, $count = count($mod_array[0]);$i < $count;$i++) { - if ($mod_array[0][$i] != ':') { - $modifierlist[$key][] = $mod_array[0][$i]; + preg_match_all( + '/(\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|:|[^:]+)/', + $single_default_modifier, + $mod_array + ); + for ($i = 0, $count = count($mod_array[ 0 ]); $i < $count; $i++) { + if ($mod_array[ 0 ][ $i ] !== ':') { + $modifierlist[ $key ][] = $mod_array[ 0 ][ $i ]; } } } - $compiler->default_modifier_list = $modifierlist; + $compiler->default_modifier_list = $modifierlist; } - $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => $compiler->default_modifier_list, 'value' => $output)); + $output = $compiler->compileTag( + 'private_modifier', + array(), + array( + 'modifierlist' => $compiler->default_modifier_list, + 'value' => $output + ) + ); } // autoescape html if ($compiler->template->smarty->escape_html) { $output = "htmlspecialchars({$output}, ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')"; } - // loop over registerd filters - if (!empty($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE])) { - foreach ($compiler->template->smarty->registered_filters[Smarty::FILTER_VARIABLE] as $key => $function) { + // loop over registered filters + if (!empty($compiler->template->smarty->registered_filters[ Smarty::FILTER_VARIABLE ])) { + foreach ($compiler->template->smarty->registered_filters[ Smarty::FILTER_VARIABLE ] as $key => + $function) { if (!is_array($function)) { $output = "{$function}({$output},\$_smarty_tpl)"; - } else if (is_object($function[0])) { - $output = "\$_smarty_tpl->smarty->registered_filters[Smarty::FILTER_VARIABLE][{$key}][0]->{$function[1]}({$output},\$_smarty_tpl)"; + } elseif (is_object($function[ 0 ])) { + $output = + "\$_smarty_tpl->smarty->registered_filters[Smarty::FILTER_VARIABLE]['{$key}'][0]->{$function[1]}({$output},\$_smarty_tpl)"; } else { $output = "{$function[0]}::{$function[1]}({$output},\$_smarty_tpl)"; } } } // auto loaded filters - if (isset($compiler->smarty->autoload_filters[Smarty::FILTER_VARIABLE])) { - foreach ((array)$compiler->template->smarty->autoload_filters[Smarty::FILTER_VARIABLE] as $name) { - $result = $this->compile_output_filter($compiler, $name, $output); + if (isset($compiler->smarty->autoload_filters[ Smarty::FILTER_VARIABLE ])) { + foreach ((array)$compiler->template->smarty->autoload_filters[ Smarty::FILTER_VARIABLE ] as $name) { + $result = $this->compile_variable_filter($compiler, $name, $output); if ($result !== false) { $output = $result; } else { // not found, throw exception - throw new SmartyException("Unable to load filter '{$name}'"); + throw new SmartyException("Unable to load variable filter '{$name}'"); } } } - if (isset($compiler->template->variable_filters)) { - foreach ($compiler->template->variable_filters as $filter) { - if (count($filter) == 1 && ($result = $this->compile_output_filter($compiler, $filter[0], $output)) !== false) { - $output = $result; - } else { - $output = $compiler->compileTag('private_modifier', array(), array('modifierlist' => array($filter), 'value' => $output)); - } + foreach ($compiler->variable_filters as $filter) { + if (count($filter) === 1 + && ($result = $this->compile_variable_filter($compiler, $filter[ 0 ], $output)) !== false + ) { + $output = $result; + } else { + $output = $compiler->compileTag( + 'private_modifier', + array(), + array('modifierlist' => array($filter), 'value' => $output) + ); } } } - - $compiler->has_output = true; - $output = ""; + $output = "\n"; } return $output; } /** - * @param object $compiler compiler object - * @param string $name name of variable filter - * @param type $output embedded output - * @return string - */ - private function compile_output_filter($compiler, $name, $output) + * @param \Smarty_Internal_TemplateCompilerBase $compiler compiler object + * @param string $name name of variable filter + * @param string $output embedded output + * + * @return string + * @throws \SmartyException + */ + private function compile_variable_filter(Smarty_Internal_TemplateCompilerBase $compiler, $name, $output) { - $plugin_name = "smarty_variablefilter_{$name}"; - $path = $compiler->smarty->loadPlugin($plugin_name, false); - if ($path) { - if ($compiler->template->caching) { - $compiler->template->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['file'] = $path; - $compiler->template->required_plugins['nocache'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name; - } else { - $compiler->template->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['file'] = $path; - $compiler->template->required_plugins['compiled'][$name][Smarty::FILTER_VARIABLE]['function'] = $plugin_name; - } + $function = $compiler->getPlugin($name, 'variablefilter'); + if ($function) { + return "{$function}({$output},\$_smarty_tpl)"; } else { // not found return false; } - return "{$plugin_name}({$output},\$_smarty_tpl)"; } - } - -?> \ No newline at end of file -- cgit v1.2.3