From 26ba5edda73b861a9fab7d7d0c57d4f1f7109887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20M=C3=BCller?=
 <25648755+M-arcus@users.noreply.github.com>
Date: Fri, 20 Apr 2018 18:24:28 +0200
Subject: [PATCH] [TASK] Template: Add check for environment values

---
 view/templates/htconfig.tpl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl
index 0b81b77326..d72307fb5a 100644
--- a/view/templates/htconfig.tpl
+++ b/view/templates/htconfig.tpl
@@ -17,9 +17,12 @@ $db_user = '{{$dbuser}}';
 $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
 
-// Set this variable to true, if you want to use environment variables for mysql
-$db_use_env_vars = false;
-if ($db_use_env_vars === true) {
+// Use environment variables for mysql if they are set beforehand
+if (!empty(getenv('MYSQL_HOST'))
+   && !empty(getenv('MYSQL_PORT'))
+   && !empty(getenv('MYSQL_USERNAME'))
+   && !empty(getenv('MYSQL_PASSWORD'))
+   && !empty(getenv('MYSQL_DATABASE'))) {
 	$db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT');
 	$db_user = getenv('MYSQL_USERNAME');
 	$db_pass = getenv('MYSQL_PASSWORD');