spam_uri_pickup(): Just renaming variable: $area => $method

is_badhost(): array('a.example.com', 'b.example.com') support

diff --git a/spam.php b/spam.php
index b8d750f..570ee1d 100644 (file)
--- a/spam.php
+++ b/spam.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam.php,v 1.67 2006/12/12 14:58:32 henoheno Exp $
+// $Id: spam.php,v 1.68 2006/12/12 15:04:22 henoheno Exp $
 // Copyright (C) 2006 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 
@@ -626,6 +626,7 @@ function is_badhost($hosts = '', $asap = TRUE)
                                //array('blogspot.com', '*.blogspot.com')
                        );
                        foreach ($blocklist['badhost'] as $part) {
+                               if (is_array($part)) $part = implode(', ', $part);
                                $regex['badhost'][$part] = '/^' . generate_glob_regex($part) . '$/i';
                        }
                }

diff --git a/spam/spam.php b/spam/spam.php
index b8d750f..570ee1d 100644 (file)
--- a/spam/spam.php
+++ b/spam/spam.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam.php,v 1.67 2006/12/12 14:58:32 henoheno Exp $
+// $Id: spam.php,v 1.68 2006/12/12 15:04:22 henoheno Exp $
 // Copyright (C) 2006 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 
@@ -626,6 +626,7 @@ function is_badhost($hosts = '', $asap = TRUE)
                                //array('blogspot.com', '*.blogspot.com')
                        );
                        foreach ($blocklist['badhost'] as $part) {
+                               if (is_array($part)) $part = implode(', ', $part);
                                $regex['badhost'][$part] = '/^' . generate_glob_regex($part) . '$/i';
                        }
                }