Changeset 733 for trunk/lib/App.inc.php

Timestamp:

Aug 15, 2020 11:16:58 PM (4 years ago)

Author:

anonymous

Message:

Add PDO connect retries. Minor fixes related to DB env vars.

File:

• trunk/lib/App.inc.php (modified) (1 diff)

trunk/lib/App.inc.php

@@ -413 +413 @@
 
             // DB connection parameters taken from environment variables in the server httpd.conf file (readable only by root)

-            if (!empty($_SERVER['DB_SERVER']) && !$this->getParam('db_server')) {
+            if (isset($_SERVER['DB_SERVER']) && '' != $_SERVER['DB_SERVER'] && null === $this->getParam('db_server')) {
                 $this->setParam(array('db_server' => $_SERVER['DB_SERVER']));
             }
-            if (!empty($_SERVER['DB_NAME']) && !$this->getParam('db_name')) {
+            if (isset($_SERVER['DB_NAME']) && '' != $_SERVER['DB_NAME'] && null === $this->getParam('db_name')) {
                 $this->setParam(array('db_name' => $_SERVER['DB_NAME']));
             }
-            if (!empty($_SERVER['DB_USER']) && !$this->getParam('db_user')) {
+            if (isset($_SERVER['DB_USER']) && '' != $_SERVER['DB_USER'] && null === $this->getParam('db_user')) {
                 $this->setParam(array('db_user' => $_SERVER['DB_USER']));
             }
-            if (!empty($_SERVER['DB_PASS']) && !$this->getParam('db_pass')) {
+            if (isset($_SERVER['DB_PASS']) && '' != $_SERVER['DB_PASS'] && null === $this->getParam('db_pass')) {
                 $this->setParam(array('db_pass' => $_SERVER['DB_PASS']));
             }