summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Fleischer <archlinux@cryptocrack.de>2012-07-17 23:05:47 +0200
committerLukas Fleischer <archlinux@cryptocrack.de>2012-07-17 23:10:27 +0200
commitf2301ca922cd5088b7889a508f1ff9518f2f3a73 (patch)
treeca1be4a5ae5b337cc0b9c68666c440ff812ddbef
parent6790b36247be55d7cc9fdd6a7880900e9c95a58d (diff)
routing.inc.php: rtrim() path in get_route()
Return the correct route -- even if a "/" is appended to the URI. Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
-rw-r--r--web/html/index.php2
-rw-r--r--web/lib/routing.inc.php1
2 files changed, 2 insertions, 1 deletions
diff --git a/web/html/index.php b/web/html/index.php
index 1561168..3539c5a 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -4,7 +4,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
include_once("aur.inc.php");
include_once("pkgfuncs.inc.php");
-$path = rtrim($_SERVER['PATH_INFO'], '/');
+$path = $_SERVER['PATH_INFO'];
$tokens = explode('/', $path);
if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) {
diff --git a/web/lib/routing.inc.php b/web/lib/routing.inc.php
index e8a2deb..bbcb9e2 100644
--- a/web/lib/routing.inc.php
+++ b/web/lib/routing.inc.php
@@ -22,6 +22,7 @@ $PKG_PATH = '/packages';
function get_route($path) {
global $ROUTES;
+ $path = rtrim($path, '/');
if (isset($ROUTES[$path])) {
return $ROUTES[$path];
} else {