Commit cf2f6675 authored by Lukas Fleischer's avatar Lukas Fleischer
Browse files

Support canonical links to packages



This is more user-friendly than supporting package IDs only and can be
used as a basis to support direct links to AUR packages in places where
links are computer-produced (e.g. Wiki templates).

Addresses FS#21600 and FS#28839.

Signed-off-by: default avatarLukas Fleischer <archlinux@cryptocrack.de>
parent 132856a9
......@@ -10,6 +10,8 @@ check_sid(); # see if they're still logged in
# Set the title to the current query if required
if (isset($_GET['ID']) && ($pkgname = pkgname_from_id($_GET['ID']))) {
$title = $pkgname;
} else if (isset($_GET['N'])) {
$title = $pkgname = $_GET['N'];
} else if (!empty($_GET['K'])) {
$title = __("Search Criteria") . ": " . $_GET['K'];
} else {
......@@ -98,6 +100,18 @@ if (isset($_GET['ID'])) {
package_details($_GET['ID'], null);
}
}
} else if (isset($_GET['N'])) {
include('pkg_search_form.php');
if (!$pkgid = pkgid_from_name($_GET['N'])) {
print __("Error trying to retrieve package details.")."<br />\n";
} else {
if (isset($_COOKIE["AURSID"])) {
package_details($pkgid, $_COOKIE["AURSID"]);
}
else {
package_details($pkgid, null);
}
}
} else {
if (!isset($_GET['K']) && !isset($_GET['SB'])) {
$_GET['SB'] = 'v';
......
......@@ -36,7 +36,7 @@ while (list($indx, $carr) = each($comments)) { ?>
</div>
<?php
$count = package_comments_count($_GET['ID']);
$count = package_comments_count(isset($_GET['ID']) ? $_GET['ID'] : pkgid_from_name($_GET['N']));
if ($count > 10 && !isset($_GET['comments'])) {
echo '<div class="pgbox">';
echo '<a href="'. $_SERVER['REQUEST_URI'] . '&comments=all">'. __('Show all %s comments', $count) . '</a>';
......
......@@ -2,7 +2,13 @@
$atype = account_from_sid($SID);
$uid = uid_from_sid($SID);
$pkgid = intval($_REQUEST['ID']);
if (isset($_REQUEST['ID'])) {
$pkgid = intval($_REQUEST['ID']);
}
else {
$pkgid = pkgid_from_name($_REQUEST['N']);
}
if ($uid == $row["MaintainerUID"] or
($atype == "Developer" or $atype == "Trusted User")) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment