X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=db.php;h=ddecff3752d724b828260e3f078976150b11aa0b;hb=e648f21f696e973b58d135cf38f786f1ebae1327;hp=c5683c0e4ee52bf1aeeac90f03f764798eab8630;hpb=6d9765bdf97af8351ed09c4187869cf05e74e2af;p=wfpl.git

diff --git a/db.php b/db.php
index c5683c0..ddecff3 100644
--- a/db.php
+++ b/db.php
@@ -95,8 +95,10 @@ function db_send_query($sql) {
 #
 # %%  put a % in the output
 # %i  put an integer in the output (strips non-numeric digits, and puts in 0 if blank)
+# %f  put a floating point value in the output (strips non-numeric digits, puts in 0.0 if not valid)
 # %"  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
+# %$  output argument as-is, no encoding. Make sure you quote everything from the user!
 #
 # complex example: db_get_rows('mytable', 'id', 'where name=%" or company like "%%%s%%"', $name, $company_partial);
 
@@ -132,6 +134,18 @@ function _db_printf($str, $args) {
 			$int = format_int(array_shift($args));
 			if($int == '') $int = '0';
 			$out .= $int;
+		} elseif($chr == 'f') {
+			$arg = array_shift($args);
+			if(is_numeric($arg)) {
+				$arg = sprintf("%f", $arg);
+			}
+			$arg = format_decimal($arg);
+			if(strlen($arg) < 1) {
+				$arg = '0.0';
+			}
+			$out .= $arg;
+		} elseif($chr == '$') {
+			$out .= array_shift($args);
 		} else {
 			$out .= $chr;
 		}
@@ -256,6 +270,22 @@ function db_insert($table, $columns, $values) {
 	
 	db_insert_ish('INSERT', $table, $columns, $values);
 }
+
+# like db_insert() above, but instead of passing columns and data separately,
+# you can pass one array with the column names as keys and the data as values
+function db_insert_assoc($table, $data) {
+	$args = func_get_args();
+	$args = array_slice($args, 2);
+	$columns = array();
+	$values = array();
+	foreach($data as $key => $value) {
+		$columns[] = $key;
+		$values[] = $value;
+	}
+	array_unshift($args, $table, join(',', $columns), $values);
+	call_user_func_array('db_insert', $args);
+}
+
 # same as above, except uses the "replace" command instead of "insert"
 function db_replace($table, $columns, $values) {
 	if(!is_array($values)) {
@@ -352,6 +382,23 @@ function db_update($table, $columns, $values) {
 	db_send_query($sql);
 }
 
+# like db_update() above, but instead of passing columns and data separately,
+# you can pass one array with the column names as keys and the data as values
+function db_update_assoc($table, $data) {
+	$args = func_get_args();
+	$args = array_slice($args, 2);
+	$columns = array();
+	$values = array();
+	foreach($data as $key => $value) {
+		$columns[] = $key;
+		$values[] = $value;
+	}
+	array_unshift($args, $values);
+	array_unshift($args, join(',', $columns));
+	array_unshift($args, $table);
+	call_user_func_array('db_update', $args);
+}
+
 # pass args for printf-style where clause as usual
 function db_delete($table, $where = '') {
 	$sql = "DELETE FROM $table";
@@ -392,13 +439,15 @@ function db_reposition_respace($table, $field) {
 # When editing a particular row, give the user a pulldown, with 0 -> first, 1 -> second, etc, and pass this integer to db_reposition (3rd parameter). The value "ignored" can be passed, and the row will be given a sort value of 0 and ignored for all sorting.
 #
 # $pretty is used in error messages to refer to the row, it defaults to whatever you pass for $table.
+#
+# return value is the "ord" value you should set/insert into your database
 
 function db_reposition($table, $row_id, $new_pos, $field = 'ord', $pretty = 'same as $table', $renumbered_already = false) {
-	if($pretty = 'same as $table') {
+	if($pretty == 'same as $table') {
 		$pretty = $table;
 	}
 
-	if($new_pos == 'ignored') {
+	if($new_pos === 'ignored') {
 		# not sorted
 		return '0';
 	}