From: eldy <>
Date: Tue, 11 Nov 2003 02:55:07 +0000 (+0000)
Subject: Webmin mdule updated to 1.210
X-Git-Tag: AWSTATS_6_0_BETA~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=291d1c4bdab4469836a5fcc28a85387b4a4ef565;p=thirdparty%2FAWStats.git

Webmin mdule updated to 1.210
---

diff --git a/tools/webmin/awstats/awstats-lib.pl b/tools/webmin/awstats/awstats-lib.pl
index f0581f4f..0f788d73 100644
--- a/tools/webmin/awstats/awstats-lib.pl
+++ b/tools/webmin/awstats/awstats-lib.pl
@@ -267,15 +267,16 @@ print "</table>\n";
 }
 
 # scan_config_dir()
+# Scan directory $dir for config file. Return an array with full path
 sub scan_config_dir
 {
-# Scan directory $DIRCONFIG
-opendir(DIR, $config{'awstats_conf'}) || die "Can't scan directory $DIRCONFIG";
+my $dir=shift;
+opendir(DIR, $dir) || die "Can't scan directory $dir";
 local @rv = grep { /^awstats\.(.*)conf$/ } sort readdir(DIR);
 closedir(DIR);
 foreach my $file (0..@rv-1) {
 	if ($rv[$file] eq 'awstats.model.conf') { next; }
-	$rv[$file]="$config{'awstats_conf'}/".$rv[$file];
+	$rv[$file]="$dir/".$rv[$file];
 	#print "$rv[0]\n<br>";
 }
 return @rv;
diff --git a/tools/webmin/awstats/awstats-webmin_changelog.txt b/tools/webmin/awstats/awstats-webmin_changelog.txt
index 474b1aab..9120ed19 100644
--- a/tools/webmin/awstats/awstats-webmin_changelog.txt
+++ b/tools/webmin/awstats/awstats-webmin_changelog.txt
@@ -3,21 +3,25 @@ AWStats-Webmin module Changelog
 $Revision$ - $Author$ - $Date$ 
 
 
-1.2
+1.210
 
 Fixes:
-- None
+- Better error messages
 
 New features/improvements:
-- Added UseXMLForOutput parameter in edit config area
-- Added LevelForFileTypesDetection parameter in edit config area
+- Added UseXMLForOutput 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
+  are defined in ACL users. Defined to /etc/awstats by default.
+  Also added a link the the ACL page to edit this directory listing.
 
 Other/Documentation:
 - None
 
 
 
-1.1
+1.100
 
 Fixes:
 - Modify of old config files add the new parameters if not found.
@@ -40,6 +44,6 @@ Other/Documentation:
 
 
 
-1.0
+1.000
 
 - First release version.
diff --git a/tools/webmin/awstats/config b/tools/webmin/awstats/config
index 6e4128ca..01348ddf 100644
--- a/tools/webmin/awstats/config
+++ b/tools/webmin/awstats/config
@@ -1,5 +1,4 @@
 awstats=/usr/local/awstats/wwwroot/cgi-bin/awstats.pl
-awstats_cgi=http://127.0.0.1/cgi-bin/awstats.pl
-awstats_conf=/etc/awstats
-#awstats_plugins=/usr/local/awstats/wwwroot/cgi-bin/plugins
-alt_conf=/etc/awstats/awstats.model.conf
+awstats_cgi=http://127.0.0.1/awstats/awstats.pl
+#awstats_conf=/etc/awstats
+alt_conf=/etc/awstats/awstats.model.conf
\ No newline at end of file
diff --git a/tools/webmin/awstats/config.info b/tools/webmin/awstats/config.info
index ecd514a6..983406f7 100644
--- a/tools/webmin/awstats/config.info
+++ b/tools/webmin/awstats/config.info
@@ -1,5 +1,4 @@
 awstats=Absolute filesystem path to AWStats (CLI),0
 awstats_cgi=Absolute or relative URL path to AWStats (CGI),0
-awstats_conf=Path to AWStats configuration files' directory,3,/etc/awstats
-#awstats_plugins=Path to AWStats plugins' directory,3,/usr/local/awstats/wwwroot/cgi-bin/plugins
-alt_conf=Sample AWStats configuration file,3,/etc/awstats/awstats.model.conf
+#awstats_conf=Path to AWStats configuration files' directory,3,/etc/awstats
+alt_conf=Sample AWStats configuration file,3,/etc/awstats/awstats.model.conf
\ No newline at end of file