OSDN Git Service

Rename array_daruma_otoshi() => array_shrinkbranch_leaves()
[pukiwiki/pukiwiki_sandbox.git] / spam / spam.php
index 44022ed..5576228 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam.php,v 1.140 2007/05/01 05:29:19 henoheno Exp $
+// $Id: spam.php,v 1.170 2007/06/09 02:22:13 henoheno Exp $
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 //
@@ -37,6 +37,71 @@ function preg_grep_invert($pattern = '//', $input = array())
        }
 }
 
+// ----
+
+// Very roughly, shrink the lines of var_export()
+// NOTE: If the same data exists, it must be corrupted.
+function var_export_shrink($expression, $return = FALSE, $ignore_numeric_keys = FALSE)
+{
+       $result =preg_replace(
+               // Remove a newline and spaces
+               '# => \n *array \(#', ' => array (',
+               var_export($expression, TRUE)
+       );
+
+       if ($ignore_numeric_keys) {
+               $result =preg_replace(
+                       // Remove numeric keys
+                       '#^( *)[0-9]+ => #m', '$1',
+                       $result
+               );
+       }
+
+       if ($return) {
+               return $result;
+       } else {
+               echo   $result;
+               return NULL;
+       }
+}
+
+// Remove redundant values from array()
+function array_unique_recursive($array = array())
+{
+       if (! is_array($array)) return $array;
+
+       $tmp = array();
+       foreach($array as $key => $value){
+               if (is_array($value)) {
+                       $array[$key] = array_unique_recursive($value);
+               } else {
+                       if (isset($tmp[$value])) {
+                               unset($array[$key]);
+                       } else {
+                               $tmp[$value] = TRUE;
+                       }
+               }
+       }
+
+       return $array;
+}
+
+// Renumber all numeric keys from 0
+function array_renumber_numeric_keys(& $array)
+{
+       if (! is_array($array)) return $array;
+
+       $count = -1;
+       $tmp = array();
+       foreach($array as $key => $value){
+               if (is_array($value)) array_renumber_numeric_keys($array[$key]);        // Recurse
+               if (is_numeric($key)) $tmp[$key] = ++$count;
+       }
+       array_rename_keys($array, $tmp);
+
+       return $array;
+}
+
 // Roughly strings(1) using PCRE
 // This function is useful to:
 //   * Reduce the size of data, from removing unprintable binary data
@@ -62,22 +127,35 @@ function strings($binary = '', $min_len = 4, $ignore_space = FALSE)
                        ),
                         $binary);
        } else {
+               // Remove "\0" etc. Preserve readable spaces if possible.
                $binary = preg_replace('/(?:[^[:graph:][:space:]]|[\r])+/s', "\n", $binary);
        }
 
        if ($min_len > 1) {
                $min_len = min(1024, intval($min_len));
-               $binary = 
-                       implode("\n",
-                               preg_grep('/^.{' . $min_len . ',}/S',
-                                       explode("\n", $binary)
-                               )
-                       );
+               $regex = '/^.{' . $min_len . ',}/S';
+               if (is_array($binary)) {
+                       foreach(array_keys($binary) as $key) {
+                               $binary[$key] = implode("\n", preg_grep($regex, explode("\n", $binary[$key])));
+                       }
+               } else {
+                       $binary = implode("\n", preg_grep($regex, explode("\n", $binary)));
+               }
        }
 
        return $binary;
 }
 
+// Reverse $string with specified delimiter
+function delimiter_reverse($string = 'foo.bar.example.com', $from_delim = '.', $to_delim = '.')
+{
+       if (! is_string($string) || ! is_string($from_delim) || ! is_string($to_delim))
+               return $string;
+
+       // com.example.bar.foo
+       return implode($to_delim, array_reverse(explode($from_delim, $string)));
+}
+
 
 // ---------------------
 // URI pickup
