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

Automaticallly fill default values if addon is turned on without saving config

Browse source
This commit is contained in:
Kijin Sung 2025-05-20 13:28:33 +09:00
parent 32fa327eb6
commit 954ebf6caa
2 changed files with 44 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/addon/addon.admin.controller.php
View file

@ -237,6 +237,29 @@ class addonAdminController extends addonController
*/
function doInsert($addon, $site_srl = 0, $gtype = 'site', $isUsed = 'N', $extra_vars = null)
{
if (!is_object($extra_vars))
{
$extra_vars = new stdClass();
}
if (!isset($extra_vars->xe_run_method))
{
$extra_vars->xe_run_method = 'run_selected';
}
if (!isset($extra_vars->mid_list) || !is_array($extra_vars->mid_list))
{
$extra_vars->mid_list = [];
}
$xml_file = RX_BASEDIR . 'addons/' . $addon . '/conf/info.xml';
$addon_info = Rhymix\Framework\Parsers\AddonInfoParser::loadXML($xml_file, $addon);
foreach ($addon_info->extra_vars as $key => $val)
{
if (!isset($extra_vars->$key))
{
$extra_vars->$key = $val->default;
}
}
$args = new stdClass;
$args->addon = $addon;
if (strlen($isUsed) == 2)

24
modules/addon/addon.controller.php
View file

@ -111,7 +111,7 @@ class addonController extends addon
$buff[] = sprintf('$addon_file = RX_BASEDIR . \'addons/%s/%s.addon.php\';', $addon, $addon);
// Addon configuration
$buff[] = '$addon_info = unserialize(' . var_export(serialize($extra_vars), true) . ');';
$buff[] = '$addon_info = ' . var_export($extra_vars, true) . ';';
// Decide whether to run in this mid
if ($run_method === 'no_run_selected')
@ -159,9 +159,27 @@ class addonController extends addon
*/
function doSetup($addon, $extra_vars, $site_srl = 0, $gtype = 'site')
{
if(!is_array($extra_vars->mid_list))
if (!is_object($extra_vars))
{
unset($extra_vars->mid_list);
$extra_vars = new stdClass();
}
if (!isset($extra_vars->xe_run_method))
{
$extra_vars->xe_run_method = 'run_selected';
}
if (!isset($extra_vars->mid_list) || !is_array($extra_vars->mid_list))
{
$extra_vars->mid_list = [];
}
$xml_file = RX_BASEDIR . 'addons/' . $addon . '/conf/info.xml';
$addon_info = Rhymix\Framework\Parsers\AddonInfoParser::loadXML($xml_file, $addon);
foreach ($addon_info->extra_vars as $key => $val)
{
if (!isset($extra_vars->$key) && isset($val->default))
{
$extra_vars->$key = $val->default;
}
}
$args = new stdClass();