Misc code cleanups and comment.

[Project_webapp.git] / lib / db.php

diff --git a/lib/db.php b/lib/db.php
index 6c102c3855852b61e7b1a986843dc4f22e2fd2e4..bcbf5aebc2709265decce8a7d53ac86099f190f5 100644 (file)
--- a/lib/db.php
+++ b/lib/db.php
@@ -20,8 +20,7 @@ class CustomDB
      */
     public function __construct($host, $username, $password, $dbname)
     {
-        $connection = new mysqli($host, $username, $password, $dbname);
-        $this->connection = $connection;
+        $this->connection = new mysqli($host, $username, $password, $dbname);
 
         if (!$this->connection->connect_errno) {
             $this->connected = true;
@@ -32,6 +31,9 @@ class CustomDB
         return $this->connection;
     }
 
+    /**
+     * [__destruct description]
+     */
     /* public function __destruct()
     {
         $this->close();
@@ -81,6 +83,7 @@ class CustomDB
 
     /**
      * [prepared_query_bind_param description]
+     * @param  [type] $types  [description]
      * @param  [type] $params [description]
      * @return [type]         [description]
      */
@@ -106,6 +109,10 @@ class CustomDB
         return $rt_val;
     }
 
+    /**
+     * [get_pquery_result description]
+     * @return [type] [description]
+     */
     public function get_pquery_result()
     {
         $rt_val = $this->current_result = $this->current_stmt->get_result();
@@ -115,11 +122,24 @@ class CustomDB
         return $rt_val;
     }
 
+    /**
+     * [get_result_array description]
+     * @return [type] [description]
+     */
     public function get_result_array()
     {
-        $rt_val = $this->current_result->fetch_array();
-        if (!$rt_val) {
+        $row = $this->current_result->fetch_array();
+        if (is_null($row)) {
+            $rt_val = [];
+        } elseif (!isset($row)) {
             echo "Fail to build SQL query result array : (" . $this->current_stmt->errno . ") " . $this->current_stmt->error . " - " . $this->current_pquery . "<br>";
+            $rt_val = false;
+        } else {
+            $rows[] = $row;
+            while ($row = $this->current_result->fetch_array()) {
+                $rows[] = $row;
+            }
+            $rt_val = $rows;
         }
         return $rt_val;
     }
@@ -137,4 +157,5 @@ class CustomDB
         return $rt_val;
     }
 }
+
 ?>