X-Git-Url: http://git.jankratochvil.net/?p=MyWeb.git;a=blobdiff_plain;f=Web.pm;h=524cf143e94cc8cfa6a8ee8df4b85b4d6e50a5ee;hp=5c7348e75c5d6cbbf03038b7f017327fa3bdbc8d;hb=78715c32e9d5fabc3a853f8b210a953bb315b6ee;hpb=f17b70752bed854cdeb75cdd10c7229ca068b798 diff --git a/Web.pm b/Web.pm index 5c7348e..524cf14 100644 --- a/Web.pm +++ b/Web.pm @@ -183,6 +183,8 @@ my($in)=@_; if (my $uri=$ENV{"REQUEST_URI"}) { if ($W->{"args"}{"Wabs"}) { + # FIXME: $in may not be defined here! + # to prevent: Use of uninitialized value in ... if ($in=~m#^/#) { $in=~s#^/*##; } @@ -311,7 +313,10 @@ sub footer (;$) $cvs_id_split[2]="" .a_href((map({ my $s=$_; $s=~s#/viewcvs/#$&~checkout~/#; $s; } $W->{"viewcvs"}))[0]."$file?rev=".$cvs_id_split[2], $cvs_id_split[2]); - $cvs_id_split[1]=a_href($W->{"viewcvs"}.$file, + # FIXME: Use 'CVS/Repository' here. + my $viewcvs=$W->{"viewcvs"}; + $viewcvs=~s#(/viewcvs)/.*$#$1/MyWeb/# if $file=~s#^My/##; + $cvs_id_split[1]=a_href($viewcvs.$file, ($package!~/^Apache::/ ? $package : $cvs_id_split[1])); $cvs_id_split[5]=&{$W->{"cvs_id_author"}}($cvs_id_split[5]); } @@ -409,7 +414,7 @@ my($url,$contents,%args)=@_; $r.='"'; do { $r.=" $_" if $_; } for ($args{"attr"}); $r.='>'.$contents.''; - if ($args{"size"} && url_is_local($url) && $url=~/[.](?:gz|Z|rpm|zip|deb|lha)/) { # Downloadable? + if ($args{"size"} && url_is_local($url) && ($args{"size"}>=2 || $url=~/[.](?:gz|Z|rpm|zip|deb|lha)/)) { # Downloadable? $url=top_dir_disk().$url if $url=~m#^/#; if (!-r $url) { cluck "File not readable: $url"; }