/////////////////////////////////////////////////
// PukiWiki - Yet another WikiWikiWeb clone.
//
-// $Id: comment.inc.php,v 1.18 2003/05/17 01:49:55 arino Exp $
+// $Id: comment.inc.php,v 1.22 2004/07/13 13:34:05 henoheno Exp $
//
/////////////////////////////////////////////////
// ¥³¥á¥ó¥È¤ÎÁÞÆþ¥Õ¥©¡¼¥Þ¥Ã¥È
define('COMMENT_NAME_FORMAT','[[$name]]');
define('COMMENT_MSG_FORMAT','$msg');
-define('COMMENT_NOW_FORMAT','SIZE(10){$now}');
+define('COMMENT_NOW_FORMAT','&new{$now};');
/////////////////////////////////////////////////
// ¥³¥á¥ó¥È¤ÎÁÞÆþ¥Õ¥©¡¼¥Þ¥Ã¥È(¥³¥á¥ó¥ÈÆâÍÆ)
define('COMMENT_FORMAT',"\x08MSG\x08 -- \x08NAME\x08 \x08NOW\x08");
/////////////////////////////////////////////////
// ¥³¥á¥ó¥È¤òÁÞÆþ¤¹¤ë°ÌÃÖ 1:Íó¤ÎÁ° 0:Íó¤Î¸å
-define('COMMENT_INS',1);
+define('COMMENT_INS','1');
/////////////////////////////////////////////////
// ¥³¥á¥ó¥È¤¬Åê¹Æ¤µ¤ì¤¿¾ì¹ç¡¢ÆâÍƤò¥á¡¼¥ë¤ÇÁ÷¤ëÀè
//define('COMMENT_MAIL',FALSE);
function plugin_comment_action()
{
- global $script,$vars,$post,$now;
- global $_title_updated;
- global $_msg_comment_collided,$_title_comment_collided;
-
- $post['msg'] = preg_replace("/\n/",'',$post['msg']);
-
- if ($post['msg'] == '')
- {
- return array('msg'=>'','body'=>'');
+ global $script, $vars, $now;
+ global $_title_updated, $_no_name;
+ global $_msg_comment_collided, $_title_comment_collided;
+
+ if (! isset($vars['msg']) || $vars['msg'] == '') {
+ return array('msg'=>'', 'body'=>'');
+ } else {
+ $vars['msg'] = preg_replace("/\n/", '', $vars['msg']);
}
-
+
$head = '';
- if (preg_match('/^(-{1,2})(.*)/',$post['msg'],$match))
+ $match = array();
+ if (preg_match('/^(-{1,2})(.*)/', $vars['msg'], $match))
{
$head = $match[1];
- $post['msg'] = $match[2];
+ $vars['msg'] = $match[2];
}
-
- $_msg = str_replace('$msg', $post['msg'], COMMENT_MSG_FORMAT);
- $_name = ($post['name'] == '') ? '' : str_replace('$name',$post['name'],COMMENT_NAME_FORMAT);
- $_now = ($post['nodate'] == '1') ? '' : str_replace('$now', $now, COMMENT_NOW_FORMAT);
+ unset($match);
+
+ $_msg = str_replace('$msg', $vars['msg'], COMMENT_MSG_FORMAT);
+
+ $_name = (! isset($vars['name']) || $vars['name'] == '') ? $_no_name : $vars['name'];
+ $_name = ($_name == '') ? '' : str_replace('$name', $_name, COMMENT_NAME_FORMAT);
+
+ $_now = ($vars['nodate'] == '1') ? '' : str_replace('$now', $now, COMMENT_NOW_FORMAT);
$comment = str_replace("\x08MSG\x08", $_msg, COMMENT_FORMAT);
$comment = str_replace("\x08NAME\x08",$_name,$comment);
$comment = str_replace("\x08NOW\x08", $_now, $comment);
- $comment = $head.$comment;
+ $comment = $head . $comment;
$postdata = '';
- $postdata_old = get_source($post['refer']);
+ $postdata_old = get_source($vars['refer']);
$comment_no = 0;
+ $comment_ins = ($vars['above'] == '1');
foreach ($postdata_old as $line)
{
- if (!COMMENT_INS)
+ if (!$comment_ins)
{
$postdata .= $line;
}
- if (preg_match('/^#comment/',$line) and $comment_no++ == $post['comment_no'])
+ if (preg_match('/^#comment/', $line) and $comment_no++ == $vars['comment_no'])
{
$postdata = rtrim($postdata)."\n-$comment\n";
- if (COMMENT_INS)
+ if ($comment_ins)
{
$postdata .= "\n";
}
}
- if (COMMENT_INS)
+ if ($comment_ins)
{
$postdata .= $line;
}
$title = $_title_updated;
$body = '';
- if (md5(@join('',get_source($post['refer']))) != $post['digest'])
+ if (md5(@join('',get_source($vars['refer']))) != $vars['digest'])
{
$title = $_title_comment_collided;
- $body = $_msg_comment_collided . make_pagelink($post['refer']);
+ $body = $_msg_comment_collided . make_pagelink($vars['refer']);
}
- page_write($post['refer'],$postdata);
+ page_write($vars['refer'], $postdata);
$retvars['msg'] = $title;
$retvars['body'] = $body;
- $post['page'] = $vars['page'] = $post['refer'];
+ $vars['page'] = $vars['refer'];
return $retvars;
}
+
function plugin_comment_convert()
{
- global $script,$vars,$digest;
- global $_btn_comment,$_btn_name,$_msg_comment;
+ global $script, $vars, $digest;
+ global $_btn_comment, $_btn_name, $_msg_comment;
static $numbers = array();
- if (!array_key_exists($vars['page'],$numbers))
- {
+ if (! isset($numbers[$vars['page']])) {
$numbers[$vars['page']] = 0;
}
$comment_no = $numbers[$vars['page']]++;
$options = func_num_args() ? func_get_args() : array();
- if (in_array('noname',$options))
- {
+ if (in_array('noname',$options)) {
$nametags = $_msg_comment;
- }
- else
- {
- $nametags = $_btn_name.'<input type="text" name="name" size="'.COMMENT_NAME_COLS."\" />\n";
+ } else {
+ $nametags = $_btn_name . '<input type="text" name="name" size="' . COMMENT_NAME_COLS . "\" />\n";
}
- $nodate = in_array('nodate',$options) ? '1' : '0';
+ $nodate = in_array('nodate', $options) ? '1' : '0';
+ $above = in_array('above', $options) ? '1' : (in_array('below', $options) ? '0' : COMMENT_INS);
$s_page = htmlspecialchars($vars['page']);
$comment_cols = COMMENT_COLS;
<form action="$script" method="post">
<div>
<input type="hidden" name="comment_no" value="$comment_no" />
- <input type="hidden" name="refer" value="$s_page" />
+ <input type="hidden" name="refer" value="$s_page" />
<input type="hidden" name="plugin" value="comment" />
<input type="hidden" name="nodate" value="$nodate" />
+ <input type="hidden" name="above" value="$above" />
<input type="hidden" name="digest" value="$digest" />
$nametags
- <input type="text" name="msg" size="$comment_cols" />
+ <input type="text" name="msg" size="$comment_cols" />
<input type="submit" name="comment" value="$_btn_comment" />
</div>
</form>
OSDN Git Service
