Fix boolean values in test data

[friendica.git] / htconfig.php

diff --git a/htconfig.php b/htconfig.php
index 1661dd30edfb72695b31f30dcc139c67741c76be..87c1301abd602526a4ba30d6288130c302c63f03 100644 (file)
--- a/htconfig.php
+++ b/htconfig.php
@@ -2,6 +2,11 @@
 
 // If automatic system installation fails:
 
+
+die('The configuration you did manually contains some mistakes. Please have a look at your .htconfig.php file.');
+// If you are doing the configuration manually, please remove the line above
+
+
 // Copy or rename this file to .htconfig.php
 
 // Why .htconfig.php? Because it contains sensitive information which could
@@ -16,6 +21,24 @@ $db_user = 'mysqlusername';
 $db_pass = 'mysqlpassword';
 $db_data = 'mysqldatabasename';
 
+// Use environment variables for mysql if they are set beforehand
+if (!empty(getenv('MYSQL_HOST'))
+       && (!empty(getenv('MYSQL_USERNAME')) || !empty(getenv('MYSQL_USER')))
+       && !getenv('MYSQL_PASSWORD') === false
+       && !empty(getenv('MYSQL_DATABASE'))) {
+       $db_host = getenv('MYSQL_HOST');
+       if (!empty(getenv('MYSQL_PORT'))) {
+               $db_host .= ':' . getenv('MYSQL_PORT');
+       }
+       if (!empty(getenv('MYSQL_USERNAME'))) {
+               $db_user = getenv('MYSQL_USERNAME');
+       } else {
+               $db_user = getenv('MYSQL_USER');
+       }
+       $db_pass = (string) getenv('MYSQL_PASSWORD');
+       $db_data = getenv('MYSQL_DATABASE');
+}
+
 // Set the database connection charset to full Unicode (utf8mb4).
 // Changing this value will likely corrupt the special characters.
 // You have been warned.