--- awstats.pl.orig 2009-10-10 14:36:38.000000000 +0200 +++ awstats.pl 2010-04-18 22:50:03.000000000 +0200 @@ -34,7 +34,7 @@ $LIMITFLUSH $NEWDAYVISITTIMEOUT $VISITTIMEOUT $NOTSORTEDRECORDTOLERANCE $WIDTHCOLICON $TOOLTIPON $lastyearbeforeupdate $lastmonthbeforeupdate $lastdaybeforeupdate $lasthourbeforeupdate $lastdatebeforeupdate - $NOHTML + $NOHTML $MultipleMonthPatch $MultipleMonthScript /; $DEBUGFORCED = 0 ; # Force debug level to log lesser level into debug.log file (Keep this value to 0) @@ -53,6 +53,8 @@ $WIDTHCOLICON = 32; $TOOLTIPON = 0; # Tooltips plugin loaded $NOHTML = 0; # Suppress the html headers +$MultipleMonthPatch = 1; # Enable/Disable the "Reported period" drop down box on the generated static pages +$MultipleMonthScript = 1; # Enable/Disable generation of external JavaScript file # ----- Running variables ----- use vars qw/ @@ -547,7 +549,7 @@ %ValidHTTPCodes %ValidSMTPCodes %TrapInfosForHTTPErrorCodes %NotPageList %DayBytes %DayHits %DayPages %DayVisits %MaxNbOf %MinHit - %ListOfYears %HistoryAlreadyFlushed %PosInFile %ValueInFile + %ListOfYears %ListOfMonths %HistoryAlreadyFlushed %PosInFile %ValueInFile %val %nextval %egal %TmpDNSLookup %TmpOS %TmpRefererServer %TmpRobot %TmpBrowser %MyDNSTable /; @@ -560,7 +562,7 @@ %NotPageList = (); %DayBytes = %DayHits = %DayPages = %DayVisits = (); %MaxNbOf = %MinHit = (); -%ListOfYears = %HistoryAlreadyFlushed = %PosInFile = %ValueInFile = (); +%ListOfYears = %ListOfMonths = %HistoryAlreadyFlushed = %PosInFile = %ValueInFile = (); %val = %nextval = %egal = (); %TmpDNSLookup = %TmpOS = %TmpRefererServer = %TmpRobot = %TmpBrowser = (); %MyDNSTable = (); @@ -6076,6 +6078,13 @@ if ( !$ListOfYears{"$year"} || $ListOfYears{"$year"} lt "$month" ) { $ListOfYears{"$year"} = "$month"; } + + if ( !$ListOfMonths{"$year"} ) { + $ListOfMonths{"$year"} = (); + } + if ( !$ListOfMonths{"$year"}{"$month"} ) { + $ListOfMonths{"$year"}{"$month"} = 1; + } } # For backward compatibility, if LastLine does not exist, set to LastTime @@ -9085,7 +9094,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode("$AWScript?${NewLinkParams}output=$key") - : "$PROG$StaticLinks.$key.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.$key-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.$key.$StaticExt" ) ) . "\"$NewLinkTarget>$menutext->{$key}\n"; print( $frame? "\n" : "   " ); @@ -9125,7 +9134,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode("$AWScript?${NewLinkParams}output=allemails") - : "$PROG$StaticLinks.allemails.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.allmails-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.allemails.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[80]"; if ( $ShowEMailSenders =~ /L/i ) { @@ -9134,7 +9143,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode("$AWScript?${NewLinkParams}output=lastemails") - : "$PROG$StaticLinks.lastemails.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.lastemails-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.lastemails.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[9]"; } @@ -9285,7 +9294,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode("$AWScript?${NewLinkParams}output=allemailr") - : "$PROG$StaticLinks.allemailr.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.allemailr-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.allemailr.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[80]"; if ( $ShowEMailReceivers =~ /L/i ) { @@ -9294,7 +9303,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode("$AWScript?${NewLinkParams}output=lastemailr") - : "$PROG$StaticLinks.lastemailr.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.lastemailr-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.lastemailr.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[9]"; } @@ -10336,6 +10345,12 @@ # ListOfYears contains max month found $ListOfYears{"$2"} = "$1"; } + if ( !$ListOfMonths{$2} ) { + $ListOfMonths{$2} = (); + } + if ( !$ListOfMonths{"$2"}{"$1"} ) { + $ListOfMonths{"$2"}{"$1"} = 1; + } my $rangestring = ( $2 || "" ) . ( $1 || "" ) . ( $3 || "" ) . ( $4 || "" ); if ( $rangestring gt $lastdatebeforeupdate ) { @@ -13305,9 +13320,66 @@ if ( $FrameName eq 'mainright' ) { $NewLinkTarget = " target=\"_parent\""; } + + if ($MultipleMonthScript) { + print "\n\n"; + print "\n +EOF + print "
\n"; + . ( ($MultipleMonthPatch) ? "\" onSubmit=\"return onSubmitForm();\" " : "\" " ) + . "style=\"padding: 0px 0px 0px 0px; margin-top: 0\"$NewLinkTarget>\n"; } if ( $QueryString !~ /buildpdf/i ) { @@ -13426,9 +13498,9 @@ print "$Message[133]:"; print ""; - if ( $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ) { + if ( $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks || $MultipleMonthPatch ) { print "\n"; - print "\n"; # Add YearRequired in list if not in ListOfYears $ListOfYears{$YearRequired} ||= $MonthRequired; @@ -13454,14 +13526,16 @@ . " value=\"$_\">$_\n"; } print "\n"; - print "\n"; - if ($SiteConfig) { + if (!$MultipleMonthPatch) { + print "\n"; + } + if (!$MultipleMonthPatch && $SiteConfig) { print "\n"; } - if ($DirConfig) { + if (!$MultipleMonthPatch && $DirConfig) { print "\n"; } @@ -13711,7 +13785,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode( "$AWScript?${NewLinkParams}output=urldetail") - : "$PROG$StaticLinks.urldetail.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.urldetail-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.urldetail.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[80]\n"; print( $frame? "\n" : "   " ); @@ -13726,7 +13800,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode( "$AWScript?${NewLinkParams}output=urlentry") - : "$PROG$StaticLinks.urlentry.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.urlentry-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.urlentry.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[104]\n"; print( $frame? "\n" : "   " ); @@ -13741,7 +13815,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode("$AWScript?${NewLinkParams}output=urlexit") - : "$PROG$StaticLinks.urlexit.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.urlexit-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.urlexit.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[116]\n"; print( $frame? "\n" : "   " ); @@ -13762,7 +13836,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode( "$AWScript?${NewLinkParams}output=osdetail") - : "$PROG$StaticLinks.osdetail.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.osdetail-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.osdetail.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[58]\n"; print( $frame? "\n" : "   " ); @@ -13777,7 +13851,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode( "$AWScript?${NewLinkParams}output=unknownos") - : "$PROG$StaticLinks.unknownos.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.unknownos-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.unknownos.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[0]\n"; print( $frame? "\n" : "   " ); @@ -13798,7 +13872,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode( "$AWScript?${NewLinkParams}output=browserdetail") - : "$PROG$StaticLinks.browserdetail.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.browserdetail-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.browserdetail.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[58]\n"; print( $frame? "\n" : "   " ); @@ -13813,7 +13887,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode( "$AWScript?${NewLinkParams}output=unknownbrowser") - : "$PROG$StaticLinks.unknownbrowser.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.unknownbrowser-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.unknownbrowser.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[0]\n"; print( $frame? "\n" : "   " ); @@ -13952,7 +14026,7 @@ "$AWScript" . ( ${NewLinkParams} ? "?${NewLinkParams}" : "" ) ) - : "$PROG$StaticLinks.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.$StaticExt" ) ) . "\">$Message[76]\n"; } @@ -17502,7 +17576,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode("$AWScript?${NewLinkParams}output=alldomains") - : "$PROG$StaticLinks.alldomains.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.alldomains-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.alldomains.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[80]"; &tab_head( "$title", 19, 0, 'countries' ); @@ -17694,21 +17768,21 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode("$AWScript?${NewLinkParams}output=allhosts") - : "$PROG$StaticLinks.allhosts.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.allhosts-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.allhosts.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[80]   -   $Message[9]   -   $Message[45]"; &tab_head( "$title", 19, 0, 'visitors' ); @@ -17816,7 +17890,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode("$AWScript?${NewLinkParams}output=alllogins") - : "$PROG$StaticLinks.alllogins.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.alllogins-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.alllogins.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[80]"; if ( $ShowAuthenticatedUsers =~ /L/i ) { @@ -17825,7 +17899,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode("$AWScript?${NewLinkParams}output=lastlogins") - : "$PROG$StaticLinks.lastlogins.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.lastlogins-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.lastlogins.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[9]"; } @@ -17945,14 +18019,14 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode("$AWScript?${NewLinkParams}output=allrobots") - : "$PROG$StaticLinks.allrobots.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.allrobots-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.allrobots.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[80]   -   $Message[9]", 19, 0, 'robots' @@ -18333,7 +18407,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode("$AWScript?${NewLinkParams}output=urldetail") - : "$PROG$StaticLinks.urldetail.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.urldetail-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.urldetail.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[80]"; if ( $ShowPagesStats =~ /E/i ) { @@ -18342,7 +18416,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode("$AWScript?${NewLinkParams}output=urlentry") - : "$PROG$StaticLinks.urlentry.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.urlentry-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.urlentry.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[104]"; } @@ -18352,7 +18426,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode("$AWScript?${NewLinkParams}output=urlexit") - : "$PROG$StaticLinks.urlexit.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.urlexit-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.urlexit.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[116]"; } @@ -18574,14 +18648,14 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode("$AWScript?${NewLinkParams}output=osdetail") - : "$PROG$StaticLinks.osdetail.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.osdetail-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.osdetail.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[80]/$Message[58]   -   $Message[0]"; &tab_head( "$title", 19, 0, 'os' ); @@ -18662,14 +18736,14 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode("$AWScript?${NewLinkParams}output=browserdetail") - : "$PROG$StaticLinks.browserdetail.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.browserdetail-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.browserdetail.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[80]/$Message[58]   -   $Message[0]"; &tab_head( "$title", 19, 0, 'browsers' ); @@ -18865,7 +18939,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode("$AWScript?${NewLinkParams}output=refererse") - : "$PROG$StaticLinks.refererse.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.refererse-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.refererse.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[80]
\n"; if ( scalar keys %_se_referrals_h ) { @@ -18937,7 +19011,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode("$AWScript?${NewLinkParams}output=refererpages") - : "$PROG$StaticLinks.refererpages.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.refererpages-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.refererpages.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[80]
\n"; if ( scalar keys %_pagesrefs_h ) { @@ -19076,7 +19150,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode("$AWScript?${NewLinkParams}output=keyphrases") - : "$PROG$StaticLinks.keyphrases.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.keyphrases-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.keyphrases.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[80]", 19, @@ -19147,7 +19221,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode("$AWScript?${NewLinkParams}output=keywords") - : "$PROG$StaticLinks.keywords.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.keywords-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.keywords.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[80]", 19, @@ -19290,7 +19364,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode( "$AWScript?${NewLinkParams}output=errors$key") - : "$PROG$StaticLinks.errors$key.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.errors$key-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.errors$key.$StaticExt" ) ) . "\"$NewLinkTarget>$key"; } @@ -19409,7 +19483,7 @@ $ENV{'GATEWAY_INTERFACE'} || !$StaticLinks ? XMLEncode( "$AWScript?${NewLinkParams}output=allextra$extranum") - : "$PROG$StaticLinks.allextra$extranum.$StaticExt" + : ( ($MultipleMonthPatch) ? "$PROG.allextra$extranum-$YearRequired-$MonthRequired.$StaticExt" : "$PROG$StaticLinks.allextra$extranum.$StaticExt" ) ) . "\"$NewLinkTarget>$Message[80]"; print "";