Wrap mysql_real_escape_string() in a function

Wrap mysql_real_escape_string() in a wrapper function db_escape_string()
to ease porting to other databases, and as another step to pulling more
of the database code into a central location.

This is a rebased version of a patch by elij submitted about half a year
ago.

Thanks-to: elij <elij.mx@gmail.com>
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2011-10-20 08:15:02 +02:00
parent 54d5dcc6e8
commit 323d418f02
12 changed files with 66 additions and 61 deletions

View file

@ -177,7 +177,7 @@ class AurJSON {
if (is_numeric($arg)) {
$id_args[] = intval($arg);
} else {
$escaped = mysql_real_escape_string($arg, $this->dbh);
$escaped = db_escape_string($arg, $this->dbh);
$name_args[] = "'" . $escaped . "'";
}
}
@ -195,7 +195,7 @@ class AurJSON {
return $this->json_error('Query arg too small');
}
$keyword_string = mysql_real_escape_string($keyword_string, $this->dbh);
$keyword_string = db_escape_string($keyword_string, $this->dbh);
$keyword_string = addcslashes($keyword_string, '%_');
$where_condition = "( Name LIKE '%{$keyword_string}%' OR " .
@ -218,7 +218,7 @@ class AurJSON {
}
else {
$where_condition = sprintf("Name=\"%s\"",
mysql_real_escape_string($pqdata, $this->dbh));
db_escape_string($pqdata, $this->dbh));
}
return $this->process_query('info', $where_condition);
}
@ -260,7 +260,7 @@ class AurJSON {
* @return mixed Returns an array of value data containing the package data
**/
private function msearch($maintainer) {
$maintainer = mysql_real_escape_string($maintainer, $this->dbh);
$maintainer = db_escape_string($maintainer, $this->dbh);
$where_condition = "Users.Username = '{$maintainer}'";