From: Sandybunting <will.a.bunting@gmail.com>
Date: Tue, 27 Sep 2022 16:31:08 +0000 (+0000)
Subject: Fixed and improved Docker image options.
X-Git-Tag: 4.6.0~14^2~14
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/6103246a73b77d4264afed927febf5eb4c38dad5?ds=sidebyside;hp=2008a343c9d4bfa2c949ec3870875630eea5fb5c

Fixed and improved Docker image options.

Fixed the Docker image TITLE option and added a DARK_STYLE option.

Changes made to docker_config.php and the docker README
---

diff --git a/docker/README.md b/docker/README.md
index b30f63a..5f9dce3 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -42,7 +42,8 @@ Available options:
 - `TITLE`: set Jirafeau instance title.
 - `ORGANISATION`: set organisation (in ToS).
 - `CONTACTPERSON`: set contact person (in ToS).
-- `STYLE`: apply a specific style.
+- `STYLE`: apply a specific style from the media folder.
+- `DARK_STYLE`: apply a specific style for browsers in dark mode.
 - `AVAILABILITY_DEFAULT`: setup which availability shows by default.
 - `ONE_TIME_DOWNLOAD`: set to 1 or 0 to enable or disable one time downloads.
 - `ENABLE_CRYPT`: set to 1 or 0 to enable or disable server side encryption.
diff --git a/docker/docker_config.php b/docker/docker_config.php
index 2509fd0..634d58b 100644
--- a/docker/docker_config.php
+++ b/docker/docker_config.php
@@ -161,11 +161,12 @@ function run_setup(&$cfg)
     setup_webroot($cfg);
     env_2_cfg_string($cfg, 'file_hash');
     env_2_cfg_bool($cfg, 'preview');
-    env_2_cfg_bool($cfg, 'title');
+    env_2_cfg_string($cfg, 'title', false);
     env_2_cfg_string($cfg, 'organisation');
     env_2_cfg_string($cfg, 'contactperson');
     env_2_cfg_string($cfg, 'style');
     env_2_cfg_string($cfg, 'availability_default');
+    env_2_cfg_string($cfg, 'dark_style');
     env_2_cfg_bool($cfg, 'one_time_download');
     env_2_cfg_bool($cfg, 'enable_crypt');
     env_2_cfg_bool($cfg, 'debug');
@@ -193,4 +194,4 @@ function run_setup(&$cfg)
     }
 }
 
-run_setup($cfg);
+run_setup($cfg);
\ No newline at end of file