Added big5.shippingchina.com:8080

[pukiwiki/pukiwiki_sandbox.git] / spam / spam_pickup.php

diff --git a/spam/spam_pickup.php b/spam/spam_pickup.php
index fd68576..d1141af 100644 (file)
--- a/spam/spam_pickup.php
+++ b/spam/spam_pickup.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam_pickup.php,v 1.55 2007/08/20 14:37:23 henoheno Exp $
+// $Id: spam_pickup.php,v 1.57 2007/08/26 14:22:16 henoheno Exp $
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 //
@@ -115,7 +115,6 @@ function uri_pickup_implode($uri = array())
        return implode('', $tmp);
 }
 
-
 // ---------------------
 // URI normalization
 
@@ -694,6 +693,7 @@ function spam_uri_pickup_preprocess($string = '', $method = array())
                        'urlx\.org/' . '|' .
                        'big5.51job.com/gate/big5/'      . '|' .
                        'big5.china.com/gate/big5/'      . '|' .
+                       'big5.shippingchina.com:8080/' . '|' .
                        'big5.xinhuanet.com/gate/big5/' . '|' .
                        'bhomiyo.com/en.xliterate/' . '|' .
                        'google.com/translate_c\?u=(?:http://)?' . '|' .
@@ -724,7 +724,7 @@ function spam_uri_pickup_preprocess($string = '', $method = array())
                        ')' .
                        '/' .
                        '([a-z0-9?=&.%_/\'\\\+-]+)' .                           // 3:path/?query=foo+bar+
-                       '\bsite:([a-z0-9.%_-]+\.[a-z0-9.%_-]+)' .       // 4:site:nasty.example.com
+                       '(?:\b|%20)site:([a-z0-9.%_-]+\.[a-z0-9.%_-]+)' .       // 4:site:nasty.example.com
                        '()' .                                                                          // 5:Preserve or remove?
                        '#i',
                ),