Show co-maintainers next to maintainers in details

Implements FS#45313.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>

3 files changed, 29 insertions, 2 deletions

diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php
index 2d06fc8..a45c9b6 100644
--- a/web/lib/aur.inc.php
+++ b/web/lib/aur.inc.php
@@ -197,6 +197,31 @@ function html_format_username($username) {
 }
 
 /**
+ * Format the maintainer and co-maintainers for inclusion in HTML data
+ *
+ * @param string $maintainer The user name of the maintainer
+ * @param array $comaintainers The list of co-maintainer user names
+ *
+ * @return string The generated HTML code for the account links
+ */
+function html_format_maintainers($maintainer, $comaintainers) {
+	$code = html_format_username($maintainer);
+
+	if (count($comaintainers) > 0) {
+		$code .= ' (';
+		foreach ($comaintainers as $comaintainer) {
+			$code .= html_format_username($comaintainer);
+			if ($comaintainer !== end($comaintainers)) {
+				$code .= ', ';
+			}
+		}
+		$code .= ')';
+	}
+
+	return $code;
+}
+
+/**
  * Determine the user's e-mail address in the database using a session ID
  *
  * @param string $sid User's session ID
diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php
index 7b75210..ae49e24 100644
--- a/web/template/pkg_details.php
+++ b/web/template/pkg_details.php
@@ -15,6 +15,7 @@ $keywords = pkgbase_get_keywords($base_id);
 
 $submitter = username_from_id($row["SubmitterUID"]);
 $maintainer = username_from_id($row["MaintainerUID"]);
+$comaintainers = pkgbase_get_comaintainers($base_id);
 $packager = username_from_id($row["PackagerUID"]);
 
 $votes = $row['NumVotes'];
@@ -293,7 +294,7 @@ if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))):
 		</tr>
 		<tr>
 			<th><?= __('Maintainer') .': ' ?></th>
-			<td><?= html_format_username($maintainer) ?></td>
+			<td><?= html_format_maintainers($maintainer, $comaintainers) ?></td>
 		</tr>
 		<tr>
 			<th><?= __('Last Packager') .': ' ?></th>
diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php
index 2ceb35f..fa24e12 100644
--- a/web/template/pkgbase_details.php
+++ b/web/template/pkgbase_details.php
@@ -14,6 +14,7 @@ $keywords = pkgbase_get_keywords($base_id);
 
 $submitter = username_from_id($row["SubmitterUID"]);
 $maintainer = username_from_id($row["MaintainerUID"]);
+$comaintainers = pkgbase_get_comaintainers($base_id);
 $packager = username_from_id($row["PackagerUID"]);
 
 $votes = $row['NumVotes'];
@@ -152,7 +153,7 @@ if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))):
 		</tr>
 		<tr>
 			<th><?= __('Maintainer') .': ' ?></th>
-			<td><?= html_format_username($maintainer) ?></td>
+			<td><?= html_format_maintainers($maintainer, $comaintainers) ?></td>
 		</tr>
 		<tr>
 			<th><?= __('Last Packager') .': ' ?></th>