This commit is contained in:
2026-03-05 00:35:54 +01:00
parent 56335701da
commit c08e86ec9c
2 changed files with 5 additions and 3 deletions

View File

@@ -2,14 +2,15 @@
use App\ModuleConfigException; use App\ModuleConfigException;
$moduleName = 'pi_control'; $moduleName = 'pi_control';
$mm = isset($modules) && $modules instanceof App\ModuleManager ? $modules : modules();
modules()->registerFunction($moduleName, 'table', function (string $name): string { $mm->registerFunction($moduleName, 'table', function (string $name): string {
$prefix = 'picontrol_'; $prefix = 'picontrol_';
$sanitized = preg_replace('/[^a-zA-Z0-9_]/', '', $name); $sanitized = preg_replace('/[^a-zA-Z0-9_]/', '', $name);
return $prefix . $sanitized; return $prefix . $sanitized;
}); });
modules()->registerFunction($moduleName, 'pdo', function () use ($moduleName): \PDO { $mm->registerFunction($moduleName, 'pdo', function () use ($moduleName): \PDO {
$settings = modules()->settings($moduleName); $settings = modules()->settings($moduleName);
$useSeparate = !empty($settings['use_separate_db']); $useSeparate = !empty($settings['use_separate_db']);
@@ -31,7 +32,7 @@ modules()->registerFunction($moduleName, 'pdo', function () use ($moduleName): \
return $base; return $base;
}); });
modules()->registerFunction($moduleName, 'ensure_schema', function () use ($moduleName): void { $mm->registerFunction($moduleName, 'ensure_schema', function () use ($moduleName): void {
$pdo = module_fn($moduleName, 'pdo'); $pdo = module_fn($moduleName, 'pdo');
$table = fn(string $name) => module_fn($moduleName, 'table', $name); $table = fn(string $name) => module_fn($moduleName, 'table', $name);

View File

@@ -198,6 +198,7 @@ final class ModuleManager
if (!empty($module['enabled'])) { if (!empty($module['enabled'])) {
$bootstrap = $module['path'] . '/bootstrap.php'; $bootstrap = $module['path'] . '/bootstrap.php';
if (is_file($bootstrap)) { if (is_file($bootstrap)) {
$modules = $this;
require_once $bootstrap; require_once $bootstrap;
} }
} }