Upload db.php

db.php

@@ -31,6 +31,7 @@ if (!file_exists($db_dir)) {
 class SQLite_DB {
     public $pdo;
     public $last_error = '';
+    public $error = '';
     public $insert_id = 0;
     public $num_rows = 0;
     public $last_query = '';
@@ -68,10 +69,15 @@ class SQLite_DB {
         $this->collate = '';
         $this->dbname = '/var/www/html/wp-content/database';
         $this->set_table_names();
-        $this->connect();
-        $this->ready = true;
-        $this->base_prefix = $this->prefix;
-        $this->timer_start();
+        
+        if ($this->connect()) {
+            $this->ready = true;
+            $this->base_prefix = $this->prefix;
+            $this->timer_start();
+        } else {
+            $this->ready = false;
+            // Don't bail here, let WordPress handle the connection error
+        }
     }
     
     private function set_table_names() {
@@ -106,7 +112,9 @@ class SQLite_DB {
             return true;
         } catch (PDOException $e) {
             $this->last_error = $e->getMessage();
+            $this->error = $e->getMessage();
             error_log("SQLite connection error: " . $e->getMessage());
+            $this->ready = false;
             return false;
         }
     }
@@ -139,6 +147,7 @@ class SQLite_DB {
             return false;
         } catch (PDOException $e) {
             $this->last_error = $e->getMessage();
+            $this->error = $e->getMessage();
             
             if (!$this->suppress_errors) {
                 if ($this->show_errors) {
@@ -391,7 +400,58 @@ class SQLite_DB {
     }
     
     public function check_connection($allow_bail = true) {
-        return true;
+        if (!$this->pdo) {
+            if ($allow_bail) {
+                $this->bail('Error establishing a database connection');
+            }
+            return false;
+        }
+        
+        try {
+            // Test the connection with a simple query
+            $this->pdo->query('SELECT 1');
+            return true;
+        } catch (PDOException $e) {
+            $this->last_error = $e->getMessage();
+            $this->error = $e->getMessage();
+            
+            if ($allow_bail) {
+                $this->bail('Error establishing a database connection: ' . $e->getMessage());
+            }
+            return false;
+        }
+    }
+    
+    public function bail($message, $error_code = '500') {
+        if (!$this->show_errors) {
+            if (class_exists('WP_Error')) {
+                $this->error = new WP_Error('db_connect_fail', $message);
+            } else {
+                $this->error = $message;
+            }
+            return false;
+        }
+        
+        if (function_exists('wp_die')) {
+            wp_die($message);
+        } else {
+            die($message);
+        }
+    }
+    
+    public function db_connect($allow_bail = true) {
+        $this->ready = false;
+        
+        if ($this->connect()) {
+            $this->ready = true;
+            return true;
+        }
+        
+        if ($allow_bail) {
+            $this->bail('Error establishing a database connection');
+        }
+        
+        return false;
     }
     
     public function db_version() {