fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-11 21:12:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Template v2 directives must match at word boundary

Browse source
This commit is contained in:
Kijin Sung 2023-10-18 01:44:36 +09:00
parent 0f14ad8ccf
commit 7b518ab747
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common/framework/parsers/template/TemplateParser_v2.php
View file

@ -225,7 +225,7 @@ class TemplateParser_v2
$content = preg_replace_callback('#(<\?php|<\?(?!=))(.+?)(\?>)#s', $callback, $content); $content = preg_replace_callback('#(<\?php|<\?(?!=))(.+?)(\?>)#s', $callback, $content);
$content = preg_replace_callback('#(\{@)(.+?)(\})#s', $callback, $content); $content = preg_replace_callback('#(\{@)(.+?)(\})#s', $callback, $content);
$content = preg_replace_callback('#(?<!@)(@php)(.+?)(?<!@)(@endphp)#s', $callback, $content); $content = preg_replace_callback('#(?<!@)(@php)\b(.+?)(?<!@)(@endphp)\b#s', $callback, $content);
return $content; return $content;
} }
@ -239,7 +239,7 @@ class TemplateParser_v2
*/ */
protected function _convertVerbatimSections(string $content): string protected function _convertVerbatimSections(string $content): string
{ {
$content = preg_replace_callback('#(@verbatim)(.+?)(@endverbatim)#s', function($match) { $content = preg_replace_callback('#(@verbatim)\b(.+?)(@endverbatim)\b#s', function($match) {
return preg_replace(['#(?<!@)\{\{#', '#(?<!@)@([a-z]+)#', '#\$#'], ['@{{', '@@$1', '&#x1B;&#x24;'], $match[2]); return preg_replace(['#(?<!@)\{\{#', '#(?<!@)@([a-z]+)#', '#\$#'], ['@{{', '@@$1', '&#x1B;&#x24;'], $match[2]);
}, $content); }, $content);
return $content; return $content;
@ -485,7 +485,7 @@ class TemplateParser_v2
// Convert both XE-style and Blade-style directives. // Convert both XE-style and Blade-style directives.
$parentheses = self::_getRegexpForParentheses(2); $parentheses = self::_getRegexpForParentheses(2);
$regexp = '#(?:<!--)?(?<!@)@(' . $directives . ')\x20?(' . $parentheses . ')?(?:[\x20\x09]*-->)?#'; $regexp = '#(?:<!--)?(?<!@)@(' . $directives . ')\b\x20?(' . $parentheses . ')?(?:[\x20\x09]*-->)?#';
$content = preg_replace_callback($regexp, function($match) { $content = preg_replace_callback($regexp, function($match) {
// Collect the necessary information. // Collect the necessary information.
@ -628,7 +628,7 @@ class TemplateParser_v2
protected function _convertMiscDirectives(string $content): string protected function _convertMiscDirectives(string $content): string
{ {
// Insert CSRF tokens. // Insert CSRF tokens.
$content = preg_replace_callback('#(?<!@)@csrf#', function($match) { $content = preg_replace_callback('#(?<!@)@csrf\b#', function($match) {
return '<input type="hidden" name="_rx_csrf_token" value="<?php echo \Rhymix\Framework\Session::getGenericToken(); ?>" />'; return '<input type="hidden" name="_rx_csrf_token" value="<?php echo \Rhymix\Framework\Session::getGenericToken(); ?>" />';
}, $content); }, $content);