fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-03 16:51:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Replace all remaining use of XE XML Parser with SimpleXML in widget module

Browse source
This commit is contained in:
Kijin Sung 2025-05-19 21:50:16 +09:00
parent 278369b70e
commit ec6ade4e26
1 changed files with 31 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

50
modules/widget/widget.controller.php
View file

@ -300,16 +300,24 @@ class WidgetController extends Widget
*/
function transWidgetBox($matches)
{
$buff = preg_replace('/<div><div>(.*)$/i','</div>',$matches[0]);
$xml_doc = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString($buff);
$buff = preg_replace('/<div><div>(.*)$/i','</div>', $matches[0]);
$xml = simplexml_load_string(trim($buff));
$args = new stdClass;
foreach ($xml->div ? $xml->div->attributes() : $xml->attributes() as $key => $val)
{
$args->{$key} = strval($val);
}
$vars = $xml_doc->div->attrs;
$widget = $vars->widget;
if(!$widget) return $matches[0];
$widget = $args->widget ?? null;
if(!$widget)
{
return $matches[0];
}
$args->widgetbox_content = $matches[3];
unset($vars->widget);
$vars->widgetbox_content = $matches[3];
return $this->execute($widget, $vars, $this->javascript_mode);
return $this->execute($widget, $args, $this->javascript_mode);
}
/**
@ -320,16 +328,25 @@ class WidgetController extends Widget
{
// Language in bringing
$lang_list = Context::get('lang_supported');
// Bringing widget cache sequence
preg_match_all('!<img([^\>]*)widget=([^\>]*?)\>!is', $content, $matches);
$cnt = count($matches[1]);
for($i=0;$i<$cnt;$i++)
foreach ($matches[0] as $buff)
{
$buff = $matches[0][$i];
$xml_doc = Rhymix\Framework\Parsers\XEXMLParser::loadXMLString(trim($buff));
$args = $xml_doc->img->attrs;
$widget = $args->widget;
$xml = simplexml_load_string(trim($buff));
if ($xml === false)
{
continue;
}
$args = new stdClass;
foreach ($xml->img ? $xml->img->attributes() : $xml->attributes() as $key => $val)
{
$args->{$key} = strval($val);
}
$widget = $args->widget ?? null;
if(!$args || !$widget || empty($args->widget_cache))
{
continue;
@ -338,12 +355,7 @@ class WidgetController extends Widget
$args->widget_sequence = $args->widget_sequence ?? 0;
$args->colorset = $args->colorset ?? null;
foreach($args as $k => $v)
{
$args->{$k} = urldecode($v);
}
foreach($lang_list as $lang_type => $val)
foreach ($lang_list as $lang_type => $val)
{
$this->getCache($widget, $args, $lang_type, true);
}