From f2301ca922cd5088b7889a508f1ff9518f2f3a73 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Tue, 17 Jul 2012 23:05:47 +0200 Subject: 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 --- web/html/index.php | 2 +- web/lib/routing.inc.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'web') 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 { -- cgit v1.2.3-54-g00ecf