sub Wrequire ($);
sub Wuse ($@);
our $W;
-our @EXPORT=qw(&Wrequire &Wuse &a_href &a_href_cz &vskip &img $W &top_dir &top_dir_disk);
+our @EXPORT=qw(&Wrequire &Wuse &a_href &a_href_cz &vskip &img ¢erimg &rightimg $W &top_dir &top_dir_disk);
our @ISA=qw(Exporter);
BEGIN
{ delete $W->{"have_ent"}; }
if ($W->{"detect_ent"} && !defined $W->{"have_ent"} && $W->{"r"}->method() eq "GET") {
$W->{"head"}.='<meta http-equiv="Refresh" content="0; URL='
- .CGI::escapeHTML("http://".$W->{"r"}->hostname()."/".($W->{"r"}->uri()=~m#^/*(.*)$#)[0]
+ .CGI::escapeHTML("http://".&{$W->{"web_hostname_sub"}}()."/".($W->{"r"}->uri()=~m#^/*(.*)$#)[0]
."?".($W->{"QUERY_STRING"} || "detect_ent_glue=1").'&have_ent=detect')
.'" />'."\n";
}
$W->{"r"}->args($W->{"QUERY_STRING"});
$ENV{"QUERY_STRING"}=$W->{"QUERY_STRING"};
# Do not: $W->{"r"}->args()
- # as it parses only QUERY_STRING (not POST data).
+ # as it parses only QUERY_STRING (not POST data).
$W->{"args"}={ CGI->new()->Vars() };
+ for (keys(%{$W->{"args"}})) {
+ my @vals=split /\x00/,$W->{"args"}{$_};
+ next if @vals<=1;
+ $W->{"args"}{$_}=[@vals];
+ }
do { $W->{$_}=$ENV{"HTTP_ACCEPT"} if !defined $W->{$_}; } for ("accept");
do { $W->{$_}=$ENV{"HTTP_USER_AGENT"} if !defined $W->{$_}; } for ("user_agent");
while (my($name,$regex)=each(%tmpl)) {
my $name_html="Parameter <span class=\"quote\">".CGI::escapeHTML($name)."</span>";
$W->{"args"}{$name}="" if !defined $W->{"args"}{$name};
- my $val=$W->{"args"}{$name};
- $val="" if !defined $val;
- fatal "$name_html <span class=\"quote\">".CGI::escapeHTML($val)."</span>"
- ." does not match required regex <span class=\"quote\">".CGI::escapeHTML($regex)."</span> "
- if $regex ne "" && $val!~/$regex/;
+ $W->{"args"}{$name}=[ $W->{"args"}{$name} ] if !ref $W->{"args"}{$name} && ref $regex;
+ fatal "$name_html passed as multivar although singlevar expected"
+ if ref $W->{"args"}{$name} && !ref $regex;
+ $regex=${$regex}[0] if ref $regex;
+ for my $val (!ref $W->{"args"}{$name} ? $W->{"args"}{$name} : @{$W->{"args"}{$name}}) {
+ $val="" if !defined $val;
+ fatal "$name_html <span class=\"quote\">".CGI::escapeHTML($val)."</span>"
+ ." does not match the required regex <span class=\"quote\">".CGI::escapeHTML($regex)."</span> "
+ if $regex ne "" && $val!~/$regex/;
+ }
}
}
$msg="UNKNOWN" if !$msg;
-# heading(false/*title*/,false/*indexme*/); # notitle is always safe, don't index the error message
+ $W->{"indexme"}=0; # For the case no heading was sent yet.
+ My::Web->heading();
print "\n".vskip("3ex")."<hr /><h1 class=\"error\">FATAL ERROR: $msg!</h1>\n"
."<p>You can report this problem's details to"
." ".a_href("mailto:".$W->{"admin_mail"},"admin of this website").".</p>\n";
print vskip if $W->{"footer_delimit"};
+ if ($W->{"heading"}) {
+ do { &{$_}() if $_; } for ($W->{"footing_delimit"});
+ }
+
print "<hr />\n" if $W->{"footer"};
if ($W->{"footer_mailme"}) {
return $contents;
}
+sub make ($)
+{
+my($cmd)=@_;
+
+ system {'flock'} 'flock','-x',top_dir_disk(),$cmd.' >&2';
+}
+
sub img_size ($$)
{
my($width,$height)=@_;
{ "id"=>"png","qs"=>1.0,"content-type"=>"image/png" },
{ "id"=>"gif","qs"=>0.9,"content-type"=>"image/gif" },
);
-my $img_variants_re='[.](?:'.join('|',map(($_->{"id"}),@img_variants)).')$';
+my $img_variants_re='[.](?:'.join('|',"jpeg",map(($_->{"id"}),@img_variants)).')$';
sub img_src ($)
{
my($file_base)=@_;
- if (!url_is_local($file_base)
- # Known image extension?
- || $file_base=~m#$img_variants_re#o) {
+ if (!url_is_local($file_base)) {
return $file_base if !wantarray();
return ($file_base,$file_base);
}
+ # Known image extension?
+ if ($file_base=~m#$img_variants_re#o) {
+ return $file_base if !wantarray();
+ return ($file_base,$file_base) if $file_base!~m#^/#;
+ return (top_dir($file_base),top_dir_disk().$file_base);
+ }
my $file_base_disk;
my $file_base_uri;
for my $var (@img_variants) {
my $file=$file_base_disk.".".$var->{"id"};
# TODO: Somehow quickly check dependencies?
- system 'make >&2 -s --no-print-directory'
- .' -C '."'".File::Basename::dirname($file)."' '".File::Basename::basename($file)."'"
+ make('make -s --no-print-directory'
+ .' -C '."'".File::Basename::dirname($file)."' '".File::Basename::basename($file)."'")
if !-f $file;
push @nego_variants,negotiate_variant(
%$var,
return ($file_base_uri.".".$ext,$file_base_disk.".".$ext);
}
-sub img ($$;$)
+sub img ($$;%)
{
-my($file_base,$alt,$attrs)=@_;
+my($file_base,$alt,%attr)=@_;
my($file_uri,$file_disk)=img_src $file_base;
my($width,$height)=Image::Size::imgsize($file_disk);
$alt=~s/<[^>]*>//g;
$alt=CGI::escapeHTML($alt);
- return "<img src=\"$file_uri\" alt=\"$alt\" title=\"$alt\" ".img_size($width,$height)
- .(!$attrs ? "" : " ".$attrs)." />";
+ my $content="<img src=\"$file_uri\" alt=\"$alt\" title=\"$alt\" ".img_size($width,$height)
+ .(!$attr{"attr"} ? "" : " ".$attr{"attr"})." />";
+ return a_href img_src($attr{"a_href_img"}),$content if $attr{"a_href_img"};
+ return a_href $attr{"a_href"},$content if $attr{"a_href"};
+ return $content;
+}
+
+sub centerimg
+{
+ my $r.="";
+ $r.='<table border="0" width="100%"><tr>'."\n";
+ @_=( [@_] ) if !ref $_[0];
+ for (@_) {
+ $r.="\t".'<td align="center">'.&{\&img}(@$_).'</td>'."\n";
+ }
+ $r.='</tr></table>'."\n";
+ return $r;
+}
+
+sub rightimg
+{
+my($text,@args_img)=@_;
+
+ # Workaround bug of 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)':
+ return <<"HERE";
+<table border="0" width="100%">
+ <col width="@{[ (!$W->{"browser"}->ie() ? "1*" : "90%" ) ]}" />
+ <col width="@{[ (!$W->{"browser"}->ie() ? "0*" : "10%" ) ]}" />
+ <tr>
+ <td align="left">
+ @{[ $text ]}
+ </td>
+ <td align="right">
+ @{[ &{\&img}(@args_img) ]}
+ </td>
+ </tr>
+</table>
+HERE
}
sub readfile ($$)
{
my($class)=@_;
+ return if $W->{"heading_passed"}++;
+
# $ENV{"CLIENT_CHARSET"} ignored (mod_czech support dropped!)
my $client_charset=$W->{"force_charset"} || "us-ascii";
header("Content-Style-Type"=>"text/css");
print '<meta name="robots" content="'.($W->{"indexme"} ? "" : "no" ).'index,follow" />'."\n";
print $W->{"head"};
+ for my $type (qw(prev next index contents start up)) {
+ do { print '<link rel="'.$type.'" href="'.$_.'" />'."\n" if $_; } for ($W->{"rel_$type"});
+ }
print "</head><body";
print ' bgcolor="black" text="white" link="aqua" vlink="teal"'
if $W->{"browser"}->netscape() && $W->{"browser"}->major<=4;
git://git.jankratochvil.net / MyWeb.git / blobdiff