mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

Merge pull request #881 from Fyorl/ticket/10970

Browse Source 
Allow INCLUDE template macros to accept paths of the form {FOO}/a/{BAR}/c
This commit is contained in:
Nils Adermann
2012-11-10 07:46:50 -08:00
parent 3f933c6870 a05f354fdf
commit f0cfae1f01
11 changed files with 83 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
phpBB/includes/template/filter.php
View File

@@ -361,6 +361,43 @@ class phpbb_template_filter extends php_user_filter
return $text_blocks;
}
/**
* Parse paths of the form {FOO}/a/{BAR}/b
*
* Note: this method assumes at least one variable in the path, this should
* be checked before this method is called.
*
* @param string $path The path to parse
* @param string $include_type The type of template function to call
* @return string An appropriately formatted string to include in the
* template or an empty string if an expression like S_FIRST_ROW was
* incorrectly used
*/
private function parse_dynamic_path($path, $include_type)
{
$matches = array();
$replace = array();
$is_expr = true;
preg_match_all('#\{((?:' . self::REGEX_NS . '\.)*)(\$)?(' . self::REGEX_VAR . ')\}#', $path, $matches);
foreach ($matches[0] as $var_str)
{
$tmp_is_expr = false;
$var = $this->get_varref($var_str, $tmp_is_expr);
$is_expr = $is_expr && $tmp_is_expr;
$replace[] = "' . $var . '";
}
if (!$is_expr)
{
return " \$_template->$include_type('" . str_replace($matches[0], $replace, $path) . "', true);";
}
else
{
return '';
}
}
/**
* Compile variables
*
@@ -774,15 +811,9 @@ class phpbb_template_filter extends php_user_filter
private function compile_tag_include($tag_args)
{
// Process dynamic includes
if ($tag_args[0] == '{')
if (strpos($tag_args, '{') !== false)
{
$var = $this->get_varref($tag_args, $is_expr);
// Make sure someone didn't try to include S_FIRST_ROW or similar
if (!$is_expr)
{
return "if (isset($var)) { \$_template->_tpl_include($var); }";
}
return $this->parse_dynamic_path($tag_args, '_tpl_include');
}
return "\$_template->_tpl_include('$tag_args');";
@@ -796,6 +827,11 @@ class phpbb_template_filter extends php_user_filter
*/
private function compile_tag_include_php($tag_args)
{
if (strpos($tag_args, '{') !== false)
{
return $this->parse_dynamic_path($tag_args, '_php_include');
}
return "\$_template->_php_include('$tag_args');";
}
@@ -883,14 +919,9 @@ class phpbb_template_filter extends php_user_filter
private function compile_tag_include_js($tag_args)
{
// Process dynamic includes
if ($tag_args[0] == '{')
if (strpos($tag_args, '{') !== false)
{
$var = $this->get_varref($tag_args, $is_expr);
if (!$is_expr)
{
return " \$_template->_js_include($var, true);";
}
return '';
return $this->parse_dynamic_path($tag_args, '_js_include');
}
// Locate file

6
phpBB/includes/template/template.php
View File

@@ -538,7 +538,11 @@ class phpbb_template
// Locate file
if ($locate)
{
$file = $this->locator->get_first_file_location(array($file), true, true);
$located = $this->locator->get_first_file_location(array($file), false, true);
if ($located)
{
$file = $located;
}
}
else if ($relative)
{