Fix: 1697308 GeoIP City doesn't generate page with buildstaticpages

diff --git a/README.TXT b/README.TXT
index c1c51c77622a27055d88c5fa06e20bdc34251655..0079614e3d0912d120eea987d47ed33378b74dc8 100644 (file)
--- a/README.TXT
+++ b/README.TXT
@@ -13,8 +13,8 @@ server log files (and even ftp servers or mail logs) on all Operating Systems.
 
 License: GNU GPL (GNU General Public License. See LICENSE file),
          OSI Certified Open Source Software license.
-Version: 6.9
-Release date: November 2008
+Version: 6.95
+Release date: September 2009
 Platforms: All (Linux, NT, BSD, Solaris and other *NIX's, BeOS, OS/2...)
 Author: Laurent Destailleur <eldy@users.sourceforge.net>
 AWStats official web site and latest version: http://awstats.sourceforge.net
@@ -148,7 +148,7 @@ Tests and results are available in AWStats documentation, in docs/ directory.
 
 IV - ABOUT THE AUTHOR, LICENSE AND SUPPORT
 -----------------------------------------
-Copyright (C) 2000-2007 - Laurent Destailleur - eldy@users.sourceforge.net
+Copyright (C) 2000-2009 - Laurent Destailleur - eldy@users.sourceforge.net
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License

diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt
index 87d2831a31aa1a0eb9a47e0ef3aeb83efeae86f5..ed738d599d678e1b55fb7e893b1d811fdeeff8d2 100644 (file)
--- a/docs/awstats_changelog.txt
+++ b/docs/awstats_changelog.txt
@@ -6,7 +6,7 @@ $Revision$ - $Author$ - $Date$
 ***** 6.95 *****
 
 New features/improvements:
-- Enhance security of awredir.pl script with a security key required by
+- Fix security in awredir.pl script by adding a security key required by
   default.
 - Enhance security of parameter sanitizing function.
 - Add name of config file used to build data files inside data files header.
@@ -17,11 +17,13 @@ New features/improvements:
 - Increase seriously bot detection.
 - Add Brezhoneg language.
 - Add a better way to detect Safari versions.
-
+- Added subpages for geoip maxmind modules in awstats_buildstaticpages.
+ 
 Fixes:
 - Fix typo in polish language file
 - awstats emmits ton of warnings with new geoipfree - ID: 2794728
-- fix: can detect robots with robots.txt url even if file is not root.
+- Fix: can detect robots with robots.txt url even if file is not root.
+- Other minor fixes.
 
 
 ***** 6.9 *****

diff --git a/tools/awstats_buildstaticpages.pl b/tools/awstats_buildstaticpages.pl
index d00536042e7c94ef50a82cb0fd98477df3e70ab7..70d918ec3fbc23d874163646d0557aa2a27fcb56 100644 (file)
--- a/tools/awstats_buildstaticpages.pl
+++ b/tools/awstats_buildstaticpages.pl
@@ -56,8 +56,10 @@ $ShowOSStats $ShowBrowsersStats $ShowOriginStats
 $ShowKeyphrasesStats $ShowKeywordsStats $ShowMiscStats $ShowHTTPErrorsStats
 $BuildReportFormat
 @ExtraName
+@PluginsToLoad
 /;
 @ExtraName = ();
+@PluginsToLoad = ();
 # ----- Time vars -----
 use vars qw/
 $starttime
@@ -228,6 +230,9 @@ sub Parse_Config {
                # Extra parameters
                if ($param =~ /^ExtraSectionName(\d+)/)                 { $ExtraName[$1]=$value; next; }
 
+               # Plugins
+               if ( $param =~ /^LoadPlugin/ ) { push @PluginsToLoad, $value; next; }
+
                # If parameters was not found previously, defined variable with name of param to value
                $$param=$value;
        }
@@ -362,6 +367,11 @@ if ($ShowHTTPErrorsStats) {
 foreach my $extranum (1..@ExtraName-1) {
        push @OutputList,'allextra'.$extranum;
 }
+#Add plugins
+foreach ( @PluginsToLoad ) {
+       if ($_ =~ /^(geoip_[_a-z]+)\s/) { push @OutputList,'plugin_'.$1; }      # Add geoip maxmind subpages
+}
+
 
 # Launch awstats update
 if ($Update) {

diff --git a/wwwroot/cgi-bin/awstats.model.conf b/wwwroot/cgi-bin/awstats.model.conf
index 911c7a0326c241653a9c846bd65b7fa2864c05c3..05bae160a4ee3c97b084983e7eb1b2d2e0c12440 100644 (file)
--- a/wwwroot/cgi-bin/awstats.model.conf
+++ b/wwwroot/cgi-bin/awstats.model.conf
@@ -1325,6 +1325,7 @@ color_x="C1B2E2"                          # Background color for number of exit pages (Default = "C1B2
 # 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 Region database.
+# More info on http://www.maxmind.com/app/perl?rId=awstat
 # This plugin reduces AWStats speed.
 #
 #LoadPlugin="geoip_region_maxmind GEOIP_STANDARD /pathto/GeoIPRegion.dat"
@@ -1350,6 +1351,7 @@ color_x="C1B2E2"                          # Background color for number of exit pages (Default = "C1B2
 # 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 ISP database.
+# More info on http://www.maxmind.com/app/perl?rId=awstat
 # This plugin reduces AWStats speed.
 #
 #LoadPlugin="geoip_isp_maxmind GEOIP_STANDARD /pathto/GeoIPISP.dat"
@@ -1361,6 +1363,7 @@ color_x="C1B2E2"                          # Background color for number of exit pages (Default = "C1B2
 # 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 Org database.
+# More info on http://www.maxmind.com/app/perl?rId=awstat
 # This plugin reduces AWStats speed.
 #
 #LoadPlugin="geoip_org_maxmind GEOIP_STANDARD /pathto/GeoIPOrg.dat"