X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=db.php;h=b1faf2c32440ca617204c93e28a708aff4f80554;hb=51cf6721f37220e1277c71545b87dcc01fbf7e81;hp=4650cb532b8bcd26814233866765ae6fbc0c911a;hpb=6e641341473c1e4ddb306bdf44730bc7d307f975;p=wfpl.git diff --git a/db.php b/db.php index 4650cb5..b1faf2c 100644 --- a/db.php +++ b/db.php @@ -16,8 +16,8 @@ # along with this program. If not, see . -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 # @@ -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"; @@ -372,8 +419,11 @@ function db_delete($table, $where = '') { define('DB_ORD_MAX', 2000000000); -function db_reposition_respace($table, $field) { - $ids = db_get_column($table, 'id', "where $field != 0 order by $field"); +function db_reposition_respace($table, $field, $where = '') { + if($where) { + $andand = " && ($where) "; + } + $ids = db_get_column($table, 'id', "where $field != 0 $andand order by $field"); $c = count($ids); if(!$c) { # should never happen @@ -392,11 +442,16 @@ 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') { +function db_reposition($table, $row_id, $new_pos, $field = 'ord', $pretty = 'same as $table', $where = '', $renumbered_already = false) { + if($pretty == 'same as $table') { $pretty = $table; } + if($where) { + $andand = " && ($where) "; + } if($new_pos === 'ignored') { # not sorted @@ -405,7 +460,7 @@ function db_reposition($table, $row_id, $new_pos, $field = 'ord', $pretty = 'sam # strategy: calculate $prev_ord and $next_ord. If there's no space between, renumber and recurse if($new_pos == '0') { - $row = db_get_row($table, "id,$field", "where $field != 0 order by $field limit 1"); + $row = db_get_row($table, "id,$field", "where $field != 0 $andand order by $field limit 1"); if($row) { list($first_row_id, $first_row_ord) = $row; if($first_row_id == $row_id) { @@ -421,10 +476,10 @@ function db_reposition($table, $row_id, $new_pos, $field = 'ord', $pretty = 'sam $prev_ord = 0; } else { $new_pos = format_int_0($new_pos); - $rows = db_get_rows($table, "id,$field", "where $field != 0 order by $field limit %i,2", $new_pos - 1); + $rows = db_get_rows($table, "id,$field", "where $field != 0 $andand order by $field limit %i,2", $new_pos - 1); if(!$rows) { message("Sorry, couldn't find the $pretty you asked to put this $pretty after. Putting it first instead."); - return db_reposition($table, $row_id, '0', $field, $pretty); + return db_reposition($table, $row_id, '0', $field, $pretty, $where); } else { list($prev_id, $prev_ord) = $rows[0]; if($prev_id == $row_id) { @@ -448,8 +503,8 @@ function db_reposition($table, $row_id, $new_pos, $field = 'ord', $pretty = 'sam message("Programmer error in $pretty ordering code. Please tell your website administrator."); return '' . rand(2, DB_ORD_MAX - 2); # reasonably unlikely to be the same as some other ord } - db_reposition_respace($table, $field); - return db_reposition($table, $row_id, $new_pos, $field, $pretty, $renumbered_already = true); + db_reposition_respace($table, $field, $where); + return db_reposition($table, $row_id, $new_pos, $field, $pretty, $where, $renumbered_already = true); } else { return $prev_ord + round(($next_ord - $prev_ord) / 2); }