Changed database connection function to take an array of information rather than specific details. This should make it easier to add additional database types.

Author: peejeh

mysql.php

@@ -14,13 +14,17 @@ class mysql {
 
     /**
      * Connect to the database.
-     * @param str server
-     * @param str username
-     * @param str password
-     */
-    function connect($server, $username, $password) {
-        if ($this->db = @mysql_pconnect($server, $username, $password)) {
-            return TRUE;
+     * @param str[] config
+     */
+    function connect($config) {
+        if ($this->db = @mysql_pconnect(
+			$config['server'],
+			$config['username'],
+			$config['password']
+		)) {
+			if ($this->select_db($config['database'])) {
+				return TRUE;
+			}
         }
         return FALSE;
     }
@@ -48,7 +52,7 @@ function select_db($database) {
      * @return resource A resultset resource
      */
     function getColumns($table) {
-        return mysql_query(sprintf('SHOW COLUMNS FROM %s', $table), $this->db);   
+        return mysql_query(sprintf('SHOW COLUMNS FROM %s', $table), $this->db);
     }
 
     /**
@@ -58,7 +62,7 @@ function getColumns($table) {
      * @return resource A resultset resource
      */
     function getRow($table, $where) {
-        return mysql_query(sprintf('SELECT * FROM %s WHERE %s', $table, $where));   
+        return mysql_query(sprintf('SELECT * FROM %s WHERE %s', $table, $where));
     }
 
     /**
@@ -68,15 +72,15 @@ function getRow($table, $where) {
      * @return resource A resultset resource
      */
     function getTable($primary, $table) {
-        return mysql_query(sprintf('SELECT %s FROM %s', $primary, $table));   
+        return mysql_query(sprintf('SELECT %s FROM %s', $primary, $table));
     }
 
     /**
      * Get the tables in a database.
      * @return resource A resultset resource
      */
     function getDatabase() {
-        return mysql_query('SHOW TABLES');   
+        return mysql_query('SHOW TABLES');
     }
 
     /**
@@ -87,7 +91,7 @@ function getDatabase() {
      * @return bool
      */
     function updateRow($table, $values, $where) {
-        return mysql_query(sprintf('UPDATE %s SET %s WHERE %s', $table, $values, $where));        
+        return mysql_query(sprintf('UPDATE %s SET %s WHERE %s', $table, $values, $where));
     }
 
     /**
@@ -107,7 +111,7 @@ function insertRow($table, $names, $values) {
      * @return resource A resultset resource
      */
     function deleteRow($table, $where) {
-        return mysql_query(sprintf('DELETE FROM %s WHERE %s', $table, $where));   
+        return mysql_query(sprintf('DELETE FROM %s WHERE %s', $table, $where));
     }
 
     /**
@@ -125,7 +129,7 @@ function escape($string) {
      * @return str[] An array of the fields and values from the next row in the resultset
      */
     function row($resource) {
-        return mysql_fetch_assoc($resource);   
+        return mysql_fetch_assoc($resource);
     }
 
     /**
@@ -150,7 +154,7 @@ function numAffected() {
      * @return int The last insert ID
      */
     function lastInsertId() {
-        return mysql_insert_id();   
+        return mysql_insert_id();
     }
 
 }

phprestsql.php

@@ -137,29 +137,18 @@ function connect() {
         require_once($database.'.php');
         $this->db = new $database(); 
         if (isset($this->config['database']['username']) && isset($this->config['database']['password'])) {
-            if (!$this->db->connect(
-                $this->config['database']['server'],
-                $this->config['database']['username'],
-                $this->config['database']['password']
-            )) {
+            if (!$this->db->connect($this->config['database'])) {
                 trigger_error('Could not connect to server', E_USER_ERROR);
             }
         } elseif (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
-            if (!$this->db->connect(
-                $this->config['database']['server'],
-                $_SERVER['PHP_AUTH_USER'],
-                $_SERVER['PHP_AUTH_PW']
-            )) {
+            if (!$this->db->connect($this->config['database'])) {
                 $this->unauthorized();
                 exit;
             }
         } else {
             $this->unauthorized();
             exit;
         }
-        if (!$this->db->select_db($this->config['database']['database'])) {
-            trigger_error('Could not select database', E_USER_ERROR);   
-        }
     }
 
     /**