From: eldy <>
Date: Fri, 24 Aug 2001 19:58:15 +0000 (+0000)
Subject: Add Expires option.
X-Git-Tag: AWSTATS_1_0~157
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9463ab67b482dcdac88322648c753488ebe0e00c;p=thirdparty%2FAWStats.git
Add Expires option.
---
diff --git a/wwwroot/cgi-bin/awstats.model.conf b/wwwroot/cgi-bin/awstats.model.conf
index 53564f3f..cae908af 100644
--- a/wwwroot/cgi-bin/awstats.model.conf
+++ b/wwwroot/cgi-bin/awstats.model.conf
@@ -243,11 +243,12 @@ OnlyFiles=""
# Default: 1
WarningMessages=1
-# Each URL shown in stats page are links you can click.
-# Possible values: 1 or 0
-# Default: 1
+# You can add in HTML report output a delay to force browsers to reload page
+# if page is called a second time after this delay.
+# Example: 3600
+# Default: 0
#
-ShowLinksOnUrl=1
+Expires=0
# Flags with link to other languages translation are visible.
# Possible values: 1 or 0
@@ -255,6 +256,12 @@ ShowLinksOnUrl=1
#
ShowFlagLinks=1
+# Each URL shown in stats page are links you can click.
+# Possible values: 1 or 0
+# Default: 1
+#
+ShowLinksOnUrl=1
+
# Search engines keywords reported are full search string or separate keywords
# Possible values:
# 0 - Search keywords reported are full search string (ie: "town maps")
diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index 0be516bf..fcf7eacf 100644
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -46,7 +46,7 @@
($AddOn, $ArchiveFileName, $ArchiveLogRecords, $BarHeight, $BarWidth,
$DIR, $DNSLookup, $Debug, $DefaultFile,
$DirCgi, $DirData, $DirIcons, $DirLang,
-$Extension, $FileConfig, $FileSuffix,
+$Expires, $Extension, $FileConfig, $FileSuffix,
$FirstTime, $HTMLEndSection, $Host, $HostAlias, $LastTime, $LastUpdate,
$LogFile, $LogFormat, $LogFormatString, $Logo, $LogoLink,
$MaxNbOfDays, $MaxNbOfHostsShown, $MaxNbOfKeywordsShown,
@@ -71,7 +71,7 @@ $found, $internal_link, $new) = ();
%MonthBytes = %MonthHits = %MonthHostsKnown = %MonthHostsUnknown = %MonthPages = %MonthUnique = %MonthVisits =
%listofyears = %monthlib = %monthnum = ();
-$VERSION="3.1 (build 29)";
+$VERSION="3.1 (build 31)";
$Lang="en";
# Default value
@@ -100,7 +100,7 @@ $BarImageVertical_k = "barrevk.png";
$BarImageHorizontal_k = "barrehk.png";
$AddOn=0;
-require "${DIR}addon.pl"; $AddOn=1; # Keep this line commented in standard version
+#require "${DIR}addon.pl"; $AddOn=1; # Keep this line commented in standard version
# URL with such end signature are kind of URL we only need to count as hits
@NotPageList= (
@@ -716,7 +716,11 @@ sub html_head {
print "\n\n";
print "\n";
print "\n";
- if ($PageCode ne "") { print "\n";
+ }
print "\n";
print "\n";
print "\n";
@@ -960,8 +964,9 @@ sub Read_Config_File {
if ($param =~ /^DirLang/) { $DirLang=$value; next; }
if ($param =~ /^DefaultFile/) { $DefaultFile=$value; next; }
if ($param =~ /^WarningMessages/) { $WarningMessages=$value; next; }
- if ($param =~ /^ShowLinksOnUrl/) { $ShowLinksOnUrl=$value; next; }
+ if ($param =~ /^Expires/) { $Expires=$value; next; }
if ($param =~ /^ShowFlagLinks/) { $ShowFlagLinks=$value; next; }
+ if ($param =~ /^ShowLinksOnUrl/) { $ShowLinksOnUrl=$value; next; }
if ($param =~ /^HTMLEndSection/) { $HTMLEndSection=$value; next; }
if ($param =~ /^BarWidth/) { $BarWidth=$value; next; }
if ($param =~ /^BarHeight/) { $BarHeight=$value; next; }
@@ -1102,8 +1107,9 @@ sub Check_Config {
if ($ArchiveLogRecords !~ /[0-1]/) { $ArchiveLogRecords=1; }
if ($DefaultFile eq "") { $DefaultFile="index.html"; }
if ($WarningMessages !~ /[0-1]/) { $WarningMessages=1; }
- if ($ShowLinksOnURL !~ /[0-1]/) { $ShowLinksOnURL=1; }
+ if ($Expires !~ /^[\d][\d]*/) { $Expires=0; }
if ($ShowFlagLinks !~ /[0-1]/) { $ShowFlagLinks=1; }
+ if ($ShowLinksOnURL !~ /[0-1]/) { $ShowLinksOnURL=1; }
if ($BarWidth !~ /^[\d][\d]*/) { $BarWidth=260; }
if ($BarHeight !~ /^[\d][\d]*/) { $BarHeight=180; }
if ($MaxNbOfDomain !~ /^[\d][\d]*/) { $MaxNbOfDomain=25; }