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

12
web/lib/pkgreqfuncs.inc.php
View file

@ -160,15 +160,15 @@ function pkgreq_file($ids, $type, $merge_into, $comments) {
$username . " [1] filed a request to merge " .
$row['Name'] . " [2] into " . $merge_into .
" [3]:\n\n" . $comments . "\n\n" .
"[1] " . aur_location() . get_user_uri($username) . "\n" .
"[2] " . aur_location() . get_pkgbase_uri($row['Name']) . "\n" .
"[3] " . aur_location() . get_pkgbase_uri($merge_into) . "\n";
"[1] " . get_user_uri($username, true) . "\n" .
"[2] " . get_pkgbase_uri($row['Name'], true) . "\n" .
"[3] " . get_pkgbase_uri($merge_into, true) . "\n";
} else {
$body =
$username . " [1] filed a " . $type . " request for " .
$row['Name'] . " [2]:\n\n" . $comments . "\n\n" .
"[1] " . aur_location() . get_user_uri($username) . "\n" .
"[2] " . aur_location() . get_pkgbase_uri($row['Name']) . "\n";
"[1] " . get_user_uri($username, true) . "\n" .
"[2] " . get_pkgbase_uri($row['Name'], true) . "\n";
}
$body = wordwrap($body, 70);
$cc = array_unique($cc);
@ -278,7 +278,7 @@ function pkgreq_close($id, $reason, $comments, $auto_close=false) {
}
if (!$auto_close) {
$body .= "\n";
$body .= "[1] " . aur_location() . get_user_uri($username);
$body .= "[1] " . get_user_uri($username, true);
$body .= "\n";
}
$body = wordwrap($body, 70);