Changeset 3726 for trunk/gsdl/perllib/plugins/EMAILPlug.pm

Timestamp:

2003-02-07T10:52:59+13:00 (21 years ago)

Author:

jrm21

Message:

minor fix for "_" chars in urls... escape them after, not before.

Also print an warning message if we have an unsupported language encoding.

File:

• trunk/gsdl/perllib/plugins/EMAILPlug.pm (modified) (3 diffs)

trunk/gsdl/perllib/plugins/EMAILPlug.pm

@@ -455 +455 @@
     $text =~ s/\"/"/g;
 
-    $text =~ s@_@\\_@g; # protect against greenstone macros...
-
     # convert email addresses and URIs into links
 # don't markup email addresses for now
@@ -466 +464 @@
     # assume URI doesn't finish with a '.'
     $text =~ s@((http|ftp|https)://[\w\-]+(\.[\w\-]+)*/?((&amp;|\.)?[\w\?\=\-_/~]+)*(\#[\w\.\-_]*)?)@<a href=\"$1\">$1<\/a>@g;
+
+    $text =~ s@_@\\_@g; # protect against greenstone macros...
 
 
@@ -925 +925 @@
       # empty anyway. We'll try to continue, assuming 8859-1. We could strip
       # characters out here if this causes problems...
+      my $outhandle=$self->{'outhandle'};
+      print $outhandle "EMAILPlug: falling back to iso-8859-1\n";
       $$textref=&unicode::unicode2utf8(&unicode::convert2unicode("iso_8859_1",$textref));