Allow package co-maintainers to pin comments
diff mbox

Message ID 20171106161144.20286-1-lfleischer@archlinux.org
State Accepted, archived
Headers show

Commit Message

Lukas Fleischer Nov. 6, 2017, 4:11 p.m. UTC
Implements FS#56255.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/lib/pkgfuncs.inc.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

Patch
diff mbox

diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php
index 5c48a8e..dbcf63e 100644
--- a/web/lib/pkgfuncs.inc.php
+++ b/web/lib/pkgfuncs.inc.php
@@ -85,8 +85,9 @@  function can_edit_comment_array($comment) {
 /**
  * Determine if the user can pin a specific package comment
  *
- * Only the Package Maintainer, Trusted Users, and Developers can pin
- * comments. This function is used for the backend side of comment pinning.
+ * Only the Package Maintainer, Package Co-maintainers, Trusted Users, and
+ * Developers can pin comments. This function is used for the backend side of
+ * comment pinning.
  *
  * @param string $comment_id The comment ID in the database
  *
@@ -97,6 +98,11 @@  function can_pin_comment($comment_id=0) {
 
 	$q = "SELECT MaintainerUID FROM PackageBases AS pb ";
 	$q.= "LEFT JOIN PackageComments AS pc ON pb.ID = pc.PackageBaseID ";
+	$q.= "WHERE pc.ID = " . intval($comment_id) . " ";
+	$q.= "UNION ";
+	$q = "SELECT pcm.UsersID FROM PackageComaintainers AS pcm ";
+	$q.= "LEFT JOIN PackageComments AS pc ";
+	$q.= "ON pcm.PackageBaseID = pc.PackageBaseID ";
 	$q.= "WHERE pc.ID = " . intval($comment_id);
 	$result = $dbh->query($q);
 
@@ -104,16 +110,17 @@  function can_pin_comment($comment_id=0) {
 		return false;
 	}
 
-	$uid = $result->fetch(PDO::FETCH_COLUMN, 0);
+	$uids = $result->fetchAll(PDO::FETCH_COLUMN, 0);
 
-	return has_credential(CRED_COMMENT_PIN, array($uid));
+	return has_credential(CRED_COMMENT_PIN, $uids);
 }
 
 /**
  * Determine if the user can edit a specific package comment using an array
  *
- * Only the Package Maintainer, Trusted Users, and Developers can pin
- * comments. This function is used for the frontend side of comment pinning.
+ * Only the Package Maintainer, Package Co-maintainers, Trusted Users, and
+ * Developers can pin comments. This function is used for the frontend side of
+ * comment pinning.
  *
  * @param array $comment All database information relating a specific comment
  *