update

[MyWeb.git] / Web.pm

diff --git a/Web.pm b/Web.pm
index f6c9a79..d59e454 100644 (file)
--- a/Web.pm
+++ b/Web.pm
@@ -38,6 +38,7 @@ use URI::Escape;
 require HTTP::BrowserDetect;
 require HTTP::Negotiate;
 require Geo::IP;
+require CGI;
 
 
 # Undo 'www/engine/httpd-restart' as it may use obsolete Perl for 'mod_perl'
@@ -71,12 +72,22 @@ my($class,%args)=@_;
        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 ("footer");
        do { $W->{$_}=1  if !defined $W->{$_}; } for ("footer_delimit");
+       do { $W->{$_}=1  if !defined $W->{$_}; } for ("footer_mailme");
        do { $W->{$_}=1  if !defined $W->{$_}; } for ("footer_ids");
        do { $W->{$_}=1  if !defined $W->{$_}; } for ("indexme");
        do { $W->{$_}="" if !defined $W->{$_}; } for ("head");
        do { $W->{$_}="" if !defined $W->{$_}; } for ("head_css");
 
+       my $footer_any=0;
+       for (qw(footer_mailme footer_ids)) {
+               $W->{$_}=0 if !$W->{"footer"};
+               $footer_any=1 if $W->{$_};
+               }
+       $W->{"footer"}=0 if !$footer_any;
+       $W->{"footer_delimit"}=0 if !$W->{"footer"};
+
        $W->{"r"}=Apache->request();
 
        $W->{"QUERY_STRING"}=$W->{"r"}->args() || "";
@@ -94,7 +105,10 @@ my($class,%args)=@_;
                }
        $W->{"QUERY_STRING"}=~s/([&])amp;/$1/g;
        $W->{"r"}->args($W->{"QUERY_STRING"});
-       $W->{"args"}={ $W->{"r"}->args() };
+       $ENV{"QUERY_STRING"}=$W->{"QUERY_STRING"};
+       # Do not: $W->{"r"}->args()
+       # as it  parses only QUERY_STRING (not POST data).
+       $W->{"args"}={ CGI->new()->Vars() };
 
        do { $W->{$_}=$ENV{"HTTP_ACCEPT"} if !defined $W->{$_}; } for ("accept");
        do { $W->{$_}=$ENV{"HTTP_USER_AGENT"} if !defined $W->{$_}; } for ("user_agent");
@@ -140,7 +154,8 @@ my(%tmpl)=@_;
        while (my($name,$regex)=each(%tmpl)) {
                my $name_html="Parametr <span class=\"quote\">".CGI::escapeHTML($name)."</span>";
                my $val=$W->{"args"}{$name};
-               fatal "$name_html does not match required regex <span class=\"quote\">".CGI::escapeHTML($regex)."</span>"
+               fatal "$name_html <span class=\"quote\">".CGI::escapeHTML($val)."</span>"
+                                               ." does not match required regex <span class=\"quote\">".CGI::escapeHTML($regex)."</span>"
                                if defined $val && $val!~/$regex/;
                fatal "$name_html is required"
                                if !defined $val;
@@ -171,10 +186,26 @@ sub footer (;$)
 {
        exit 1 if $W->{"footer_passed"}++;      # deadlock prevention:
 
-       if ($W->{"footer_ids"}) {
-               print vskip if $W->{"footer_delimit"};
-               print '<hr /><p class="cvs-id">';
+       print vskip if $W->{"footer_delimit"};
+
+       print "<hr />\n" if $W->{"footer"};
+
+       if ($W->{"footer_mailme"}) {
+               print '<form action="'.$W->{"top_dir"}.'/SendMsg.pl" method="post" onsubmit="'
+                               ."this.elements['msgscript'].value=this.elements['msghtml'].value;"
+                               ."this.elements['msghtml'].value='';"
+                               ."this.submit();"
+                               .'">'."\n";
+                       print '<p align="center">'."\n";
+                               print '<input name="msgscript" type="hidden" />'."\n";
+                               print '<input name="msghtml" type="text" size="32" alt="Message" />'."\n";
+                               print '<input name="submit" type="submit" value="Quick Note" />'."\n";
+                       print '</p>'."\n";
+               print '</form>'."\n";
+               }
 
+       if ($W->{"footer_ids"}) {
+               print '<p class="cvs-id">';
                print join("<br />\n",map({ my $package=$_;
                        my $cvs_id=(eval('$'.$package."::CVS_ID")
 #                                      || $package     # debug
@@ -207,6 +238,7 @@ sub footer (;$)
                        } (
                                        $W->{"__PACKAGE__"},
                                        __PACKAGE__,
+                                       "WebConfig",
                                        @{$W->{"packages_used"}{$Apache::Registry::curstash}},
                                        )));
                print "</p>\n";
@@ -268,7 +300,7 @@ my($url,$contents,%args)=@_;
        elsif ($W->{"have_ent"})        # ent client
                { $r.=$urlent; }
        else    # unknown client, &CGI::escapeHTML should not be needed here
-               { $r.=CGI::escapeHTML("http://".$W->{"r"}->hostname()."/redirect.pl?location=".uri_escape($url)); }
+               { $r.=CGI::escapeHTML("http://".$W->{"r"}->hostname()."/Redirect.pl?location=".uri_escape($url)); }
        $r.='">'.$contents.'</a>';
        if ($args{"size"} && url_is_local($url) && $url=~/[.](?:gz|rpm|zip|deb)/) {     # Downloadable?
                if (!-r $url)
@@ -287,7 +319,7 @@ sub remote_ip ()
        # As 'Apache::ForwardedFor' takes the first of $ENV{"HTTP_X_FORWARDED_FOR"}
        # while the contents is '127.0.0.1, 213.220.195.171' if client has its own proxy.
        # We must take the last item ourselves.
-       my $r=$ENV{"HTTP_X_FORWARDED_FOR"};
+       my $r=$ENV{"HTTP_X_FORWARDED_FOR"} || $W->{"r"}->remote_host();
        $r=~s/^.*,\s*//;
        return $r;
 }
@@ -341,8 +373,8 @@ my($file_base,$alt,$attrs)=@_;
                        $file=$file_base.".".$var->{"id"};
                        # TODO: Somehow quickly check dependencies?
                        system 'make >&2 -s --no-print-directory'
-                                                       .' -C '."'".File::Basename::dirname($file)."' '".File::Basename::basename($file)."'"
-                                       if !-f $file;
+                                                       .' -C '."'".File::Basename::dirname($file)."' '".File::Basename::basename($file)."'";
+#                                      if !-f $file;
                        push @nego_variants,negotiate_variant(
                                        %$var,
                                        "size"=>(stat $file)[7],
@@ -393,6 +425,7 @@ my($class)=@_;
        # $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");
 
        while (my($key,$val)=each(%{$W->{"headers"}})) {
                $W->{"r"}->header_out($key,$val);
@@ -429,6 +462,7 @@ body {
 :visited { color: teal;   background-color: transparent; }
 h1,h2    { color: yellow; background-color: transparent; }
 td       { padding: 2px; }
+caption  { caption-side: bottom; }
 .footer img { vertical-align: middle; }
 HERE
                print $W->{"head_css"}."\n";