Fix 1026153

diff --git a/docs/awstats_config.html b/docs/awstats_config.html
index 7087811b60f6f0259a2292eb2b906c1856d99453..1cd099c683e5e5604e1a7a54c05c9af4d7a47b12 100644 (file)
--- a/docs/awstats_config.html
+++ b/docs/awstats_config.html
@@ -232,6 +232,7 @@ when reading it), follow the example:<br>
 <li><a href="#Extra">ExtraSectionAddSumRowX</a>
 <li><a href="#Extra">MaxNbOfExtraX</a>
 <li><a href="#Extra">MinHitExtraX</a>       
+<li><a href="#ExtraTrackedRowsLimit">ExtraTrackedRowsLimit</a>
 </ul>
 
 <br><b>INCLUDES</b><br>
@@ -1681,49 +1682,24 @@ color_u,color_v,color_p,color_h,color_k,color_s<br>
 <b>Version : </b><br>
 5.2+<br>
 5.8 for ExtraSectionFirstColumnFormatX, ExtraSectionAddAverageRowX, ExtraSectionAddSumRowX<br>
-<br># You can define your own charts, you choose here what are rows and columns
-<br># keys. This feature is particularly usefull for marketing purpose, tracking
-<br># products orders for example.
-<br># For this, edit all parameters of Extra section. Each set of parameter is a
-<br># different chart. For several charts, duplicate section changing the number.
-<br># Note that each Extra section reduces AWStats speed by 10%.
-<br>#
-<br># WARNING: A wrong setup of Extra section can result in a too large arrays
-<br># that will consume all your memory, making AWStats unusable after several
-<br># updates, so be sure to setup it correctly.
-<br># In most cases, you don't need this feature.
-<br>#
-<br># ExtraSectionNameX is title of your personalized chart.
-<br># ExtraSectionConditionalX are conditions you can use to count or not the hit,
-<br>#   Use one of the field condition (URL, QUERY_STRING, REFERER, UA, HOST)
-<br>#   and string to match after a coma. Use "|" for "OR". If you can also use
-<br>#   several conditions, they will be combined as "AND".
-<br># ExtraSectionFirstColumnTitleX is the first column title of the chart.
-<br># ExtraSectionFirstColumnValuesX is a Regex string to tell AWStats in which 
-<br>#   field to extract value from (URL, QUERY_STRING, REFERER, UA, HOST) and how
-<br>#   to extract the value. Each different value found will appear in first
-<br>#   column of report on a different row. Be sure that list of different values
-<br>#   is "limited" to avoid "not enough memory" problems !
-<br># ExtraSectionFirstColumnFormatX is the string used to write value.
-<br># ExtraSectionStatTypesX are things you want to count. You can use standard
-<br>#   code letters (P for pages,H for hits,B for bandwidth,L for last access).
-<br># ExtraSectionAddAverageRowX add a row at bottom of chart with average values.
-<br># ExtraSectionAddSumRowX add a row at bottom of chart with sum values.
-<br># MaxNbOfExtraX is maximum number of rows shown in chart.
-<br># MinHitExtraX is minimum number of hits required to be shown in chart.
+<br>You can see the <a href="awstats_extra.html">following page</a> for explanation of
+all ExtraSection...X directives and how to use them.
+
+<br><br><hr>
+
+<a name="ExtraTrackedRowsLimit"><b>ExtraTrackedRowsLimit</b></a><br>
+<b>Version : </b>6.1<br>
+<br># There is also a global parameter ExtraTrackedRowsLimit that limit the
+<br># number of possible rows an ExtraSection can report. This parameter is
+<br># here to protect too much memory use when you make a bad setup in your
+<br># ExtraSection. It applies to all ExtraSection independently meaning that
+<br># none ExtraSection can report more rows than value defined by ExtraTrackedRowsLimit.
+<br># If you know an ExtraSection will report more rows than its value, you should
+<br># increase this parameter or AWStats will stop with an error.
+<br># Example: 2000
+<br># Default: 500
 <br>#
-<br>
-<br># Example to report the 20 products the most ordered by "order.cgi" script
-<br>ExtraSectionName1="Product orders"
-<br>ExtraSectionCondition1="URL,/cgi-bin/order.cgi|URL,/cgi-bin/order2.cgi"
-<br>ExtraSectionFirstColumnTitle1="Product ID"
-<br>ExtraSectionFirstColumnValues1="QUERY_STRING,productid=([^&amp;]+)"
-<br>ExtraSectionFirstColumnFormat1="%s"
-<br>ExtraSectionStatTypes1=PL
-<br>ExtraSectionAddAverageRow1=0
-<br>ExtraSectionAddSumRow1=1<br>
-<br>MaxNbOfExtra1=20
-<br>MinHitExtra1=1
+<br>ExtraTrackedRowsLimit=500
 
 <br><br><hr>
 

diff --git a/wwwroot/cgi-bin/awstats.model.conf b/wwwroot/cgi-bin/awstats.model.conf
index d7ae69d45fe556301f0a49ff8c0942d77da31486..c05536a6b86eba8c446ac8faac26062378c0bd87 100644 (file)
--- a/wwwroot/cgi-bin/awstats.model.conf
+++ b/wwwroot/cgi-bin/awstats.model.conf
@@ -1396,6 +1396,18 @@ color_x="C1B2E2"                         # Background color for number of exit pages (Default = "C1B2
 #MinHitExtra1=1
 
 
+# There is also a global parameter ExtraTrackedRowsLimit that limit the
+# number of possible rows an ExtraSection can report. This parameter is
+# here to protect too much memory use when you make a bad setup in your
+# ExtraSection. It applies to all ExtraSection independently meaning that
+# none ExtraSection can report more rows than value defined by ExtraTrackedRowsLimit.
+# If you know an ExtraSection will report more rows than its value, you should
+# increase this parameter or AWStats will stop with an error.
+# Example: 2000
+# Default: 500
+#
+ExtraTrackedRowsLimit=500
+
 
 #-----------------------------------------------------------------------------
 # INCLUDES