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

Fix vote/notify link on the package details page

Browse source 
Call pkgbase_user_voted() and pkgbase_user_notify() using the package
base ID instead of using the package ID.

Fixes FS#40165.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2014-05-01 09:27:06 +02:00
parent 05f88b28b8
commit e161c4f94b
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
web/lib/pkgfuncs.inc.php
View file

@ -395,11 +395,12 @@ function pkg_name_is_blacklisted($name) {
function pkg_get_details($id=0) { function pkg_get_details($id=0) {
$dbh = DB::connect(); $dbh = DB::connect();
$q = "SELECT Packages.*, PackageBases.Name AS BaseName, "; $q = "SELECT Packages.*, PackageBases.ID AS BaseID, ";
$q.= "PackageBases.CategoryID, PackageBases.NumVotes, "; $q.= "PackageBases.Name AS BaseName, PackageBases.CategoryID, ";
$q.= "PackageBases.OutOfDateTS, PackageBases.SubmittedTS, "; $q.= "PackageBases.NumVotes, PackageBases.OutOfDateTS, ";
$q.= "PackageBases.ModifiedTS, PackageBases.SubmitterUID, "; $q.= "PackageBases.SubmittedTS, PackageBases.ModifiedTS, ";
$q.= "PackageBases.MaintainerUID, PackageCategories.Category "; $q.= "PackageBases.SubmitterUID, PackageBases.MaintainerUID, ";
$q.= "PackageCategories.Category ";
$q.= "FROM Packages, PackageBases, PackageCategories "; $q.= "FROM Packages, PackageBases, PackageCategories ";
$q.= "WHERE PackageBases.ID = Packages.PackageBaseID "; $q.= "WHERE PackageBases.ID = Packages.PackageBaseID ";
$q.= "AND PackageBases.CategoryID = PackageCategories.ID "; $q.= "AND PackageBases.CategoryID = PackageCategories.ID ";

5
web/template/pkg_details.php
View file

@ -3,6 +3,7 @@ $atype = account_from_sid($SID);
$uid = uid_from_sid($SID); $uid = uid_from_sid($SID);
$pkgid = intval($row['ID']); $pkgid = intval($row['ID']);
$base_id = intval($row['BaseID']);
$catarr = pkgbase_categories(); $catarr = pkgbase_categories();
@ -73,7 +74,7 @@ $sources = pkg_sources($row["ID"]);
</form> </form>
</li> </li>
<?php endif; ?> <?php endif; ?>
<?php if (pkgbase_user_voted($uid, $row['ID'])): ?> <?php if (pkgbase_user_voted($uid, $base_id)): ?>
<li> <li>
<form action="<?= get_pkgbase_uri($row['BaseName']) . 'unvote/'; ?>" method="post"> <form action="<?= get_pkgbase_uri($row['BaseName']) . 'unvote/'; ?>" method="post">
<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
@ -88,7 +89,7 @@ $sources = pkg_sources($row["ID"]);
</form> </form>
</li> </li>
<?php endif; ?> <?php endif; ?>
<?php if (pkgbase_user_notify($uid, $row['ID'])): ?> <?php if (pkgbase_user_notify($uid, $base_id)): ?>
<li> <li>
<form action="<?= get_pkgbase_uri($row['BaseName']) . 'unnotify/'; ?>" method="post"> <form action="<?= get_pkgbase_uri($row['BaseName']) . 'unnotify/'; ?>" method="post">
<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />

4
web/template/pkgbase_details.php
View file

@ -49,7 +49,7 @@ $pkgs = pkgbase_get_pkgnames($base_id);
</form> </form>
</li> </li>
<?php endif; ?> <?php endif; ?>
<?php if (pkgbase_user_voted($uid, $row['ID'])): ?> <?php if (pkgbase_user_voted($uid, $base_id)): ?>
<li> <li>
<form action="<?= get_pkgbase_uri($row['Name']) . 'unvote/'; ?>" method="post"> <form action="<?= get_pkgbase_uri($row['Name']) . 'unvote/'; ?>" method="post">
<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
@ -64,7 +64,7 @@ $pkgs = pkgbase_get_pkgnames($base_id);
</form> </form>
</li> </li>
<?php endif; ?> <?php endif; ?>
<?php if (pkgbase_user_notify($uid, $row['ID'])): ?> <?php if (pkgbase_user_notify($uid, $base_id)): ?>
<li> <li>
<form action="<?= get_pkgbase_uri($row['Name']) . 'unnotify/'; ?>" method="post"> <form action="<?= get_pkgbase_uri($row['Name']) . 'unnotify/'; ?>" method="post">
<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />