# 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
#
# 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'];
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']));
}
$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';
$sql = '';
foreach($values as $value) {
if($sql) $sql .= ',';
- $sql .= '"' . enc_sql($value) . '"';
+ $sql .= '"' . db_enc_sql($value) . '"';
}
$sql = "$command INTO $table ($columns) values($sql)";
if($sql != '') {
$sql .= ', ';
}
- $sql .= $columns[$i] . ' = "' . enc_sql($values[$i]) . '"';
+ $sql .= $columns[$i] . ' = "' . db_enc_sql($values[$i]) . '"';
}
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
#
# 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
# 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) {
$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) {
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);
}