X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=db.php;h=f39d5e006afa1b259964be75c6c5b9fc488df6d8;hb=3faf64c6a1e0cbd4f880da951775c41fb8a6f0ab;hp=4cb4a61468007c81f9f5c322b32ec85a914c213e;hpb=6efe0372c5d3b2db723ada811917b6a52f13130b;p=wfpl.git

diff --git a/db.php b/db.php
index 4cb4a61..f39d5e0 100644
--- a/db.php
+++ b/db.php
@@ -2,41 +2,41 @@
 
 #  Copyright (C) 2006 Jason Woofenden
 #
-#  This file is part of wfpl.
-#
-#  wfpl 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 2, or (at your option)
-#  any later version.
-#
-#  wfpl 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.
-#
+#  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 wfpl; see the file COPYING.  If not, write to the
-#  Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-#  MA 02111-1307, USA.
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 require_once('code/wfpl/encode.php');
 require_once('code/wfpl/format.php');
 
-# db_connect() parameters:
+# db_connect() -- connect to a mysql database
 #
-# database: the name of the database you want to connect to. Defaults to the
-# second-to-last part of the domain name. eg for foo.example.com it would be
-# "example".
+# PARAMETERS:
 #
-# user: username for connecting to the database. Defaults to
-# $GLOBALS['db_username'] or (if that's not set) "www".
+#   database: the name of the database you want to connect to. Defaults to the
+#   second-to-last part of the domain name. eg for foo.example.com it would be
+#   "example".
+# 
+#   user: username for connecting to the database. Defaults to
+#   $GLOBALS['db_username'] or (if that's not set) "www".
+# 
+#   password: password for connecting to the database. Defaults to
+#   $GLOBALS['db_password'] or (if that's not set "".
 #
-# password: password for connecting to the database. Defaults to
-# $GLOBALS['db_password'] or (if that's not set "".
+# RETURNS:
 #
-# RETURNS: the database connection handle. You'll only need this if you
-# want to have multiple databases open at once.
+#   the database connection handle. You'll only need this if you want to have
+#   multiple databases open at once.
 
 function db_connect($database = 'auto', $user = 'auto', $pass = 'auto', $host = 'localhost') {
 	if($database == 'auto') {
@@ -98,17 +98,16 @@ function db_send_query($sql) {
 # %"  output double quotes, surrounding the variable which is encoded to be in there.
 # %s  output encoded to be in double quotes, but don't output the quotes
 #
-# complex example: db_get_rows('mytable', 'id', 'name=%" or company like "%%%s%%"', $name, $company_partial);
+# complex example: db_get_rows('mytable', 'id', 'where name=%" or company like "%%%s%%"', $name, $company_partial);
 
 function db_printf($str) {
 	$args = func_get_args();
 	$args = array_slice($args, 1);
-	_db_printf($str, $args);
+	return _db_printf($str, $args);
 }
 
-# This function does the work, but takes the parameters in an array, and backwards.
+# This function does the work, but takes the parameters in an array
 function _db_printf($str, $args) {
-	$args = array_reverse($args); # because array_pop() takes from the end
 	$out = '';
 	while($str) {
 		$pos = strpos($str, '%');
@@ -126,9 +125,11 @@ function _db_printf($str, $args) {
 		$str = substr($str, $pos + 2);
 
 		if($chr == '"') {
-			$out .= '"' . enc_sql(array_pop($args)) . '"';
+			$out .= '"' . enc_sql(array_shift($args)) . '"';
+		} elseif($chr == 's') {
+			$out .= enc_sql(array_shift($args));
 		} elseif($chr == 'i') {
-			$int = format_int(array_pop($args));
+			$int = format_int(array_shift($args));
 			if($int == '') $int = '0';
 			$out .= $int;
 		} else {
@@ -143,7 +144,7 @@ function _db_printf($str, $args) {
 function db_send_get($table, $columns, $where, $args) {
 	$sql = "SELECT $columns FROM $table";
 	if($where) {
-		$sql .= ' WHERE ' . _db_printf($where, $args);
+		$sql .= ' ' . _db_printf($where, $args);
 	}
 
 	return db_send_query($sql);
@@ -165,6 +166,22 @@ function db_get_rows($table, $columns, $where = '') {
 	return $rows;
 }
 
+# like db_get_rows, but return array of hashes.
+function db_get_assocs($table, $columns, $where = '') {
+	$args = func_get_args();
+	$args = array_slice($args, 3);
+	$result = db_send_get($table, $columns, $where, $args);
+
+	$rows = array();
+	while($row = mysql_fetch_assoc($result)) {
+		$rows[] = $row;
+	}
+
+	mysql_free_result($result);
+
+	return $rows;
+}
+
 function db_get_column($table, $columns, $where = '') {
 	$args = func_get_args();
 	$args = array_slice($args, 3);
@@ -192,6 +209,19 @@ function db_get_row($table, $columns, $where = '') {
 	return $row;
 }
 
+# like db_get_row, but return a hash.
+function db_get_assoc($table, $columns, $where = '') {
+	$args = func_get_args();
+	$args = array_slice($args, 3);
+	$result = db_send_get($table, $columns, $where, $args);
+
+	$row = mysql_fetch_assoc($result);
+
+	mysql_free_result($result);
+
+	return $row;
+}
+
 function db_get_value($table, $columns, $where = '') {
 	$args = func_get_args();
 	$args = array_slice($args, 3);
@@ -207,6 +237,12 @@ function db_get_value($table, $columns, $where = '') {
 	return $value;
 }
 
+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);
+}
+
 # call either of these ways:
 #
 # db_insert('people', 'name,company', 'jason', 'widgets ltd');
@@ -262,17 +298,17 @@ function db_insert_ish($command, $table, $columns, $values) {
 # db_update('users', 'name', 'Bruce');
 #
 # # name user #6 Bruce
-# db_update('users', 'name', 'Bruce', 'id= %"', 6);
+# db_update('users', 'name', 'Bruce', 'where id=%i', 6);
 #
 # # update the whole bit for user #6
-# db_update('users', 'name,email,description', 'Bruce', 'bruce@example.com', 'is a cool guy', 'id= %"', 6);
+# db_update('users', 'name,email,description', 'Bruce', 'bruce@example.com', 'is a cool guy', 'where id=%i', 6);
 #
 # # update the whole bit for user #6 (passing data as an array)
 # $data = array('Bruce', 'bruce@example.com', 'is a cool guy');
-# db_update('users', 'name,email,description', $data, 'id= %"', 6);
+# db_update('users', 'name,email,description', $data, 'where id=%i', 6);
 
 # The prototype is really something like this:
-# db_update(table, columns, values..., where(optional), where_args...(optional
+# db_update(table, columns, values..., where(optional), where_args...(optional))
 function db_update($table, $columns, $values) {
 	$args = func_get_args();
 	$args = array_slice($args, 2);
@@ -302,7 +338,7 @@ function db_update($table, $columns, $values) {
 		$where = $args[0];
 		$args = array_slice($args, 1);
 
-		$sql .= ' WHERE ';
+		$sql .= ' ';
 		# any left for where claus arguments?
 		if($args) {
 			$sql .= _db_printf($where, $args);
@@ -319,7 +355,7 @@ function db_update($table, $columns, $values) {
 function db_delete($table, $where = '') {
 	$sql = "DELETE FROM $table";
 	if($where) {
-		$sql .= ' WHERE ';
+		$sql .= ' ';
 		$args = func_get_args();
 		$args = array_slice($args, 2);
 		if($args) {