From: eldy <>
Date: Wed, 29 Jan 2003 16:29:27 +0000 (+0000)
Subject: Fixed: Pb in WhoIs link for host name that contains a "-" char.
X-Git-Tag: AWSTATS_5_4_BETA~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4a577c3fa7f294d5ccaf9cf56669d18f0f0519c;p=thirdparty%2FAWStats.git

Fixed: Pb in WhoIs link for host name that contains a "-" char.
---

diff --git a/docs/awstats_changelog.txt b/docs/awstats_changelog.txt
index 4d8e617d..87dd04fc 100644
--- a/docs/awstats_changelog.txt
+++ b/docs/awstats_changelog.txt
@@ -16,6 +16,7 @@ Fixes:
 - Value of title "Top x" for domains chart was not always correct.
 - Fixed bug 620040 that prevented to use "#" char in HTMLHeadSection.
 - Whois link did not work for jp, au, uk and nz domains.
+- WhoIs link did not work if host name contained a "-" char.
 
 New features/improvments:
 - Added urlaliasbuilder.pl tool.
@@ -36,6 +37,7 @@ Other/Documentation:
 - Added an error message if a -migrate is done on an history file with
   wrong file name.
 - GeoIP memory cache code is now stored inside plugin code.
+- All tooltips code has been moved into tooltip plugin.
 - Added list of loaded plugins in AWStats copyright string.
 - Minor cosmetic change (remove ShowHeader parameter).
 - Updated documentation.
diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl
index ac868dbe..0dc09f5d 100644
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@ -3916,7 +3916,7 @@ sub ShowWhoIsCell {
 		$linkforwhois=2;
 	}
 	else {	# Hostname
-		$keyurl =~ /(\w+\.\w+\.(au|uk|jp|nz))$/ or $keyurl =~ /(\w+\.\w+)$/;
+		$keyurl =~ /([-\w]+\.[-\w]+\.(au|uk|jp|nz))$/ or $keyurl =~ /([-\w]+\.[-\w]+)$/;
 		$keyforwhois=$1;
 		$linkforwhois=1;
 	}