BugTrack/197

diff --git a/plugin/bugtrack.inc.php b/plugin/bugtrack.inc.php
index 1c26b9a..77dbb59 100644 (file)
--- a/plugin/bugtrack.inc.php
+++ b/plugin/bugtrack.inc.php
@@ -8,7 +8,7 @@
  * Êѹ¹ÍúÎò:
  *  2002.06.17: ºî¤ê»Ï¤á
  *
- * $Id: bugtrack.inc.php,v 1.4 2003/01/27 05:38:44 panda Exp $
+ * $Id: bugtrack.inc.php,v 1.5 2003/01/31 10:53:26 panda Exp $
  */
 
 function plugin_bugtrack_init()
@@ -204,7 +204,7 @@ function plugin_bugtrack_write($base, $pagename, $summary, $name, $priority, $st
        }
 
        // is_page¤Î¥­¥ã¥Ã¥·¥å¤ò¥¯¥ê¥¢¤¹¤ë¡£
-       is_page($post['refer'],true);
+       is_page($post['refer'],TRUE);
        
        return $page;
 }

diff --git a/plugin/comment.inc.php b/plugin/comment.inc.php
index 141c1c9..933cdc0 100644 (file)
--- a/plugin/comment.inc.php
+++ b/plugin/comment.inc.php
@@ -1,94 +1,79 @@
 <?php
-// $Id: comment.inc.php,v 1.11 2003/01/31 01:49:35 panda Exp $
-
-global $name_cols, $comment_cols, $msg_format, $name_format;
-global $msg_format, $now_format, $comment_format;
-global $comment_ins, $comment_mail, $comment_no;
+// $Id: comment.inc.php,v 1.12 2003/01/31 10:53:26 panda Exp $
 
 /////////////////////////////////////////////////
 // ¥³¥á¥ó¥È¤Î̾Á°¥Æ¥­¥¹¥È¥¨¥ê¥¢¤Î¥«¥é¥à¿ô
-$name_cols = 15;
+define('COMMENT_NAME_COLS',15);
 /////////////////////////////////////////////////
 // ¥³¥á¥ó¥È¤Î¥Æ¥­¥¹¥È¥¨¥ê¥¢¤Î¥«¥é¥à¿ô
-$comment_cols = 70;
+define('COMMENT_COLS',70);
 /////////////////////////////////////////////////
 // ¥³¥á¥ó¥È¤ÎÁÞÆþ¥Õ¥©¡¼¥Þ¥Ã¥È
-$name_format = '[[$name]]';
-$msg_format = '$msg';
-$now_format = 'SIZE(10){$now}';
+define('COMMENT_NAME_FORMAT','[[$name]]');
+define('COMMENT_MSG_FORMAT','$msg');
+define('COMMENT_NOW_FORMAT','SIZE(10){$now}');
 /////////////////////////////////////////////////
 // ¥³¥á¥ó¥È¤ÎÁÞÆþ¥Õ¥©¡¼¥Þ¥Ã¥È(¥³¥á¥ó¥ÈÆâÍÆ)
-$comment_format = '$msg -- $name $now';
+define('COMMENT_FORMAT','$msg -- $name $now');
 /////////////////////////////////////////////////
 // ¥³¥á¥ó¥È¤òÁÞÆþ¤¹¤ë°ÌÃÖ 1:Íó¤ÎÁ° 0:Íó¤Î¸å
-$comment_ins = 1;
+define('COMMENT_INS',1);
 /////////////////////////////////////////////////
 // ¥³¥á¥ó¥È¤¬Åê¹Æ¤µ¤ì¤¿¾ì¹ç¡¢ÆâÍƤò¥á¡¼¥ë¤ÇÁ÷¤ëÀè
