<?php
// PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: func.php,v 1.47 2005/11/20 05:31:17 henoheno Exp $
+// $Id: func.php,v 1.104 2011/01/25 15:01:01 henoheno Exp $
// Copyright (C)
-// 2002-2005 PukiWiki Developers Team
+// 2002-2006 PukiWiki Developers Team
// 2001-2002 Originally written by yu-ji
// License: GPL v2 or (at your option) any later version
//
return FALSE;
} else {
$fp = fopen(get_filename($page), 'rb') or
- die('is_freeze(): fopen() failed: ' . htmlspecialchars($page));
+ die('is_freeze(): fopen() failed: ' . htmlsc($page));
flock($fp, LOCK_SH) or die('is_freeze(): flock() failed');
rewind($fp);
$buffer = fgets($fp, 9);
flock($fp, LOCK_UN) or die('is_freeze(): flock() failed');
- fclose($fp) or die('is_freeze(): fclose() failed: ' . htmlspecialchars($page));
+ fclose($fp) or die('is_freeze(): fclose() failed: ' . htmlsc($page));
$is_freeze[$page] = ($buffer != FALSE && rtrim($buffer, "\r\n") == '#freeze');
return $is_freeze[$page];
}
}
+// Handling $non_list
+// $non_list will be preg_quote($str, '/') later.
+function check_non_list($page = '')
+{
+ global $non_list;
+ static $regex;
+
+ if (! isset($regex)) $regex = '/' . $non_list . '/';
+
+ return preg_match($regex, $page);
+}
+
// Auto template
function auto_template($page)
{
{
static $init, $mb_convert_kana, $pre, $post, $quote = '/';
- if (! is_array($words)) $words = array($words);
-
if (! isset($init)) {
// function: mb_convert_kana() is for Japanese code only
if (LANG == 'ja' && function_exists('mb_convert_kana')) {
$mb_convert_kana = create_function('$str, $option',
- 'return mb_convert_kana($str, $option);');
+ 'return mb_convert_kana($str, $option, SOURCE_ENCODING);');
} else {
$mb_convert_kana = create_function('$str, $option',
'return $str;');
$init = TRUE;
}
+ if (! is_array($words)) $words = array($words);
+
// Generate regex for the words
$regex = array();
foreach ($words as $word) {
// Normalize: ASCII letters = to single-byte. Others = to Zenkaku and Katakana
$word_nm = $mb_convert_kana($word, 'aKCV');
- $nmlen = mb_strlen($word_nm);
+ $nmlen = mb_strlen($word_nm, SOURCE_ENCODING);
// Each chars may be served ...
$chars = array();
for ($pos = 0; $pos < $nmlen; $pos++) {
- $char = mb_substr($word_nm, $pos, 1);
+ $char = mb_substr($word_nm, $pos, 1, SOURCE_ENCODING);
// Just normalized one? (ASCII char or Zenkaku-Katakana?)
- $or = array(preg_quote($do_escape ? htmlspecialchars($char) : $char, $quote));
+ $or = array(preg_quote($do_escape ? htmlsc($char) : $char, $quote));
if (strlen($char) == 1) {
// An ASCII (single-byte) character
foreach (array(strtoupper($char), strtolower($char)) as $_char) {
$or[] = preg_quote($mb_convert_kana($_char, 'A'), $quote); // As Zenkaku?
}
} else {
+ // NEVER COME HERE with mb_substr(string, start, length, 'ASCII')
// A multi-byte character
$or[] = preg_quote($mb_convert_kana($char, 'c'), $quote); // As Hiragana?
$or[] = preg_quote($mb_convert_kana($char, 'k'), $quote); // As Hankaku-Katakana?
}
// 'Search' main function
-function do_search($word, $type = 'AND', $non_format = FALSE)
+function do_search($word, $type = 'AND', $non_format = FALSE, $base = '')
{
global $script, $whatsnew, $non_list, $search_non_list;
global $_msg_andresult, $_msg_orresult, $_msg_notfoundresult;
- global $search_auth;
+ global $search_auth, $show_passage;
$retval = array();
$b_type = ($type == 'AND'); // AND:TRUE OR:FALSE
$keys = get_search_words(preg_split('/\s+/', $word, -1, PREG_SPLIT_NO_EMPTY));
+ foreach ($keys as $key=>$value)
+ $keys[$key] = '/' . $value . '/S';
- $_pages = get_existpages();
- $pages = array();
+ $pages = get_existpages();
- $non_list_pattern = '/' . $non_list . '/';
- foreach ($_pages as $page) {
- if ($page == $whatsnew || (! $search_non_list && preg_match($non_list_pattern, $page)))
- continue;
+ // Avoid
+ if ($base != '') {
+ $pages = preg_grep('/^' . preg_quote($base, '/') . '/S', $pages);
+ }
+ if (! $search_non_list) {
+ $pages = array_diff($pages, preg_grep('/' . $non_list . '/S', $pages));
+ }
+ $pages = array_flip($pages);
+ unset($pages[$whatsnew]);
- // ¸¡º÷Âоݥڡ¼¥¸¤ÎÀ©¸Â¤ò¤«¤±¤ë¤«¤É¤¦¤« (¥Ú¡¼¥¸Ì¾¤ÏÀ©¸Â³°)
+ $count = count($pages);
+ foreach (array_keys($pages) as $page) {
+ $b_match = FALSE;
+
+ // Search for page name
+ if (! $non_format) {
+ foreach ($keys as $key) {
+ $b_match = preg_match($key, $page);
+ if ($b_type xor $b_match) break; // OR
+ }
+ if ($b_match) continue;
+ }
+
+ // Search auth for page contents
if ($search_auth && ! check_readable($page, false, false)) {
- $source = get_source(); // Empty
- } else {
- $source = get_source($page);
+ unset($pages[$page]);
+ --$count;
}
- if (! $non_format)
- array_unshift($source, $page); // ¥Ú¡¼¥¸Ì¾¤â¸¡º÷ÂоݤË
- $b_match = FALSE;
+ // Search for page contents
foreach ($keys as $key) {
- $tmp = preg_grep('/' . $key . '/', $source);
- $b_match = ! empty($tmp);
- if ($b_match xor $b_type) break;
+ $b_match = preg_match($key, get_source($page, TRUE, TRUE));
+ if ($b_type xor $b_match) break; // OR
}
- if ($b_match) $pages[$page] = get_filetime($page);
+ if ($b_match) continue;
+
+ unset($pages[$page]); // Miss
}
if ($non_format) return array_keys($pages);
$r_word = rawurlencode($word);
- $s_word = htmlspecialchars($word);
+ $s_word = htmlsc($word);
if (empty($pages))
return str_replace('$1', $s_word, $_msg_notfoundresult);
- ksort($pages);
+ ksort($pages, SORT_STRING);
+
$retval = '<ul>' . "\n";
- foreach ($pages as $page=>$time) {
+ foreach (array_keys($pages) as $page) {
$r_page = rawurlencode($page);
- $s_page = htmlspecialchars($page);
- $passage = get_passage($time);
+ $s_page = htmlsc($page);
+ $passage = $show_passage ? ' ' . get_passage(get_filetime($page)) : '';
$retval .= ' <li><a href="' . $script . '?cmd=read&page=' .
$r_page . '&word=' . $r_word . '">' . $s_page .
'</a>' . $passage . '</li>' . "\n";
$retval .= '</ul>' . "\n";
$retval .= str_replace('$1', $s_word, str_replace('$2', count($pages),
- str_replace('$3', count($_pages), $b_type ? $_msg_andresult : $_msg_orresult)));
+ str_replace('$3', $count, $b_type ? $_msg_andresult : $_msg_orresult)));
return $retval;
}
}
// Encode page-name
-function encode($key)
+function encode($str)
{
- return ($key == '') ? '' : strtoupper(bin2hex($key));
+ $str = strval($str);
+ return ($str == '') ? '' : strtoupper(bin2hex($str));
// Equal to strtoupper(join('', unpack('H*0', $key)));
// But PHP 4.3.10 says 'Warning: unpack(): Type H: outside of string in ...'
}
// Decode page name
-function decode($key)
+function decode($str)
{
- return hex2bin($key);
+ return pkwk_hex2bin($str);
}
// Inversion of bin2hex()
-function hex2bin($hex_string)
+function pkwk_hex2bin($hex_string)
{
// preg_match : Avoid warning : pack(): Type H: illegal hex digit ...
// (string) : Always treat as string (not int etc). See BugTrack2/31
foreach($pages as $file=>$page) {
$r_page = rawurlencode($page);
- $s_page = htmlspecialchars($page, ENT_QUOTES);
+ $s_page = htmlsc($page, ENT_QUOTES);
$passage = get_pg_passage($page);
$str = ' <li><a href="' . $href . $r_page . '">' .
$s_page . '</a>' . $passage;
if ($withfilename) {
- $s_file = htmlspecialchars($file);
+ $s_file = htmlsc($file);
$str .= "\n" . ' <ul><li>' . $s_file . '</li></ul>' .
"\n" . ' ';
}
}
} else {
$head = (preg_match('/^([A-Za-z])/', $page, $matches)) ? $matches[1] :
- (preg_match('/^([ -~])/', $page, $matches) ? $symbol : $other);
+ (preg_match('/^([ -~])/', $page) ? $symbol : $other);
}
$list[$head][$page] = $str;
global $rule_page;
if (! is_page($rule_page)) {
- return '<p>Sorry, page \'' . htmlspecialchars($rule_page) .
+ return '<p>Sorry, page \'' . htmlsc($rule_page) .
'\' unavailable.</p>';
} else {
return convert_html(get_source($rule_page));
if (isset($script_directory_index)) {
if (! file_exists($script_directory_index))
die_message('Directory index file not found: ' .
- htmlspecialchars($script_directory_index));
+ htmlsc($script_directory_index));
$matches = array();
if (preg_match('#^(.+/)' . preg_quote($script_directory_index, '#') . '$#',
$script, $matches)) $script = $matches[1];
return join($glue, $arr);
}
+// Sugar with default settings
+function htmlsc($string = '', $flags = ENT_COMPAT, $charset = CONTENT_CHARSET)
+{
+ return htmlspecialchars($string, $flags, $charset); // htmlsc()
+}
+
+
//// Compat ////
// is_a -- Returns TRUE if the object is of this class or has this class as one of its parents
// (PHP 4 >= 4.3.0, PHP5)
if (! function_exists('sha1')) {
if (extension_loaded('mhash')) {
- function sha1($str, $raw_output = FALSE)
- {
- if ($raw_output) {
- // PHP 5.0.0 or lator only :)
- return mhash(MHASH_SHA1, $str);
- } else {
- return bin2hex(mhash(MHASH_SHA1, $str));
- }
- }
- } else {
- function sha1($str, $raw_output = FALSE)
+ function sha1($str)
{
- die('Function sha1() not found and extension \'mhash\' not exists');
+ return bin2hex(mhash(MHASH_SHA1, $str));
}
}
}
OSDN Git Service
