Changeset 565 for branches/1.1dev/config

Timestamp:

Apr 5, 2016 6:58:26 PM (8 years ago)

Author:

anonymous

Message:

Added $CFG->dbserver to boot config options.

File:

• branches/1.1dev/config/boot.inc.php (modified) (4 diffs)

branches/1.1dev/config/boot.inc.php

@@ -56 +56 @@
 
     // MySQL connection parameters.
-    if (!empty($_SERVER['DB_NAME']) && !empty($_SERVER['DB_USER']) && !empty($_SERVER['DB_PASS'])) {
+    if (!empty($_SERVER['DB_SERVER']) && !empty($_SERVER['DB_NAME']) && !empty($_SERVER['DB_USER']) && !empty($_SERVER['DB_PASS'])) {
         // We set DB passwords as environment variables in the httpd.conf file,
         // which is readable only by root.
+        $CFG->dbserver = $_SERVER['DB_SERVER'];
         $CFG->database = $_SERVER['DB_NAME'];
         $CFG->username = $_SERVER['DB_USER'];
@@ -71 +72 @@
     }
 
+    $CFG->dbserver = (!isset($CFG->dbserver) || '' == $CFG->dbserver) ? 'localhost' : $CFG->dbserver;
+
     if (empty($CFG->database) || empty($CFG->username) || !isset($CFG->password)) { // Allow password to be empty string.
         logMsg('Database credentials missing.', LOG_WARNING, __FILE__, __LINE__);
@@ -76 +79 @@
 
     // Connect to MySQL
-    if ($dbh = mysql_connect('localhost', $CFG->username, $CFG->password)) {
+    if ($dbh = mysql_connect($CFG->dbserver, $CFG->username, $CFG->password)) {
         // Select database
         mysql_select_db($CFG->database, $dbh);
@@ -288 +291 @@
 
     SITE_BASE . '/_templates' . PATH_SEPARATOR .
-    CODE_BASE . '/templates'
+    CODE_BASE . '/templates' . PATH_SEPARATOR .
+
+    SITE_BASE . '/../lib'
 );