@@ -96,7 +174,7 @@ function uri_pickup($string = '')
        preg_match_all(
                // scheme://userinfo@host:port/path/or/pathinfo/maybefile.and?query=string#fragment
                // Refer RFC3986 (Regex below is not strict)
-               '#(\b[a-z][a-z0-9.+-]{1,8}):/+' .       // 1: Scheme
+               '#(\b[a-z][a-z0-9.+-]{1,8}):[/\\\]+' .  // 1: Scheme
                '(?:' .
                        '([^\s<>"\'\[\]/\#?@]*)' .              // 2: Userinfo (Username)
                '@)?' .
@@ -104,7 +182,7 @@ function uri_pickup($string = '')
                        // 3: Host
                        '\[[0-9a-f:.]+\]' . '|' .                               // IPv6([colon-hex and dot]): RFC2732
                        '(?:[0-9]{1,3}\.){3}[0-9]{1,3}' . '|' . // IPv4(dot-decimal): 001.22.3.44
-                       '[a-z0-9.-]+' .                                                 // hostname(FQDN) : foo.example.org
+                       '[a-z0-9][a-z0-9.-]+[a-z0-9]' .                 // hostname(FQDN) : foo.example.org
                ')' .
                '(?::([0-9]*))?' .                                      // 4: Port
                '((?:/+[^\s<>"\'\[\]/\#]+)*/+)?' .      // 5: Directory path or path-info
@@ -387,7 +465,7 @@ function spam_uri_pickup_preprocess($string = '')
        // http://victim.example.org/nasty.example.org/path#frag
        // => http://nasty.example.org/?refer=victim.example.org and original
        $string = preg_replace(
-               '#http://' .
+               '#h?ttp://' .
                '(' .
                        'ime\.nu' . '|' .       // 2ch.net
                        'ime\.st' . '|' .       // 2ch.net
@@ -399,6 +477,23 @@ function spam_uri_pickup_preprocess($string = '')
                $string
        );
 
+       // Domain exposure (gate-big5)
+       // http://victim.example.org/gate/big5/nasty.example.org/path
+       // => http://nasty.example.org/?refer=victim.example.org and original
+       $string = preg_replace(
+               '#h?ttp://' .
+               '(' .
+                       'big5.51job.com'         . '|' .
+                       'big5.china.com'         . '|' .
+                       'big5.xinhuanet.com' . '|' .
+               ')' .
+               '/gate/big5' .
+               '/([a-z0-9.%_-]+\.[a-z0-9.%_-]+)' .
+                '#i',  // nasty.example.org
+               'http://$2/?refer=$1 $0',                               // Preserve $0 or remove?
+               $string
+       );
+
        // Domain exposure (See _preg_replace_callback_domain_exposure())
        $string = preg_replace_callback(
                array(
@@ -926,10 +1021,15 @@ function generate_host_regex($string = '', $divider = '/')
 
 function get_blocklist($list = '')
 {
-       static $regexs;
+       static $regexes;
+
+       if ($list === NULL) {
+               $regexes = NULL;        // Unset
+               return array();
+       }
 
-       if (! isset($regexs)) {
-               $regexs = array();
+       if (! isset($regexes)) {
+               $regexes = array();
                if (file_exists(SPAM_INI_FILE)) {
                        $blocklist = array();
                        include(SPAM_INI_FILE);
@@ -938,7 +1038,7 @@ function get_blocklist($list = '')
                        //              'IANA-examples' => '#^(?:.*\.)?example\.(?:com|net|org)$#',
                        //      );
                        if (isset($blocklist['list'])) {
-                               $regexs['list'] = & $blocklist['list'];
+                               $regexes['list'] = & $blocklist['list'];
                        } else {
                                // Default
                                $blocklist['list'] = array(
@@ -950,12 +1050,12 @@ function get_blocklist($list = '')
                                if (! isset($blocklist[$_list])) continue;
                                foreach ($blocklist[$_list] as $key => $value) {
                                        if (is_array($value)) {
-                                               $regexs[$_list][$key] = array();
+                                               $regexes[$_list][$key] = array();
                                                foreach($value as $_key => $_value) {
-                                                       get_blocklist_add($regexs[$_list][$key], $_key, $_value);
+                                                       get_blocklist_add($regexes[$_list][$key], $_key, $_value);
                                                }
                                        } else {
-                                               get_blocklist_add($regexs[$_list], $key, $value);
+                                               get_blocklist_add($regexes[$_list], $key, $value);
                                        }
                                }
                                unset($blocklist[$_list]);
@@ -963,11 +1063,11 @@ function get_blocklist($list = '')
                }
        }
 
-       if ($list == '') {
-               return $regexs; // ALL
-       } else if (isset($regexs[$list])) {
-               return $regexs[$list];
-       } else {        
+       if ($list === '') {
+               return $regexes;        // ALL
+       } else if (isset($regexes[$list])) {
+               return $regexes[$list];
+       } else {
                return array();
        }
 }
@@ -1016,19 +1116,6 @@ function blocklist_distiller(& $hosts, $keys = array('goodhost', 'badhost'), $as
        return $blocked;
 }
 
-// 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);
-       foreach($list as $key=>$type){
-               if (! $type) unset($blocked[$key]); // Ignore goodhost etc
-       }
-
-       return $bool ? ! empty($blocked) : $blocked;
-}
-
-
 // Default (enabled) methods and thresholds (for content insertion)
 function check_uri_spam_method($times = 1, $t_area = 0, $rule = TRUE)
 {
@@ -1069,70 +1156,91 @@ function check_uri_spam_method($times = 1, $t_area = 0, $rule = TRUE)
 // Simple/fast spam check
 function check_uri_spam($target = '', $method = array())
 {
-       if (! is_array($method) || empty($method)) {
-               $method = check_uri_spam_method();
-       }
+       // Return value
        $progress = array(
+               'method'  => array(
+                       // Theme to do  => Dummy, optional value, or optional array()
+                       //'quantity'    => 8,
+                       //'uniqhost'    => TRUE,
+                       //'non_uniqhost'=> 3,
+                       //'non_uniquri' => 3,
+                       //'badhost'     => TRUE,
+                       //'area_anchor' => 0,
+                       //'area_bbcode' => 0,
+                       //'uri_anchor'  => 0,
+                       //'uri_bbcode'  => 0,
+               ),
                'sum' => array(
-                       'quantity'    => 0,
-                       'uniqhost'    => 0,
-                       'non_uniqhost'=> 0,
-                       'non_uniquri' => 0,
-                       'badhost'     => 0,
-                       'area_anchor' => 0,
-                       'area_bbcode' => 0,
-                       'uri_anchor'  => 0,
-                       'uri_bbcode'  => 0,
+                       // Theme        => Volume found (int)
+               ),
+               'is_spam' => array(
+                       // Flag. If someting defined here,
+                       // one or more spam will be included
+                       // in this report
+               ),
+               'blocked' => array(
+                       // Hosts blocked
+                       //'category' => array(
+                       //      'host',
+                       //)
+               ),
+               'hosts' => array(
+                       // Hosts not blocked
                ),
-               'is_spam' => array(),
-               'method'  => & $method,
-               'remains' => array(),
-               'error'   => array(),
        );
+
+       // Aliases
        $sum     = & $progress['sum'];
        $is_spam = & $progress['is_spam'];
-       $remains = & $progress['remains'];
-       $error   = & $progress['error'];
+       $progress['method'] = & $method;        // Argument
+       $blocked = & $progress['blocked'];
+       $hosts   = & $progress['hosts'];
        $asap    = isset($method['asap']);
 
-       // Recurse
+       // Init
+       if (! is_array($method) || empty($method)) {
+               $method = check_uri_spam_method();
+       }
+       foreach(array_keys($method) as $key) {
+               if (! isset($sum[$key])) $sum[$key] = 0;
+       }
+
        if (is_array($target)) {
                foreach($target as $str) {
-                       // Recurse
-                       $_progress = check_uri_spam($str, $method);
-                       $_sum      = & $_progress['sum'];
-                       $_is_spam  = & $_progress['is_spam'];
-                       $_remains  = & $_progress['remains'];
-                       $_error    = & $_progress['error'];
+                       if (! is_string($str)) continue;
+
+                       $_progress = check_uri_spam($str, $method);     // Recurse
+
+                       // Merge $sum
+                       $_sum = & $_progress['sum'];
                        foreach (array_keys($_sum) as $key) {
-                               $sum[$key] += $_sum[$key];
-                       }
-                       foreach (array_keys($_is_spam) as $key) {
-                               if (is_array($_is_spam[$key])) {
-                                       // Marge keys (badhost)
-                                       foreach(array_keys($_is_spam[$key]) as $_key) {
-                                               if (! isset($is_spam[$key][$_key])) {
-                                                       $is_spam[$key][$_key] =  $_is_spam[$key][$_key];
-                                               } else {
-                                                       $is_spam[$key][$_key] += $_is_spam[$key][$_key];
-                                               }
-                                       }
+                               if (! isset($sum[$key])) {
+                                       $sum[$key] = & $_sum[$key];
                                } else {
-                                       $is_spam[$key] = TRUE;
+                                       $sum[$key] += $_sum[$key];
                                }
                        }
-                       foreach ($_remains as $key=>$value) {
-                               foreach ($value as $_key=>$_value) {
-                                       if (is_int($_key)) {
-                                               $remains[$key][]      = $_value;
-                                       } else {
-                                               $remains[$key][$_key] = $_value;
-                                       }
-                               }
+
+                       // Merge $is_spam
+                       $_is_spam = & $_progress['is_spam'];
+                       foreach (array_keys($_is_spam) as $key) {
+                               $is_spam[$key] = TRUE;
+                               if ($asap) break;
                        }
-                       if (! empty($_error)) $error += $_error;
                        if ($asap && $is_spam) break;
+
+                       // Merge only
+                       $blocked = array_merge_recursive($blocked, $_progress['blocked']);
+                       $hosts   = array_merge_recursive($hosts,   $_progress['hosts']);
                }
+
+               // Unique values
+               $blocked = array_unique_recursive($blocked);
+               $hosts   = array_unique_recursive($hosts);
+
+               // Recount $sum['badhost']
+               $sum['badhost'] = array_count_leaves($blocked);
+
                return $progress;
        }
 
@@ -1167,7 +1275,6 @@ function check_uri_spam($target = '', $method = array())
 
        // URI: Pickup
        $pickups = uri_pickup_normalize(spam_uri_pickup($target, $method));
-       //$remains['uri_pickup'] = & $pickups;
 
        // Return if ...
        if (empty($pickups)) return $progress;
@@ -1238,10 +1345,8 @@ function check_uri_spam($target = '', $method = array())
        if ($asap && $is_spam) return $progress;
 
        // Host: Uniqueness (uniq / non-uniq)
-       $hosts = array();
        foreach ($pickups as $pickup) $hosts[] = & $pickup['host'];
        $hosts = array_unique($hosts);
-       //$remains['uniqhost'] = & $hosts;
        $sum['uniqhost'] += count($hosts);
        if ((! $asap || ! $is_spam) && isset($method['non_uniqhost'])) {
                $sum['non_uniqhost'] = $sum['quantity'] - $sum['uniqhost'];
@@ -1264,23 +1369,7 @@ function check_uri_spam($target = '', $method = array())
                }
                unset($list);
 
-               if (! $asap && $hosts) {
-                       $remains['badhost'] = array();
-                       foreach ($hosts as $value) {
-                               $remains['badhost'][$value] = TRUE;
-                       }
-               }
-
-               if (! empty($blocked)) {
-
-                       //var_dump($blocked);   // BADHOST detail
-
-                       $sum['badhost'] += array_count_leaves($blocked);
-                       foreach(array_keys($blocked) as $keys) {
-                               $is_spam['badhost'][$keys] =
-                                       array_count_leaves($blocked[$keys]);
-                       }
-               }
+               if (! empty($blocked)) $is_spam['badhost'] = TRUE;
        }
 
        return $progress;
@@ -1299,16 +1388,50 @@ function array_count_leaves($array = array(), $count_empty = FALSE)
        return $count;
 }
 
-// Merge two leaves
-function array_merge_leaves($array1 = array(), $array2 = array())
+// An array-leaves to a flat array
+function array_flat_leaves($array, $unique = TRUE)
 {
-       return array_merge_recursive($array1, $array2);
+       if (! is_array($array)) return $array;
+
+       $tmp = array();
+       foreach(array_keys($array) as $key) {
+               if (is_array($array[$key])) {
+                       // Recurse
+                       foreach(array_flat_leaves($array[$key]) as $_value) {
+                               $tmp[] = $_value;
+                       }
+               } else {
+                       $tmp[] = & $array[$key];
+               }
+       }
+
+       return $unique ? array_values(array_unique($tmp)) : $tmp;
 }
 
+// An array() to an array leaf
+function array_leaf($array = array('A', 'B', 'C.D'), $stem = FALSE, $edge = array())
+{
+       $leaf = array();
+       $tmp  = & $leaf;
+       foreach($array as $arg) {
+               if (! is_string($arg) && ! is_int($arg)) continue;
+               $tmp[$arg] = array();
+               $parent    = & $tmp;
+               $tmp       = & $tmp[$arg];
+       }
+       if ($stem) {
+               $parent[key($parent)] = & $edge;
+       } else {
+               $parent = key($parent);
+       }
+
+       return $leaf;   // array('A' => array('B' => 'C.D'))
+}
+
+
 // ---------------------
 // Reporting
 
-// TODO: Don't show unused $method!
 // Summarize $progress (blocked only)
 function summarize_spam_progress($progress = array(), $blockedonly = FALSE)
 {
@@ -1319,7 +1442,7 @@ function summarize_spam_progress($progress = array(), $blockedonly = FALSE)
                $method = & $progress['method'];
                if (isset($progress['sum'])) {
                        foreach ($progress['sum'] as $key => $value) {
-                               if (isset($method[$key])) {
+                               if (isset($method[$key]) && $value) {
                                        $tmp[] = $key . '(' . $value . ')';
                                }
                        }
@@ -1329,15 +1452,222 @@ function summarize_spam_progress($progress = array(), $blockedonly = FALSE)
        return implode(', ', $tmp);
 }
 
+function summarize_detail_badhost($progress = array())
+{
+       if (! isset($progress['blocked']) || empty($progress['blocked'])) return '';
+
+       // Flat per group
+       $blocked = array();
+       foreach($progress['blocked'] as $list => $lvalue) {
+               foreach($lvalue as $group => $gvalue) {
+                       $flat = implode(', ', array_flat_leaves($gvalue));
+                       if ($flat === $group) {
+                               $blocked[$list][]       = $flat;
+                       } else {
+                               $blocked[$list][$group] = $flat;
+                       }
+               }
+       }
+
+       // Shrink per list
+       // From: 'A-1' => array('ie.to')
+       // To:   'A-1' => 'ie.to'
+       foreach($blocked as $list => $lvalue) {
+               if (is_array($lvalue) &&
+                  count($lvalue) == 1 &&
+                  is_numeric(key($lvalue))) {
+                   $blocked[$list] = current($lvalue);
+               }
+       }
+
+       return var_export_shrink($blocked, TRUE, TRUE);
+}
+
+function summarize_detail_newtral($progress = array())
+{
+       if (! isset($progress['hosts'])    ||
+           ! is_array($progress['hosts']) ||
+           empty($progress['hosts'])) return '';
+
+       $result = '';
+       if (FALSE) {
+               // Sort by domain
+               $tmp = array();
+               foreach($progress['hosts'] as $value) {
+                       $tmp[delimiter_reverse($value)] = $value;
+               }
+               ksort($tmp, SORT_STRING);
+               $result = count($tmp) . ' (' .implode(', ', $tmp) . ')';
+       } else {
+               $tmp = array();
+               foreach($progress['hosts'] as $value) {
+                       $tmp = array_merge_recursive(
+                               $tmp,
+                               array_leaf(explode('.', delimiter_reverse($value)), TRUE, $value)
+                       );
+               }
+
+//var_dump($tmp);
+// TODO: IP address 1.2.3.4 => "0"-3-2-1 by array_shrinkbranch_leaves()
+
+               array_shrinkbranch_leaves($tmp, '.', TRUE); // "domain.tld"
+               array_joinbranch_leaf($tmp, '.', 0, TRUE);
+               foreach($tmp as $key => $value) {
+                       if (is_array($value)) {
+                               ksort($tmp[$key], SORT_STRING);
+                               $tmp[$key] = implode(', ', array_flat_leaves($value));
+                       }
+               }
+               ksort($tmp, SORT_STRING);
+
+               $result = var_export_shrink($tmp, TRUE, TRUE);
+       }
+
+       return $result;
+}
+
+
+function array_joinbranch_leaf(& $array, $delim = '.', $limit = 0, $reverse = FALSE)
+{
+       $result = array();
+
+       if (! is_array($array)) return $result; // Nothing to do
+
+       $limit  = max(0, intval($limit));
+       $cstack = array();
+
+       foreach(array_keys($array) as $key) {
+               $kstack = array();
+               $k      = -1;
+
+               $single = array($key => & $array[$key]);        // Keep it single
+               $cursor = & $single;
+               while(is_array($cursor) && count($cursor) == 1) {       // Once
+                       ++$k;
+                       $kstack[] = key($cursor);
+                       $cursor   = & $cursor[$kstack[$k]];
+                       if ($limit != 0 && $k == $limit) break;
+               }
+
+               // Relink
+               if ($k != 0) {
+                       if ($reverse) $kstack = array_reverse($kstack);
+                       $joinkey = implode($delim, $kstack);
+
+                       unset($array[$key]);
+                       $array[$joinkey]  = & $cursor;
+                       $result[$joinkey] = $k + 1;     // Key seems not an single array => joined length
+               }
+       }
+
+       return $result;
+}
+//$a = array(array()); //=> array()
+//$a = array('F' => array('B' => array('C' => array('d' => array('' => '6')))));
+//$b = array('R' => array('S' => array('T' => array('U' => array('' => '7')))));
+//$a = array('I' => $a, '@' => $b);
+//$a = array('F' => array(5), 0 => array('H'));
+//echo "<br>";
+//var_dump(array_joinbranch_leaf($a, '#', 0, 0));
+//var_export($a);
+//echo "<br>";
+//echo "<br>";
+
+
+// array('A' => array('B' => 'C')) to
+// array('A.B' => 'C')
+// array(
+//     'A' => array(
+//             'B' => array(
+//                     'C' => array(
+//                             'D' => '1'
+//                     ),
+//             ),
+//     ),
+//     'G' => array(
+//             'H' => '2'
+//     ),
+// )
+// to
+// array (
+//     'G.H'     => '2',
+//     'A.B.C.D' => '1',
+// )
+function array_shrinkbranch_leaves(& $array, $delim = '.', $reverse = FALSE, $recurse = FALSE)
+{
+       $result = 0;
+       if (! is_array($array) || empty($array)) return $result;
+
+       foreach(array_keys($array) as $key) {
+               $branch = & $array[$key];
+               if (! is_array($branch) || empty($branch)) continue;
+
+               foreach(array_keys($branch) as $bkey) {
+                       $joinkey = $reverse ?
+                               $bkey . $delim . $key :
+                               $key  . $delim . $bkey;
+                       $array[$joinkey] = & $branch[$bkey];
+                       unset($array[$key]);
+                       ++$result;
+               }
+       }
+
+       // Rescan (Recurse)
+       if ($recurse && $result) {
+               $result = array_shrinkbranch_leaves($array, $delim, $reverse, $recurse);
+       }
+
+       return $result; // Tell me how many
+}
+//$a = array (
+//     'edu' => array (
+//             'berkeley' => array (
+//                     'polisci' => array (
+//                             '' => 'polisci.berkeley.edu',
+//                     ),
+//             ),
+//             'cmich' => array (
+//                     'rso' => array (
+//                             '' => 'rso.cmich.edu',
+//                     ),
+//             ),
+//     ),
+//);
+//array_shrinkbranch_leaves($a, '.', TRUE);
+//var_export($a);
+
+//$a = array (
+//     '4' => array (
+//             '5' => array (
+//                     '6' => array (
+//                             '' => '7.8.9',
+//                     ),
+//             ),
+//     ),
+//);
+//array_shrinkbranch_leaves($a, '.', TRUE);
+//var_export($a);
+
+
 // ---------------------
 // Exit
 
+// Freeing memories
+function spam_dispose()
+{
+       get_blocklist(NULL);
+}
+
 // Common bahavior for blocking
 // NOTE: Call this function from various blocking feature, to disgueise the reason 'why blocked'
 function spam_exit($mode = '', $data = array())
 {
+
+       $exit = TRUE;
        switch ($mode) {
-               case '':        echo("\n");     break;
+               case '':
+                       echo("\n");
+                       break;
                case 'dump':
                        echo('<pre>' . "\n");
                        echo htmlspecialchars(var_export($data, TRUE));
@@ -1345,8 +1675,7 @@ function spam_exit($mode = '', $data = array())
                        break;
        };
 
-       // Force exit
-       exit;
+       if ($exit) exit;        // Force exit
 }
 
 
@@ -1359,11 +1688,11 @@ function pkwk_spamfilter($action, $page, $target = array('title' => ''), $method
 {
        $progress = check_uri_spam($target, $method);
 
-       if (! empty($progress['is_spam'])) {
-               // Mail to administrator(s)
+       if (empty($progress['is_spam'])) {
+               spam_dispose();
+       } else {
+               $target = string($target, 0);   // Removing "\0" etc
                pkwk_spamnotify($action, $page, $target, $progress, $method);
-
-               // Exit
                spam_exit($exitmode, $progress);
        }
 }
@@ -1384,23 +1713,13 @@ function pkwk_spamnotify($action, $page, $target = array('title' => ''), $progre
        if (! $asap) {
                $summary['METRICS'] = summarize_spam_progress($progress);
        }
-       if (isset($progress['is_spam']['badhost'])) {
-               $badhost = array();
-               foreach($progress['is_spam']['badhost'] as $glob=>$number) {
-                       $badhost[] = $glob . '(' . $number . ')';
-               }
-               $summary['DETAIL_BADHOST'] = implode(', ', $badhost);
-       }
-       if (! $asap && $progress['remains']['badhost']) {
-               $count = count($progress['remains']['badhost']);
-               $summary['DETAIL_NEUTRAL_HOST'] = $count .
-                       ' (' .
-                               preg_replace(
-                                       '/[^, a-z0-9.-]/i', '',
-                                       implode(', ', array_keys($progress['remains']['badhost']))
-                               ) .
-                       ')';
-       }
+
+       $tmp = summarize_detail_badhost($progress);
+       if ($tmp != '') $summary['DETAIL_BADHOST'] = $tmp;
+
+       $tmp = summarize_detail_newtral($progress);
+       if (! $asap && $tmp != '') $summary['DETAIL_NEUTRAL_HOST'] = $tmp;
+
        $summary['COMMENT'] = $action;
        $summary['PAGE']    = '[blocked] ' . (is_pagename($page) ? $page : '');
        $summary['URI']     = get_script_uri() . '?' . rawurlencode($page);