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>

3 files changed, 4 insertions, 31 deletions

diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php
index 322ea603..9cdd8a3a 100644
--- a/web/lib/pkgbasefuncs.inc.php
+++ b/web/lib/pkgbasefuncs.inc.php
@@ -236,7 +236,6 @@ function pkgbase_display_details($base_id, $row, $SID="") {
 		include('pkgbase_details.php');
 
 		if ($SID) {
-			include('actions_form.php');
 			include('pkg_comment_form.php');
 		}
 
diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php
index 948e2ae9..7e7a98fb 100644
--- a/web/lib/pkgfuncs.inc.php
+++ b/web/lib/pkgfuncs.inc.php
@@ -481,7 +481,6 @@ function pkg_display_details($id=0, $row, $SID="") {
 		include('pkg_details.php');
 
 		if ($SID) {
-			include('actions_form.php');
 			include('pkg_comment_form.php');
 		}
 
diff --git a/web/lib/routing.inc.php b/web/lib/routing.inc.php
index 95853041..833ea0f1 100644
--- a/web/lib/routing.inc.php
+++ b/web/lib/routing.inc.php
@@ -26,10 +26,6 @@ $PKGBASE_PATH = '/pkgbase';
 $PKGREQ_PATH = '/requests';
 $USER_PATH = '/account';
 
-function use_virtual_urls() {
-	return config_get_bool('options', 'use_virtual_urls');
-}
-
 function get_route($path) {
 	global $ROUTES;
 
@@ -42,13 +38,7 @@ function get_route($path) {
 }
 
 function get_uri($path) {
-	global $ROUTES;
-
-	if (use_virtual_urls()) {
-		return $path;
-	} else {
-		return get_route($path);
-	}
+	return $path;
 }
 
 function get_pkg_route() {
@@ -68,22 +58,12 @@ function get_pkgreq_route() {
 
 function get_pkg_uri($pkgname) {
 	global $PKG_PATH;
-
-	if (use_virtual_urls()) {
-		return $PKG_PATH . '/' . urlencode($pkgname) . '/';
-	} else {
-		return '/' . get_route($PKG_PATH) . '?N=' . urlencode($pkgname);
-	}
+	return $PKG_PATH . '/' . urlencode($pkgname) . '/';
 }
 
 function get_pkgbase_uri($pkgbase_name) {
 	global $PKGBASE_PATH;
-
-	if (use_virtual_urls()) {
-		return $PKGBASE_PATH . '/' . urlencode($pkgbase_name) . '/';
-	} else {
-		return '/' . get_route($PKGBASE_PATH) . '?N=' . urlencode($pkgbase_name);
-	}
+	return $PKGBASE_PATH . '/' . urlencode($pkgbase_name) . '/';
 }
 
 function get_user_route() {
@@ -93,10 +73,5 @@ function get_user_route() {
 
 function get_user_uri($username) {
 	global $USER_PATH;
-
-	if (use_virtual_urls()) {
-		return $USER_PATH . '/' . urlencode($username) . '/';
-	} else {
-		return '/' . get_route($USER_PATH) . '?U=' . urlencode($username);
-	}
+	return $USER_PATH . '/' . urlencode($username) . '/';
 }