X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=db.php;h=14787ac830199ee5a9e2bde4bb5acc561e45f25f;hb=f6fdd9deec6c7815f5877270e746e1bd1201a726;hp=1bf78fd6c868093b2ebc25d610dea0be4c7354fb;hpb=a781daf79ad6d3a3dfec09ac61e8dcc4c8cc1c48;p=wfpl.git

diff --git a/db.php b/db.php
index 1bf78fd..14787ac 100644
--- a/db.php
+++ b/db.php
@@ -16,8 +16,8 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-require_once('code/wfpl/encode.php');
-require_once('code/wfpl/format.php');
+require_once(__DIR__.'/'.'encode.php');
+require_once(__DIR__.'/'.'format.php');
 
 # db_connect() -- connect to a mysql database
 #
@@ -38,7 +38,11 @@ require_once('code/wfpl/format.php');
 #   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') {
+function db_enc_sql($str) {
+	return mysql_real_escape_string($str, $GLOBALS['wfpl_db_handle'] ? $GLOBALS['wfpl_db_handle'] : null);
+}
+
+function db_connect($database = 'auto', $user = 'auto', $pass = 'auto', $host = 'localhost', $encoding = 'utf8') {
 	if($database == 'auto') {
 		if(isset($GLOBALS['db_name'])) {
 			$database = $GLOBALS['db_name'];
@@ -72,6 +76,8 @@ function db_connect($database = 'auto', $user = 'auto', $pass = 'auto', $host =
 		die('Could not connect to the database: ' . mysql_error());
 	}
 
+	mysql_set_charset($encoding, $GLOBALS['wfpl_db_handle']);
+
 	if(!mysql_select_db($database, $GLOBALS['wfpl_db_handle'])) {
 		die("Couldn not access database \"$database\": " . mysql_error($GLOBALS['wfpl_db_handle']));
 	}
@@ -127,9 +133,9 @@ function _db_printf($str, $args) {
 		$str = substr($str, $pos + 2);
 
 		if($chr == '"') {
-			$out .= '"' . enc_sql(array_shift($args)) . '"';
+			$out .= '"' . db_enc_sql(array_shift($args)) . '"';
 		} elseif($chr == 's') {
-			$out .= enc_sql(array_shift($args));
+			$out .= db_enc_sql(array_shift($args));
 		} elseif($chr == 'i') {
 			$int = format_int(array_shift($args));
 			if($int == '') $int = '0';
@@ -155,6 +161,7 @@ function _db_printf($str, $args) {
 }
 
 
+# helper function
 function db_send_get($table, $columns, $where, $args) {
 	$sql = "SELECT $columns FROM $table";
 	if($where) {
@@ -165,6 +172,7 @@ function db_send_get($table, $columns, $where, $args) {
 }
 
 
+# if no results: returs []
 function db_get_rows($table, $columns, $where = '') {
 	$args = func_get_args();
 	$args = array_slice($args, 3);
@@ -181,6 +189,7 @@ function db_get_rows($table, $columns, $where = '') {
 }
 
 # like db_get_rows, but return array of hashes.
+# if no results: returs []
 function db_get_assocs($table, $columns, $where = '') {
 	$args = func_get_args();
 	$args = array_slice($args, 3);
@@ -196,6 +205,7 @@ function db_get_assocs($table, $columns, $where = '') {
 	return $rows;
 }
 
+# if no results: returs []
 function db_get_column($table, $columns, $where = '') {
 	$args = func_get_args();
 	$args = array_slice($args, 3);
@@ -211,6 +221,8 @@ function db_get_column($table, $columns, $where = '') {
 	return $column;
 }
 
+# returns first matching row
+# if no results: returns false
 function db_get_row($table, $columns, $where = '') {
 	$args = func_get_args();
 	$args = array_slice($args, 3);
@@ -224,6 +236,7 @@ function db_get_row($table, $columns, $where = '') {
 }
 
 # like db_get_row, but return a hash.
+# if no results: returns false
 function db_get_assoc($table, $columns, $where = '') {
 	$args = func_get_args();
 	$args = array_slice($args, 3);
@@ -236,10 +249,11 @@ function db_get_assoc($table, $columns, $where = '') {
 	return $row;
 }
 
-function db_get_value($table, $columns, $where = '') {
+# if no results: returns false
+function db_get_value($table, $column, $where = '') {
 	$args = func_get_args();
 	$args = array_slice($args, 3);
-	$result = db_send_get($table, $columns, $where, $args);
+	$result = db_send_get($table, $column, $where, $args);
 
 	$value = mysql_fetch_row($result);
 	if($value !== false) {
@@ -251,10 +265,11 @@ function db_get_value($table, $columns, $where = '') {
 	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:
@@ -308,7 +323,7 @@ function db_insert_ish($command, $table, $columns, $values) {
 	$sql = '';
 	foreach($values as $value) {
 		if($sql) $sql .= ',';
-		$sql .= '"' . enc_sql($value) . '"';
+		$sql .= '"' . db_enc_sql($value) . '"';
 	}
 
 	$sql = "$command INTO $table ($columns) values($sql)";
@@ -358,7 +373,7 @@ function db_update($table, $columns, $values) {
 		if($sql != '') {
 			$sql .= ', ';
 		}
-		$sql .= $columns[$i] . ' = "' . enc_sql($values[$i]) . '"';
+		$sql .= $columns[$i] . ' = "' . db_enc_sql($values[$i]) . '"';
 	}