fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-02 01:52:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix incorrect handling of nested context switches (CSS inside HTML inside JS) in template v2 #2646

Browse source
This commit is contained in:
Kijin Sung 2026-01-06 21:36:10 +09:00
parent 333f214b8c
commit 8b1da6a98a
1 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -179,14 +179,18 @@ class TemplateParser_v2
*/ */
protected function _addContextSwitches(string $content): string protected function _addContextSwitches(string $content): string
{ {
$context_index = random_int(12000, 99000);
// Inline styles. // Inline styles.
$content = preg_replace_callback('#(?<=\s)(style=")([^"]*?)"#i', function($match) { $content = preg_replace_callback('#(?<=\s)(style=")([^"]*?)"#i', function($match) {
return $match[1] . '<?php $this->config->context = \'CSS\'; ?>' . $match[2] . '<?php $this->config->context = \'HTML\'; ?>"'; return $match[1] . '<?php $this->config->context = \'CSS\'; ?>' . $match[2] . '<?php $this->config->context = \'HTML\'; ?>"';
}, $content); }, $content);
// Inline scripts. // Inline scripts.
$content = preg_replace_callback('#(?<=\s)(href="javascript:|pattern="|on[a-z]+=")([^"]*?)"#i', function($match) { $content = preg_replace_callback('#(?<=\s)(href="javascript:|pattern="|on[a-z]+=")([^"]*?)"#i', function($match) use(&$context_index) {
return $match[1] . '<?php $this->config->context = \'JS\'; ?>' . $match[2] . '<?php $this->config->context = \'HTML\'; ?>"'; $context_index++;
return $match[1] . '<?php $this->config->context = \'JS\'; /* !CTX' . $context_index . '! */?>' .
$match[2] . '<?php $this->config->context = \'HTML\'; /* !CTX' . $context_index . '! */?>"';
}, $content); }, $content);
// <style> tags. // <style> tags.
@ -202,14 +206,15 @@ class TemplateParser_v2
}, $content); }, $content);
// <script> tags that aren't links. // <script> tags that aren't links.
$content = preg_replace_callback('#(<script\b([^>]*)|</script)#i', function($match) { $content = preg_replace_callback('#(<script\b([^>]*)|</script)#i', function($match) use(&$context_index) {
if (substr($match[1], 1, 1) === '/') if (substr($match[1], 1, 1) === '/')
{ {
return '<?php $this->config->context = \'HTML\'; ?>' . $match[1]; return '<?php $this->config->context = \'HTML\'; /* !CTX' . $context_index . '! */?>' . $match[1];
} }
elseif (!str_contains($match[2] ?? '', 'src="')) elseif (!str_contains($match[2] ?? '', 'src="'))
{ {
return $match[1] . '<?php $this->config->context = \'JS\'; ?>'; $context_index++;
return $match[1] . '<?php $this->config->context = \'JS\'; /* !CTX' . $context_index . '! */?>';
} }
else else
{ {
@ -217,6 +222,18 @@ class TemplateParser_v2
} }
}, $content); }, $content);
// Remove nested context switches.
if ($context_index > 0)
{
$content = preg_replace_callback('#(<\?php \$this->config->context = \'JS\'; /\* !CTX([0-9]+)! \*/\?>)(.*?)(<\?php \$this->config->context = \'HTML\'; /\* !CTX\2! \*/\?>)#s', function($match) {
return preg_replace('#/\* !CTX\d+! \*/#', '', $match[1]) .
preg_replace('#<\?php \$this->config->context = \'[A-Z]+\'; \?>#', '', $match[3]) .
preg_replace('#/\* !CTX\d+! \*/#', '', $match[4]);
}, $content);
$content = preg_replace('#(<\?php \$this->config->context = \'[A-Z]+\'; )/\* !CTX[0-9]+! \*/(\?>)#', '$1$2', $content);
}
return $content; return $content;
} }