X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;ds=sidebyside;f=Web.pm;h=d24bf28581e85c360214e63e9b3b46d6c07effbd;hb=0c7663aae12f00d8b4cb794fd266a52d96baffb5;hp=143f3a7b7d00964d5b2aaf5a95b350bbb05844b5;hpb=a6cafbdedd009c8dfce91ba9d390fbce72df2595;p=MyWeb.git

diff --git a/Web.pm b/Web.pm
index 143f3a7..d24bf28 100644
--- a/Web.pm
+++ b/Web.pm
@@ -817,7 +817,7 @@ my($in,$contents,%args)=@_;
 	if (!defined $contents) {
 		$contents=$in;
 		$contents=File::Basename::basename($contents) if $args{"basename"};
-		$contents=~s/^mailto:([-.\w]+@[-.\w]+)$/$1/;
+		$contents=~s/^mailto:([-.\w]+(?:@|\Q(at)\E)[-.\w]+)$/$1/;
 		$contents=escapeHTML($contents);
 		}
 	$contents=~s#<a\b[^>]*>##gi;
@@ -831,8 +831,12 @@ my($in,$contents,%args)=@_;
 	$r.='"';
 	do { $r.=" $_" if $_; } for ($args{"attr"});
 	$r.='>'.$contents.'</a>';
-	if ($args{"size"} && uri_is_local($in) && ($args{"size"}>=2 || $in=~/[.](?:gz|Z|rpm|zip|deb|lha)/)) {	# Downloadable?
-		my $path_abs_disk=path_abs_disk $in,%args;
+	my $size_in=$in;
+	do { $size_in=$_ if $_ && !/^\d+$/; } for $args{"size"};
+	if ($args{"size"} && uri_is_local($size_in)
+			&& (($args{"size"} && $args{"size"}=~/^\d+$/ && $args{"size"}>=2)
+					|| $size_in=~/[.](?:gz|Z|rpm|zip|deb|lha)/)) {	# Downloadable?
+		my $path_abs_disk=path_abs_disk $size_in,%args;
 		cluck "File not readable: $path_abs_disk" if !-r $path_abs_disk;
 		$r.='&nbsp;('.size_display((stat($path_abs_disk))[7]).')';
 		}