From: henoheno <henoheno>
Date: Thu, 11 Jan 2007 16:06:54 +0000 (+0900)
Subject: Sample: http://google.ca/
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=38d6fb3b82ffc67c36ced5570b2d2132c1473972;p=pukiwiki%2Fpukiwiki_sandbox.git

Sample: http://google.ca/
---

diff --git a/spam.php b/spam.php
index 81a7943..ab3a372 100644
--- a/spam.php
+++ b/spam.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam.php,v 1.106 2007/01/11 15:51:12 henoheno Exp $
+// $Id: spam.php,v 1.107 2007/01/11 16:06:54 henoheno Exp $
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 // Functions for Concept-work of spam-uri metrics
@@ -347,7 +347,7 @@ function spam_uri_pickup_preprocess($string = '')
 	$string = preg_replace_callback(
 		array(
 			// Something Google: http://www.google.com/supported_domains
-			'#(http)://([a-z0-9.]+\.google\.[a-z]{2,3}(?:\.[a-z]{2})?)/' .
+			'#(http)://((?:[a-z0-9.]+\.)?google\.[a-z]{2,3}(?:\.[a-z]{2})?)/' .
 			'([ a-z0-9?=&.%_+-]+)' .					// ?query=foo+bar hoge
 			'\bsite:([a-z0-9.%_-]+\.[a-z0-9.%_-]+)' .	// site:nasty.example.com
 			//'()' .	// Preserve or remove?
diff --git a/spam/spam.php b/spam/spam.php
index 81a7943..ab3a372 100644
--- a/spam/spam.php
+++ b/spam/spam.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam.php,v 1.106 2007/01/11 15:51:12 henoheno Exp $
+// $Id: spam.php,v 1.107 2007/01/11 16:06:54 henoheno Exp $
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 // Functions for Concept-work of spam-uri metrics
@@ -347,7 +347,7 @@ function spam_uri_pickup_preprocess($string = '')
 	$string = preg_replace_callback(
 		array(
 			// Something Google: http://www.google.com/supported_domains
-			'#(http)://([a-z0-9.]+\.google\.[a-z]{2,3}(?:\.[a-z]{2})?)/' .
+			'#(http)://((?:[a-z0-9.]+\.)?google\.[a-z]{2,3}(?:\.[a-z]{2})?)/' .
 			'([ a-z0-9?=&.%_+-]+)' .					// ?query=foo+bar hoge
 			'\bsite:([a-z0-9.%_-]+\.[a-z0-9.%_-]+)' .	// site:nasty.example.com
 			//'()' .	// Preserve or remove?