X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=library%2FSmarty%2Flibs%2Fsysplugins%2Fsmarty_internal_compile_extends.php;h=2b541f2e358f648cdf136564e2e849ebe892968f;hb=c94525938d6075ac07079d64564f78dec6a9c386;hp=9042aa23339b10cfb4a42285a70ae8c344abe984;hpb=ba4db236ecff1ffdb56adc2715b3f53515f8cb34;p=friendica.git diff --git a/library/Smarty/libs/sysplugins/smarty_internal_compile_extends.php b/library/Smarty/libs/sysplugins/smarty_internal_compile_extends.php index 9042aa2333..2b541f2e35 100644 --- a/library/Smarty/libs/sysplugins/smarty_internal_compile_extends.php +++ b/library/Smarty/libs/sysplugins/smarty_internal_compile_extends.php @@ -1,128 +1,85 @@ true, 'eval' => true); - $this->_rdl = preg_quote($compiler->smarty->right_delimiter); - $this->_ldl = preg_quote($compiler->smarty->left_delimiter); - $filepath = $compiler->template->source->filepath; - $this->mbstring_overload = ini_get('mbstring.func_overload') & 2; // check and get attributes $_attr = $this->getAttributes($compiler, $args); if ($_attr['nocache'] === true) { $compiler->trigger_template_error('nocache option not allowed', $compiler->lex->taglineno); } - - $_smarty_tpl = $compiler->template; - $include_file = null; if (strpos($_attr['file'], '$_tmp') !== false) { $compiler->trigger_template_error('illegal value for file attribute', $compiler->lex->taglineno); } - eval('$include_file = ' . $_attr['file'] . ';'); + + $name = $_attr['file']; + /** @var Smarty_Internal_Template $_smarty_tpl + * used in evaluated code + */ + $_smarty_tpl = $compiler->template; + eval("\$tpl_name = $name;"); // create template object - $_template = new $compiler->smarty->template_class($include_file, $compiler->smarty, $compiler->template); - // save file dependency - if (isset($_is_stringy[$_template->source->type])) { - $template_sha1 = sha1($include_file); - } else { - $template_sha1 = sha1($_template->source->filepath); - } - if (isset($compiler->template->properties['file_dependency'][$template_sha1])) { - $compiler->trigger_template_error("illegal recursive call of \"{$include_file}\"", $compiler->lex->line - 1); - } - $compiler->template->properties['file_dependency'][$template_sha1] = array($_template->source->filepath, $_template->source->timestamp, $_template->source->type); - $_content = ($this->mbstring_overload ? mb_substr($compiler->template->source->content, $compiler->lex->counter - 1, 20000000, 'latin1') : substr($compiler->template->source->content, $compiler->lex->counter - 1)); - if (preg_match_all("!({$this->_ldl}block\s(.+?){$this->_rdl})!", $_content, $s) != - preg_match_all("!({$this->_ldl}/block{$this->_rdl})!", $_content, $c)) { - $compiler->trigger_template_error('unmatched {block} {/block} pairs'); + $_template = new $compiler->smarty->template_class($tpl_name, $compiler->smarty, $compiler->template); + // check for recursion + $uid = $_template->source->uid; + if (isset($compiler->extends_uid[$uid])) { + $compiler->trigger_template_error("illegal recursive call of \"$include_file\"", $compiler->lex->line - 1); } - preg_match_all("!{$this->_ldl}block\s(.+?){$this->_rdl}|{$this->_ldl}/block{$this->_rdl}|{$this->_ldl}\*([\S\s]*?)\*{$this->_rdl}!", $_content, $_result, PREG_OFFSET_CAPTURE); - $_result_count = count($_result[0]); - $_start = 0; - while ($_start+1 < $_result_count) { - $_end = 0; - $_level = 1; - if (($this->mbstring_overload ? mb_substr($_result[0][$_start][0],0,mb_strlen($compiler->smarty->left_delimiter,'latin1')+1, 'latin1') : substr($_result[0][$_start][0],0,strlen($compiler->smarty->left_delimiter)+1)) == $compiler->smarty->left_delimiter.'*') { - $_start++; - continue; - } - while ($_level != 0) { - $_end++; - if (($this->mbstring_overload ? mb_substr($_result[0][$_start + $_end][0],0,mb_strlen($compiler->smarty->left_delimiter,'latin1')+1, 'latin1') : substr($_result[0][$_start + $_end][0],0,strlen($compiler->smarty->left_delimiter)+1)) == $compiler->smarty->left_delimiter.'*') { - continue; - } - if (!strpos($_result[0][$_start + $_end][0], '/')) { - $_level++; - } else { - $_level--; + $compiler->extends_uid[$uid] = true; + if (empty($_template->source->components)) { + array_unshift($compiler->sources, $_template->source); + } else { + foreach ($_template->source->components as $source) { + array_unshift($compiler->sources, $source); + $uid = $source->uid; + if (isset($compiler->extends_uid[$uid])) { + $compiler->trigger_template_error("illegal recursive call of \"{$source->filepath}\"", $compiler->lex->line - 1); } - } - $_block_content = str_replace($compiler->smarty->left_delimiter . '$smarty.block.parent' . $compiler->smarty->right_delimiter, '%%%%SMARTY_PARENT%%%%', - ($this->mbstring_overload ? mb_substr($_content, $_result[0][$_start][1] + mb_strlen($_result[0][$_start][0], 'latin1'), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + mb_strlen($_result[0][$_start][0], 'latin1'), 'latin1') : substr($_content, $_result[0][$_start][1] + strlen($_result[0][$_start][0]), $_result[0][$_start + $_end][1] - $_result[0][$_start][1] - + strlen($_result[0][$_start][0])))); - Smarty_Internal_Compile_Block::saveBlockData($_block_content, $_result[0][$_start][0], $compiler->template, $filepath); - $_start = $_start + $_end + 1; - } - if ($_template->source->type == 'extends') { - $_template->block_data = $compiler->template->block_data; - } - $compiler->template->source->content = $_template->source->content; - if ($_template->source->type == 'extends') { - $compiler->template->block_data = $_template->block_data; - foreach ($_template->source->components as $key => $component) { - $compiler->template->properties['file_dependency'][$key] = array($component->filepath, $component->timestamp, $component->type); + $compiler->extends_uid[$uid] = true; } } - $compiler->template->source->filepath = $_template->source->filepath; - $compiler->abort_and_recompile = true; + unset ($_template); + $compiler->inheritance_child = true; + $compiler->lex->yypushstate(Smarty_Internal_Templatelexer::CHILDBODY); return ''; } - } - -?> \ No newline at end of file