X-Git-Url: http://git.shiar.nl/perl/plp/.git/blobdiff_plain/b5eadb0c810558015cd4dc943e2c25b4acbfec58..720e78a4f8351eedac26b196aa9f3922fd5bd0ee:/plpfunc.pm

diff --git a/plpfunc.pm b/plpfunc.pm
index 49bb63c..a113c76 100644
--- a/plpfunc.pm
+++ b/plpfunc.pm
@@ -31,7 +31,7 @@ sub Entity(@){
 	    s/</&lt;/g;
 	    s/>/&gt;/g;
 	    s/\n/<br>\n/g;
-	    s/\t/    /eg;
+	    s/\t/&nbsp; &nbsp; &nbsp; &nbsp;&nbsp;/g;
 	    s/  /&nbsp;&nbsp;/g;
 	};
 	if ($@){ return defined wantarray ? @_ : undef }
@@ -108,6 +108,7 @@ sub Counter($){
 }
 
 sub AutoURL($){
+    # This sub assumes your string does not match /(["<>])\cC\1/
     my $ref;    
     if (defined wantarray){
 	$ref = \(my $copy = $_[0]);
@@ -115,19 +116,21 @@ sub AutoURL($){
 	$ref = \$_[0];
     }
     eval {
-	my ($p, $b, $c);
-	$$ref =~ s/&quot;/"\cC"/g;
-	$$ref =~ s/&gt;/>\cC>/g;
+	$$ref =~ s/&quot;/"\cC"/g; # Single characters are easier to match :)
+	$$ref =~ s/&gt;/>\cC>/g;   # so we can just use a character class []
 	$$ref =~ s/&lt;/<\cC</g;
+	
 	# Now this is a big, ugly regex! But hey - it works :)    
 	$$ref =~ s{((\w+://|www\.|WWW\.)[a-zA-Z0-9\.\@:-]+[^\"\'>< \r\t\n]*)}{
-	    local $_ = $1, $p = $2, ((($b) = /([\.,!\?\(\)\[\]]+$)/) ? s/// :
-	    undef), s/&(?!\x23?\w+;)/&amp;/g, s/\"/&quot;/g, $c = 
-	    ($p eq 'www.' || $p eq 'WWW.' ? "http://$_" : $_),
-	    qq{<a href="$c" target="_blank">$_</a>$b}
+	    local $_ = $1;
+	    my $scheme = $2;
+	    s/// if (my $trailing) = /([\.,!\?\(\)\[\]]+$)/;
+	    s/&(?!\x23?\w+;)/&amp;/g;
+	    s/\"/&quot;/g;
+	    my $href = ($scheme =~ /www\./i ? "http://$_" : $_);
+	    qq{<a href="$href" target="_blank">$_</a>$trailing};
 	}eg;
 
-
 	$$ref =~ s/"\cC"/&quot;/g;
 	$$ref =~ s/>\cC>/&gt;/g;
 	$$ref =~ s/<\cC</&lt;/g;