X-Git-Url: http://git.shiar.nl/perl/plp/.git/blobdiff_plain/b5eadb0c810558015cd4dc943e2c25b4acbfec58..720e78a4f8351eedac26b196aa9f3922fd5bd0ee:/plpfunc.pm?ds=inline
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/</g;
s/>/>/g;
s/\n/
\n/g;
- s/\t/ /eg;
+ s/\t/ /g;
s/ / /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/"/"\cC"/g;
- $$ref =~ s/>/>\cC>/g;
+ $$ref =~ s/"/"\cC"/g; # Single characters are easier to match :)
+ $$ref =~ s/>/>\cC>/g; # so we can just use a character class []
$$ref =~ s/</<\cC< \r\t\n]*)}{
- local $_ = $1, $p = $2, ((($b) = /([\.,!\?\(\)\[\]]+$)/) ? s/// :
- undef), s/&(?!\x23?\w+;)/&/g, s/\"/"/g, $c =
- ($p eq 'www.' || $p eq 'WWW.' ? "http://$_" : $_),
- qq{$_$b}
+ local $_ = $1;
+ my $scheme = $2;
+ s/// if (my $trailing) = /([\.,!\?\(\)\[\]]+$)/;
+ s/&(?!\x23?\w+;)/&/g;
+ s/\"/"/g;
+ my $href = ($scheme =~ /www\./i ? "http://$_" : $_);
+ qq{$_$trailing};
}eg;
-
$$ref =~ s/"\cC"/"/g;
$$ref =~ s/>\cC>/>/g;
$$ref =~ s/<\cC</g;