external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

aurjson: Merge info and multiinfo commands

Browse source 
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
This commit is contained in:
Lukas Fleischer 2015-10-04 09:57:35 +02:00
parent 261c7f74dd
commit 3c06716c72
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
web/lib/aurjson.class.php
View file

@ -76,7 +76,7 @@ class AurJSON {
if (isset($http_data['v'])) { if (isset($http_data['v'])) {
$this->version = intval($http_data['v']); $this->version = intval($http_data['v']);
} }
if ($this->version < 1 || $this->version > 4) { if ($this->version < 1 || $this->version > 5) {
return $this->json_error('Invalid version specified.'); return $this->json_error('Invalid version specified.');
} }
@ -93,6 +93,9 @@ class AurJSON {
$this->dbh = DB::connect(); $this->dbh = DB::connect();
$type = str_replace('-', '_', $http_data['type']); $type = str_replace('-', '_', $http_data['type']);
if ($type == 'info' && $this->version >= 5) {
$type = 'multiinfo';
}
$json = call_user_func(array(&$this, $type), $http_data); $json = call_user_func(array(&$this, $type), $http_data);
$etag = md5($json); $etag = md5($json);
@ -250,7 +253,7 @@ class AurJSON {
} elseif ($this->version >= 2) { } elseif ($this->version >= 2) {
if ($this->version == 2 || $this->version == 3) { if ($this->version == 2 || $this->version == 3) {
$fields = implode(',', self::$fields_v2); $fields = implode(',', self::$fields_v2);
} else if ($this->version == 4) { } else if ($this->version == 4 || $this->version == 5) {
$fields = implode(',', self::$fields_v4); $fields = implode(',', self::$fields_v4);
} }
$query = "SELECT {$fields} " . $query = "SELECT {$fields} " .