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

Fix HTMLFilter internal methods sometimes not returning string

Browse source
This commit is contained in:
Kijin Sung 2024-03-19 22:19:32 +09:00
parent c57dbf4d73
commit df99dce94a
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common/framework/filters/HTMLFilter.php
View file

@ -649,7 +649,7 @@ class HTMLFilter
return $content; return $content;
} }
return preg_replace_callback('!<(div|img)([^>]*)(' . implode('|', $regexp) . ')([^>]*)>!i', function($match) { return (string)preg_replace_callback('!<(div|img)([^>]*)(' . implode('|', $regexp) . ')([^>]*)>!i', function($match) {
$tag = strtolower($match[1]); $tag = strtolower($match[1]);
$attrs = array(); $attrs = array();
$html = preg_replace_callback('!([a-zA-Z0-9_-]+)="([^"]+)"!', function($attr) use($tag, &$attrs) { $html = preg_replace_callback('!([a-zA-Z0-9_-]+)="([^"]+)"!', function($attr) use($tag, &$attrs) {
@ -703,7 +703,7 @@ class HTMLFilter
return $content; return $content;
} }
return preg_replace_callback('!<(div|img)([^>]*)(\srx_encoded_properties="([^"]+)")!i', function($match) { return (string)preg_replace_callback('!<(div|img)([^>]*)(\srx_encoded_properties="([^"]+)")!i', function($match) {
$attrs = array(); $attrs = array();
list($encoded_properties, $signature) = explode(':', $match[4]); list($encoded_properties, $signature) = explode(':', $match[4]);
if (!Security::verifySignature($encoded_properties, $signature)) if (!Security::verifySignature($encoded_properties, $signature))
@ -732,7 +732,7 @@ class HTMLFilter
protected static function _encodeDataAttributes(string $content): string protected static function _encodeDataAttributes(string $content): string
{ {
$tags = implode('|', self::$_data_allowed); $tags = implode('|', self::$_data_allowed);
return preg_replace_callback('!<(' . $tags . ')\s([^>]+)>!i', function($match) { return (string)preg_replace_callback('!<(' . $tags . ')\s([^>]+)>!i', function($match) {
$attrs = array(); $attrs = array();
$html = preg_replace_callback('!\s(data-[a-zA-Z0-9_-]+)="([^"]*)"!', function($attr) use(&$attrs) { $html = preg_replace_callback('!\s(data-[a-zA-Z0-9_-]+)="([^"]*)"!', function($attr) use(&$attrs) {
$attrkey = strtolower($attr[1]); $attrkey = strtolower($attr[1]);
@ -765,7 +765,7 @@ class HTMLFilter
protected static function _decodeDataAttributes(string $content): string protected static function _decodeDataAttributes(string $content): string
{ {
$tags = implode('|', self::$_data_allowed); $tags = implode('|', self::$_data_allowed);
return preg_replace_callback('!<(' . $tags . ')([^>]*)(\srx_encoded_datas="([^"]+)")!i', function($match) { return (string)preg_replace_callback('!<(' . $tags . ')([^>]*)(\srx_encoded_datas="([^"]+)")!i', function($match) {
$attrs = array(); $attrs = array();
list($encoded_datas, $signature) = explode(':', $match[4]); list($encoded_datas, $signature) = explode(':', $match[4]);
if (!Security::verifySignature($encoded_datas, $signature)) if (!Security::verifySignature($encoded_datas, $signature))