code-standards wrap operators with spaces

[friendica.git] / htconfig.php

diff --git a/htconfig.php b/htconfig.php
index c078103e81207426233a518c50fe240868714b97..87c1301abd602526a4ba30d6288130c302c63f03 100644 (file)
--- a/htconfig.php
+++ b/htconfig.php
@@ -21,12 +21,21 @@ $db_user = 'mysqlusername';
 $db_pass = 'mysqlpassword';
 $db_data = 'mysqldatabasename';
 
-// Set this variable to true if you want to use environment variables for mysql
-$db_use_env_vars = false; 
-if ($db_use_env_vars) {
-       $db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT');
-       $db_user = getenv('MYSQL_USERNAME');
-       $db_pass = getenv('MYSQL_PASSWORD');
+// 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');
 }