From: eldy <> Date: Mon, 6 Jan 2003 04:18:31 +0000 (+0000) Subject: Minor cosmetic change (remove ShowHeader parameter). X-Git-Tag: AWSTATS_5_4_BETA~74 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2d6bfc166fce66d3c5c1de1aafd65617fc98081;p=thirdparty%2FAWStats.git Minor cosmetic change (remove ShowHeader parameter). --- diff --git a/wwwroot/cgi-bin/awstats.model.conf b/wwwroot/cgi-bin/awstats.model.conf index c8eb330b..23361e53 100644 --- a/wwwroot/cgi-bin/awstats.model.conf +++ b/wwwroot/cgi-bin/awstats.model.conf @@ -703,9 +703,6 @@ DirLang="./lang" # C = Web compression (mod_gzip) # M = Average mail size (mail logs) # -# Show AWStats head title and icon -# Default: 1, Possible codes: None -ShowHeader=1 # Show menu header with links on detailed reports # Default: 1, Possible codes: None ShowMenu=1 diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl index 05eca864..66ef583a 100644 --- a/wwwroot/cgi-bin/awstats.pl +++ b/wwwroot/cgi-bin/awstats.pl @@ -135,7 +135,7 @@ $UseFramesWhenCGI, $DecodeUA)= use vars qw/ $AllowToUpdateStatsFromBrowser $ArchiveLogRecords $DetailedReportsOnNewWindows $FirstDayOfWeek $KeyWordsNotSensitive $SaveDatabaseFilesWithPermissionsForEveryone -$ShowHeader $ShowMenu $ShowMonthDayStats $ShowDaysOfWeekStats +$ShowMenu $ShowMonthDayStats $ShowDaysOfWeekStats $ShowHoursStats $ShowDomainsStats $ShowHostsStats $ShowRobotsStats $ShowSessionsStats $ShowPagesStats $ShowFileTypesStats $ShowBrowsersStats $ShowOSStats $ShowOriginStats @@ -146,7 +146,7 @@ $WarningMessages $DebugMessages /; ($AllowToUpdateStatsFromBrowser, $ArchiveLogRecords, $DetailedReportsOnNewWindows, $FirstDayOfWeek, $KeyWordsNotSensitive, $SaveDatabaseFilesWithPermissionsForEveryone, -$ShowHeader, $ShowMenu, $ShowMonthDayStats, $ShowDaysOfWeekStats, +$ShowMenu, $ShowMonthDayStats, $ShowDaysOfWeekStats, $ShowHoursStats, $ShowDomainsStats, $ShowHostsStats, $ShowRobotsStats, $ShowSessionsStats, $ShowPagesStats, $ShowFileTypesStats, $ShowBrowsersStats, $ShowOSStats, $ShowOriginStats, $ShowKeyphrasesStats, @@ -1177,7 +1177,6 @@ sub Parse_Config { # Read optional appearance setup section if ($param =~ /^Lang/) { $Lang=$value; next; } if ($param =~ /^DirLang/) { $DirLang=$value; next; } - if ($param =~ /^ShowHeader/) { $ShowHeader=$value; next; } if ($param =~ /^ShowMenu/) { $ShowMenu=$value; next; } if ($param =~ /^ShowMonthDayStats/) { $ShowMonthDayStats=$value; next; } if ($param =~ /^ShowDaysOfWeekStats/) { $ShowDaysOfWeekStats=$value; next; } @@ -1547,7 +1546,6 @@ sub Check_Config { } # Optional appearance setup section if ($MaxRowsInHTMLOutput !~ /^\d+/ || $MaxRowsInHTMLOutput<1) { $MaxRowsInHTMLOutput=1000; } - if ($ShowHeader !~ /[0-1]/) { $ShowHeader=1; } if ($ShowMenu !~ /[0-1]/) { $ShowMenu=1; } if ($ShowMonthDayStats !~ /[01UVPHB]/) { $ShowMonthDayStats='UVPHB'; } if ($ShowDaysOfWeekStats !~ /[01PHBL]/) { $ShowDaysOfWeekStats='PHBL'; } @@ -3822,16 +3820,15 @@ sub Show_Flag_Links { $NewLinkParams =~ s/(^|&)staticlinks(=\w*|$)//i; $NewLinkParams =~ s/(^|&)framename=[^&]*//i; $NewLinkParams =~ s/(^|&)lang=[^&]*//i; - if ($FrameName eq 'mainleft') { $NewLinkTarget=" target=\"_parent\""; } + if ($FrameName eq 'mainright') { $NewLinkTarget=" target=\"_parent\""; } $NewLinkParams =~ tr/&/&/s; $NewLinkParams =~ s/^&//; $NewLinkParams =~ s/&$//; if ($NewLinkParams) { $NewLinkParams="${NewLinkParams}&"; } } else { $NewLinkParams=($SiteConfig?"config=$SiteConfig&":"")."year=$YearRequired&month=$MonthRequired&"; } - if ($FrameName eq 'mainleft') { $NewLinkParams.='framename=index&'; } + if ($FrameName eq 'mainright') { $NewLinkParams.='framename=index&'; } - print "
\n"; foreach my $flag (split(/\s+/,$ShowFlagLinks)) { if ($flag ne $CurrentLang) { my $lng=$flag; @@ -5965,23 +5962,6 @@ EOF print "\n"; } - # LOGO AND FLAGS - #--------------------------------------------------------------------- - if ($ShowHeader && ($FrameName ne 'mainright' || $FrameName eq 'mainleft')) { - print "\n"; - print "\n"; - if ($LogoLink =~ "http://awstats.sourceforge.net") { - print "\n"; - } - else { - print "\n"; - } - if ($FrameName ne 'mainleft') { print "\n"; } - print "
AWStats\n"; - if (! $StaticLinks) { Show_Flag_Links($Lang); } - print "\"".ucfirst($PROG)."
$Message[54]
\n"; - } - # MENU #--------------------------------------------------------------------- if ($ShowMenu || $FrameName eq 'mainleft') { @@ -5999,20 +5979,32 @@ EOF $NewLinkParams =~ tr/&/&/s; $NewLinkParams =~ s/^&//; $NewLinkParams =~ s/&$//; my $NewLinkTarget=''; if ($FrameName eq 'mainright') { $NewLinkTarget=" target=_parent"; } - print "
"; + print "\n"; } - print "\n"; - + print "\n"; if ($FrameName ne 'mainright') { # Print site name - print "\n"; + print ""; + + # Logo and flags + if ($FrameName ne 'mainleft') { + if ($LogoLink =~ "http://awstats.sourceforge.net") { + print ""; + } + print "\n"; } if ($FrameName ne 'mainleft') { # Print LastUpdate - print ""; - print ""; + print "\n"; + print ""; + + # Logo and flags + if ($FrameName eq 'mainright') { + if ($LogoLink =~ "http://awstats.sourceforge.net") { + print ""; + } + + print "\n"; # Print selected period of analysis (month and year required) print ""; - print "\n"; } - print "
$Message[7] : ".($frame?"  ":"")."$SiteDomain
$Message[7] : ".($frame?"  ":"")."$SiteDomain\"".ucfirst($PROG)."\n"; + } + else { + print "\n"; + } + if (! $StaticLinks) { print "
"; Show_Flag_Links($Lang); } + print "
$Message[35] :"; + print "
$Message[35] :"; if ($LastUpdate) { print Format_Date($LastUpdate,0); } else { # Here NbOfOldLines = 0 (because LastUpdate is defined) @@ -6033,10 +6025,24 @@ EOF print "       "; print "$Message[74]"; } - print "
\"".ucfirst($PROG)."\n"; + } + else { + print "\n"; + } + if (! $StaticLinks) { print "
"; Show_Flag_Links($Lang); } + print "
$Message[133] :"; + print ""; if ($ENV{'GATEWAY_INTERFACE'} || !$StaticLinks) { print "
\n"; + if ($FrameName ne 'mainleft') { print "\n"; } else { print "
\n"; } print "\n";