From 3afeb44b1db13f09444b8ddf4b42e1fdcf3b3047 Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Wed, 18 Jul 2018 19:07:00 +0200 Subject: [PATCH] Prepare for embedded mode --- controllers/BaseController.php | 1 + helpers/extensions.php | 11 ++++++++++- views/layout/default.blade.php | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/controllers/BaseController.php b/controllers/BaseController.php index 23eeb04a..47853f2c 100644 --- a/controllers/BaseController.php +++ b/controllers/BaseController.php @@ -19,6 +19,7 @@ class BaseController $versionInfo = $applicationService->GetInstalledVersion(); $container->view->set('version', $versionInfo->Version); $container->view->set('releaseDate', $versionInfo->ReleaseDate); + $container->view->set('isEmbeddedInstallation', $applicationService->IsEmbeddedInstallation()); $container->view->set('localizationStrings', $localizationService->GetCurrentCultureLocalizations()); $container->view->set('L', function($text, ...$placeholderValues) use($localizationService) diff --git a/helpers/extensions.php b/helpers/extensions.php index 5fb4c8d7..2b551363 100644 --- a/helpers/extensions.php +++ b/helpers/extensions.php @@ -132,6 +132,15 @@ function Setting(string $name, $value) { if (!defined($name)) { - define($name, $value); + // The content of a $name.txt file in /data/settingoverrides can overwrite the given setting (for embedded mode) + $settingOverrideFile = DATAPATH . '/settingoverrides/' . $name . '.txt'; + if (file_exists($settingOverrideFile)) + { + define($name, file_get_contents($settingOverrideFile)); + } + else + { + define($name, $value); + } } } diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php index 559cccbd..1172f6b8 100644 --- a/views/layout/default.blade.php +++ b/views/layout/default.blade.php @@ -164,7 +164,7 @@