db.php: SWITCH TO MYSQLI API

diff --git a/db.php b/db.php
index 14787ac..c137d03 100644 (file)
--- a/db.php
+++ b/db.php
@@ -39,7 +39,7 @@ require_once(__DIR__.'/'.'format.php');
 #   multiple databases open at once.
 
 function db_enc_sql($str) {
-       return mysql_real_escape_string($str, $GLOBALS['wfpl_db_handle'] ? $GLOBALS['wfpl_db_handle'] : null);
+       return mysqli_real_escape_string(isset($GLOBALS['wfpl_db_handle']) ? $GLOBALS['wfpl_db_handle'] : null, $str);
 }
 
 function db_connect($database = 'auto', $user = 'auto', $pass = 'auto', $host = 'localhost', $encoding = 'utf8') {
@@ -71,15 +71,15 @@ function db_connect($database = 'auto', $user = 'auto', $pass = 'auto', $host =
                }
        }
 
-       $GLOBALS['wfpl_db_handle'] = mysql_connect($host, $user, $pass);
+       $GLOBALS['wfpl_db_handle'] = mysqli_connect($host, $user, $pass);
        if(!$GLOBALS['wfpl_db_handle']) {
-               die('Could not connect to the database: ' . mysql_error());
+               die('Could not connect to the database: ' . mysqli_error());
        }
 
-       mysql_set_charset($encoding, $GLOBALS['wfpl_db_handle']);
+       mysqli_set_charset($GLOBALS['wfpl_db_handle'], $encoding);
 
-       if(!mysql_select_db($database, $GLOBALS['wfpl_db_handle'])) {
-               die("Couldn not access database \"$database\": " . mysql_error($GLOBALS['wfpl_db_handle']));
+       if(!mysqli_select_db($GLOBALS['wfpl_db_handle'], $database)) {
+               die("Couldn not access database \"$database\": " . mysqli_error($GLOBALS['wfpl_db_handle']));
        }
 
        return $GLOBALS['wfpl_db_handle'];
@@ -88,9 +88,9 @@ function db_connect($database = 'auto', $user = 'auto', $pass = 'auto', $host =
 # Unless you're doing something unusual like an ALTER TABLE don't call this directly
 function db_send_query($sql) {
        #echo("Sending query: " . enc_html($sql) . "<br>\n");
-       $result = mysql_query($sql, $GLOBALS['wfpl_db_handle']);
+       $result = mysqli_query($GLOBALS['wfpl_db_handle'], $sql);
        if(!$result) {
-               die(enc_html('DATABASE ERROR: ' . mysql_error($GLOBALS['wfpl_db_handle']) . ' in the following query: ' . $sql));
+               die(enc_html('DATABASE ERROR: ' . mysqli_error($GLOBALS['wfpl_db_handle']) . ' in the following query: ' . $sql));
        }
 
        return $result;
@@ -179,11 +179,11 @@ function db_get_rows($table, $columns, $where = '') {
        $result = db_send_get($table, $columns, $where, $args);
 
        $rows = array();
-       while($row = mysql_fetch_row($result)) {
+       while($row = mysqli_fetch_row($result)) {
                $rows[] = $row;
        }
 
-       mysql_free_result($result);
+       mysqli_free_result($result);
 
        return $rows;
 }
@@ -196,11 +196,11 @@ function db_get_assocs($table, $columns, $where = '') {
        $result = db_send_get($table, $columns, $where, $args);
 
        $rows = array();
-       while($row = mysql_fetch_assoc($result)) {
+       while($row = mysqli_fetch_assoc($result)) {
                $rows[] = $row;
        }
 
-       mysql_free_result($result);
+       mysqli_free_result($result);
 
        return $rows;
 }
@@ -212,11 +212,11 @@ function db_get_column($table, $columns, $where = '') {
        $result = db_send_get($table, $columns, $where, $args);
 
        $column = array();
-       while($row = mysql_fetch_row($result)) {
+       while($row = mysqli_fetch_row($result)) {
                $column[] = $row[0];
        }
 
-       mysql_free_result($result);
+       mysqli_free_result($result);
 
        return $column;
 }
@@ -228,9 +228,9 @@ function db_get_row($table, $columns, $where = '') {
        $args = array_slice($args, 3);
        $result = db_send_get($table, $columns, $where, $args);
 
-       $row = mysql_fetch_row($result);
+       $row = mysqli_fetch_row($result);
 
-       mysql_free_result($result);
+       mysqli_free_result($result);
 
        return $row;
 }
@@ -242,9 +242,9 @@ function db_get_assoc($table, $columns, $where = '') {
        $args = array_slice($args, 3);
        $result = db_send_get($table, $columns, $where, $args);
 
-       $row = mysql_fetch_assoc($result);
+       $row = mysqli_fetch_assoc($result);
 
-       mysql_free_result($result);
+       mysqli_free_result($result);
 
        return $row;
 }
@@ -255,12 +255,12 @@ function db_get_value($table, $column, $where = '') {
        $args = array_slice($args, 3);
        $result = db_send_get($table, $column, $where, $args);
 
-       $value = mysql_fetch_row($result);
+       $value = mysqli_fetch_row($result);
        if($value !== false) {
                $value = $value[0];
        }
 
-       mysql_free_result($result);
+       mysqli_free_result($result);
 
        return $value;
 }
@@ -313,7 +313,7 @@ function db_replace($table, $columns, $values) {
        
 # return the value mysql made up for the auto_increment field (for the last insert)
 function db_auto_id() {
-       return mysql_insert_id($GLOBALS['wfpl_db_handle']);
+       return mysqli_insert_id($GLOBALS['wfpl_db_handle']);
 }