upload.php cleanup: really don't make dot files

[wfpl.git] / db.php

diff --git a/db.php b/db.php
index 9540220..5eec706 100644 (file)
--- a/db.php
+++ b/db.php
@@ -1,19 +1,9 @@
 <?php
 
-#  Copyright (C) 2006 Jason Woofenden
-#
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#  
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#  
-#  You should have received a copy of the GNU General Public License
-#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This program is in the public domain within the United States. Additionally,
+# we waive copyright and related rights in the work worldwide through the CC0
+# 1.0 Universal public domain dedication, which can be found at
+# http://creativecommons.org/publicdomain/zero/1.0/
 
 
 require_once(__DIR__.'/'.'encode.php');
@@ -39,7 +29,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 +61,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 +78,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 +169,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 +186,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 +202,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 +218,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 +232,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,20 +245,21 @@ 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;
 }
 
+# returns an integer
 function db_count($table, $where = '') {
        $args = func_get_args();
        array_splice($args, 1, 0, array('count(*)'));
-       return call_user_func_array('db_get_value', $args);
+       return (int) call_user_func_array('db_get_value', $args);
 }
 
 # call either of these ways:
@@ -312,7 +303,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']);
 }