From: eldy <> Date: Sun, 24 Oct 2004 17:28:49 +0000 (+0000) Subject: New: Add ability to add plugin that add their own chart. X-Git-Tag: AWSTATS_6_3_RELEASE~81 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68455095d1cf9599f09f48e8089bbbcad11d180d;p=thirdparty%2FAWStats.git New: Add ability to add plugin that add their own chart. New: Add the geoip_region_maxmind and the geoip_city_maxmind plugin. --- diff --git a/wwwroot/cgi-bin/awstats.model.conf b/wwwroot/cgi-bin/awstats.model.conf index e26d2a38..f26a5436 100644 --- a/wwwroot/cgi-bin/awstats.model.conf +++ b/wwwroot/cgi-bin/awstats.model.conf @@ -1278,6 +1278,17 @@ color_x="C1B2E2" # Background color for number of exit pages (Default = "C1B2 # #LoadPlugin="geoip_region_maxmind GEOIP_STANDARD /pathto/GeoIPRegion.dat" +# Plugin: GeoIP_City_Maxmind +# Perl modules required: Geo::IP (from Maxmind) +# This plugin add a chart of hits by cities. +# Note: This plugin need Maxmind GeoIP Perl module AND the city database. +# Note: I get some problem with Maxmind Geo::IP Perl module with ActiveState +# on Windows but it works great on Linux with default Perl. +# You need to purchase a license from Maxmind to get/use the City database. +# This plugin reduces AWStats speed. +# +#LoadPlugin="geoip_city_maxmind GEOIP_STANDARD /pathto/GeoIPCity.dat" + # Plugin: UserInfo # Perl modules required: None # Add a text (Firtname, Lastname, Office Department, ...) in authenticated user diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl index de4ce89c..6984f732 100644 --- a/wwwroot/cgi-bin/awstats.pl +++ b/wwwroot/cgi-bin/awstats.pl @@ -3238,7 +3238,8 @@ sub Read_History_With_TmpUpdate { eval("$function"); delete $SectionsToLoad{"plugin_$pluginname"}; if ($SectionsToSave{"plugin_$pluginname"}) { - Save_History("plugin_$pluginname",$year,$month); delete $SectionsToSave{"plugin_$pluginname"}; + Save_History("plugin_$pluginname",$year,$month); + delete $SectionsToSave{"plugin_$pluginname"}; if ($withpurge) { my $function="SectionInitHashArray_$pluginname()"; eval("$function"); @@ -3290,6 +3291,7 @@ sub Read_History_With_TmpUpdate { } # Write all unwrote sections in section order ('general','time', 'day','sider','session' and other...) + if ($Debug) { debug(" Check and write all unwrote sections: ".join(',',keys %SectionsToSave),2); } foreach my $key (sort { $SectionsToSave{$a} <=> $SectionsToSave{$b} } keys %SectionsToSave) { Save_History("$key",$year,$month,$lastlinenb,$lastlineoffset,$lastlinechecksum); } @@ -3957,7 +3959,6 @@ sub Save_History { if ($PluginsLoaded{'SectionInitHashArray'}{"$pluginname"}) { my $function="SectionWriteHistory_$pluginname(\$xml,\$xmlbb,\$xmlbs,\$xmlbe,\$xmlrb,\$xmlrs,\$xmlre,\$xmleb,\$xmlee)"; eval("$function"); - last; } } @@ -5327,7 +5328,6 @@ if ($ENV{'GATEWAY_INTERFACE'}) { # Run from a browser as CGI $UpdateStats=($QueryString=~/update=1/i?1:0); if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&DecodeEncodedString("$1"); } - if ($QueryString =~ /logfile=([^&]+)/i) { $LogFile=&DecodeEncodedString("$1"); } if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons=&DecodeEncodedString("$1"); } if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&DecodeEncodedString("$1"); } if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&DecodeEncodedString("$1"); } @@ -5343,6 +5343,8 @@ if ($ENV{'GATEWAY_INTERFACE'}) { # Run from a browser as CGI if ($QueryString =~ /output=lasthosts:([^&]+)/i) { $FilterIn{'host'}=&DecodeEncodedString("$1"); } # Filter on host list can be defined with output=lasthosts:filter to reduce number of lines read and showed if ($QueryString =~ /output=urldetail:([^&]+)/i) { $FilterIn{'url'}=&DecodeEncodedString("$1"); } # Filter on URL list can be defined with output=urldetail:filter to reduce number of lines read and showed if ($QueryString =~ /output=refererpages:([^&]+)/i) { $FilterIn{'refererpages'}=&DecodeEncodedString("$1"); } # Filter on referer list can be defined with output=refererpages:filter to reduce number of lines read and showed + # Config parameters + if ($QueryString =~ /LogFile=([^&]+)/i) { $LogFile=&DecodeEncodedString("$1"); } # If migrate if ($QueryString =~ /(^|-|&)migrate=([^&]+)/i) { @@ -5372,7 +5374,6 @@ else { # Run from command line $UpdateStats=1; if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig="$1"; } - if ($QueryString =~ /logfile=([^&]+)/i) { $LogFile="$1"; } if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons="$1"; } if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode="$1"; } if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig="$1"; } @@ -5388,7 +5389,9 @@ else { # Run from command line if ($QueryString =~ /output=lasthosts:([^&]+)/i) { $FilterIn{'host'}="$1"; } # Filter on host list can be defined with output=lasthosts:filter to reduce number of lines read and showed if ($QueryString =~ /output=urldetail:([^&]+)/i) { $FilterIn{'url'}="$1"; } # Filter on URL list can be defined with output=urldetail:filter to reduce number of lines read and showed if ($QueryString =~ /output=refererpages:([^&]+)/i) { $FilterIn{'refererpages'}="$1"; } # Filter on referer list can be defined with output=refererpages:filter to reduce number of lines read and showed - + # Config parameters + if ($QueryString =~ /LogFile=([^&]+)/i) { $LogFile="$1"; } + # If show options if ($QueryString =~ /showsteps/i) { $ShowSteps=1; $QueryString=~s/showsteps[^&]*//i; } if ($QueryString =~ /showcorrupted/i) { $ShowCorrupted=1; $QueryString=~s/showcorrupted[^&]*//i; } @@ -5485,8 +5488,8 @@ if ((! $ENV{'GATEWAY_INTERFACE'}) && (! $SiteConfig)) { print " -showsteps to add benchmark information every $NBOFLINESFORBENCHMARK lines processed\n"; print " -showcorrupted to add output for each corrupted lines found, with reason\n"; print " -showdropped to add output for each dropped lines found, with reason\n"; - print " -logfile=x to change log to analyze whatever is 'LogFile' in config file\n"; print " -updatefor=n to stop the update process after parsing n lines\n"; + print " -LogFile=x to change log to analyze whatever is 'LogFile' in config file\n"; print " Be care to process log files in chronological order when updating statistics.\n"; print "\n"; print "Options to show statistics:\n"; @@ -6535,8 +6538,8 @@ if ($UpdateStats && $FrameName ne 'index' && $FrameName ne 'mainleft') { # Updat if ($PluginsLoaded{'GetCountryCodeByAddr'}{'geoipfree'}) { $Domain=GetCountryCodeByAddr_geoipfree($HostResolved); } elsif ($PluginsLoaded{'GetCountryCodeByAddr'}{'geoip'}) { $Domain=GetCountryCodeByAddr_geoip($HostResolved); } if ($AtLeastOneSectionPlugin) { - foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessHost'}}) { - my $function="SectionProcessHost_$pluginname(\$HostResolved)"; + foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessIp'}}) { + my $function="SectionProcessIp_$pluginname(\$HostResolved)"; eval("$function"); } } @@ -6550,8 +6553,8 @@ if ($UpdateStats && $FrameName ne 'index' && $FrameName ne 'mainleft') { # Updat elsif ($PluginsLoaded{'GetCountryCodeByAddr'}{'geoip'}) { $Domain=GetCountryCodeByAddr_geoip($Host); } elsif ($HostResolved =~ /\.(\w+)$/) { $Domain=$1; } if ($AtLeastOneSectionPlugin) { - foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessHostname'}}) { - my $function="SectionProcessHostname_$pluginname(\$Host)"; + foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessIp'}}) { + my $function="SectionProcessIp_$pluginname(\$Host)"; eval("$function"); } } @@ -8576,7 +8579,8 @@ if (scalar keys %HTMLOutput) { # else { print "".(! $StaticLinks && $monthix==$nowmonth && $YearRequired==$nowyear?'':''); print "$MonthNumLib{$monthix}
$YearRequired"; - print (! $StaticLinks && $monthix==$nowmonth && $YearRequired==$nowyear?'':'').""; + print (! $StaticLinks && $monthix==$nowmonth && $YearRequired==$nowyear?'':''); + print ""; # } } # if (!$StaticLinks) { @@ -8605,7 +8609,8 @@ if (scalar keys %HTMLOutput) { print ""; print "".(! $StaticLinks && $monthix==$nowmonth && $YearRequired==$nowyear?'':''); print "$MonthNumLib{$monthix} $YearRequired"; - print (! $StaticLinks && $monthix==$nowmonth && $YearRequired==$nowyear?'':'').""; + print (! $StaticLinks && $monthix==$nowmonth && $YearRequired==$nowyear?'':''); + print ""; if ($ShowMonthStats =~ /U/i) { print "",$MonthUnique{$YearRequired.$monthix}?$MonthUnique{$YearRequired.$monthix}:"0",""; } if ($ShowMonthStats =~ /V/i) { print "",$MonthVisits{$YearRequired.$monthix}?$MonthVisits{$YearRequired.$monthix}:"0",""; } if ($ShowMonthStats =~ /P/i) { print "",$MonthPages{$YearRequired.$monthix}?$MonthPages{$YearRequired.$monthix}:"0",""; } @@ -8807,7 +8812,8 @@ if (scalar keys %HTMLOutput) { print ""; print "".(! $StaticLinks && $day==$nowday && $month==$nowmonth && $year==$nowyear?'':''); print Format_Date("$year$month$day"."000000",2); - print (! $StaticLinks && $day==$nowday && $month==$nowmonth && $year==$nowyear?'':'').""; + print (! $StaticLinks && $day==$nowday && $month==$nowmonth && $year==$nowyear?'':''); + print ""; if ($ShowDaysOfMonthStats =~ /V/i) { print "",$DayVisits{$year.$month.$day}?$DayVisits{$year.$month.$day}:"0",""; } if ($ShowDaysOfMonthStats =~ /P/i) { print "",$DayPages{$year.$month.$day}?$DayPages{$year.$month.$day}:"0",""; } if ($ShowDaysOfMonthStats =~ /H/i) { print "",$DayHits{$year.$month.$day}?$DayHits{$year.$month.$day}:"0",""; } @@ -8929,7 +8935,8 @@ if (scalar keys %HTMLOutput) { for (@DOWIndex) { print "".(! $StaticLinks && $_==($nowwday-1) && $MonthRequired==$nowmonth && $YearRequired==$nowyear?'':''); print $Message[$_+84]; - print (! $StaticLinks && $_==($nowwday-1) && $MonthRequired==$nowmonth && $YearRequired==$nowyear?'':'').""; + print (! $StaticLinks && $_==($nowwday-1) && $MonthRequired==$nowmonth && $YearRequired==$nowyear?'':''); + print ""; } print "\n\n"; } @@ -8946,6 +8953,7 @@ if (scalar keys %HTMLOutput) { print ""; print "".(! $StaticLinks && $_==($nowwday-1) && $MonthRequired==$nowmonth && $YearRequired==$nowyear?'':''); print $Message[$_+84]; + print (! $StaticLinks && $_==($nowwday-1) && $MonthRequired==$nowmonth && $YearRequired==$nowyear?'':''); print ""; if ($ShowDaysOfWeekStats =~ /P/i) { print "",$avg_dayofweek_p[$_],""; } if ($ShowDaysOfWeekStats =~ /H/i) { print "",$avg_dayofweek_h[$_],""; }