From 7ad4bc352d678ec011af50d7be8e159d26a8a749 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <archlinux@cryptocrack.de>
Date: Wed, 18 Jul 2012 08:23:27 +0200
Subject: Use virtual paths for voters page

Link to "/packages/$pkgname/voters/" instead of using "/voters/" and a
get parameter to request a specific package by ID.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
 web/html/index.php           |  6 ++++++
 web/lib/routing.inc.php      |  1 -
 web/template/pkg_details.php | 10 ++++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'web')

diff --git a/web/html/index.php b/web/html/index.php
index 3539c5aa..df0d1337 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -13,6 +13,12 @@ if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) {
 		$_GET['N'] = $tokens[2];
 
 		if (isset($tokens[3])) {
+			if ($tokens[3] == 'voters') {
+				$_GET['ID'] = pkgid_from_name($tokens[2]);
+				include('voters.php');
+				return;
+			}
+
 			/* TODO: Remove support for legacy URIs and move these
 			 * actions to separate modules. */
 			switch ($tokens[3]) {
diff --git a/web/lib/routing.inc.php b/web/lib/routing.inc.php
index 5cffe81b..4ca1150f 100644
--- a/web/lib/routing.inc.php
+++ b/web/lib/routing.inc.php
@@ -14,7 +14,6 @@ $ROUTES = array(
 	'/rss' => 'rss.php',
 	'/submit' => 'pkgsubmit.php',
 	'/tu' => 'tu.php',
-	'/voters' => 'voters.php',
 	'/addvote' => 'addvote.php',
 );
 
diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php
index 774d670b..67cb5d18 100644
--- a/web/template/pkg_details.php
+++ b/web/template/pkg_details.php
@@ -143,10 +143,12 @@ if ($row["MaintainerUID"]):
 		</tr>
 		<tr>
 			<th><?php echo __('Votes') . ': ' ?></th>
-<?php
-if ($atype == "Developer" || $atype == "Trusted User"):
-?>
-			<td><a href="<?php echo get_uri('/voters/'); ?>?ID=<?php echo$pkgid ?>"><?php echo $votes ?></a>
+<?php if ($atype == "Developer" || $atype == "Trusted User"): ?>
+<?php if ($USE_VIRTUAL_URLS): ?>
+			<td><a href="<?php echo get_pkg_uri($row['Name']); ?>voters/"><?php echo $votes ?></a>
+<?php else: ?>
+			<td><a href="<?php echo get_uri('/voters/'); ?>?ID=<?php echo $pkgid ?>"><?php echo $votes ?></a>
+<?php endif; ?>
 <?php else: ?>
 			<td><?php echo $votes ?></td>
 <?php endif; ?>
-- 
cgit v1.2.3-24-g4f1b