Changeset 484 for trunk/lib/DB.inc.php

Timestamp:

Jul 30, 2014 10:43:49 PM (10 years ago)

Author:

anonymous

Message:

Changed private methods and properties to protected. A few minor bug fixes.

File:

• trunk/lib/DB.inc.php (modified) (7 diffs)

trunk/lib/DB.inc.php

@@ -33 +33 @@
 
     // A place to keep an object instance for the singleton pattern.
-    private static $instance = null;
+    protected static $instance = null;
 
     // If $db->connect has successfully opened a db connection.
-    private $_connected = false;
+    protected $_connected = false;
 
     // Database handle.
@@ -42 +42 @@
 
     // Count how many queries run during the whole instance.
-    private $_query_count = 0;
+    protected $_query_count = 0;
 
     // Hash of DB parameters.
-    private $_params = array();
+    protected $_params = array();
 
     // Default parameters.
-    private $_param_defaults = array(
+    protected $_param_defaults = array(
 
         // DB passwords should be set as apache environment variables in httpd.conf, readable only by root.
@@ -73 +73 @@
 
     // Caches.
-    private $existing_tables;
-    private $table_columns;
+    protected $existing_tables;
+    protected $table_columns;
 
     /**
@@ -147 +147 @@
 
         // Connect to database. Always create a new link to the server.
+        // Connection errors are surpressed so we can do our own error management below.
         if ($this->dbh = @mysql_connect($this->getParam('db_server'), $this->getParam('db_user'), $this->getParam('db_pass'), true)) {
             // Select database
@@ -222 +223 @@
     * @since    15 Jan 2007 15:59:00
     */
-    private function _fail()
+    protected function _fail()
     {
         if ($this->getParam('db_die_on_failure')) {
-            header(' ', true, 503);
-            echo _("This page is temporarily unavailable. Please try again in a few minutes.");
+            if (!defined('_CLI')) {
+                // For http requests, send a Service Unavailable header.
+                header(' ', true, 503);
+                echo _("This page is temporarily unavailable. Please try again in a few minutes.");
+            }
             die;
         } else {
@@ -318 +322 @@
             $app->logMsg(sprintf('MySQL error %s: %s in query: %s', mysql_errno($this->dbh), mysql_error($this->dbh), $debugqry), LOG_EMERG, __FILE__, __LINE__);
             if ($this->getParam('db_debug')) {
-                echo '<pre style="padding:2em; background:#ddd; font:9px monaco;">' . wordwrap(mysql_error($this->dbh)) . '<hr>' . htmlspecialchars($debugqry) . '</pre>';
+                if (!defined('_CLI')) {
+                    echo '<pre style="padding:2em; background:#ddd; font:9px monaco;">' . wordwrap(mysql_error($this->dbh)) . '<hr>' . htmlspecialchars($debugqry) . '</pre>';
+                }
             }
             // Die if db_die_on_failure = true, or just continue without connection
@@ -355 +361 @@
             return true;
         } else {
-            $app->logMsg(sprintf('Nonexistent DB table: %s.%s', $this->getParam('db_name'), $table), LOG_ALERT, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Nonexistent DB table: %s.%s', $this->getParam('db_name'), $table), LOG_INFO, __FILE__, __LINE__);
             return false;
         }