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

Use associative array to store custom namespaces

Browse source
This commit is contained in:
Kijin Sung 2023-08-12 21:53:52 +09:00
parent 911772393a
commit a7954506f6
5 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

17
common/autoload.php
View file

@ -138,14 +138,17 @@ spl_autoload_register(function($class_name)
}
elseif (isset($GLOBALS['RX_NAMESPACES']) && preg_match($GLOBALS['RX_NAMESPACES']['regexp'], $class_name, $matches))
{
$plugin_path = $GLOBALS['RX_NAMESPACES'][strtr($matches[1], '/', '\\')] ?? '';
$dir = RX_BASEDIR . $plugin_path . '/' . strtolower($matches[2]);
$filename1 = $dir . $matches[3] . '.php';
$filename2 = $dir . strtolower($matches[3]) . '.php';
if ($matches[1] !== 'Framework' && !empty($matches[3]))
$plugin_path = $GLOBALS['RX_NAMESPACES']['mapping'][strtr($matches[1], '/', '\\')] ?? '';
if ($plugin_path)
{
$lang_plugin = array_last(explode('/', $plugin_path));
$lang_path = RX_BASEDIR . $plugin_path . '/lang';
$dir = RX_BASEDIR . $plugin_path . '/' . strtolower($matches[2]);
$filename1 = $dir . $matches[3] . '.php';
$filename2 = $dir . strtolower($matches[3]) . '.php';
if ($matches[1] !== 'Framework' && !empty($matches[3]))
{
$lang_plugin = array_last(explode('/', $plugin_path));
$lang_path = RX_BASEDIR . $plugin_path . '/lang';
}
}
}

6
common/defaults/config.php
View file

@ -135,8 +135,10 @@ return array(
'tablets' => false,
'viewport' => 'width=device-width, initial-scale=1.0, user-scalable=yes',
),
'namespaces' => [],
'prefixes' => [],
'namespaces' => [
'mapping' => [],
'regexp' => '',
],
'use_rewrite' => true,
'use_sso' => false,
'other' => array(),

7
common/framework/Config.php
View file

@ -42,16 +42,11 @@ class Config
}
}
if (!empty(self::$_config['namespaces']))
if (isset(self::$_config['namespaces']) && !empty(self::$_config['namespaces']['regexp']))
{
$GLOBALS['RX_NAMESPACES'] = self::$_config['namespaces'];
}
if (!empty(self::$_config['prefixes']))
{
$GLOBALS['RX_PREFIXES'] = self::$_config['prefixes'];
}
return self::$_config;
}

10
modules/module/module.controller.php
View file

@ -1463,20 +1463,20 @@ class ModuleController extends Module
continue;
}
if (!isset($namespaces[$name]))
if (!isset($namespaces['mapping'][$name]))
{
$namespaces[$name] = 'modules/' . $module_name;
$namespaces['mapping'][$name] = 'modules/' . $module_name;
$changed = true;
}
}
// Remove namespaces that are no longer defined by this module.
foreach ($namespaces as $name => $path)
foreach ($namespaces['mapping'] ?? [] as $name => $path)
{
$attached_module = preg_replace('!^modules/!', '', $path);
if ($attached_module === $module_name && !in_array($name, $module_action_info->namespaces ?? []))
{
unset($namespaces[$name]);
unset($namespaces['mapping'][$name]);
$changed = true;
}
}
@ -1484,7 +1484,7 @@ class ModuleController extends Module
// Generate a regular expression for routing.
$regexp = [];
unset($namespaces['regexp']);
foreach ($namespaces as $name => $path)
foreach ($namespaces['mapping'] ?? [] as $name => $path)
{
$regexp[] = preg_quote(strtr($name, '\\', '/'), '!');
}

4
modules/module/module.model.php
View file

@ -1738,12 +1738,12 @@ class ModuleModel extends Module
$namespaces = config('namespaces') ?? [];
foreach ($module_action_info->namespaces ?? [] as $name)
{
if(!isset($namespaces[$name]))
if(!isset($namespaces['mapping'][$name]))
{
$info->need_update = true;
}
}
foreach ($namespaces as $name => $path)
foreach ($namespaces['mapping'] ?? [] as $name => $path)
{
$attached_module = preg_replace('!^modules/!', '', $path);
if ($attached_module === $module_name && !in_array($name, $module_action_info->namespaces ?? []))