Commit: 6b30a7efd3f4baa495cffad7f8fd0f6e56ac838d - pukiwiki (git)

Commit MetaInfo

• Revisión: 6b30a7efd3f4baa495cffad7f8fd0f6e56ac838d (tree)
• Tiempo: 2007-07-29 22:05:15
• Autor: henoheno <henoheno>
• Commiter: henoheno

Log Message

$Id: spam.php,v 1.200 2007/07/29 12:59:24 henoheno Exp $
* Ressurect array_merge_leaves() to preserve numeric keys
* isser($sum['uniqhost'])

Cambiar Resumen

• modified: lib/spam.php

Diferencia incremental

--- a/lib/spam.php
+++ b/lib/spam.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam.php,v 1.30 2007/07/03 14:53:35 henoheno Exp $
+// $Id: spam.php,v 1.31 2007/07/29 13:05:15 henoheno Exp $
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 //
@@ -161,6 +161,44 @@ function array_count_leaves($array = array(), $count_empty = FALSE)
 	return $count;
 }
 
+// Merge two leaves
+// Similar to PHP array_merge_leaves(), except strictly preserving keys as string
+function array_merge_leaves($array1, $array2, $sort_keys = TRUE)
+{
+	// Array(s) only 
+	$is_array1 = is_array($array1);
+	$is_array2 = is_array($array2);
+	if ($is_array1) {
+		if ($is_array2) {
+			;	// Pass
+		} else {
+			return $array1;
+		}
+	} else if ($is_array2) {
+		return $array2;
+	} else {
+		return $array2; // Not array ($array1 is overwritten)
+	}
+
+	$keys_all = array_merge(array_keys($array1), array_keys($array2));
+	if ($sort_keys) sort($keys_all, SORT_STRING);
+
+	$result = array();
+	foreach($keys_all as $key) {
+		$isset1 = isset($array1[$key]);
+		$isset2 = isset($array2[$key]);
+		if ($isset1 && $isset2) {
+			// Recurse
+			$result[$key] = array_merge_leaves($array1[$key], $array2[$key], $sort_keys);
+		} else if ($isset1) {
+			$result[$key] = & $array1[$key];
+		} else {
+			$result[$key] = & $array2[$key];
+		}
+	}
+	return $result;
+}
+
 // An array-leaves to a flat array
 function array_flat_leaves($array, $unique = TRUE)
 {
@@ -529,8 +567,8 @@ function check_uri_spam($target = '', $method = array())
 			if ($asap && $is_spam) break;
 
 			// Merge only
-			$blocked = array_merge_recursive($blocked, $_progress['blocked']);
-			$hosts   = array_merge_recursive($hosts,   $_progress['hosts']);
+			$blocked = array_merge_leaves($blocked, $_progress['blocked'], FALSE);
+			$hosts   = array_merge_leaves($hosts,   $_progress['hosts'],   FALSE);
 		}
 
 		// Unique values
@@ -646,7 +684,7 @@ function check_uri_spam($target = '', $method = array())
 	// Host: Uniqueness (uniq / non-uniq)
 	foreach ($pickups as $pickup) $hosts[] = & $pickup['host'];
 	$hosts = array_unique($hosts);
-	$sum['uniqhost'] += count($hosts);
+	if (isset($sum['uniqhost'])) $sum['uniqhost'] += count($hosts);
 	if ((! $asap || ! $is_spam) && isset($method['non_uniqhost'])) {
 		$sum['non_uniqhost'] = $sum['quantity'] - $sum['uniqhost'];
 		if ($sum['non_uniqhost'] > $method['non_uniqhost']) {
@@ -746,7 +784,7 @@ function summarize_detail_newtral($progress = array())
 		} else {
 			$rest = rtrim(substr($value, 0, - strlen($resp)), '.');	// 'A.foo.bar'
 		}
-		$trie = array_merge_recursive($trie, array($resp => array($rest => NULL)));
+		$trie = array_merge_leaves($trie, array($resp => array($rest => NULL)), FALSE);
 	}
 
 	// Format: var_export_shrink() -like output