<?php
-// $Id: spam.php,v 1.161 2007/05/13 04:50:09 henoheno Exp $
+// $Id: spam.php,v 1.168 2007/06/03 15:40:35 henoheno Exp $
// Copyright (C) 2006-2007 PukiWiki Developers Team
// License: GPL v2 or (at your option) any later version
//
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)
'@)?' .
function get_blocklist($list = '')
{
- static $regexs;
+ static $f_dispose = FALSE, $regexes;
- if (! isset($regexs)) {
- $regexs = array();
+ if ($list === NULL) {
+ $f_dispose = TRUE;
+ $regexes = NULL; // Unset
+ return array();
+ }
+
+ if (! isset($regexes)) {
+ if ($f_dispose === TRUE) die(__FUNCTION__ . '(): Memory already disposed');
+
+ $regexes = array();
if (file_exists(SPAM_INI_FILE)) {
$blocklist = array();
include(SPAM_INI_FILE);
// 'IANA-examples' => '#^(?:.*\.)?example\.(?:com|net|org)$#',
// );
if (isset($blocklist['list'])) {
- $regexs['list'] = & $blocklist['list'];
+ $regexes['list'] = & $blocklist['list'];
} else {
// Default
$blocklist['list'] = array(
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]);
}
}
- 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();
}
}
foreach($progress['blocked'] as $list => $lvalue) {
foreach($lvalue as $group => $gvalue) {
$flat = implode(', ', array_flat_leaves($gvalue));
- if ($flat == $group) {
+ if ($flat === $group) {
$blocked[$list][] = $flat;
} else {
$blocked[$list][$group] = $flat;
array_leaf(explode('.', delimiter_reverse($value) . '.'), TRUE, $value)
);
}
- ksort($tmp, SORT_STRING);
- $tmp = array_joinkey_leaf($tmp, '.', TRUE, TRUE);
- $tmp = array_joinkey_leaf($tmp, '.', TRUE, FALSE);
- $tmp = array_joinkey_leaf($tmp, '.', TRUE, FALSE);
- //$tmp = array_joinkey_leaf($tmp, '.', TRUE, FALSE);
+//var_dump($tmp);
+// TODO: IP address 1.2.3.4 => "0"-3-2-1 by array_daruma_otoshi()
+
+//var_export('<br>-------------<br>');
+//var_export($tmp);
+//var_export('<br>-------------<br>');
+
+ array_daruma_otoshi($tmp, '.', TRUE); // "domain.tld"
+ array_joinbranch_leaf($tmp, '.', 0, TRUE);
foreach($tmp as $key => $value) {
if (is_array($value)) {
- ksort($tmp[$key]);
+ ksort($tmp[$key], SORT_STRING);
$tmp[$key] = implode(', ', array_flat_leaves($value));
}
}
+ ksort($tmp, SORT_STRING);
- //$tmp = array_unique_recursive($tmp); // Buggy?
$result = var_export_shrink($tmp, TRUE, TRUE);
}
}
-function array_joinkey_leaf($array = array('A' => array('B' => 'C.D')),
- $delim = '.', $reverse = FALSE, $allowmulti = FALSE)
+function array_joinbranch_leaf(& $array, $delim = '.', $limit = 0, $reverse = FALSE)
{
- if (! is_array($array)) return $array;
-
$result = array();
+
+ if (! is_array($array)) return $result; // Nothing to do
+
+ $limit = max(0, intval($limit));
+ $cstack = array();
+
foreach(array_keys($array) as $key) {
- if (! is_array($array[$key]) || (! $allowmulti && count($array[$key]) > 1)) {
- $result[$key] = & $array[$key]; // Do nothing
- } else {
- foreach(array_keys($array[$key]) as $_key) {
- $joinkey = $reverse ?
- $_key . $delim . $key :
- $key . $delim . $_key;
- $result[$joinkey] = & $array[$key][$_key];
- }
+ $kstack = array();
+ $k = -1;
+
+ $single = array($key => & $array[$key]); // Keep it single
+ $cursor = & $single;
+ while(is_array($cursor) && count($cursor) == 1) { // Do 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);
+
+ $array[$joinkey] = & $cursor;
+ $result[$joinkey] = $k + 1; // Leaf probably multiple array => joined length
+ unset($array[$key]);
+ }
+ }
+
+ 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_daruma_otoshi(& $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_daruma_otoshi($array, $delim, $reverse, $recurse);
}
- return $result; // array('A.B' => 'C.D')
+ 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_daruma_otoshi($a, '.', TRUE);
+//var_export($a);
+
+//$a = array (
+// '4' => array (
+// '5' => array (
+// '6' => array (
+// '' => '7.8.9',
+// ),
+// ),
+// ),
+//);
+//array_daruma_otoshi($a, '.', TRUE);
+//var_export($a);
+
// ---------------------
// Exit
// NOTE: Call this function from various blocking feature, to disgueise the reason 'why blocked'
function spam_exit($mode = '', $data = array())
{
+ // Dispose
+ get_blocklist(NULL);
+
+ $exit = TRUE;
switch ($mode) {
- case '': echo("\n"); break;
+ case '':
+ echo("\n");
+ break;
case 'dump':
echo('<pre>' . "\n");
echo htmlspecialchars(var_export($data, TRUE));
break;
};
- // Force exit
- exit;
+ if ($exit) exit; // Force exit
}