X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=Web.pm;h=6b76695d16763b4e9e7cbe50dfbd052c4ad4283e;hb=ee36f55cab44a05ddb218efafc9e553070baba8e;hp=79025036e58c29f514791066f2da025f0a394812;hpb=ca570b527837eaaf84750ae3eec92e86d4ec2d5c;p=MyWeb.git diff --git a/Web.pm b/Web.pm index 7902503..6b76695 100644 --- a/Web.pm +++ b/Web.pm @@ -272,7 +272,7 @@ my($class,%args)=@_; $W->{"have_js"}=($W->{"args"}{"have_js"} ? 1 : 0); if ($W->{"detect_js"} && !$W->{"have_js"}) { - $W->{"head"}.=''."\n"; + $W->{"head"}.=''."\n"; } do { _args_check(%$_) if $_; } for ($W->{"args_check"}); @@ -578,7 +578,7 @@ my($uri)=@_; return $uri if defined $W->{"have_ent"} && !$W->{"have_ent"}; # non-ent client return $urient if $W->{"have_ent"}; # ent client # Unknown client, &escapeHTML should not be needed here: - return escapeHTML(path_web('/Redirect.pm?location='.uri_escape($uri->abs(unparsed_uri())))); + return escapeHTML(path_web('/My/Redirect.pm?location='.uri_escape($uri->abs(unparsed_uri())))); } our $a_href_inhibited; @@ -670,12 +670,14 @@ sub a_href_cc($$;%) { my($url,$contents,%args)=@_; + # A bit ineffective but we must process all the possibilities to get stable 'headers_in' hits! + my %map=map(($_=>a_href($url->{$_},$contents,%args)),keys(%$url)); my $cc; $cc||=Geo::IP->new()->country_code_by_addr(remote_ip()) if $have_Geo_IP; $cc||=""; - $url=$url->{$cc}; - return $contents if !$url; - return a_href $url,$contents,%args; + my $r=$map{$cc}; + return $r if $r; + return $contents; } sub make ($)