[aur-dev] [PATCH 3/4] rpc.php: be a bit more consistent in query building
Dan McGee
dan at archlinux.org
Tue Apr 12 01:15:48 EDT 2011
Do the implode as the same but separate step each time, and remove
indentation where no other query has it.
Signed-off-by: Dan McGee <dan at archlinux.org>
---
web/lib/aurjson.class.php | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php
index a22be62..9b0e1a0 100644
--- a/web/lib/aurjson.class.php
+++ b/web/lib/aurjson.class.php
@@ -110,10 +110,11 @@ class AurJSON {
return $this->json_error('Query arg too small');
}
+ $fields = implode(',', self::$fields);
$keyword_string = mysql_real_escape_string($keyword_string, $this->dbh);
$keyword_string = addcslashes($keyword_string, '%_');
- $query = "SELECT " . implode(',', self::$fields) .
+ $query = "SELECT {$fields} " .
" FROM Packages WHERE " .
" ( Name LIKE '%{$keyword_string}%' OR " .
" Description LIKE '%{$keyword_string}%' )";
@@ -127,7 +128,9 @@ class AurJSON {
* @return mixed Returns an array of value data containing the package data
**/
private function info($pqdata) {
- $base_query = "SELECT " . implode(',', self::$fields) .
+ $fields = implode(',', self::$fields);
+
+ $base_query = "SELECT {$fields} " .
" FROM Packages WHERE ";
if ( is_numeric($pqdata) ) {
@@ -137,11 +140,8 @@ class AurJSON {
$query_stub = "ID={$pqdata}";
}
else {
- if(get_magic_quotes_gpc()) {
- $pqdata = stripslashes($pqdata);
- }
$query_stub = sprintf("Name=\"%s\"",
- mysql_real_escape_string($pqdata));
+ mysql_real_escape_string($pqdata, $this->dbh));
}
$query = $base_query . $query_stub;
@@ -154,13 +154,13 @@ 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);
$fields = implode(',', self::$fields);
+ $maintainer = mysql_real_escape_string($maintainer, $this->dbh);
$query = "SELECT Users.Username as Maintainer, {$fields} " .
- " FROM Packages, Users " .
- " WHERE Packages.MaintainerUID = Users.ID AND " .
- " Users.Username = '{$maintainer}'";
+ " FROM Packages, Users WHERE " .
+ " Packages.MaintainerUID = Users.ID AND " .
+ " Users.Username = '{$maintainer}'";
return $this->process_query('msearch', $query);
}
--
1.7.4.4
More information about the aur-dev
mailing list