-$comment_mail = FALSE;
-
-// initialize
-$comment_no = 0;
+//define('COMMENT_MAIL',FALSE);
 
 function plugin_comment_action()
 {
        global $script,$vars,$post,$now;
-       global $name_format,$msg_format,$now_format,$comment_format,$comment_ins;
        global $_title_updated;
        global $_msg_comment_collided,$_title_comment_collided;
-               
-       $_comment_format = $comment_format;
+       
+       $post['msg'] = preg_replace("/\n/",'',$post['msg']);
+       
+       if ($post['msg'] == '') {
+               return array('msg'=>'','body'=>'');
+       }
+       
+       $comment_format = COMMENT_FORMAT;
        if ($post['nodate']=='1') {
-               $_comment_format = str_replace('$now','',$_comment_format);
+               $comment_format = str_replace('$now','',$comment_format);
        }
-       if ($post['msg']=='') {
-               $retvars['msg'] = $name;
-               $post['page'] = $post['refer'];
-               $vars['page'] = $post['refer'];
-               $retvars['body'] = convert_html(get_source($post['refer']));
-               return $retvars;
+       
+       $postdata = '';
+       $postdata_old  = get_source($post['refer']);
+       $comment_no = 0;
+       
+       if ($post['name']) {
+               $name = str_replace('$name',$post['name'],COMMENT_NAME_FORMAT);
        }
-       if ($post['msg']) {
-               $post['msg'] = preg_replace("/\n/",'',$post['msg']);
-               
-               $postdata = '';
-               $postdata_old  = get_source($post['refer']);
-               $comment_no = 0;
-               
-               if ($post['name'])
-                       $name = str_replace('$name',$post['name'],$name_format);
-               
-               if ($post['msg']) {
-                       $head = '';
-                       if (preg_match('/^(-{1,2})(.*)/',$post['msg'],$match)) {
-                               $head = $match[1];
-                               $post['msg'] = $match[2];
-                       }
-                       
-                       $comment = str_replace('$msg',str_replace('$msg',$post["msg"],$msg_format),$_comment_format);
-                       $comment = str_replace('$name',$name,$comment);
-                       $comment = str_replace('$now',str_replace('$now',$now,$now_format),$comment);
-                       $comment = $head.$comment;
+       
+       $head = '';
+       if (preg_match('/^(-{1,2})(.*)/',$post['msg'],$match)) {
+               $head = $match[1];
+               $post['msg'] = $match[2];
+       }
+       
+       $comment = str_replace('$msg',str_replace('$msg',$post['msg'],COMMENT_MSG_FORMAT),$comment_format);
+       $comment = str_replace('$name',$name,$comment);
+       $comment = str_replace('$now',str_replace('$now',$now,COMMENT_NOW_FORMAT),$comment);
+       $comment = $head.$comment;
+       
+       foreach($postdata_old as $line) {
+               if (!COMMENT_INS) {
+                       $postdata .= $line;
                }
-               
-               foreach($postdata_old as $line) {
-                       if (!$comment_ins) {
-                               $postdata .= $line;
-                       }
-                       if (preg_match('/^#comment/',$line)) {
-                               if ($comment_no == $post['comment_no'] and $post['msg'] != '') {
-                                       $postdata = rtrim($postdata)."\n-$comment\n";
-                                       if ($comment_ins) {
-                                               $postdata .= "\n";
-                                       }
+               if (preg_match('/^#comment/',$line)) {
+                       if ($comment_no == $post['comment_no'] and $post['msg'] != '') {
+                               $postdata = rtrim($postdata)."\n-$comment\n";
+                               if (COMMENT_INS) {
+                                       $postdata .= "\n";
                                }
-                               $comment_no++;
-                       }
-                       if ($comment_ins) {
-                               $postdata .= $line;
                        }
+                       $comment_no++;
+               }
+               if (COMMENT_INS) {
+                       $postdata .= $line;
                }
-               
-               $postdata_input = "-$comment\n";
        }
        
        $title = $_title_updated;
@@ -109,34 +94,34 @@ function plugin_comment_action()
 }
 function plugin_comment_convert()
 {
-       global $script,$vars,$name_cols,$comment_cols,$digest;
-       global $_btn_comment,$_btn_name,$_msg_comment,$vars;
+       global $script,$vars,$digest;
+       global $_btn_comment,$_btn_name,$_msg_comment;
        static $comment_no = 0;
        
        $options = func_num_args() ? func_get_args() : array();
        
-       $nametags = "$_btn_name<input type=\"text\" name=\"name\" size=\"$name_cols\" />\n";
        if (in_array('noname',$options)) {
                $nametags = $_msg_comment;
        }
+       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';
        
-       $s_comment_no = htmlspecialchars($comment_no);
-       $s_page = htmlspecialchars($vars["page"]);
-       $s_digest = htmlspecialchars($digest);
-       $s_comment_cols = htmlspecialchars($comment_cols);
+       $s_page = htmlspecialchars($vars['page']);
+       $comment_cols = COMMENT_COLS;
        $string = <<<EOD
 <br />
 <form action="$script" method="post">
  <div>
-  <input type="hidden" name="comment_no" value="$s_comment_no" />
+  <input type="hidden" name="comment_no" value="$comment_no" />
   <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="digest" value="$s_digest" />
+  <input type="hidden" name="digest" value="$digest" />
   $nametags
-  <input type="text" name="msg" size="$s_comment_cols" />
+  <input type="text" name="msg" size="$comment_cols" />
   <input type="submit" name="comment" value="$_btn_comment" />
  </div>
 </form>