X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=db.php;h=c137d03a3cd63a92770a457322f961e4f277c354;hp=c93e5f35fdad1fad0610603662d65b3b3115e87f;hb=9a3136a5bee66e1055ffb566373952b6054dd7bf;hpb=b06120b7272f31b715fdec90f12e1a02956cdca2
diff --git a/db.php b/db.php
index c93e5f3..c137d03 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
#
@@ -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 mysqli_real_escape_string(isset($GLOBALS['wfpl_db_handle']) ? $GLOBALS['wfpl_db_handle'] : null, $str);
+}
+
+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'];
@@ -67,13 +71,15 @@ function db_connect($database = 'auto', $user = 'auto', $pass = 'auto', $host =
}
}
- $GLOBALS['wfpl_db_handle'] = mysql_connect($host, $user, $pass);
+ $GLOBALS['wfpl_db_handle'] = mysqli_connect($host, $user, $pass);
if(!$GLOBALS['wfpl_db_handle']) {
- die('Could not connect to the database: ' . mysql_error());
+ die('Could not connect to the database: ' . mysqli_error());
}
- if(!mysql_select_db($database, $GLOBALS['wfpl_db_handle'])) {
- die("Couldn not access database \"$database\": " . mysql_error($GLOBALS['wfpl_db_handle']));
+ mysqli_set_charset($GLOBALS['wfpl_db_handle'], $encoding);
+
+ if(!mysqli_select_db($GLOBALS['wfpl_db_handle'], $database)) {
+ die("Couldn not access database \"$database\": " . mysqli_error($GLOBALS['wfpl_db_handle']));
}
return $GLOBALS['wfpl_db_handle'];
@@ -82,9 +88,9 @@ function db_connect($database = 'auto', $user = 'auto', $pass = 'auto', $host =
# Unless you're doing something unusual like an ALTER TABLE don't call this directly
function db_send_query($sql) {
#echo("Sending query: " . enc_html($sql) . "
\n");
- $result = mysql_query($sql, $GLOBALS['wfpl_db_handle']);
+ $result = mysqli_query($GLOBALS['wfpl_db_handle'], $sql);
if(!$result) {
- die(enc_html('DATABASE ERROR: ' . mysql_error($GLOBALS['wfpl_db_handle']) . ' in the following query: ' . $sql));
+ die(enc_html('DATABASE ERROR: ' . mysqli_error($GLOBALS['wfpl_db_handle']) . ' in the following query: ' . $sql));
}
return $result;
@@ -95,8 +101,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);
@@ -125,13 +133,25 @@ 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';
$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;
}
@@ -141,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) {
@@ -151,96 +172,104 @@ 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);
$result = db_send_get($table, $columns, $where, $args);
$rows = array();
- while($row = mysql_fetch_row($result)) {
+ while($row = mysqli_fetch_row($result)) {
$rows[] = $row;
}
- mysql_free_result($result);
+ mysqli_free_result($result);
return $rows;
}
# 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);
$result = db_send_get($table, $columns, $where, $args);
$rows = array();
- while($row = mysql_fetch_assoc($result)) {
+ while($row = mysqli_fetch_assoc($result)) {
$rows[] = $row;
}
- mysql_free_result($result);
+ mysqli_free_result($result);
return $rows;
}
+# if no results: returs []
function db_get_column($table, $columns, $where = '') {
$args = func_get_args();
$args = array_slice($args, 3);
$result = db_send_get($table, $columns, $where, $args);
$column = array();
- while($row = mysql_fetch_row($result)) {
+ while($row = mysqli_fetch_row($result)) {
$column[] = $row[0];
}
- mysql_free_result($result);
+ mysqli_free_result($result);
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);
$result = db_send_get($table, $columns, $where, $args);
- $row = mysql_fetch_row($result);
+ $row = mysqli_fetch_row($result);
- mysql_free_result($result);
+ mysqli_free_result($result);
return $row;
}
# 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);
$result = db_send_get($table, $columns, $where, $args);
- $row = mysql_fetch_assoc($result);
+ $row = mysqli_fetch_assoc($result);
- mysql_free_result($result);
+ mysqli_free_result($result);
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);
+ $value = mysqli_fetch_row($result);
if($value !== false) {
$value = $value[0];
}
- mysql_free_result($result);
+ mysqli_free_result($result);
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:
@@ -256,6 +285,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)) {
@@ -268,7 +313,7 @@ function db_replace($table, $columns, $values) {
# return the value mysql made up for the auto_increment field (for the last insert)
function db_auto_id() {
- return mysql_insert_id($GLOBALS['wfpl_db_handle']);
+ return mysqli_insert_id($GLOBALS['wfpl_db_handle']);
}
@@ -278,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)";
@@ -328,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]) . '"';
}
@@ -352,6 +397,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 +434,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 +457,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) {
+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 +475,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 +491,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 +518,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);
}