Changeset 449 for branches/eli_branch/lib/App.inc.php

Timestamp:

Dec 16, 2013 5:32:39 AM (11 years ago)

Author:

anonymous

Message:

Test existence of db_* values before loading env variables; disabled use of trigger_error in App::getParam(), although this may allow value missing issues.

File:

• branches/eli_branch/lib/App.inc.php (modified) (2 diffs)

branches/eli_branch/lib/App.inc.php

@@ -225 +225 @@
             return $this->_params[$param];
         } else {
-            trigger_error(sprintf('Parameter is not set: %s', $param), E_USER_NOTICE);
+            /// trigger_error(sprintf('Parameter is not set: %s', $param), E_USER_NOTICE);
             return null;
         }
@@ -275 +275 @@
 
             // DB connection parameters taken from environment variables in the httpd.conf file, readable only by root.
-            if (!empty($_SERVER['DB_SERVER'])) {
+            if (!empty($_SERVER['DB_SERVER']) && !$this->getParam('db_server')) {
                 $this->setParam(array('db_server' => $_SERVER['DB_SERVER']));
             }
-            if (!empty($_SERVER['DB_NAME'])) {
+            if (!empty($_SERVER['DB_NAME']) && !$this->getParam('db_name')) {
                 $this->setParam(array('db_name' => $_SERVER['DB_NAME']));
             }
-            if (!empty($_SERVER['DB_USER'])) {
+            if (!empty($_SERVER['DB_USER']) && !$this->getParam('db_user')) {
                 $this->setParam(array('db_user' => $_SERVER['DB_USER']));
             }
-            if (!empty($_SERVER['DB_PASS'])) {
+            if (!empty($_SERVER['DB_PASS']) && !$this->getParam('db_pass')) {
                 $this->setParam(array('db_pass' => $_SERVER['DB_PASS']));
             }