Added BuildReportFormat parameter.

diff --git a/docs/awstats.pdf b/docs/awstats.pdf
index 9af9b644b4822920b209d21be1fd091ec3f18c8f..df2c1f0f5a1f759430f2135b45a2469c90300eec 100644 (file)
Binary files a/docs/awstats.pdf and b/docs/awstats.pdf differ

diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt
index f59c76ebfffc13e06896d0abac29a2a2ae203ea3..e9ccb7ab704aa8113c4ce32399349491791f1347 100644 (file)
--- a/docs/awstats_changelog.txt
+++ b/docs/awstats_changelog.txt
@@ -5,29 +5,34 @@ $Revision$ - $Author$ - $Date$
 6.0
 
 Fixes:
+- Fixed bug 599388: Search engines are not detected if domain is IP
+  address.
+- Fixed bug 711758.
+- Fixed bug 812681: bad case for ENV expansion in awstats.conf.
+- Fixed bug 813908: Incomplete documentation
 - Fixed bug 816267: onedigit dayofmonth breaks syslog regex
 - Fixed bug 817287,830458: wrong regexp in Read_DNS_Cache subroutine
-- Fixed bug 599388: Google search engines was not detected if
-  domain was ip.
-- Fixed bug 812681: bad case for ENV expansion in awstats.conf.
+- Fixed bug 817388: lib/referer_spam.pm & lib/robots.pm
 - Fixed bug 818704: Warning in IPv6 plugin when no reverse DNS
+- Fixed bug 841877: regex bug for parsing log lines
 - Fixed value for ValueSMTPCodes if not defined in config file.
 - Fixed pb when country code is not same than lang code (example:
   estonian has lang code 'et' and country code 'ee').
 - Replaced Kb/visits to Kb/mails for mail log analysis.
 - Remove some warnings that appears when running perl -W 
-- Other minor bugs (typo erros and other).
+- Other minor bugs (814970,823064,823323,831438,836315 ).
 
 New features/improvements:
 - Increased speed by 10 to 20%.
 - Some changes to make AWStats to be XML compliant ready.
-  Need to set the new parameter UseXMLForOutput to 1 in config file.
-- Can use UA and HOST fields to build personalized ExtraSection reports.
+  Need to set the new parameter BuildReportFormat to 'xml' in config file.
 - A new search engine database to allow several "match id" for same
   search engine. Example: All google ip referer id are recognised.
+- Can use UA and HOST fields to build personalized ExtraSection reports.
 - Support for right to left languages. Added 'he' language.
-- Added two level of detection for LevelForRobotsDetection.
-- Added LevelForFileTypesDetection parameter.
+- Added LevelForSearchEnginesDetection parameter to choose between 2 possible
+  levels of detection for search engines (like LevelForRobotsDetection).
+- Added LevelForFileTypesDetection parameter (2 possible levels).
 - Added percent column for file types.
 - Added experimental graphapplet plugin (graph are built by applet).
 - Webmin module updated to 1.210

diff --git a/docs/awstats_config.html b/docs/awstats_config.html
index a61ef15e3a90b13fa6e5ccd739b38813130b1fae..a925601cf0f09afd5c25b3fdeb8e9c14c5a48031 100644 (file)
--- a/docs/awstats_config.html
+++ b/docs/awstats_config.html
@@ -71,6 +71,8 @@ when reading it), follow the example:<br>
 <li><a href="#AllowAccessFromWebToFollowingAuthenticatedUsers">AllowAccessFromWebToFollowingAuthenticatedUsers</a>
 <li><a href="#AllowAccessFromWebToFollowingIPAddresses">AllowAccessFromWebToFollowingIPAddresses</a>
 <li><a href="#CreateDirDataIfNotExists">CreateDirDataIfNotExists</a>
+<li><a href="#BuildHistoryFormat">BuildHistoryFormat</a>
+<li><a href="#BuildReportFormat">BuildReportFormat</a>
 <li><a href="#SaveDatabaseFilesWithPermissionsForEveryone">SaveDatabaseFilesWithPermissionsForEveryone</a>
 <li><a href="#PurgeLogFile">PurgeLogFile</a>
 <li><a href="#ArchiveLogRecords">ArchiveLogRecords</a>
@@ -116,7 +118,6 @@ when reading it), follow the example:<br>
 <br><b>OPTIONAL APPEARANCE SETUP SECTION (Not required but increase AWStats features)</b><br>
 <ul>
 <li><a href="#UseFramesWhenCGI">UseFramesWhenCGI</a>
