OSDN Git Service

DETAIL_NEUTRAL_HOST: Sort by domain
[pukiwiki/pukiwiki_sandbox.git] / spam / spam.php
index 4ac9fa7..669315d 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam.php,v 1.139 2007/05/01 05:04:39 henoheno Exp $
+// $Id: spam.php,v 1.150 2007/05/05 07:09:33 henoheno Exp $
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 //
@@ -37,6 +37,27 @@ function preg_grep_invert($pattern = '//', $input = array())
        }
 }
 
+// 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;
+}
+
 // Roughly strings(1) using PCRE
 // This function is useful to:
 //   * Reduce the size of data, from removing unprintable binary data
@@ -1069,70 +1090,89 @@ 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 $blocked
+                       $blocked = array_merge_leaves($blocked, $_progress['blocked']);
+
+                       // Merge $hosts
+                       $hosts   = array_merge_leaves($hosts,   $_progress['hosts']);
                }
+
+               // Recount $sum['badhost']
+               $sum['badhost'] = array_count_leaves($blocked);
+
                return $progress;
        }
 
@@ -1167,7 +1207,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 +1277,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'];
@@ -1262,24 +1299,9 @@ function check_uri_spam($target = '', $method = array())
                foreach($list as $key=>$type){
                        if (! $type) unset($blocked[$key]); // Ignore goodhost etc
                }
+               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;
@@ -1298,6 +1320,19 @@ function array_count_leaves($array = array(), $count_empty = FALSE)
        return $count;
 }
 
+// Merge two leaves' value
+function array_merge_leaves(& $array1, & $array2, $unique_values = TRUE)
+{
+       // All NUMERIC keys are always renumbered from 0
+       $array = array_merge_recursive($array1, $array2);
+
+       // Redundant values (and keys) are vanished
+       if ($unique_values) $array = array_unique_recursive($array);
+
+       return $array;
+}
+
+
 // ---------------------
 // Reporting
 
@@ -1312,7 +1347,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 . ')';
                                }
                        }
@@ -1322,6 +1357,46 @@ function summarize_spam_progress($progress = array(), $blockedonly = FALSE)
        return implode(', ', $tmp);
 }
 
+// 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)
+{
+       $result =preg_replace(
+               // Remove a newline and spaces
+               '# => \n *array \(#', ' => array (',
+               var_export($expression, TRUE)
+       );
+
+       if ($return) {
+               return $result;
+       } else {
+               echo   $result;
+               return NULL;
+       }
+}
+
+function summarize_detail_badhost($progress = array())
+{
+       if (! isset($progress['is_spam']['badhost'])) return '';
+
+       return var_export_shrink($progress['blocked'], TRUE);
+}
+
+function summarize_detail_newtral($progress = array())
+{
+       if (! isset($progress['hosts']) || ! is_array($progress['hosts'])) return '';
+
+       // Sort by domain
+       $tmp = array();
+       foreach($progress['hosts'] as $value) {
+               $tmp[strrev($value)] = $value;
+       }
+       ksort($tmp);
+
+       return implode(', ', $tmp);
+}
+
+
 // ---------------------
 // Exit
 
@@ -1377,23 +1452,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);