Accept pretty much bloody anything inside a [url] tag as a legal URL.

diff --git a/include/bbcode.php b/include/bbcode.php
index f39ebd5b92184be34d127926586741718a2e0890..c55ebab00c152c09361c3d763998adbfe5cd41e9 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -15,14 +15,14 @@ function bbcode($Text) {
        $Text = nl2br($Text);
 
        // Set up the parameters for a URL search string
-       $URLSearchString = " a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%";
+       $URLSearchString = "^\[\]";
        // Set up the parameters for a MAIL search string
-       $MAILSearchString = $URLSearchString . " a-zA-Z0-9\.@";
+       $MAILSearchString = $URLSearchString;
 
        // Perform URL Search
 
 
-       $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]+)/", ' <a href="$2" target="external-link">$2</a>', $Text);
+       $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%\$\!]+)/", ' <a href="$2" target="external-link">$2</a>', $Text);
 
        $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '<a href="$1" target="external-link">$1</a>', $Text);
        $Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '<a href="$1" target="external-link">$2</a>', $Text);