external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid double slashes in notification email body

Browse source 
Refactor some of the URI generation code to avoid double slashes in
absolute URIs.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2014-12-13 15:28:05 +01:00
parent aa2724bbfe
commit 5ebf534ba7
6 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

23
web/lib/routing.inc.php
View file

@ -37,8 +37,12 @@ function get_route($path) {
}
}
function get_uri($path) {
return $path;
function get_uri($path, $absolute=false) {
if ($absolute) {
return rtrim(aur_location(), '/') . $path;
} else {
return $path;
}
}
function get_pkg_route() {
@ -56,14 +60,16 @@ function get_pkgreq_route() {
return $PKGREQ_PATH;
}
function get_pkg_uri($pkgname) {
function get_pkg_uri($pkgname, $absolute=false) {
global $PKG_PATH;
return $PKG_PATH . '/' . urlencode($pkgname) . '/';
$path = $PKG_PATH . '/' . urlencode($pkgname) . '/';
return get_uri($path, $absolute);
}
function get_pkgbase_uri($pkgbase_name) {
function get_pkgbase_uri($pkgbase_name, $absolute=false) {
global $PKGBASE_PATH;
return $PKGBASE_PATH . '/' . urlencode($pkgbase_name) . '/';
$path = $PKGBASE_PATH . '/' . urlencode($pkgbase_name) . '/';
return get_uri($path, $absolute);
}
function get_user_route() {
@ -71,7 +77,8 @@ function get_user_route() {
return $USER_PATH;
}
function get_user_uri($username) {
function get_user_uri($username, $absolute=false) {
global $USER_PATH;
return $USER_PATH . '/' . urlencode($username) . '/';
$path = $USER_PATH . '/' . urlencode($username) . '/';
return get_uri($path, $absolute);
}