<?php
-// $Id: SpamTest.php,v 1.5 2007/04/30 07:41:09 henoheno Exp $
+// $Id: SpamTest.php,v 1.6 2007/05/01 05:04:39 henoheno Exp $
// Copyright (C) 2007 heno
//
// Design test case for spam.php (called from runner.php)
function testFunc_is_badhost()
{
- $remains = array();
-
// FALSE (Nothing)
- $this->assertEquals(array(), is_badhost(array(), TRUE, $remains));
+ $this->assertEquals(FALSE, is_badhost(array(), FALSE, TRUE));
+ $this->assertEquals(array(), is_badhost(array(), FALSE, FALSE));
// TRUE
+ $this->assertEquals(TRUE, is_badhost('=.blogspot.com', FALSE, TRUE));
$this->assertEquals(
array(
'B-1' => array(
)
)
),
- is_badhost('=.blogspot.com', TRUE, $remains)
+ is_badhost('=.blogspot.com', FALSE, FALSE)
);
-
- // $remains
- is_badhost('nothing', TRUE, $remains);
- $this->assertEquals(array(0 => 'nothing'), $remains);
}
}
<?php
-// $Id: spam.php,v 1.138 2007/04/30 03:23:33 henoheno Exp $
+// $Id: spam.php,v 1.139 2007/05/01 05:04:39 henoheno Exp $
// Copyright (C) 2006-2007 PukiWiki Developers Team
// License: GPL v2 or (at your option) any later version
//
return $blocked;
}
-function is_badhost($hosts = array(), $asap = TRUE, & $remains)
+// Simple example for badhost (not used now)
+function is_badhost($hosts = array(), $asap = TRUE, $bool = TRUE)
{
$list = get_blocklist('list');
-
$blocked = blocklist_distiller($hosts, array_keys($list), $asap);
- $remains = $hosts;
foreach($list as $key=>$type){
- if (! $type) {
- unset($blocked[$key]); // Ignore goodhost etc
- }
+ if (! $type) unset($blocked[$key]); // Ignore goodhost etc
}
- return $blocked;
+ return $bool ? ! empty($blocked) : $blocked;
}
// Return if ...
if ($asap && $is_spam) return $progress;
- // URI: Bad host
+ // URI: Bad host (Separate good/bad hosts from $hosts)
if ((! $asap || ! $is_spam) && isset($method['badhost'])) {
- $__remains = array();
- $badhost = is_badhost($hosts, $asap, $__remains);
- if (! $asap) {
- if ($__remains) {
- $remains['badhost'] = array();
- foreach ($__remains as $value) {
- $remains['badhost'][$value] = TRUE;
- }
+
+ // is_badhost()
+ $list = get_blocklist('list');
+ $blocked = blocklist_distiller($hosts, array_keys($list), $asap);
+ foreach($list as $key=>$type){
+ if (! $type) unset($blocked[$key]); // Ignore goodhost etc
+ }
+
+ if (! $asap && $hosts) {
+ $remains['badhost'] = array();
+ foreach ($hosts as $value) {
+ $remains['badhost'][$value] = TRUE;
}
}
- unset($__remains);
- if (! empty($badhost)) {
- //var_dump($badhost); // BADHOST detail
+ if (! empty($blocked)) {
+
+ //var_dump($blocked); // BADHOST detail
- $sum['badhost'] += array_count_leaves($badhost);
- foreach(array_keys($badhost) as $keys) {
+ $sum['badhost'] += array_count_leaves($blocked);
+ foreach(array_keys($blocked) as $keys) {
$is_spam['badhost'][$keys] =
- array_count_leaves($badhost[$keys]);
+ array_count_leaves($blocked[$keys]);
}
- unset($badhost);
}
}