From: eldy <> Date: Sat, 26 Oct 2002 18:46:37 +0000 (+0000) Subject: Removed need to migrate warning on left frame. X-Git-Tag: AWSTATS_5_2_BETA~32 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7c73b135ad593b1670ec799b0e5b577fd792b7a;p=thirdparty%2FAWStats.git Removed need to migrate warning on left frame. --- diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl index 7d6d3943..9d857b8b 100644 --- a/wwwroot/cgi-bin/awstats.pl +++ b/wwwroot/cgi-bin/awstats.pl @@ -523,7 +523,7 @@ use vars qw/ @Message /; sub html_head { if ($HTMLOutput) { # Write head section - if ($FrameName ne "index") { print "\n\n"; } + if ($FrameName ne 'index') { print "\n\n"; } else { print "\n\n"; } print "\n"; print "\n"; @@ -532,7 +532,7 @@ sub html_head { #else { print "\n"; } if ($Expires) { print "\n"; } print "\n"; - if ($FrameName ne "mainleft") { print "\n"; } + if ($FrameName ne 'mainleft') { print "\n"; } print "\n"; print "$Message[7] $SiteDomain\n"; if ($FrameName ne 'index') { @@ -1875,10 +1875,12 @@ sub Read_History_With_TmpUpdate { # Show migrate warning for backward compatibility if ($versionnum < 5000 && ! $MigrateStats && ! $BadFormatWarning{$year.$month}) { - $BadFormatWarning{$year.$month}=1; - my $message="Warning: Data file '$filetoread' has an old history file format (version $versionnum). You should upgrade it...\nFrom command line: $PROG.$Extension -migrate=\"$filetoread\""; - if ($ENV{"GATEWAY_INTERFACE"} && $AllowToUpdateStatsFromBrowser) { $message.="\nFrom your browser with URL: http://".$ENV{"SERVER_NAME"}.$ENV{"SCRIPT_NAME"}."?migrate=$filetoread"; } - warning("$message"); + if ($FrameName ne 'mainleft') { + $BadFormatWarning{$year.$month}=1; + my $message="Warning: Data file '$filetoread' has an old history file format (version $versionnum). You should upgrade it...\nFrom command line: $PROG.$Extension -migrate=\"$filetoread\""; + if ($ENV{"GATEWAY_INTERFACE"} && $AllowToUpdateStatsFromBrowser) { $message.="\nFrom your browser with URL: http://".$ENV{"SERVER_NAME"}.$ENV{"SCRIPT_NAME"}."?migrate=$filetoread"; } + warning("$message"); + } } if (! ($versionnum < 5000) && $MigrateStats && ! $BadFormatWarning{$year.$month}) { $BadFormatWarning{$year.$month}=1; @@ -4290,14 +4292,14 @@ if ($Lang eq "10") { $Lang="kr"; } # Define frame name and correct variable for frames if (! $FrameName) { - if ($ENV{"GATEWAY_INTERFACE"} && $UseFramesWhenCGI && $HTMLOutput eq 'main') { $FrameName="index"; } + if ($ENV{"GATEWAY_INTERFACE"} && $UseFramesWhenCGI && $HTMLOutput eq 'main') { $FrameName='index'; } else { $FrameName='main'; } } # Load Message and Plugins -if ($FrameName ne "index") { +if ($FrameName ne 'index') { &Read_Language_Data($Lang); - if ($FrameName ne "mainleft") { + if ($FrameName ne 'mainleft') { &Read_Ref_Data(); &Read_Plugins(); } @@ -4393,7 +4395,7 @@ if ($MigrateStats) { } # Output main frame page and exit. This must be after the security check. -if ($FrameName eq "index") { +if ($FrameName eq 'index') { # Define the NewLinkParams for main chart my $NewLinkParams=${QueryString}; $NewLinkParams =~ s/framename=[^ &]*//i; @@ -4443,7 +4445,7 @@ if ($Debug) { # UPDATE PROCESS #------------------------------------------ if ($Debug) { debug("UpdateStats is $UpdateStats",2); } -if ($UpdateStats && $FrameName ne "index" && $FrameName ne "mainleft") { # Update only on index page or when not framed to avoid update twice +if ($UpdateStats && $FrameName ne 'index' && $FrameName ne 'mainleft') { # Update only on index page or when not framed to avoid update twice if (! $HTMLOutput) { print "Update for config '$FileConfig'\n"; @@ -5658,7 +5660,7 @@ if ($HTMLOutput) { $NewLinkParams =~ s/framename=[^ &]*//i; my $NewLinkTarget=""; if ($DetailedReportsOnNewWindows) { $NewLinkTarget=" target=\"awstatsbis\""; } - if (($FrameName eq "mainleft" || $FrameName eq "mainright") && $DetailedReportsOnNewWindows < 2) { + if (($FrameName eq 'mainleft' || $FrameName eq 'mainright') && $DetailedReportsOnNewWindows < 2) { $NewLinkParams.="&framename=mainright"; $NewLinkTarget=" target=\"mainright\""; } @@ -5667,7 +5669,7 @@ if ($HTMLOutput) { # WRITE TOOLTIPS INFO #--------------------------------------------------------------------- - if ($FrameName ne "mainleft") { + if ($FrameName ne 'mainleft') { # Get the tooltips texts &Read_Language_Tooltip($Lang); @@ -5729,7 +5731,7 @@ EOF } # HTMLHeadSection - if ($FrameName ne "index" && $FrameName ne "mainleft") { + if ($FrameName ne 'index' && $FrameName ne 'mainleft') { print " \n\n"; print "$HTMLHeadSection\n"; print "\n"; @@ -5737,7 +5739,7 @@ EOF # LOGO AND FLAGS #--------------------------------------------------------------------- - if (($ShowHeader && $FrameName ne "mainright") || $FrameName eq "mainleft") { + if (($ShowHeader && $FrameName ne 'mainright') || $FrameName eq 'mainleft') { print "\n"; print "\n"; } - if ($FrameName ne "mainleft") { print "\n"; } + if ($FrameName ne 'mainleft') { print "\n"; } print "
AWStats\n"; if (! $StaticLinks) { Show_Flag_Links($Lang); } @@ -5748,18 +5750,18 @@ EOF else { print "
$Message[54]
$Message[54]
\n"; } # MENU #--------------------------------------------------------------------- - if ($ShowMenu || $FrameName eq "mainleft") { + if ($ShowMenu || $FrameName eq 'mainleft') { if ($Debug) { debug("ShowMenu",2); } - my $frame=($FrameName eq "mainleft"); + my $frame=($FrameName eq 'mainleft'); print "$Center \n"; - if ($FrameName ne "mainleft") { + if ($FrameName ne 'mainleft') { my $NewLinkParams=${QueryString}; $NewLinkParams =~ s/update(=\w*|$|[ &]+)//i; $NewLinkParams =~ s/staticlinks(=\w*|$|[ &]+)//i; @@ -5768,17 +5770,17 @@ EOF $NewLinkParams =~ s/framename=[^ &]*//i; $NewLinkParams =~ tr/&/&/s; $NewLinkParams =~ s/^&//; $NewLinkParams =~ s/&$//; my $NewLinkTarget=""; - if ($FrameName eq "mainright") { $NewLinkTarget=" target=_parent"; } + if ($FrameName eq 'mainright') { $NewLinkTarget=" target=_parent"; } print "
"; } print "\n"; - if ($FrameName ne "mainright") { + if ($FrameName ne 'mainright') { # Print site name print "$Message[7] : ".($frame?"  ":"")."$SiteDomain\n"; } - if ($FrameName ne "mainleft") { + if ($FrameName ne 'mainleft') { # Print LastUpdate print "$Message[35] :"; @@ -5797,7 +5799,7 @@ EOF $NewLinkParams =~ s/update(=\w*|$|[ &]+)//i; $NewLinkParams =~ s/staticlinks(=\w*|$|[ &]+)//i; $NewLinkParams =~ s/framename=[^ &]*//i; - if ($FrameName eq "mainright") { $NewLinkParams.="&framename=mainright"; } + if ($FrameName eq 'mainright') { $NewLinkParams.="&framename=mainright"; } $NewLinkParams =~ tr/&/&/s; $NewLinkParams =~ s/^&//; $NewLinkParams =~ s/&$//; if ($NewLinkParams) { $NewLinkParams="${NewLinkParams}&"; } print "       "; @@ -5821,7 +5823,7 @@ EOF if ($SiteConfig) { print "\n"; } if ($QueryString =~ /lang=(\w+)/i) { print "\n"; } if ($QueryString =~ /debug=(\d+)/i) { print "\n"; } - if ($FrameName eq "mainright") { print "\n"; } + if ($FrameName eq 'mainright') { print "\n"; } print ""; } else { @@ -5834,14 +5836,14 @@ EOF } print "\n"; - if ($FrameName ne "mainleft") { print "\n"; } + if ($FrameName ne 'mainleft') { print "\n"; } else { print "
\n"; } print "\n"; # Print menu links - if (($HTMLOutput eq 'main' && $FrameName ne "mainright") || $FrameName eq "mainleft") { # If main page asked - my $linkpage=($FrameName eq "mainleft"?"$AWScript?${NewLinkParams}":""); $linkpage =~ s/&$//; - my $targetpage=($FrameName eq "mainleft"?" target=mainright":""); + if (($HTMLOutput eq 'main' && $FrameName ne 'mainright') || $FrameName eq 'mainleft') { # If main page asked + my $linkpage=($FrameName eq 'mainleft'?"$AWScript?${NewLinkParams}":""); $linkpage =~ s/&$//; + my $targetpage=($FrameName eq 'mainleft'?" target=mainright":""); my $linetitle=1; print "\n"; # When @@ -5883,10 +5885,10 @@ EOF if ($ShowFileTypesStats) { print ($frame?"":""); print "$Message[73]"; print ($frame?"\n":"   "); } if ($ShowFileSizesStats) { } if ($ShowOSStats) { print ($frame?"":""); print "$Message[59]"; print ($frame?"\n":"   "); } - if ($ShowOSStats && $FrameName eq "mainleft") { print ($frame?"   \"...\" ":""); print "$Message[0]\n"; print ($frame?"\n":"   "); } + if ($ShowOSStats && $FrameName eq 'mainleft') { print ($frame?"   \"...\" ":""); print "$Message[0]\n"; print ($frame?"\n":"   "); } if ($ShowBrowsersStats) { print ($frame?"":""); print "$Message[21]"; print ($frame?"\n":"   "); } if ($ShowBrowsersStats) { print ($frame?"   \"...\" ":""); print "$Message[58]\n"; print ($frame?"\n":"   "); } - if ($ShowBrowsersStats && $FrameName eq "mainleft") { print ($frame?"   \"...\" ":""); print "$Message[0]\n"; print ($frame?"\n":"   "); } + if ($ShowBrowsersStats && $FrameName eq 'mainleft') { print ($frame?"   \"...\" ":""); print "$Message[0]\n"; print ($frame?"\n":"   "); } if ($linetitle) { print ($frame?"":"\n"); } # Referers $linetitle=&AtLeastOneNotNull($ShowOriginStats,$ShowKeyphrasesStats,$ShowKeywordsStats); @@ -5918,7 +5920,7 @@ EOF print "\n"; $NewLinkParams =~ s/urlfilter=[^ &]*//i; $NewLinkParams =~ tr/&/&/s; $NewLinkParams =~ s/&$//; - if (! $DetailedReportsOnNewWindows || $FrameName eq "mainright") { + if (! $DetailedReportsOnNewWindows || $FrameName eq 'mainright') { print "\n"; } else { @@ -5930,7 +5932,7 @@ EOF } # Exit if left frame - if ($FrameName eq "mainleft") { + if ($FrameName eq 'mainleft') { &html_end(); exit 0; } @@ -6023,7 +6025,7 @@ EOF # $NewLinkParams =~ tr/&/&/s; $NewLinkParams =~ s/^&//; $NewLinkParams =~ s/&$//; # if ($NewLinkParams) { $NewLinkParams="${NewLinkParams}&"; } # my $NewLinkTarget=""; -# if ($FrameName eq "mainright") { $NewLinkTarget=" target=_parent"; } +# if ($FrameName eq 'mainright') { $NewLinkTarget=" target=_parent"; } # # # Show monthly stats # print "\n"; # } @@ -6761,7 +6763,7 @@ EOF $NewLinkParams =~ tr/&/&/s; $NewLinkParams =~ s/^&//; $NewLinkParams =~ s/&$//; if ($NewLinkParams) { $NewLinkParams="${NewLinkParams}&"; } my $NewLinkTarget=""; - if ($FrameName eq "mainright") { $NewLinkTarget=" target=_parent"; } + if ($FrameName eq 'mainright') { $NewLinkTarget=" target=_parent"; } # Ratio my $RatioVisits=0; my $RatioPages=0; my $RatioHits=0; my $RatioBytes=0; @@ -6960,7 +6962,7 @@ EOF my $dayofweekcursor=DayOfWeek($day,$month,$year); print "\n"; } @@ -6994,7 +6996,7 @@ EOF # Show data arrays link # if ($DetailedReportsOnNewWindows) { $NewLinkTarget=" target=\"awstatsbis\""; } -# if (($FrameName eq "mainleft" || $FrameName eq "mainright") && $DetailedReportsOnNewWindows < 2) { +# if (($FrameName eq 'mainleft' || $FrameName eq 'mainright') && $DetailedReportsOnNewWindows < 2) { # $NewLinkParams.="&framename=mainright"; # $NewLinkTarget=" target=\"mainright\""; # }
$Message[76]
"; @@ -6186,7 +6188,7 @@ EOF # my $dayofweekcursor=DayOfWeek($day,$month,$year); # print ""; # print ($day==$nowday && $month==$nowmonth && $year==$nowyear?"":""); -# print "$day
".$MonthLib{$month}.""; +# print "$day
".$MonthLib{$month}.""; # print ($day==$nowday && $month==$nowmonth && $year==$nowyear?"":""); # print "		"; print ($day==$nowday && $month==$nowmonth && $year==$nowyear?"":""); - print "$day
".$MonthLib{$month}.""; + print "$day
".$MonthLib{$month}.""; print ($day==$nowday && $month==$nowmonth && $year==$nowyear?"":""); print "