Changeset 549 for branches/1.1dev/config

Timestamp:

Oct 2, 2015 9:02:39 PM (9 years ago)

Author:

anonymous

Message:

Backporting minor debugging niceites.

File:

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

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

@@ -23 +23 @@
     define('SITE_BASE', '__NO_SITE_BASE__');
 }
- 
+
 /******************************************************************************
  * INCLUDE GLOBAL LIBRARIES AND CONFIGURATIONS
@@ -57 +57 @@
     // MySQL connection parameters.
     if (!empty($_SERVER['DB_NAME']) && !empty($_SERVER['DB_USER']) && !empty($_SERVER['DB_PASS'])) {
-        // We set DB passwords as environment variables in the httpd.conf file, 
+        // We set DB passwords as environment variables in the httpd.conf file,
         // which is readable only by root.
         $CFG->database = $_SERVER['DB_NAME'];
@@ -70 +70 @@
         include SITE_BASE . '/../config/db_auth.inc.php';
     }
-    
+
     if (empty($CFG->database) || empty($CFG->username) || !isset($CFG->password)) { // Allow password to be empty string.
         logMsg('Database credentials missing.', LOG_WARNING, __FILE__, __LINE__);
     }
-    
+
     // Connect to MySQL
     if ($dbh = mysql_connect('localhost', $CFG->username, $CFG->password)) {
         // Select database
-        mysql_select_db($CFG->database, $dbh);        
+        mysql_select_db($CFG->database, $dbh);
     }
 
@@ -104 +104 @@
     {
         global $CFG, $dbh;
-        
+
         $debugqry = preg_replace("/\n[\t ]+/", "\n", $query);
         if ($CFG->db_always_debug || $debug) {
+            logMsg($debugqry, LOG_DEBUG, __FILE__, __LINE__);
             echo "<!-- --------------------------------------\n" . $debugqry . "\n-->";
         }
-        
-        // Ensure we have an active connection. 
+
+        // Ensure we have an active connection.
         // If we continue on a dead connection we might experience a "MySQL server has gone away" error.
         // http://dev.mysql.com/doc/refman/5.0/en/gone-away.html
@@ -118 +119 @@
             mysql_close($dbh);
             if ($dbh = mysql_connect('localhost', $CFG->username, $CFG->password)) {
-                mysql_select_db($CFG->database, $dbh);        
+                mysql_select_db($CFG->database, $dbh);
             }
             if (!$dbh || mysql_error($dbh)) {
@@ -149 +150 @@
         return $qid;
     }
-    
+
     $mysql_character_sets = array(
         'utf-8' => 'utf8',
         'iso-8859-1' => 'latin1',
     );
-    
+
     // Tell MySQL what character set we're useing. Available only on MySQL verions > 4.01.01.
     if ('' != $CFG->character_set && isset($mysql_character_sets[strtolower($CFG->character_set)])) {
@@ -168 +169 @@
  *****************************************************************************/
 
- 
+
 // Skip sessions for some scripts, like the cron executed scripts.
 if (true === $CFG->enable_session) { //________________________________________
@@ -177 +178 @@
         session_id($ses);
     }
-    
+
     // Session parameters.
     ini_set('session.use_cookies', $CFG->session_use_cookies);
@@ -197 +198 @@
         session_set_save_handler('mysqlSessionOpen', 'mysqlSessionClose', 'mysqlSessionRead', 'mysqlSessionWrite', 'mysqlSessionDestroy', 'mysqlSessionGarbage');
     }
-    
+
     // Start the session. Access session data using: $_SESSION['...']
     session_start();
@@ -209 +210 @@
 //     if (getGet(session_name())) {
 //         logMsg(sprintf('Found session in get: %s=%s', session_name(), getGet(session_name())), LOG_DEBUG, __FILE__, __LINE__);
-//     }    
+//     }
 //     logMsg(sprintf('Using session %s=%s', session_name(), session_id()), LOG_DEBUG, __FILE__, __LINE__);
-    
+
 
     /******************************************************************************
      * LANGUAGE
      *****************************************************************************/
-            
+
     // Set the language.
     if ($lang = getFormData('lang')) {
@@ -269 +270 @@
     header('X-Codebase-Version: ' . $CFG->codebase_version);
 }
- 
+
 // Capture the ultimate referrer. Used? Not yet.
 if (!isset($_SESSION['_ultimate_referrer'])) {
@@ -279 +280 @@
 $inc_lang = isset($_SESSION['_language']) ? $_SESSION['_language'] : 'en';
 ini_set('include_path',
-    ini_get('include_path') . PATH_SEPARATOR . 
+    ini_get('include_path') . PATH_SEPARATOR .
     SITE_BASE . '/_templates/' . $inc_lang . PATH_SEPARATOR .
     CODE_BASE . '/templates/' . $inc_lang . PATH_SEPARATOR .
-    
+
     SITE_BASE . '/_templates/en' . PATH_SEPARATOR .
     CODE_BASE . '/templates/en' . PATH_SEPARATOR .
-    
+
     SITE_BASE . '/_templates' . PATH_SEPARATOR .
     CODE_BASE . '/templates'