+gsmperl

[MyWeb.git] / Web.pm

diff --git a/Web.pm b/Web.pm
index c522082..41aaef2 100644 (file)
--- a/Web.pm
+++ b/Web.pm
@@ -24,10 +24,44 @@ use strict;
 use warnings;
 
 use Exporter;
-our @EXPORT=qw(&require &a_href &a_href_cz &vskip &img $W);
+sub Wrequire ($);
+sub Wuse ($@);
+our $W;
+our @EXPORT=qw(&Wrequire &Wuse &a_href &a_href_cz &vskip &img $W &top_dir);
 our @ISA=qw(Exporter);
 
-use WebConfig; # for %WebConfig
+BEGIN
+{
+       sub Wrequire ($)
+       {
+       my($file)=@_;
+
+#              print STDERR "Wrequire $file\n";
+               $file=~s#/#::#g;
+               $file=~s/[.]pm$//;
+               my $class=$file;
+               $file=~s#::#/#g;
+               $file.=".pm";
+               my $aref=($W->{"packages_used"}{$Apache::Registry::curstash}||=[]);
+               push @$aref,$class
+                               if !{ map(($_=>1),@$aref) }->{$class};  # Prevent duplicated entries.
+               CORE::require $file;
+               1;      # Otherwise 'require' would already file above.
+       }
+
+       sub Wuse ($@)
+       {
+       my($file,@list)=@_;
+
+#              print STDERR "Wuse $file\n";
+               Wrequire $file;
+               local $Exporter::ExportLevel=$Exporter::ExportLevel+1;
+               $file->import(@list);
+               1;
+       }
+}
+
+BEGIN { Wuse 'WebConfig'; }    # for %WebConfig
 require CGI;   # for &escapeHTML
 require Image::Size;   # for &imgsize
 use File::Basename;    # &basename
@@ -44,7 +78,7 @@ delete $ENV{"PERLLIB"};
 delete $ENV{"LD_LIBRARY_PATH"};
 
 
-our $W;
+#our $W;
                # $W->{"title"}
                # $W->{"head"}
                # $W->{"head_css"}
@@ -61,7 +95,9 @@ sub init ($%)
 {
 my($class,%args)=@_;
 
+       my $packages_used_save=$W->{"packages_used"};
        $W={ %WebConfig,%args };        # override %WebConfig settings
+       $W->{"packages_used"}=$packages_used_save;
 
        $W->{"__PACKAGE__"}||="Apache::ROOT".$Apache::Registry::curstash;
 
@@ -70,6 +106,7 @@ 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 ("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");
@@ -119,7 +156,7 @@ my($class,%args)=@_;
 
        $W->{"have_js"}=($W->{"args"}{"have_js"} ? 1 : 0);
        if ($W->{"detect_js"} && !$W->{"have_js"}) {
-               $W->{"head"}.='<script type="text/javascript" src="'.$W->{"top_dir"}.'/have_js.js.pl"></script>'."\n";
+               $W->{"head"}.='<script type="text/javascript" src="'.top_dir().'/have_js.js.pl"></script>'."\n";
                }
 
        do { args_check(%$_) if $_; } for ($W->{"args_check"});
@@ -127,20 +164,10 @@ my($class,%args)=@_;
        return $W;
 }
 
-sub require ($)
+sub top_dir ()
 {
-my($file)=@_;
-
-       $file=~s#/#::#g;
-       $file=~s/[.]pm$//;
-       my $class=$file;
-       $file=~s#::#/#g;
-       $file.=".pm";
-       my $aref=($W->{"packages_used"}{$Apache::Registry::curstash}||=[]);
-       push @$aref,$class
-                       if !{ map(($_=>1),@$aref) }->{$class};  # Prevent duplicated entries.
-       CORE::require $file;
-       1;      # Otherwise 'require' would already file above.
+       do { return $_ if $_; } for ($W->{"top_dir"});
+       return $INC[0]; # fallback
 }
 
 sub fatal (;$);
@@ -189,7 +216,7 @@ sub footer (;$)
        print "<hr />\n" if $W->{"footer"};
 
        if ($W->{"footer_mailme"}) {
-               print '<form action="'.$W->{"top_dir"}.'/SendMsg.pl" method="post" onsubmit="'
+               print '<form action="'.top_dir().'/SendMsg.pl" method="post" onsubmit="'
                                ."this.elements['msgscript'].value=this.elements['msghtml'].value;"
                                ."this.elements['msghtml'].value='';"
                                ."this.submit();"
@@ -220,7 +247,7 @@ sub footer (;$)
                                        my $ext;
                                        for (qw(.html.pl .pl .pm),"") {
                                                $ext=$_;
-                                               last if -r $W->{"top_dir"}."/$file$ext";
+                                               last if -r top_dir()."/$file$ext";
                                                cluck "Class file $file not found" if !$ext;
                                                }
                                        $file.=$ext;
@@ -236,11 +263,15 @@ sub footer (;$)
                        } (
                                        $W->{"__PACKAGE__"},
                                        __PACKAGE__,
-                                       "WebConfig",
                                        @{$W->{"packages_used"}{$Apache::Registry::curstash}},
                                        )));
                print "</p>\n";
                }
+
+       if ($W->{"heading"}) {
+               do { &{$_}() if $_; } for ($W->{"footing"});
+               }
+
        print "</body></html>\n";
        exit(0);
 }
@@ -298,7 +329,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($W->{"top_dir"}."/Redirect.pl?location=".uri_escape($url)); }
+               { $r.=CGI::escapeHTML(top_dir()."/Redirect.pl?location=".uri_escape($url)); }
        $r.='">'.$contents.'</a>';
        if ($args{"size"} && url_is_local($url) && $url=~/[.](?:gz|Z|rpm|zip|deb|lha)/) {       # Downloadable?
                if (!-r $url)
@@ -390,6 +421,7 @@ my($file_base,$alt,$attrs)=@_;
 
        my $file=img_src $file_base;
        my($width,$height)=Image::Size::imgsize($file);
+       $alt=~s/<[^>]*>//g;
        $alt=CGI::escapeHTML($alt);
        return "<img src=\"$file\" alt=\"$alt\" title=\"$alt\" ".img_size($width,$height)
                        .(!$attrs ? "" : " ".$attrs)." />";
@@ -476,6 +508,10 @@ HERE
        print ' bgcolor="black" text="white" link="aqua" vlink="teal"'
                        if $W->{"browser"}->netscape() && $W->{"browser"}->major<=4;
        print ">\n";
+
+       if ($W->{"heading"}) {
+               do { &{$_}() if $_; } for ($W->{"heading"});
+               }
 }
 
 1;