';
+ print $this->prthtmlhead ($this->c['BBSTITLE']);
+ print '▼ 戻';
print $this->prtmessage($message, 0, 0, FALSE);
@@ -708,8 +708,8 @@
}
$this->sethttpheader();
- print $this->prthtmlhead ($this->c['bbstitle']);
- print '▼ 戻';
+ print $this->prthtmlhead ($this->c['BBSTITLE']);
+ print '▼ 戻';
$result = $this->msgsearchlist($mode);
@@ -731,7 +731,7 @@
$msgrange = 0;
for ($i = 0; $i < count($result); $i++) {
$testbuffer .= $this->prtmessage($result[$i], $mode);
- if (strlen($testbuffer) > $this->c['ctrl_maxpagesize'] - 1000) {
+ if (strlen($testbuffer) > $this->c['CTRL_MAXPAGESIZE'] - 1000) {
$eindex = $bindex + $i;
$abbreviated = TRUE;
break;
@@ -768,8 +768,8 @@
function prthelp() {
$this->sethttpheader();
- print $this->prthtmlhead ($this->c['bbstitle']);
- print '戻
';
+ print $this->prthtmlhead ($this->c['BBSTITLE']);
+ print '戻
';
print 'ｱｸｾｽｷｰ一覧
[1] 戻る
[2] 画面上へ
[5] 次ページ
[7] リロード
[8] 画面下へ
[9] 投稿
';
print $this->prthtmlfoot ();
diff --dos -uNr kuzuhaphp.orig/sub/bbslog.php kuzuhaphp/sub/bbslog.php
--- kuzuhaphp.orig/sub/bbslog.php Sat Jun 21 10:16:54 2003
+++ kuzuhaphp/sub/bbslog.php Fri Apr 01 15:20:20 2005
@@ -207,7 +207,11 @@
}
$this->t->addVar('dateform', 'OLDLOGSAVESW', $this->c['OLDLOGSAVESW']);
- if (!$this->conf['oldlogfmt'] or !$this->conf['oldlogbtn']) {
+ if ($this->c['BBSMODE_IMAGE'] == 1) {
+ if ($this->c['SHOWIMG']) $this->t->addVar('sicheck', 'CHK_SI', ' checked="checked"');
+ $this->t->setAttribute('sicheck', 'visibility', 'visible');
+ }
+ if (!$this->c['OLDLOGFMT'] or !$this->c['OLDLOGBTN']) {
$this->t->setAttribute("check_bt", "visibility", "hidden");
}
if ($this->c['GZIPU']) $this->t->addVar('loglist', 'CHK_G', ' checked="checked"');
@@ -420,8 +424,7 @@
if ($this->c['OLDLOGFMT']) {
if (!@$conditions['showall']) {
$result = 0;
- while (!feof ($fh)) {
- $logline = Func::fgetline(&$fh);
+ while (($logline = Func::fgetline($fh)) !== FALSE) {
$message = $this->getmessage($logline);
$result = $this->msgsearch($message, $conditions);
# 検索ヒット
@@ -432,16 +435,18 @@
$needle = "\Q{$conditions['q']}\E";
$quoteq = preg_quote($conditions['q'], "/");
if ($conditions['ci']) {
- $prtmessage = preg_replace("/($quoteq)/i", "$1", $prtmessage);
- while (preg_match("/(<[^<>]*)$quoteq<\/span>/i", $prtmessage)) {
- $prtmessage = preg_replace("/(<[^<>]*)$quoteq<\/span>/i", "$1", $prtmessage, 1);
- }
+ #$prtmessage = preg_replace("/($quoteq)/i", "$1", $prtmessage);
+ #while (preg_match("/(<[^<>]*)$quoteq<\/span>/i", $prtmessage)) {
+ # $prtmessage = preg_replace("/(<[^<>]*)$quoteq<\/span>/i", "$1", $prtmessage, 1);
+ #}
+ $prtmessage = preg_replace("/((?:\G|>)[^<]*?)($quoteq)/i", "$1$2", $prtmessage);
}
else {
- $prtmessage = str_replace($conditions['q'], "{$conditions['q']}", $prtmessage);
- while (preg_match("/(<[^<>]*)$quoteq<\/span>/", $prtmessage)) {
- $prtmessage = preg_replace("/(<[^<>]*)$quoteq<\/span>/", "$1", $prtmessage, 1);
- }
+ #$prtmessage = str_replace($conditions['q'], "{$conditions['q']}", $prtmessage);
+ #while (preg_match("/(<[^<>]*)$quoteq<\/span>/", $prtmessage)) {
+ # $prtmessage = preg_replace("/(<[^<>]*)$quoteq<\/span>/", "$1", $prtmessage, 1);
+ #}
+ $prtmessage = preg_replace("/((?:\G|>)[^<]*?)($quoteq)/", "$1$2", $prtmessage);
}
}
print $prtmessage;
@@ -455,8 +460,7 @@
}
# 全件表示
else {
- while (!feof ($fh)) {
- $logline = Func::fgetline(&$fh);
+ while (($logline = Func::fgetline($fh)) !== FALSE) {
$messagestr = $this->prtmessage($this->getmessage($logline), $msgmode, $filename);
print $messagestr;
}
@@ -469,8 +473,7 @@
$buffer = "";
$flgbuffer = FALSE;
$result = 0;
- while (!feof ($fh)) {
- $htmlline = Func::fgetline(&$fh);
+ while (($htmlline = Func::fgetline($fh)) !== FALSE) {
# メッセージの開始
if (!$flgbuffer and preg_match("/]*id=\"m\d+\"[^>]*>/", $htmlline)) {
$buffer = $htmlline;
@@ -487,16 +490,18 @@
$needle = "\Q{$conditions['q']}\E";
$quoteq = preg_quote($conditions['q'], "/");
if ($conditions['ci']) {
- $buffer = preg_replace("/($quoteq)/i", "
$1", $buffer);
- while (preg_match("/(<[^<>]*)
$quoteq<\/span>/i", $buffer)) {
- $buffer = preg_replace("/(<[^<>]*)$quoteq<\/span>/i", "$1", $buffer, 1);
- }
+ #$buffer = preg_replace("/($quoteq)/i", "$1", $buffer);
+ #while (preg_match("/(<[^<>]*)$quoteq<\/span>/i", $buffer)) {
+ # $buffer = preg_replace("/(<[^<>]*)$quoteq<\/span>/i", "$1", $buffer, 1);
+ #}
+ $buffer = preg_replace("/((?:\G|>)[^<]*?)($quoteq)/i", "$1$2", $buffer);
}
else {
- $buffer = str_replace($conditions['q'], "{$conditions['q']}", $buffer);
- while (preg_match("/(<[^<>]*)$quoteq<\/span>/", $buffer)) {
- $buffer = preg_replace("/(<[^<>]*)$quoteq<\/span>/", "$1", $buffer, 1);
- }
+ #$buffer = str_replace($conditions['q'], "{$conditions['q']}", $buffer);
+ #while (preg_match("/(<[^<>]*)$quoteq<\/span>/", $buffer)) {
+ # $buffer = preg_replace("/(<[^<>]*)$quoteq<\/span>/", "$1", $buffer, 1);
+ #}
+ $buffer = preg_replace("/((?:\G|>)[^<]*?)($quoteq)/", "$1$2", $buffer);
}
}
print $buffer;
@@ -519,8 +524,7 @@
}
}
else {
- while (!feof ($fh)) {
- $htmlline = Func::fgetline(&$fh);
+ while (($htmlline = Func::fgetline($fh)) !== FALSE) {
print $htmlline;
}
}
@@ -534,9 +538,10 @@
#$resultmsg = "{$filename}： {$timerangestr} ";
if (@$conditions['q'] != '') {
$value = $conditions['q'];
- $value_euc = JcodeConvert($value, 2, 1);
- $value_euc = htmlentities($value_euc, ENT_QUOTES, 'EUC-JP');
- $value = JcodeConvert($value_euc, 1, 2);
+ #$value_euc = JcodeConvert($value, 2, 1);
+ #$value_euc = htmlentities($value_euc, ENT_QUOTES, 'EUC-JP');
+ #$value = JcodeConvert($value_euc, 1, 2);
+ $value = htmlspecialchars($value, ENT_QUOTES);
$resultmsg .= '「' . $value . '」は';
}
if ($resultcount > 0) {
@@ -545,10 +550,10 @@
else {
$resultmsg .= '見つかりませんでした。';
}
+ #print $resultmsg;
+ $this->t->addVar('oldlog_lower', 'RESULTMSG', $resultmsg);
+ $this->t->displayParsedTemplate('oldlog_lower');
}
- print $resultmsg;
- $this->t->addVar('oldlog_lower', 'RESULTMSG', $resultmsg);
- $this->t->displayParsedTemplate('oldlog_lower');
}
}
@@ -570,26 +575,26 @@
function msgsearchhtml ($buffer, $conditions) {
$message = array();
- $message['user'] = '';
- $message['title'] = '';
- $message['msg'] = '';
- $message['ndatestr'] = '';
+ $message['USER'] = '';
+ $message['TITLE'] = '';
+ $message['MSG'] = '';
+ $message['NDATESTR'] = '';
if (preg_match("/([^<]+)<\/span>/", $buffer, $matches)) {
- $message['user'] = $matches[1];
+ $message['USER'] = $matches[1];
}
if (preg_match("/([^<]+)<\/span>/", $buffer, $matches)) {
- $message['title'] = $matches[1];
+ $message['TITLE'] = $matches[1];
}
if (preg_match("/[\r\n\s]*(.+?)<\/pre>/ms", $buffer, $matches)) {
- $message['msg'] = $matches[1];
+ $message['MSG'] = $matches[1];
}
if (preg_match("/[^<]*投稿日：(\d+)\/(\d+)\/(\d+)[^\d]+(\d+)時(\d+)分(\d+)秒/", $buffer, $matches)) {
if (@$conditions['savesw']) {
- $message['ndatestr'] = $matches[3] . $matches[4];
+ $message['NDATESTR'] = $matches[3] . $matches[4];
}
else {
- $message['ndatestr'] = $matches[4] . $matches[5];
+ $message['NDATESTR'] = $matches[4] . $matches[5];
}
}
@@ -612,19 +617,19 @@
if (@$conditions['savesw']) {
$starttime = $conditions['sd'].$conditions['sh'];
$endtime = $conditions['ed'].$conditions['eh'];
- if (!@$message['ndatestr']) {
- $message['ndatestr'] = date("dH", $message['ndate']);
+ if (!@$message['NDATESTR']) {
+ $message['NDATESTR'] = date("dH", $message['NDATE']);
}
}
# 日毎
else {
$starttime = $conditions['sh'].$conditions['si'];
$endtime = $conditions['eh'].$conditions['ei'];
- if (!@$message['ndatestr']) {
- $message['ndatestr'] = date("Hi", $message['ndate']);
+ if (!@$message['NDATESTR']) {
+ $message['NDATESTR'] = date("Hi", $message['NDATE']);
}
}
- if ($message['ndatestr'] < $starttime or $message['ndatestr'] > $endtime) {
+ if ($message['NDATESTR'] < $starttime or $message['NDATESTR'] > $endtime) {
return 2;
}
@@ -635,13 +640,13 @@
$haystack = '';
if ($conditions['t'] == 'u') {
- $haystack = $message['user'];
+ $haystack = $message['USER'];
}
else if ($conditions['t'] == 't') {
- $haystack = $message['title'];
+ $haystack = $message['TITLE'];
}
else {
- $haystack = "{$message['user']}<>{$message['title']}<>{$message['msg']}";
+ $haystack = "{$message['USER']}<>{$message['TITLE']}<>{$message['MSG']}";
}
# OR検索
@@ -717,8 +722,7 @@
$ttitle = array();
$ttime = array();
$tindex = 0;
- while (!feof ($fh)) {
- $logline = Func::fgetline(&$fh);
+ while (($logline = Func::fgetline($fh)) !== FALSE) {
$message = $this->getmessage($logline);
if (!$message['THREAD'] or $message['THREAD'] == $message['POSTID'] or !@$ttitle[$message['THREAD']]) {
$tid[$tindex] = $message['POSTID'];
diff --dos -uNr kuzuhaphp.orig/sub/bbstree.php kuzuhaphp/sub/bbstree.php
--- kuzuhaphp.orig/sub/bbstree.php Sat Jun 21 10:16:54 2003
+++ kuzuhaphp/sub/bbstree.php Fri Apr 01 15:20:20 2005
@@ -222,7 +222,7 @@
if ($isreadnew) {
$hit = FALSE;
for ($i = 0; $i < count($thread); $i++) {
- if ($thread[$i]['postid'] > $this->f['p']) {
+ if ($thread[$i]['POSTID'] > $this->f['p']) {
$hit = TRUE;
break;
}
@@ -343,6 +343,7 @@
$treeprint = '';
# 親メッセージの出力
+ reset($treemsgs);
while (list($pos, $treemsg) = each($treemsgs)) {
if ($treemsg['POSTID'] == $parentid) {
@@ -380,6 +381,7 @@
# 子のIDを列挙
$childids = array();
+ reset($treemsgs);
while ($treemsg = each($treemsgs)) {
if ($treemsg[1]['REFID'] == $parentid) {
$childids[] = $treemsg[1]['POSTID'];
diff --dos -uNr kuzuhaphp.orig/sub/template.html kuzuhaphp/sub/template.html
--- kuzuhaphp.orig/sub/template.html Sat Jun 21 10:16:54 2003
+++ kuzuhaphp/sub/template.html Fri Apr 01 15:20:20 2005
@@ -91,7 +91,8 @@
{MSG}
-{ENVLIST}