diff options
| author | fukachan <fukachan> | 2003-07-19 09:29:16 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2003-07-19 09:29:16 +0000 |
| commit | 52449fa0a4c31c0196d083b85db1c53edb2f6fb1 (patch) | |
| tree | e7dc4ab03bcc44fca5ad26ea2a358308be6a89a9 /fml | |
| parent | 972dd93be88363b5e27259337ea2ada8eeba599c (diff) | |
| download | fml8-udb-merge.tar.gz fml8-udb-merge.tar.bz2 fml8-udb-merge.zip | |
catch up -currentudb-merge
Diffstat (limited to 'fml')
| -rw-r--r-- | fml/lib/Mail/Message/MH.pm | 6 | ||||
| -rw-r--r-- | fml/lib/Mail/Message/ToHTML.pm | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/fml/lib/Mail/Message/MH.pm b/fml/lib/Mail/Message/MH.pm index efd5ab4b..ba28b836 100644 --- a/fml/lib/Mail/Message/MH.pm +++ b/fml/lib/Mail/Message/MH.pm @@ -2,7 +2,7 @@ # # Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi # -# $FML: MH.pm,v 1.12 2003/01/11 15:16:35 fukachan Exp $ +# $FML: MH.pm,v 1.14 2003/06/06 10:26:15 tmu Exp $ # package Mail::Message::MH; @@ -78,15 +78,19 @@ sub expand } elsif ($str =~ /^(\d+)\-(\d+)$/) { my ($first, $last) = ($1, $2); + $first = $min if($first < $min); + $last = $max if($last > $max); return _expand_range($first, $last); } elsif ($str =~ /^(first)\-(\d+)$/) { my ($first, $last) = ($1, $2); + $last = $max if($last > $max); return _expand_range($min, $last); } elsif ($str =~ /^(\d+)\-(last)$/) { unless (defined $max) { return undef;} my ($first, $last) = ($1, $2); + $first = $min if($first < $min); return _expand_range($first, $max); } elsif ($str eq 'first') { diff --git a/fml/lib/Mail/Message/ToHTML.pm b/fml/lib/Mail/Message/ToHTML.pm index 90c539cb..4d859731 100644 --- a/fml/lib/Mail/Message/ToHTML.pm +++ b/fml/lib/Mail/Message/ToHTML.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: ToHTML.pm,v 1.41.2.14 2003/06/15 08:07:16 fukachan Exp $ +# $FML$ # package Mail::Message::ToHTML; @@ -17,7 +17,8 @@ my $debug = 0; my $URL = "<A HREF=\"http://www.fml.org/software/\">Mail::Message::ToHTML</A>"; -my $version = q$FML: ToHTML.pm,v 1.41.2.14 2003/06/15 08:07:16 fukachan Exp $; +my $version = q$FML$; + if ($version =~ /,v\s+([\d\.]+)\s+/) { $version = "$URL $1"; } @@ -1838,7 +1839,7 @@ sub __sprintf_safe_str if (defined $str) { # $url$trailor => $url $trailor for text2html() incomplete regexp - $str =~ s#(http://\S+[\w\d/])#_separete_url($1)#ge; + $str =~ s#(http://[^\s\<\>\'\"]+[\w\d/])#_separete_url($1)#ge; use HTML::FromText; return text2html($str, urls => 1, pre => $attr_pre); |