sub Wrequire ($);
sub Wuse ($@);
our $W;
-our @EXPORT=qw(&Wrequire &Wuse &a_href &a_href_cz &vskip &img ¢erimg &rightimg $W &top_dir &top_dir_disk &Wprint);
-our @ISA=qw(Exporter);
+our @EXPORT=qw(&Wrequire &Wuse &a_href &a_href_cz &vskip &img ¢erimg &rightimg $W &top_dir &top_dir_disk &Wprint &input_hidden_persistents);
+our @ISA=qw(Exporter Tie::Handle);
BEGIN
{
$file.=".pm";
my $who=$W->{"__PACKAGE__"};
$who||="__My::Web" if $W->{"__My::Web_init"};
- my $aref=($W->{"packages_used"}{$who}||=[]);
- push @$aref,$class
- if !{ map(($_=>1),@$aref) }->{$class}; # Prevent duplicated entries.
+ if ($who) {
+ my $aref=($W->{"packages_used"}{$who}||=[]);
+ push @$aref,$class
+ if !{ map(($_=>1),@$aref) }->{$class}; # Prevent duplicated entries.
+ }
CORE::require $file;
1; # Otherwise 'require' would already file above.
}
require HTTP::Negotiate;
my $have_Geo_IP; BEGIN { $have_Geo_IP=eval { require Geo::IP; 1; }; }
use ModPerl::Util qw(exit);
+use POSIX qw(strftime);
+use Tie::Handle;
+use Apache::Const qw(HTTP_MOVED_TEMPORARILY);
+use URI;
+use URI::QueryParam;
#our $W;
do { $W->{$_}=0 if !defined $W->{$_}; } for ("detect_ent");
do { $W->{$_}=0 if !defined $W->{$_}; } for ("detect_js");
do { $W->{$_}=1 if !defined $W->{$_}; } for ("have_css"); # AFAIK it does not hurt anyone.
- do { $W->{$_}=1 if !defined $W->{$_}; } for ("heading");
do { $W->{$_}=1 if !defined $W->{$_}; } for ("footer");
do { $W->{$_}=1 if !defined $W->{$_}; } for ("footer_delimit");
do { $W->{$_}=1 if !defined $W->{$_}; } for ("footer_mailme");
$W->{"r"}=Apache->request();
$W->{"QUERY_STRING"}=$W->{"r"}->args() || "";
- if ($W->{"QUERY_STRING"}=~/[&]amp;have_ent/)
- { $W->{"have_ent"}=0; }
- elsif ($W->{"QUERY_STRING"}=~ /[&]have_ent/)
- { $W->{"have_ent"}=1; }
- else
- { 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->{"web_hostname_sub"}}()."/".($W->{"r"}->uri()=~m#^/*(.*)$#)[0]
- ."?".($W->{"QUERY_STRING"} || "detect_ent_glue=1").'&have_ent=detect')
- .'" />'."\n";
+ if ($W->{"detect_ent"}) {
+ if ($W->{"QUERY_STRING"}=~/[&]amp;have_ent/)
+ { $W->{"have_ent"}=0; }
+ elsif ($W->{"QUERY_STRING"}=~ /[&]have_ent/)
+ { $W->{"have_ent"}=1; }
+ else
+ { delete $W->{"have_ent"}; }
+ if (!defined $W->{"have_ent"} && $W->{"r"}->method() eq "GET") {
+ $W->{"head"}.='<meta http-equiv="Refresh" content="0; URL='
+ .CGI::escapeHTML("http://".&{$W->{"web_hostname_sub"}}()."/".($W->{"r"}->uri()=~m#^/*(.*)$#)[0]
+ ."?".($W->{"QUERY_STRING"} || "detect_ent_glue=1").'&have_ent=detect')
+ .'" />'."\n";
+ }
}
$W->{"QUERY_STRING"}=~s/([&])amp;/$1/g;
$W->{"r"}->args($W->{"QUERY_STRING"});
+ # Workaround: &CGI::Vars behaves weird if strings passed both as POST data and in: $QUERY_STRING
+ do { $W->{"r"}->args(""); delete $ENV{"QUERY_STRING"}; } if $W->{"r"}->method() eq "POST";
# Do not: $W->{"r"}->args()
# as it parses only QUERY_STRING (not POST data).
$W->{"args"}={ CGI->new($W->{"r"})->Vars() };
- for (keys(%{$W->{"args"}})) {
- my @vals=split /\x00/,$W->{"args"}{$_};
+ for my $name (keys(%{$W->{"args"}})) {
+ my @vals=split /\x00/,$W->{"args"}{$name};
next if @vals<=1;
- $W->{"args"}{$_}=[@vals];
+ $W->{"args"}{$name}=[@vals];
}
do { $W->{$_}=$W->{"r"}->headers_in()->{"Accept"} if !defined $W->{$_}; } for ("accept");
do { args_check(%$_) if $_; } for ($W->{"args_check"});
- return $W;
+ $ENV{"HOSTNAME"}||=&{$W->{"web_hostname_sub"}}();
+
+ return bless $W,$class;
}
sub Wprint($)
{
my($text)=@_;
- $W->{"r"}->print($text);
+ $W->{"r"}->puts($text);
+}
+
+# local *FH;
+# tie *FH,ref($W),$W;
+sub TIEHANDLE($)
+{
+my($class,$W)=@_;
+
+ my $self={};
+ $self->{"W"}=$W or confess "Missing W";
+ return bless $self,$class;
+}
+
+sub WRITE
+{
+my($self,$scalar,$length,$offset)=@_;
+
+ Wprint substr($scalar,0,$length);
}
sub top_dir_disk ()
return $INC[0]; # fallback
}
-sub top_dir (;$)
+# $args{"abs"}
+sub top_dir (;$%)
{
-my($in)=@_;
+my($in,%args)=@_;
if (my $uri=$W->{"r"}->unparsed_uri()) {
- if ($W->{"args"}{"Wabs"}) {
+ if ($W->{"args"}{"Wabs"} || $args{"abs"}) {
# FIXME: $in may not be defined here!
# to prevent: Use of uninitialized value in ...
if ($in=~m#^/#) {
$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;
+ $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>"
my($msg)=@_;
$msg="UNKNOWN" if !$msg;
+ cluck "FATAL: $msg";
$W->{"indexme"}=0; # For the case no heading was sent yet.
+ $W->{"heading_done"}=0; # for the case of already sent {"header_only"}==1
+ $W->{"header_only"}=0; # assurance for &heading
My::Web->heading();
Wprint "\n".vskip("3ex")."<hr /><h1 class=\"error\">FATAL ERROR: $msg!</h1>\n"
."<p>You can report this problem's details to"
Wprint vskip if $W->{"footer_delimit"};
- if ($W->{"heading"}) {
- do { &{$_}() if $_; } for ($W->{"footing_delimit"});
- }
+ do { &{$_}() if $_; } for ($W->{"footing_delimit"});
Wprint "<hr />\n" if $W->{"footer"};
."this.elements['msghtml'].value='';"
."this.submit();"
.'">'."\n";
+ Wprint input_hidden_persistents()."\n";
Wprint '<p align="right">'."\n";
Wprint '<input name="msgscript" type="hidden" />'."\n";
Wprint '<input name="msghtml" type="text" size="32" alt="Message" />'."\n";
Wprint '<!-- '.$package.' - $'.$cvs_id.'$ -->'."\n" if $cvs_id;
}
- if ($W->{"heading"}) {
- do { &{$_}() if $_; } for ($W->{"footing"});
- }
+ do { &{$_}() if $_; } for ($W->{"footing"});
Wprint "</body></html>\n";
exit(0);
return $url!~m#^[a-z]+://#;
}
+sub url_out($%)
+{
+my($url,%args)=@_;
+
+ return $url if !url_is_local $url;
+ $url=top_dir($url,%args) if $url=~m#^/# || $args{"abs"};
+
+ my $uri=URI->new($url);
+ for my $key (keys(%{$W->{"args_persistent"}})) {
+ my $val=$W->{"args"}{$key};
+ next if !defined $val;
+ $uri->query_param_append($key=>$val);
+ }
+ $url="".$uri;
+
+ return $url;
+}
+
sub a_href ($;$%)
{
my($url,$contents,%args)=@_;
$contents=~s#<a\b[^>]*>##gi;
$contents=~s#</a>##gi;
- $url=top_dir($url) if url_is_local $url && $url=~m#^/#;
+ $url=url_out($url,%args);
my $r='<a href="';
my $urlent=CGI::escapeHTML($url);
return $r;
}
+sub input_hidden_persistents()
+{
+ return join("",map({
+ my $key=$_;
+ my $val=$W->{"args"}{$key};
+ (!defined $val ? () : '<input type="hidden"'
+ .' name="'.CGI::escapeHTML($key).'"'
+ .' value="'.CGI::escapeHTML($val).'"'
+ .' />'."\n");
+ } (keys(%{$W->{"args_persistent"}}))));
+}
+
+sub http_moved($$;$)
+{
+my($self,$url,$status)=@_;
+
+ $url=url_out($url,"abs"=>1);
+ $status||=Apache::HTTP_MOVED_TEMPORARILY;
+ $W->{"r"}->status($status);
+ $W->{"r"}->header_out("Location"=>$url);
+ $W->{"header_only"}=1;
+ My::Web->heading();
+ exit;
+ die "NOTREACHED";
+}
+
sub remote_ip ()
{
# Do not: PerlModule Apache::ForwardedFor
return @r;
}
+sub no_cache($)
+{
+my($self)=@_;
+
+ header("Expires"=>"Mon, 26 Jul 1997 05:00:00 GMT"); # date in the past
+ header("Last-Modified"=>strftime("%a, %d %b %Y %H:%M:%S GMT",gmtime())); # always modified
+ header("Cache-Control"=>"no-cache, must-revalidate"); # HTTP/1.1
+ header("Pragma"=>"no-cache"); # HTTP/1.0
+}
+
sub heading ()
{
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");
header("Content-Script-Type"=>"text/javascript");
+ $class->no_cache() if $W->{"no_cache"};
while (my($key,$val)=each(%{$W->{"headers"}})) {
$W->{"r"}->header_out($key,$val);
}
- $W->{"r"}->send_http_header("text/html; charset=$client_charset"); # "Content-type"; do not use header()
+ if (!$W->{"header_only"}) {
+ $W->{"r"}->send_http_header("text/html; charset=$client_charset"); # "Content-type"; do not use header()
+ }
- return if $W->{"heading_done"}++;
exit if $W->{"r"}->header_only();
+ return if $W->{"header_only"};
+ # We still can append headers before we put out some text.
+ # FIXME: It is not clean to still append them without overwriting.
+ return if $W->{"heading_done"}++;
if (1) { # || !$msie_major || $msie_major>=4) # TODO:dyn
Wprint '<?xml version="1.0" encoding="'.$client_charset.'"?>'."\n";
Wprint "</head><body";
# Wprint ' bgcolor="black" text="white" link="aqua" vlink="teal"'
# if $W->{"browser"}->netscape() && (!$W->{"browser"}->major() || $W->{"browser"}->major()<=4);
+ do { &{$_}($W) if $_; } for $W->{"body_attr_sub"};
Wprint ">\n";
- if ($W->{"heading"}) {
- do { &{$_}() if $_; } for ($W->{"heading"});
- }
+ do { &{$_}() if $_; } for ($W->{"heading"});
}
BEGIN {
git://git.jankratochvil.net / MyWeb.git / blobdiff