adasdadad
This commit is contained in:
@@ -5,6 +5,7 @@ declare(strict_types=1);
|
||||
require_once dirname(__DIR__, 3) . '/src/App/bootstrap.php';
|
||||
|
||||
use App\AppPaths;
|
||||
use App\AppAccessConfig;
|
||||
use App\ConfigLoader;
|
||||
use App\KeycloakAuth;
|
||||
use App\LdapProvisioner;
|
||||
@@ -30,7 +31,11 @@ if ($method === 'OPTIONS') {
|
||||
$keycloakConfig = ConfigLoader::load($projectRoot, 'keycloak');
|
||||
$auth = new KeycloakAuth($keycloakConfig);
|
||||
$moduleRegistry = new ModuleRegistry(AppPaths::customAppsRoot($projectRoot));
|
||||
$registry = new AppRegistry($projectRoot . '/config/apps.php', $moduleRegistry->desktopApps());
|
||||
$registry = new AppRegistry(
|
||||
$projectRoot . '/config/apps.php',
|
||||
$moduleRegistry->desktopApps(),
|
||||
AppAccessConfig::load($projectRoot)
|
||||
);
|
||||
$widgetRegistry = new WidgetRegistry($projectRoot . '/config/widgets.php', $moduleRegistry->widgets());
|
||||
$service = new UserSelfManagementService($projectRoot);
|
||||
$registrationConfig = ConfigLoader::load($projectRoot, 'registration');
|
||||
@@ -103,9 +108,25 @@ function requiresReload(array $before, array $after): bool
|
||||
$afterSkin = (string) ($after['desktop']['active_skin'] ?? '');
|
||||
$beforeApps = array_values(array_map('strval', (array) ($before['apps']['enabled_ids'] ?? [])));
|
||||
$afterApps = array_values(array_map('strval', (array) ($after['apps']['enabled_ids'] ?? [])));
|
||||
$beforeDesktopIcons = array_values(array_map('strval', (array) ($before['apps']['desktop_icon_ids'] ?? [])));
|
||||
$afterDesktopIcons = array_values(array_map('strval', (array) ($after['apps']['desktop_icon_ids'] ?? [])));
|
||||
$beforeTray = array_values(array_map('strval', (array) ($before['tray']['active_ids'] ?? [])));
|
||||
$afterTray = array_values(array_map('strval', (array) ($after['tray']['active_ids'] ?? [])));
|
||||
$beforeWidgets = array_values(array_map('strval', (array) ($before['widgets']['active_ids'] ?? [])));
|
||||
$afterWidgets = array_values(array_map('strval', (array) ($after['widgets']['active_ids'] ?? [])));
|
||||
|
||||
sort($beforeApps);
|
||||
sort($afterApps);
|
||||
sort($beforeDesktopIcons);
|
||||
sort($afterDesktopIcons);
|
||||
sort($beforeTray);
|
||||
sort($afterTray);
|
||||
sort($beforeWidgets);
|
||||
sort($afterWidgets);
|
||||
|
||||
return $beforeSkin !== $afterSkin || $beforeApps !== $afterApps;
|
||||
return $beforeSkin !== $afterSkin
|
||||
|| $beforeApps !== $afterApps
|
||||
|| $beforeDesktopIcons !== $afterDesktopIcons
|
||||
|| $beforeTray !== $afterTray
|
||||
|| $beforeWidgets !== $afterWidgets;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user