metaform: fix auto-generation of Reply-To email header

[wfpl.git] / db.php

diff --git a/db.php b/db.php
index 42a21cf..ddecff3 100644 (file)
--- 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;
                }
@@ -425,6 +439,8 @@ 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') {