From 571b74b9017169ed6181a57d637ad737fd15f6b3 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <archlinux@cryptocrack.de>
Date: Fri, 21 Nov 2014 11:34:38 +0100
Subject: Always use virtual URLs

Support for non-virtual URLs has been broken for a long time and is no
longer used on the official AUR setup.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
 web/template/pkgbase_details.php | 66 ++++++++++++----------------------------
 1 file changed, 19 insertions(+), 47 deletions(-)

(limited to 'web/template/pkgbase_details.php')

diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php
index 406408b..b8d36ed 100644
--- a/web/template/pkgbase_details.php
+++ b/web/template/pkgbase_details.php
@@ -34,7 +34,7 @@ $pkgs = pkgbase_get_pkgnames($base_id);
 				<li><a href="<?= $urlpath . '/' . $row['Name'] ?>.tar.gz"><?= __('Download tarball') ?></a></li>
 				<li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li>
 				<li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li>
-				<?php if (use_virtual_urls() && $uid): ?>
+				<?php if ($uid): ?>
 				<?php if ($row["OutOfDateTS"] === NULL): ?>
 				<li>
 					<form action="<?= get_pkgbase_uri($row['Name']) . 'flag/'; ?>" method="post">
@@ -138,69 +138,41 @@ if (has_credential(CRED_PKGBASE_CHANGE_CATEGORY, array($row["MaintainerUID"]))):
 		</tr>
 		<tr>
 			<th><?= __('Submitter') .': ' ?></th>
-<?php
-if ($row["SubmitterUID"]):
-	if ($SID):
-		if (!use_virtual_urls()):
-?>
-			<td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?= htmlspecialchars($row['SubmitterUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= html_format_username($submitter) ?>"><?= html_format_username($submitter) ?></a></td>
-		<?php else: ?>
+			<?php if ($row["SubmitterUID"] && $SID): ?>
 			<td><a href="<?= get_uri('/account/') . html_format_username($submitter, ENT_QUOTES) ?>" title="<?= __('View account information for %s', html_format_username($submitter)) ?>"><?= html_format_username($submitter) ?></a></td>
-		<?php endif; ?>
-<?php else: ?>
-		<td><?= html_format_username($submitter) ?></td>
-	<?php endif; ?>
-<?php else: ?>
+			<?php elseif ($row["SubmitterUID"] && !$SID): ?>
+			<td><?= html_format_username($submitter) ?></td>
+			<?php else: ?>
 			<td><?= __('None') ?></td>
-<?php endif; ?>
+			<?php endif; ?>
 		</tr>
 		<tr>
 			<th><?= __('Maintainer') .': ' ?></th>
-<?php
-if ($row["MaintainerUID"]):
-	if ($SID):
-		if (!use_virtual_urls()):
-?>
-			<td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?= htmlspecialchars($row['MaintainerUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= html_format_username($maintainer) ?>"><?= html_format_username($maintainer) ?></a></td>
-		<?php else: ?>
+			<?php if ($row["MaintainerUID"] && $SID): ?>
 			<td><a href="<?= get_uri('/account/') . html_format_username($maintainer) ?>" title="<?= __('View account information for %s', html_format_username($maintainer)) ?>"><?= html_format_username($maintainer) ?></a></td>
-		<?php endif; ?>
-	<?php else: ?>
-		<td><?= html_format_username($maintainer) ?></td>
-	<?php endif; ?>
-<?php else: ?>
+			<?php elseif ($row["MaintainerUID"] && !$SID): ?>
+			<td><?= html_format_username($maintainer) ?></td>
+			<?php else: ?>
 			<td><?= __('None') ?></td>
-<?php endif; ?>
+			<?php endif; ?>
 		</tr>
 		<tr>
 			<th><?= __('Last Packager') .': ' ?></th>
-<?php
-if ($row["PackagerUID"]):
-	if ($SID):
-		if (!use_virtual_urls()):
-?>
-			<td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&amp;ID=<?= htmlspecialchars($row['PackagerUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= html_format_username($packager) ?>"><?= html_format_username($packager) ?></a></td>
-		<?php else: ?>
+			<?php if ($row["PackagerUID"] && $SID): ?>
 			<td><a href="<?= get_uri('/account/') . html_format_username($packager) ?>" title="<?= __('View account information for %s', html_format_username($packager)) ?>"><?= html_format_username($packager) ?></a></td>
-		<?php endif; ?>
-	<?php else: ?>
-		<td><?= html_format_username($packager) ?></td>
-	<?php endif; ?>
-<?php else: ?>
+			<?php elseif ($row["PackagerUID"] && !$SID): ?>
+			<td><?= html_format_username($packager) ?></td>
+			<?php else: ?>
 			<td><?= __('None') ?></td>
-<?php endif; ?>
+			<?php endif; ?>
 		</tr>
 		<tr>
 			<th><?= __('Votes') . ': ' ?></th>
-<?php if (has_credential(CRED_PKGBASE_LIST_VOTERS)): ?>
-<?php if (use_virtual_urls()): ?>
+			<?php if (has_credential(CRED_PKGBASE_LIST_VOTERS)): ?>
 			<td><a href="<?= get_pkgbase_uri($row['Name']); ?>voters/"><?= $votes ?></a></td>
-<?php else: ?>
-			<td><a href="<?= get_uri('/voters/'); ?>?N=<?= htmlspecialchars($row['Name'], ENT_QUOTES) ?>"><?= $votes ?></a></td>
-<?php endif; ?>
-<?php else: ?>
+			<?php else: ?>
 			<td><?= $votes ?></td>
-<?php endif; ?>
+			<?php endif; ?>
 		</tr>
 		<tr>
 			<th><?= __('First Submitted') . ': ' ?></th>
-- 
cgit v1.2.3-54-g00ecf