summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-02-18 21:34:07 +0100
committerErich Eckner <git@eckner.net>2019-02-18 21:34:07 +0100
commit28f074140370a8c2a11b995271e4c135b2cc1c7f (patch)
treea78653ef597ae690f57f9b8b31514bdecb34655d /packages
parentad8b318c1eaddbc2043b9a7cbaa6332177db491c (diff)
downloadwebsite-28f074140370a8c2a11b995271e4c135b2cc1c7f.tar.xz
extracting of ORDER BY info from $_GET moved from packages/index.php to function in lib/style.php
Diffstat (limited to 'packages')
-rw-r--r--packages/index.php19
1 files changed, 7 insertions, 12 deletions
diff --git a/packages/index.php b/packages/index.php
index 4d854a9..35f0d26 100644
--- a/packages/index.php
+++ b/packages/index.php
@@ -129,19 +129,11 @@ require_once BASE . "/lib/format.php";
false
);
- $q_f = $extra_joins . $filter . $fuzzy_filter . " ORDER BY ";
-
- if (array_key_exists("sort", $_GET)) {
- if (isset($pkglist_sorts[$_GET["sort"]]["mysql"]))
- $q_f .= $pkglist_sorts[$_GET["sort"]]["mysql"] . ",";
- elseif (isset($pkglist_sorts[substr($_GET["sort"],1)]["mysql"]))
- $q_f .= $pkglist_sorts[substr($_GET["sort"],1)]["mysql"] . " DESC,";
- }
-
- $q_f .= "`binary_packages`.`pkgname`,`repositories`.`stability`,`repositories`.`name`,`architectures`.`name`";
$num_results = query_package_listing(
- $q_f,
+ $extra_joins . $filter . $fuzzy_filter .
+ " ORDER BY " . package_listing_query_order_by() .
+ "`binary_packages`.`pkgname`,`repositories`.`stability`,`repositories`.`name`,`architectures`.`name`",
array(),
true
);
@@ -153,7 +145,10 @@ require_once BASE . "/lib/format.php";
$page = 1;
$fuzzy_matches = query_package_listing(
- $q_f . " LIMIT " . (($page-1)*100) . ", 100",
+ $extra_joins . $filter . $fuzzy_filter .
+ " ORDER BY " . package_listing_query_order_by() .
+ "`binary_packages`.`pkgname`,`repositories`.`stability`,`repositories`.`name`,`architectures`.`name`" .
+ " LIMIT " . (($page-1)*100) . ", 100",
$float_columns,
false
);