From d55b0e6a1eac6239b3d82ca9516b586baa94feeb Mon Sep 17 00:00:00 2001
From: David Mudrak <david.mudrak@gmail.com>
Date: Mon, 12 Jul 2010 15:03:19 +0000
Subject: [PATCH] NOMDL MNet: improved trailing slashes removal

Double slashes and eventual whitespace after trailing slash are now
removed, too.
---
 admin/mnet/peers.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin/mnet/peers.php b/admin/mnet/peers.php
index 156553999407b..c65f03d81d8aa 100644
--- a/admin/mnet/peers.php
+++ b/admin/mnet/peers.php
@@ -77,7 +77,8 @@
 // if the first form has been submitted, bootstrap the peer and load up the review form
 if ($formdata = $simpleform->get_data()) {
     // ensure we remove trailing slashes
-    $formdata->wwwroot = preg_replace(':/$:', '', $formdata->wwwroot);
+    $formdata->wwwroot = trim($formdata->wwwroot);
+    $formdata->wwwroot = rtrim($formdata->wwwroot, '/');
 
     // ensure the wwwroot starts with a http or https prefix
     if (strtolower(substr($formdata->wwwroot, 0, 4)) != 'http') {