X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=Web.pm;h=2a93ce16fccabf37a24c5b251b6247855bc32ee1;hb=8c80926a8d815836ff9bc26740751cd1780fd045;hp=13e397c17a74509b25da4b339129063abd519194;hpb=4b4554f24cc005a4c1f97e8b4f73693702284731;p=MyWeb.git

diff --git a/Web.pm b/Web.pm
index 13e397c..2a93ce1 100644
--- a/Web.pm
+++ b/Web.pm
@@ -27,7 +27,7 @@ use Exporter;
 sub Wrequire ($);
 sub Wuse ($@);
 our $W;
-our @EXPORT=qw(&Wrequire &Wuse &a_href &a_href_cz &vskip &img $W &top_dir);
+our @EXPORT=qw(&Wrequire &Wuse &a_href &a_href_cz &vskip &img $W &top_dir &top_dir_disk);
 our @ISA=qw(Exporter);
 
 BEGIN
@@ -156,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="'.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"});
@@ -164,12 +164,41 @@ my($class,%args)=@_;
 	return $W;
 }
 
-sub top_dir ()
+sub top_dir_disk ()
 {
 	do { return $_ if $_; } for ($W->{"top_dir"});
 	return $INC[0];	# fallback
 }
 
+sub top_dir (;$)
+{
+my($in)=@_;
+
+	if (my $uri=$ENV{"REQUEST_URI"}) {
+		$uri.="Index" if $uri=~m#/$#;
+		if (defined $in) {
+			my($inpath,$inquery)=split /[?]/,$in,2;
+			$inpath=~tr///cs;
+			$uri=~tr///cs;
+			for (;;) {
+				my($in1 ,$in2 )=($in =~m#^(/[^/]+)(/.*)$#);
+				my($uri1,$uri2)=($uri=~m#^(/[^/]+)(/.*)$#);
+				last if !defined $in1 || !defined $uri1 || $in1 ne $uri1;
+				$in=$in2;
+				$uri=$uri2;
+				}
+			}
+		$uri=~s#^/*##;
+		$uri=~s#[^/]+#..#g;
+		$uri=File::Basename::dirname($uri);
+		my $r=$uri.(defined $in ? $in : "");
+#		1 while $r=~s#^[.]/##;
+#		$r="./$r" if $r=~m#^(?:?.*)$#;	# empty pathname?
+		return $r;
+		}
+	return top_dir_disk().$in;
+}
+
 sub fatal (;$);
 
 sub args_check (%)
@@ -177,13 +206,13 @@ sub args_check (%)
 my(%tmpl)=@_;
 
 	while (my($name,$regex)=each(%tmpl)) {
-		my $name_html="Parametr <span class=\"quote\">".CGI::escapeHTML($name)."</span>";
+		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 defined $val && $val!~/$regex/;
-		fatal "$name_html is required"
-				if !defined $val;
+						." does not match required regex <span class=\"quote\">".CGI::escapeHTML($regex)."</span> "
+				if $regex ne "" && $val!~/$regex/;
 		}
 }
 
@@ -216,7 +245,7 @@ sub footer (;$)
 	print "<hr />\n" if $W->{"footer"};
 
 	if ($W->{"footer_mailme"}) {
-		print '<form action="'.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();"
@@ -247,7 +276,7 @@ sub footer (;$)
 					my $ext;
 					for (qw(.html.pl .pl .pm),"") {
 						$ext=$_;
-						last if -r top_dir()."/$file$ext";
+						last if -r top_dir_disk()."/$file$ext";
 						cluck "Class file $file not found" if !$ext;
 						}
 					$file.=$ext;
@@ -331,6 +360,8 @@ my($url,$contents,%args)=@_;
 	$contents=~s#<a\b[^>]*>##gi;
 	$contents=~s#</a>##gi;
 
+	$url=top_dir($url) if url_is_local $url && $url=~m#^/#;
+
 	my $r='<a href="';
 	my $urlent=CGI::escapeHTML($url);
 	   if ($url eq $urlent)
@@ -342,11 +373,12 @@ 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(top_dir()."/Redirect.pl?location=".uri_escape($url)); }
+		{ $r.=CGI::escapeHTML(top_dir('/Redirect.pl?location='.uri_escape($url))); }
 	$r.='"';
 	do { $r.=" $_" if $_; } for ($args{"attr"});
 	$r.='>'.$contents.'</a>';
 	if ($args{"size"} && url_is_local($url) && $url=~/[.](?:gz|Z|rpm|zip|deb|lha)/) {	# Downloadable?
+		$url=top_dir_disk().$url if $url=~m#^/#;
 		if (!-r $url)
 			{ cluck "File not readable: $url"; }
 		else {
@@ -381,6 +413,13 @@ my($url,$contents,%args)=@_;
 	return $contents;
 }
 
+sub make ($)
+{
+my($cmd)=@_;
+
+	system {'flock'} 'flock','-x',top_dir_disk(),$cmd.' >&2';
+}
+
 sub img_size ($$)
 {
 my($width,$height)=@_;
@@ -401,22 +440,35 @@ my @img_variants=(
 		{ "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)=@_;
 
-	return $file_base if !url_is_local($file_base)
+	if (!url_is_local($file_base)
 			# Known image extension?
-			|| $file_base=~m#$img_variants_re#o;
+			|| $file_base=~m#$img_variants_re#o) {
+		return $file_base if !wantarray();
+		return ($file_base,$file_base);
+		}
+
+	my $file_base_disk;
+	my $file_base_uri;
+	if ($file_base!~m#^/#) {
+		$file_base_disk=$file_base_uri=$file_base;
+		}
+	else {
+		$file_base_disk=top_dir_disk().$file_base;
+		$file_base_uri=top_dir($file_base);
+		}
 
 	my @nego_variants;
 	for my $var (@img_variants) {
-		my $file=$file_base.".".$var->{"id"};
+		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,
@@ -427,18 +479,20 @@ my($file_base)=@_;
 	# but should we provide somehow either 'HTTP::Headers' or 'HTTP::Request' ?
 	my $ext=HTTP::Negotiate::choose(\@nego_variants);
 	$ext||=$img_variants[0]->{"id"};	# &HTTP::Negotiate::choose failed?
-	return $file_base.".".$ext;
+
+	return $file_base_uri.".".$ext if !wantarray();
+	return ($file_base_uri.".".$ext,$file_base_disk.".".$ext);
 }
 
 sub img ($$;$)
 {
 my($file_base,$alt,$attrs)=@_;
 
-	my $file=img_src $file_base;
-	my($width,$height)=Image::Size::imgsize($file);
+	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\" alt=\"$alt\" title=\"$alt\" ".img_size($width,$height)
+	return "<img src=\"$file_uri\" alt=\"$alt\" title=\"$alt\" ".img_size($width,$height)
 			.(!$attrs ? "" : " ".$attrs)." />";
 }
 
@@ -520,6 +574,9 @@ HERE
 
 	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;