-<li><a href="#UseXMLForOutput">UseXMLForOutput</a>
 <li><a href="#DetailedReportsOnNewWindows">DetailedReportsOnNewWindows</a>
 <li><a href="#Expires">Expires</a>
 <li><a href="#MaxRowsInHTMLOutput">MaxRowsInHTMLOutput</a>
@@ -627,6 +628,29 @@ when reading it), follow the example:<br>
 
 <br><br><hr>
 
+<a name="BuildHistoryFormat"><b>BuildHistoryFormat</b></a><br>
+<b>Version : </b>6.0+<br>
+<br># If you can choose in which format tha awstats history database is saved.
+<br># For the moment, only text is supported.
+<br># Possible values: text
+<br># Default: text
+<br>#
+<br>BuildHistoryFormat=text
+
+<br><br><hr>
+
+<a name="BuildReportFormat"><b>BuildReportFormat</b></a><br>
+<b>Version : </b>6.0+<br>
+<br># If you prefer having the report output pages be built as XML compliant pages
+<br># instead of simple HTML pages, you can set this to 'xml' (May not works
+<br># properly with some browsers).
+<br># Possible values: html or xml
+<br># Default: html
+<br>#
+<br>BuildReportFormat=html
+
+<br><br><hr>
+
 <a name="SaveDatabaseFilesWithPermissionsForEveryone"><b>SaveDatabaseFilesWithPermissionsForEveryone</b></a><br>
 <b>Version : </b>4.0+<br>
 <br># In most case, AWStats is used as a cgi program. So AWStats process is ran
@@ -1157,18 +1181,6 @@ AWStats 4.1+ supports both keywords AND keyphrases by default with no need of an
 
 <br><br><hr>
 
-<a name="UseXMLForOutput"><b>UseXMLForOutput</b></a><br>
-<b>Version : </b>5.91+<br>
-<br># If you prefer having the report output pages be built as XML compliant pages
-<br># instead of simple HTML pages, you can set this to 1 (May not works properly
-<br># with some browsers).
-<br># Possible values: 0 or 1
-<br># Default: 0
-<br>#
-<br>UseXMLForOutput=0
-
-<br><br><hr>
-
 <a name="DetailedReportsOnNewWindows"><b>DetailedReportsOnNewWindows</b></a><br>
 <b>Version : </b>4.1+ (5.0+ for value 2)<br>
 <br># This parameter ask your browser to open detailed reports into a different

diff --git a/tools/webmin/awstats/awstats-webmin_changelog.txt b/tools/webmin/awstats/awstats-webmin_changelog.txt
index 9120ed1905dbf991a02ae85f6e69f71fe0d2dcd4..0958cda40c611676da6641aaa04ff5d2eb5462b0 100644 (file)
--- a/tools/webmin/awstats/awstats-webmin_changelog.txt
+++ b/tools/webmin/awstats/awstats-webmin_changelog.txt
@@ -9,7 +9,7 @@ Fixes:
 - Better error messages
 
 New features/improvements:
-- Added UseXMLForOutput parameter in edit config area.
+- Added BuildHistoryFormat and BuildReportFormat parameter in edit config area.
 - Added LevelForFileTypesDetection parameter in edit config area.
 - Module setup parameter awstats_conf has been removed since now
   directories into wich you can scan/edit AWStats configuration files

