Attachment #74866 for bug #108228

View | Details | Raw Unified | Return to bug 108228
Collapse All | Expand All




 #
 PORTNAME=	awstats
PORTVERSION=	6.6
PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}

 	${INSTALL_SCRIPT} ${WRKSRC}/tools/logresolvemerge.pl ${PREFIX}/www/awstats/tools
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/maillogconvert.pl ${PREFIX}/www/awstats/tools
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/urlaliasbuilder.pl ${PREFIX}/www/awstats/tools
	${INSTALL_SCRIPT} ${WRKSRC}/tools/webmin/awstats-1.7.wbm ${PREFIX}/www/awstats/tools/webmin
 	${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awredir.pl ${PREFIX}/www/awstats/cgi-bin
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/awstats.model.conf ${PREFIX}/www/awstats/cgi-bin
 	${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awstats.pl ${PREFIX}/www/awstats/cgi-bin

 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lib/* ${PREFIX}/www/awstats/cgi-bin/lib
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/*.pm ${PREFIX}/www/awstats/cgi-bin/plugins
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/example/* ${PREFIX}/www/awstats/cgi-bin/plugins/example
	${INSTALL_DATA} ${WRKSRC}/wwwroot/classes/awgraphapplet.jar ${PREFIX}/www/awstats/classes/awgraphapplet.jar
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/css/* ${PREFIX}/www/awstats/css
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/browser/* ${PREFIX}/www/awstats/icons/browser
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/clock/* ${PREFIX}/www/awstats/icons/clock

Lines 1-3 Link Here

(-)/usr/home/samm/src/ports/awstats/distinfo (-3 / +3 lines)
1	MD5 (awstats-6.5.tar.gz) = aef00b2ff5c5413bd2a868299cabd69a	1	MD5 (awstats-6.6.tar.gz) = 3e6da58e0c479ae0de49ae3e6948576e
2	SHA256 (awstats-6.5.tar.gz) = 08a63a30c5be698a164c957b3d68e8bacafc0c86ab72458382584d9f8b45bd2c	2	SHA256 (awstats-6.6.tar.gz) = b5811694f14f74af706d73e4d580ccb63ea839ffeaa19912ea57d198bb6069eb
3	SIZE (awstats-6.5.tar.gz) = 1051780	3	SIZE (awstats-6.6.tar.gz) = 1079064




--- wwwroot/cgi-bin/awstats.pl	Wed Oct 25 09:05:29 2006
+++ wwwroot/cgi-bin/awstats.pl	Wed Oct 25 09:02:30 2006
@@ -1131,7 +1131,18 @@
 	my $configdir=shift;
 	my @PossibleConfigDir=();

-	if ($configdir) { @PossibleConfigDir=("$configdir"); }
+	if ($configdir)
+	{
+		# If from CGI, overwriting of configdir is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
+		#if ($ENV{'GATEWAY_INTERFACE'} && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
+		#{
+		#	error("Sorry, to allow overwriting of configdir parameter from an AWStats CGI usage, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1");
+		#}
+		#else
+		#{
+			@PossibleConfigDir=("$configdir");
+		#}
+	}
 	else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }

 	# Open config file
@@ -4439,6 +4450,7 @@
 	my $stringtoclean=shift;
 	$stringtoclean =~ s/</&lt;/g;
 	$stringtoclean =~ s/>/&gt;/g;
+	$stringtoclean =~ s/|//g;
 	return $stringtoclean;
 }

@@ -5534,7 +5546,7 @@
 	    $QueryString =~ s/&/&amp;/g;
 	}

-	$QueryString = CleanFromCSSA($QueryString);
+	$QueryString = CleanFromCSSA(&DecodeEncodedString($QueryString));

     # Security test
 	if ($QueryString =~ /LogFile=([^&]+)/i)				{ error("Logfile parameter can't be overwritten when AWStats is used from a CGI"); }
@@ -5542,26 +5554,26 @@
 	# No update but report by default when run from a browser
 	$UpdateStats=($QueryString=~/update=1/i?1:0);

-	if ($QueryString =~ /config=([^&]+)/i)				{ $SiteConfig=&DecodeEncodedString("$1"); }
-	if ($QueryString =~ /diricons=([^&]+)/i)			{ $DirIcons=&DecodeEncodedString("$1"); }
-	if ($QueryString =~ /pluginmode=([^&]+)/i)			{ $PluginMode=&Sanitize(&DecodeEncodedString("$1"),1); }
-	if ($QueryString =~ /configdir=([^&]+)/i)			{ $DirConfig=&Sanitize(&DecodeEncodedString("$1")); }
-	# All filters
-	if ($QueryString =~ /hostfilter=([^&]+)/i)			{ $FilterIn{'host'}=&DecodeEncodedString("$1"); }			# Filter on host list can also be defined with hostfilter=filter
-	if ($QueryString =~ /hostfilterex=([^&]+)/i)		{ $FilterEx{'host'}=&DecodeEncodedString("$1"); }			#
-	if ($QueryString =~ /urlfilter=([^&]+)/i)			{ $FilterIn{'url'}=&DecodeEncodedString("$1"); }			# Filter on URL list can also be defined with urlfilter=filter
-	if ($QueryString =~ /urlfilterex=([^&]+)/i)			{ $FilterEx{'url'}=&DecodeEncodedString("$1"); }			#
-	if ($QueryString =~ /refererpagesfilter=([^&]+)/i)	{ $FilterIn{'refererpages'}=&DecodeEncodedString("$1"); }	# Filter on referer list can also be defined with refererpagesfilter=filter
-	if ($QueryString =~ /refererpagesfilterex=([^&]+)/i) { $FilterEx{'refererpages'}=&DecodeEncodedString("$1"); }	#
+	if ($QueryString =~ /config=([^&]+)/i)				{ $SiteConfig=&Sanitize("$1"); }
+	if ($QueryString =~ /diricons=([^&]+)/i)			{ $DirIcons="$1"; }
+	if ($QueryString =~ /pluginmode=([^&]+)/i)			{ $PluginMode=&Sanitize("$1",1); }
+	if ($QueryString =~ /configdir=([^&]+)/i)			{ $DirConfig=&Sanitize("$1"); }	
+ 	# All filters
+	if ($QueryString =~ /hostfilter=([^&]+)/i)			{ $FilterIn{'host'}="$1"; }			# Filter on host list can also be defined with hostfilter=filter
+	if ($QueryString =~ /hostfilterex=([^&]+)/i)		{ $FilterEx{'host'}="$1"; }			#
+	if ($QueryString =~ /urlfilter=([^&]+)/i)			{ $FilterIn{'url'}="$1"; }			# Filter on URL list can also be defined with urlfilter=filter
+	if ($QueryString =~ /urlfilterex=([^&]+)/i)			{ $FilterEx{'url'}="$1"; }			#
+	if ($QueryString =~ /refererpagesfilter=([^&]+)/i)	{ $FilterIn{'refererpages'}="$1"; }	# Filter on referer list can also be defined with refererpagesfilter=filter
+	if ($QueryString =~ /refererpagesfilterex=([^&]+)/i) { $FilterEx{'refererpages'}="$1"; }	#
 	# All output
-	if ($QueryString =~ /output=allhosts:([^&]+)/i)		{ $FilterIn{'host'}=&DecodeEncodedString("$1"); }			# Filter on host list can be defined with output=allhosts:filter to reduce number of lines read and showed
-	if ($QueryString =~ /output=lasthosts:([^&]+)/i)	{ $FilterIn{'host'}=&DecodeEncodedString("$1"); }			# Filter on host list can be defined with output=lasthosts:filter to reduce number of lines read and showed
-	if ($QueryString =~ /output=urldetail:([^&]+)/i)	{ $FilterIn{'url'}=&DecodeEncodedString("$1"); }			# Filter on URL list can be defined with output=urldetail:filter to reduce number of lines read and showed
-	if ($QueryString =~ /output=refererpages:([^&]+)/i)	{ $FilterIn{'refererpages'}=&DecodeEncodedString("$1"); }	# Filter on referer list can be defined with output=refererpages:filter to reduce number of lines read and showed
+	if ($QueryString =~ /output=allhosts:([^&]+)/i)		{ $FilterIn{'host'}="$1"; }			# Filter on host list can be defined with output=allhosts:filter to reduce number of lines read and showed
+	if ($QueryString =~ /output=lasthosts:([^&]+)/i)	{ $FilterIn{'host'}="$1"; }			# Filter on host list can be defined with output=lasthosts:filter to reduce number of lines read and showed
+	if ($QueryString =~ /output=urldetail:([^&]+)/i)	{ $FilterIn{'url'}="$1"; }			# Filter on URL list can be defined with output=urldetail:filter to reduce number of lines read and showed
+	if ($QueryString =~ /output=refererpages:([^&]+)/i)	{ $FilterIn{'refererpages'}="$1"; }	# Filter on referer list can be defined with output=refererpages:filter to reduce number of lines read and showed

 	# If migrate
 	if ($QueryString =~ /(^|-|&|&amp;)migrate=([^&]+)/i)	{
-		$MigrateStats=&DecodeEncodedString("$2");
+		$MigrateStats=&Sanitize("$2");
 		$MigrateStats =~ /^(.*)$PROG(\d{0,2})(\d\d)(\d\d\d\d)(.*)\.txt$/;
 		$SiteConfig=$5?$5:'xxx'; $SiteConfig =~ s/^\.//;		# SiteConfig is used to find config file
 	}
@@ -5625,8 +5637,6 @@
 if ($QueryString =~ /(^|&|&amp;)databasebreak=(\w+)/i)	{ $DatabaseBreak=$2; }
 if ($QueryString =~ /(^|&|&amp;)updatefor=(\d+)/i)		{ $UpdateFor=$2; }
 if ($QueryString =~ /(^|&|&amp;)noloadplugin=([^&]+)/i)	{ foreach (split(/,/,$2)) { $NoLoadPlugin{&Sanitize("$_",1)}=1; } }
-#Removed for security reasons
-#if ($QueryString =~ /(^|&|&amp;)loadplugin=([^&]+)/i)		{ foreach (split(/,/,$2)) { $NoLoadPlugin{&Sanitize("$_",1)}=-1; } }
 if ($QueryString =~ /(^|&|&amp;)limitflush=(\d+)/i)		{ $LIMITFLUSH=$2; }
 # Get/Define output
 if ($QueryString =~ /(^|&|&amp;)output(=[^&]*|)(.*)(&|&amp;)output(=[^&]*|)(&|$)/i) { error("Only 1 output option is allowed","","",1); }




 %%PORTDOCS%%%%DOCSDIR%%/images/screen_shot_large_4.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/screen_shot_large_5.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/star.png
%%PORTDOCS%%%%DOCSDIR%%/images/awstats.png
%%PORTDOCS%%%%DOCSDIR%%/images/awstats.gif
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/pad_awstats.htm
 %%PORTDOCS%%%%DOCSDIR%%/pad_awstats.xml

 www/awstats/cgi-bin/lang/awstats-tr.txt
 www/awstats/cgi-bin/lang/awstats-tw.txt
 www/awstats/cgi-bin/lang/awstats-ua.txt
www/awstats/cgi-bin/lang/awstats-lt.txt
 www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-br.txt
 www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-cz.txt
 www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-en.txt
 www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-is.txt
www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-it.txt
 www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-br.txt
 www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-en.txt
 www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-fr.txt
 www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-is.txt
www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-it.txt
 www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-al.txt
 www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-ba.txt
 www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-bg.txt

 www/awstats/cgi-bin/plugins/tooltips.pm
 www/awstats/cgi-bin/plugins/urlalias.pm
 www/awstats/cgi-bin/plugins/userinfo.pm
www/awstats/classes/awgraphapplet.jar
 www/awstats/css/awstats_bw.css
 www/awstats/css/awstats_default.css
 www/awstats/icons/browser/adobe.png

 www/awstats/icons/browser/webcopier.png
 www/awstats/icons/browser/webtv.png
 www/awstats/icons/browser/webzip.png
www/awstats/icons/browser/abilon.png
www/awstats/icons/browser/akregator.png
www/awstats/icons/browser/analogx.png
www/awstats/icons/browser/doris.png
www/awstats/icons/browser/flashget.png
www/awstats/icons/browser/freshdownload.png
www/awstats/icons/browser/frontpage.png
www/awstats/icons/browser/gnome.png
www/awstats/icons/browser/gnus.png
www/awstats/icons/browser/httrack.png
www/awstats/icons/browser/leechget.png
www/awstats/icons/browser/neon.png
www/awstats/icons/browser/rssxpress.png
www/awstats/icons/browser/subversion.png
www/awstats/icons/browser/webreaper.png
www/awstats/icons/browser/winxbox.png
www/awstats/icons/browser/wizz.png
 www/awstats/icons/clock/hr1.png
 www/awstats/icons/clock/hr10.png
 www/awstats/icons/clock/hr11.png

 www/awstats/icons/mime/unknown.png
 www/awstats/icons/mime/video.png
 www/awstats/icons/mime/wmv.png
www/awstats/icons/mime/glasses.png
 www/awstats/icons/os/aix.png
 www/awstats/icons/os/amigaos.png
 www/awstats/icons/os/apple.png

 www/awstats/icons/os/winme.png
 www/awstats/icons/os/winnt.png
 www/awstats/icons/os/winxp.png
www/awstats/icons/os/commodore.png
www/awstats/icons/os/psp.png
www/awstats/icons/os/winxbox.png
 www/awstats/icons/other/awstats_logo1.png
 www/awstats/icons/other/awstats_logo5.png
 www/awstats/icons/other/awstats_logo6.png

 www/awstats/tools/logresolvemerge.pl
 www/awstats/tools/maillogconvert.pl
 www/awstats/tools/urlaliasbuilder.pl
www/awstats/tools/webmin/awstats-1.7.wbm
 @dirrm www/awstats/tools/webmin
 @dirrm www/awstats/tools
 @dirrm www/awstats/js

Return to bug 108228

Lines 6-13 Link Here

(-)/usr/home/samm/src/ports/awstats/Makefile (-3 / +3 lines)
6	#	6	#
7	PORTNAME= awstats	7	PORTNAME= awstats
8	PORTVERSION= 6.5	8	PORTVERSION= 6.6
9	PORTREVISION= 2
10	PORTEPOCH= 1	9	PORTEPOCH= 1
11	CATEGORIES= www	10	CATEGORIES= www
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
Lines 72-78 Link Here
72	${INSTALL_SCRIPT} ${WRKSRC}/tools/logresolvemerge.pl ${PREFIX}/www/awstats/tools	71	${INSTALL_SCRIPT} ${WRKSRC}/tools/logresolvemerge.pl ${PREFIX}/www/awstats/tools
73	${INSTALL_SCRIPT} ${WRKSRC}/tools/maillogconvert.pl ${PREFIX}/www/awstats/tools	72	${INSTALL_SCRIPT} ${WRKSRC}/tools/maillogconvert.pl ${PREFIX}/www/awstats/tools
74	${INSTALL_SCRIPT} ${WRKSRC}/tools/urlaliasbuilder.pl ${PREFIX}/www/awstats/tools	73	${INSTALL_SCRIPT} ${WRKSRC}/tools/urlaliasbuilder.pl ${PREFIX}/www/awstats/tools
75	${INSTALL_SCRIPT} ${WRKSRC}/tools/webmin/awstats-1.6.wbm ${PREFIX}/www/awstats/tools/webmin	74	${INSTALL_SCRIPT} ${WRKSRC}/tools/webmin/awstats-1.7.wbm ${PREFIX}/www/awstats/tools/webmin
76	${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awredir.pl ${PREFIX}/www/awstats/cgi-bin	75	${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awredir.pl ${PREFIX}/www/awstats/cgi-bin
77	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/awstats.model.conf ${PREFIX}/www/awstats/cgi-bin	76	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/awstats.model.conf ${PREFIX}/www/awstats/cgi-bin
78	${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awstats.pl ${PREFIX}/www/awstats/cgi-bin	77	${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awstats.pl ${PREFIX}/www/awstats/cgi-bin
Lines 83-88 Link Here
83	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lib/* ${PREFIX}/www/awstats/cgi-bin/lib	82	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lib/* ${PREFIX}/www/awstats/cgi-bin/lib
84	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/*.pm ${PREFIX}/www/awstats/cgi-bin/plugins	83	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/*.pm ${PREFIX}/www/awstats/cgi-bin/plugins
85	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/example/* ${PREFIX}/www/awstats/cgi-bin/plugins/example	84	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/example/* ${PREFIX}/www/awstats/cgi-bin/plugins/example
		85	${INSTALL_DATA} ${WRKSRC}/wwwroot/classes/awgraphapplet.jar ${PREFIX}/www/awstats/classes/awgraphapplet.jar
86	${INSTALL_DATA} ${WRKSRC}/wwwroot/css/* ${PREFIX}/www/awstats/css	86	${INSTALL_DATA} ${WRKSRC}/wwwroot/css/* ${PREFIX}/www/awstats/css
87	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/browser/* ${PREFIX}/www/awstats/icons/browser	87	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/browser/* ${PREFIX}/www/awstats/icons/browser
88	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/clock/* ${PREFIX}/www/awstats/icons/clock	88	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/clock/* ${PREFIX}/www/awstats/icons/clock

Lines 1-91 Link Here

(-)/usr/home/samm/src/ports/awstats/files/patch-awstats.pl-security (-91 lines)
1	--- wwwroot/cgi-bin/awstats.pl Wed Oct 25 09:05:29 2006
2	+++ wwwroot/cgi-bin/awstats.pl Wed Oct 25 09:02:30 2006
3	@@ -1131,7 +1131,18 @@
4	my $configdir=shift;
5	my @PossibleConfigDir=();
6
7	- if ($configdir) { @PossibleConfigDir=("$configdir"); }
8	+ if ($configdir)
9	+ {
10	+ # If from CGI, overwriting of configdir is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
11	+ #if ($ENV{'GATEWAY_INTERFACE'} && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
12	+ #{
13	+ # error("Sorry, to allow overwriting of configdir parameter from an AWStats CGI usage, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1");
14	+ #}
15	+ #else
16	+ #{
17	+ @PossibleConfigDir=("$configdir");
18	+ #}
19	+ }
20	else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
21
22	# Open config file
23	@@ -4439,6 +4450,7 @@
24	my $stringtoclean=shift;
25	$stringtoclean =~ s/</</g;
26	$stringtoclean =~ s/>/>/g;
27	+ $stringtoclean =~ s/\|//g;
28	return $stringtoclean;
29	}
30
31	@@ -5534,7 +5546,7 @@
32	$QueryString =~ s/&/&/g;
33	}
34
35	- $QueryString = CleanFromCSSA($QueryString);
36	+ $QueryString = CleanFromCSSA(&DecodeEncodedString($QueryString));
37
38	# Security test
39	if ($QueryString =~ /LogFile=([^&]+)/i) { error("Logfile parameter can't be overwritten when AWStats is used from a CGI"); }
40	@@ -5542,26 +5554,26 @@
41	# No update but report by default when run from a browser
42	$UpdateStats=($QueryString=~/update=1/i?1:0);
43
44	- if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&DecodeEncodedString("$1"); }
45	- if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons=&DecodeEncodedString("$1"); }
46	- if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize(&DecodeEncodedString("$1"),1); }
47	- if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize(&DecodeEncodedString("$1")); }
48	- # All filters
49	- if ($QueryString =~ /hostfilter=([^&]+)/i) { $FilterIn{'host'}=&DecodeEncodedString("$1"); } # Filter on host list can also be defined with hostfilter=filter
50	- if ($QueryString =~ /hostfilterex=([^&]+)/i) { $FilterEx{'host'}=&DecodeEncodedString("$1"); } #
51	- if ($QueryString =~ /urlfilter=([^&]+)/i) { $FilterIn{'url'}=&DecodeEncodedString("$1"); } # Filter on URL list can also be defined with urlfilter=filter
52	- if ($QueryString =~ /urlfilterex=([^&]+)/i) { $FilterEx{'url'}=&DecodeEncodedString("$1"); } #
53	- if ($QueryString =~ /refererpagesfilter=([^&]+)/i) { $FilterIn{'refererpages'}=&DecodeEncodedString("$1"); } # Filter on referer list can also be defined with refererpagesfilter=filter
54	- if ($QueryString =~ /refererpagesfilterex=([^&]+)/i) { $FilterEx{'refererpages'}=&DecodeEncodedString("$1"); } #
55	+ if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize("$1"); }
56	+ if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons="$1"; }
57	+ if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize("$1",1); }
58	+ if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize("$1"); }
59	+ # All filters
60	+ if ($QueryString =~ /hostfilter=([^&]+)/i) { $FilterIn{'host'}="$1"; } # Filter on host list can also be defined with hostfilter=filter
61	+ if ($QueryString =~ /hostfilterex=([^&]+)/i) { $FilterEx{'host'}="$1"; } #
62	+ if ($QueryString =~ /urlfilter=([^&]+)/i) { $FilterIn{'url'}="$1"; } # Filter on URL list can also be defined with urlfilter=filter
63	+ if ($QueryString =~ /urlfilterex=([^&]+)/i) { $FilterEx{'url'}="$1"; } #
64	+ if ($QueryString =~ /refererpagesfilter=([^&]+)/i) { $FilterIn{'refererpages'}="$1"; } # Filter on referer list can also be defined with refererpagesfilter=filter
65	+ if ($QueryString =~ /refererpagesfilterex=([^&]+)/i) { $FilterEx{'refererpages'}="$1"; } #
66	# All output
67	- if ($QueryString =~ /output=allhosts:([^&]+)/i) { $FilterIn{'host'}=&DecodeEncodedString("$1"); } # Filter on host list can be defined with output=allhosts:filter to reduce number of lines read and showed
68	- if ($QueryString =~ /output=lasthosts:([^&]+)/i) { $FilterIn{'host'}=&DecodeEncodedString("$1"); } # Filter on host list can be defined with output=lasthosts:filter to reduce number of lines read and showed
69	- if ($QueryString =~ /output=urldetail:([^&]+)/i) { $FilterIn{'url'}=&DecodeEncodedString("$1"); } # Filter on URL list can be defined with output=urldetail:filter to reduce number of lines read and showed
70	- if ($QueryString =~ /output=refererpages:([^&]+)/i) { $FilterIn{'refererpages'}=&DecodeEncodedString("$1"); } # Filter on referer list can be defined with output=refererpages:filter to reduce number of lines read and showed
71	+ if ($QueryString =~ /output=allhosts:([^&]+)/i) { $FilterIn{'host'}="$1"; } # Filter on host list can be defined with output=allhosts:filter to reduce number of lines read and showed
72	+ if ($QueryString =~ /output=lasthosts:([^&]+)/i) { $FilterIn{'host'}="$1"; } # Filter on host list can be defined with output=lasthosts:filter to reduce number of lines read and showed
73	+ if ($QueryString =~ /output=urldetail:([^&]+)/i) { $FilterIn{'url'}="$1"; } # Filter on URL list can be defined with output=urldetail:filter to reduce number of lines read and showed
74	+ if ($QueryString =~ /output=refererpages:([^&]+)/i) { $FilterIn{'refererpages'}="$1"; } # Filter on referer list can be defined with output=refererpages:filter to reduce number of lines read and showed
75
76	# If migrate
77	if ($QueryString =~ /(^\|-\|&\|&)migrate=([^&]+)/i) {
78	- $MigrateStats=&DecodeEncodedString("$2");
79	+ $MigrateStats=&Sanitize("$2");
80	$MigrateStats =~ /^(.)$PROG(\d{0,2})(\d\d)(\d\d\d\d)(.)\.txt$/;
81	$SiteConfig=$5?$5:'xxx'; $SiteConfig =~ s/^\.//; # SiteConfig is used to find config file
82	}
83	@@ -5625,8 +5637,6 @@
84	if ($QueryString =~ /(^\|&\|&)databasebreak=(\w+)/i) { $DatabaseBreak=$2; }
85	if ($QueryString =~ /(^\|&\|&)updatefor=(\d+)/i) { $UpdateFor=$2; }
86	if ($QueryString =~ /(^\|&\|&)noloadplugin=([^&]+)/i) { foreach (split(/,/,$2)) { $NoLoadPlugin{&Sanitize("$_",1)}=1; } }
87	-#Removed for security reasons
88	-#if ($QueryString =~ /(^\|&\|&)loadplugin=([^&]+)/i) { foreach (split(/,/,$2)) { $NoLoadPlugin{&Sanitize("$_",1)}=-1; } }
89	if ($QueryString =~ /(^\|&\|&)limitflush=(\d+)/i) { $LIMITFLUSH=$2; }
90	# Get/Define output
91	if ($QueryString =~ /(^\|&\|&)output(=[^&]\|)(.)(&\|&)output(=[^&]*\|)(&\|$)/i) { error("Only 1 output option is allowed","","",1); }

Lines 42-47 Link Here

(-)/usr/home/samm/src/ports/awstats/pkg-plist (-1 / +28 lines)
42	%%PORTDOCS%%%%DOCSDIR%%/images/screen_shot_large_4.jpg	42	%%PORTDOCS%%%%DOCSDIR%%/images/screen_shot_large_4.jpg
43	%%PORTDOCS%%%%DOCSDIR%%/images/screen_shot_large_5.jpg	43	%%PORTDOCS%%%%DOCSDIR%%/images/screen_shot_large_5.jpg
44	%%PORTDOCS%%%%DOCSDIR%%/images/star.png	44	%%PORTDOCS%%%%DOCSDIR%%/images/star.png
		45	%%PORTDOCS%%%%DOCSDIR%%/images/awstats.png
		46	%%PORTDOCS%%%%DOCSDIR%%/images/awstats.gif
45	%%PORTDOCS%%%%DOCSDIR%%/index.html	47	%%PORTDOCS%%%%DOCSDIR%%/index.html
46	%%PORTDOCS%%%%DOCSDIR%%/pad_awstats.htm	48	%%PORTDOCS%%%%DOCSDIR%%/pad_awstats.htm
47	%%PORTDOCS%%%%DOCSDIR%%/pad_awstats.xml	49	%%PORTDOCS%%%%DOCSDIR%%/pad_awstats.xml
Lines 93-106 Link Here
93	www/awstats/cgi-bin/lang/awstats-tr.txt	95	www/awstats/cgi-bin/lang/awstats-tr.txt
94	www/awstats/cgi-bin/lang/awstats-tw.txt	96	www/awstats/cgi-bin/lang/awstats-tw.txt
95	www/awstats/cgi-bin/lang/awstats-ua.txt	97	www/awstats/cgi-bin/lang/awstats-ua.txt
		98	www/awstats/cgi-bin/lang/awstats-lt.txt
96	www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-br.txt	99	www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-br.txt
97	www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-cz.txt	100	www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-cz.txt
98	www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-en.txt	101	www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-en.txt
99	www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-is.txt	102	www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-is.txt
		103	www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-it.txt
100	www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-br.txt	104	www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-br.txt
101	www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-en.txt	105	www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-en.txt
102	www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-fr.txt	106	www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-fr.txt
103	www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-is.txt	107	www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-is.txt
		108	www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-it.txt
104	www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-al.txt	109	www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-al.txt
105	www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-ba.txt	110	www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-ba.txt
106	www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-bg.txt	111	www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-bg.txt
Lines 162-167 Link Here
162	www/awstats/cgi-bin/plugins/tooltips.pm	167	www/awstats/cgi-bin/plugins/tooltips.pm
163	www/awstats/cgi-bin/plugins/urlalias.pm	168	www/awstats/cgi-bin/plugins/urlalias.pm
164	www/awstats/cgi-bin/plugins/userinfo.pm	169	www/awstats/cgi-bin/plugins/userinfo.pm
		170	www/awstats/classes/awgraphapplet.jar
165	www/awstats/css/awstats_bw.css	171	www/awstats/css/awstats_bw.css
166	www/awstats/css/awstats_default.css	172	www/awstats/css/awstats_default.css
167	www/awstats/icons/browser/adobe.png	173	www/awstats/icons/browser/adobe.png
Lines 248-253 Link Here
248	www/awstats/icons/browser/webcopier.png	254	www/awstats/icons/browser/webcopier.png
249	www/awstats/icons/browser/webtv.png	255	www/awstats/icons/browser/webtv.png
250	www/awstats/icons/browser/webzip.png	256	www/awstats/icons/browser/webzip.png
		257	www/awstats/icons/browser/abilon.png
		258	www/awstats/icons/browser/akregator.png
		259	www/awstats/icons/browser/analogx.png
		260	www/awstats/icons/browser/doris.png
		261	www/awstats/icons/browser/flashget.png
		262	www/awstats/icons/browser/freshdownload.png
		263	www/awstats/icons/browser/frontpage.png
		264	www/awstats/icons/browser/gnome.png
		265	www/awstats/icons/browser/gnus.png
		266	www/awstats/icons/browser/httrack.png
		267	www/awstats/icons/browser/leechget.png
		268	www/awstats/icons/browser/neon.png
		269	www/awstats/icons/browser/rssxpress.png
		270	www/awstats/icons/browser/subversion.png
		271	www/awstats/icons/browser/webreaper.png
		272	www/awstats/icons/browser/winxbox.png
		273	www/awstats/icons/browser/wizz.png
251	www/awstats/icons/clock/hr1.png	274	www/awstats/icons/clock/hr1.png
252	www/awstats/icons/clock/hr10.png	275	www/awstats/icons/clock/hr10.png
253	www/awstats/icons/clock/hr11.png	276	www/awstats/icons/clock/hr11.png
Lines 557-562 Link Here
557	www/awstats/icons/mime/unknown.png	580	www/awstats/icons/mime/unknown.png
558	www/awstats/icons/mime/video.png	581	www/awstats/icons/mime/video.png
559	www/awstats/icons/mime/wmv.png	582	www/awstats/icons/mime/wmv.png
		583	www/awstats/icons/mime/glasses.png
560	www/awstats/icons/os/aix.png	584	www/awstats/icons/os/aix.png
561	www/awstats/icons/os/amigaos.png	585	www/awstats/icons/os/amigaos.png
562	www/awstats/icons/os/apple.png	586	www/awstats/icons/os/apple.png
Lines 617-622 Link Here
617	www/awstats/icons/os/winme.png	641	www/awstats/icons/os/winme.png
618	www/awstats/icons/os/winnt.png	642	www/awstats/icons/os/winnt.png
619	www/awstats/icons/os/winxp.png	643	www/awstats/icons/os/winxp.png
		644	www/awstats/icons/os/commodore.png
		645	www/awstats/icons/os/psp.png
		646	www/awstats/icons/os/winxbox.png
620	www/awstats/icons/other/awstats_logo1.png	647	www/awstats/icons/other/awstats_logo1.png
621	www/awstats/icons/other/awstats_logo5.png	648	www/awstats/icons/other/awstats_logo5.png
622	www/awstats/icons/other/awstats_logo6.png	649	www/awstats/icons/other/awstats_logo6.png
Lines 650-656 Link Here
650	www/awstats/tools/logresolvemerge.pl	677	www/awstats/tools/logresolvemerge.pl
651	www/awstats/tools/maillogconvert.pl	678	www/awstats/tools/maillogconvert.pl
652	www/awstats/tools/urlaliasbuilder.pl	679	www/awstats/tools/urlaliasbuilder.pl
653	www/awstats/tools/webmin/awstats-1.6.wbm	680	www/awstats/tools/webmin/awstats-1.7.wbm
654	@dirrm www/awstats/tools/webmin	681	@dirrm www/awstats/tools/webmin
655	@dirrm www/awstats/tools	682	@dirrm www/awstats/tools
656	@dirrm www/awstats/js	683	@dirrm www/awstats/js