diff --git a/tools/webmin/awstats/edit_config.cgi b/tools/webmin/awstats/edit_config.cgi
index fc9bc512ba25197ae68e7e8930d6b3fb9e2484e9..903897ed1d60763840e3f2075f80ea4570559a4a 100644 (file)
--- a/tools/webmin/awstats/edit_config.cgi
+++ b/tools/webmin/awstats/edit_config.cgi
@@ -153,6 +153,10 @@ if ($in{'advanced'} == 1) {
        print &hblink($text{'help_help'}, "help.cgi?param=AllowAccessFromWebToFollowingIPAddresses")." </td> </tr>\n";
        print "<tr> <td><b>CreateDirDataIfNotExists</b></td> <td> <input size=10 name=CreateDirDataIfNotExists type=text value='$lconf->{'CreateDirDataIfNotExists'}'> </td> <td> ";
        print &hblink($text{'help_help'}, "help.cgi?param=CreateDirDataIfNotExists")." </td> </tr>\n";
+       print "<tr> <td><b>BuildHistoryFormat</b></td> <td> <input size=10 name=BuildHistoryFormat type=text value='$lconf->{'BuildHistoryFormat'}'> </td> <td> ";
+       print &hblink($text{'help_help'}, "help.cgi?param=BuildHistoryFormat")." </td> </tr>\n";
+       print "<tr> <td><b>BuildReportFormat</b></td> <td> <input size=10 name=BuildReportFormat type=text value='$lconf->{'BuildReportFormat'}'> </td> <td> ";
+       print &hblink($text{'help_help'}, "help.cgi?param=BuildReportFormat")." </td> </tr>\n";
        print "<tr> <td><b>SaveDatabaseFilesWithPermissionsForEveryone</b></td> <td> <input size=10 name=SaveDatabaseFilesWithPermissionsForEveryone type=text value='$lconf->{'SaveDatabaseFilesWithPermissionsForEveryone'}'> </td> <td> ";
        print &hblink($text{'help_help'}, "help.cgi?param=SaveDatabaseFilesWithPermissionsForEveryone")." </td> </tr>\n";
        print "<tr> <td><b>PurgeLogFile</b></td> <td> <input size=10 name=PurgeLogFile type=text value='$lconf->{'PurgeLogFile'}'> </td> <td> ";
@@ -238,8 +242,6 @@ print "<tr> <td colspan=3><br>OPTIONAL APPEARANCE SETUP SECTION (Not required bu
 if ($in{'advanced'} == 3) {
        print "<tr> <td><b>UseFramesWhenCGI</b></td> <td> <input size=10 name=UseFramesWhenCGI type=text value='$lconf->{'UseFramesWhenCGI'}'> </td> <td> ";
        print &hblink($text{'help_help'}, "help.cgi?param=UseFramesWhenCGI")." </td> </tr>\n";
-       print "<tr> <td><b>UseXMLForOutput</b></td> <td> <input size=10 name=UseXMLForOutput type=text value='$lconf->{'UseXMLForOutput'}'> </td> <td> ";
-       print &hblink($text{'help_help'}, "help.cgi?param=UseXMLForOutput")." </td> </tr>\n";
        print "<tr> <td><b>DetailedReportsOnNewWindows</b></td> <td> <input size=10 name=DetailedReportsOnNewWindows type=text value='$lconf->{'DetailedReportsOnNewWindows'}'> </td> <td> ";
        print &hblink($text{'help_help'}, "help.cgi?param=DetailedReportsOnNewWindows")." </td> </tr>\n";
        print "<tr> <td><b>Expires</b></td> <td> <input size=10 name=Expires type=text value='$lconf->{'Expires'}'> </td> <td> ";

diff --git a/wwwroot/cgi-bin/awstats.model.conf b/wwwroot/cgi-bin/awstats.model.conf
index 30891a7bd016aa697556d6e398aa4b3a63d7e418..69ab88dff55277cd67e94702e2f34a54daa4a45c 100644 (file)
--- a/wwwroot/cgi-bin/awstats.model.conf
+++ b/wwwroot/cgi-bin/awstats.model.conf
@@ -352,6 +352,23 @@ AllowAccessFromWebToFollowingIPAddresses=""
 CreateDirDataIfNotExists=0
 
 
+# If you can choose in which format tha awstats history database is saved.
+# For the moment, only text is supported.
+# Possible values: text
+# Default: text
+#
+BuildHistoryFormat=text
+
+
+# If you prefer having the report output pages be built as XML compliant pages
+# instead of simple HTML pages, you can set this to 'xml' (May not works
+# properly with some browsers).
+# Possible values: html or xml
+# Default: html
+#
+BuildReportFormat=html
+
+
 # In most case, AWStats is used as a cgi program. So AWStats process is ran
 # by default web server user (nobody for Unix, IUSR_xxx for IIS/Windows,...).
 # To make use easier and avoid permission's problems between update process 
@@ -761,15 +778,6 @@ LevelForFileTypesDetection=2                       # 0 disables file types detection.
 UseFramesWhenCGI=1
 
 
-# If you prefer having the report output pages be built as XML compliant pages
-# instead of simple HTML pages, you can set this to 1 (May not works properly
-# with some browsers).
-# Possible values: 0 or 1
-# Default: 0
-#
-UseXMLForOutput=0
-
-
 # This parameter ask your browser to open detailed reports into a different
 # window than the main page.
 # Possible values: