From afcece16efaf0ecbb3da9d49d100f5d72d545fb0 Mon Sep 17 00:00:00 2001 From: masui Date: Mon, 1 Jul 2002 16:08:57 +0900 Subject: [PATCH] =?utf8?q?reimy=E3=81=95=E3=82=93=E3=81=AB=E3=82=88?= =?utf8?q?=E3=82=8BHTML=E9=81=A9=E6=AD=A3=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- plugin/article.inc.php | 28 +++++++++++-------- plugin/attach.inc.php | 54 +++++++++++++++++++----------------- plugin/calendar.inc.php | 26 +++++++++--------- plugin/calendar2.inc.php | 32 +++++++++++----------- plugin/comment.inc.php | 26 ++++++++++-------- plugin/counter.inc.php | 4 +-- plugin/img.inc.php | 10 ++++--- plugin/insert.inc.php | 24 +++++++++------- plugin/lookup.inc.php | 14 ++++++---- plugin/memo.inc.php | 24 +++++++++------- plugin/newpage.inc.php | 22 +++++++++------ plugin/recent.inc.php | 11 ++++---- plugin/template.inc.php | 71 ++++++++++++++++++++++++++---------------------- plugin/version.inc.php | 4 +-- plugin/vote.inc.php | 31 +++++++++++---------- plugin/yetlist.inc.php | 4 +-- 16 files changed, 209 insertions(+), 176 deletions(-) diff --git a/plugin/article.inc.php b/plugin/article.inc.php index 07cf5c1..0481310 100644 --- a/plugin/article.inc.php +++ b/plugin/article.inc.php @@ -19,7 +19,7 @@ -Åê¹ÆÆâÍƤΥ᡼¥ë¼«Æ°ÇÛ¿®Àè ¤òÀßÄê¤Î¾å¡¢¤´»ÈÍѤ¯¤À¤µ¤¤¡£ - $Id: article.inc.php,v 1.3 2002/06/26 06:23:57 masui Exp $ + $Id: article.inc.php,v 1.4 2002/07/01 07:08:57 masui Exp $ */ @@ -149,9 +149,11 @@ function plugin_article_action() $body = "$_msg_collided\n"; $body .= "
\n" - ."\n" - ."\n" - ."
\n" + ."
\n" + ."\n" + ."\n" + ."
\n" + ."
\n" ."
\n"; } else @@ -222,17 +224,19 @@ function plugin_article_convert() global $_btn_article,$_btn_name,$_btn_subject,$vars; if((arg_check("read")||$vars["cmd"] == ""||arg_check("unfreeze")||arg_check("freeze")||$vars["write"]||$vars["article"])) - $button = "\n"; + $button = "\n"; $string = "
\n" - ."\n" - ."\n" - ."\n" - ."\n" - ."$_btn_name
\n" - ."$_btn_subject
\n" - ."
\n" + ."
\n" + ."\n" + ."\n" + ."\n" + ."\n" + ."$_btn_name
\n" + ."$_btn_subject
\n" + ."
\n" .$button + ."
\n" ."
"; $article_no++; diff --git a/plugin/attach.inc.php b/plugin/attach.inc.php index 949e537..4d9e3d8 100644 --- a/plugin/attach.inc.php +++ b/plugin/attach.inc.php @@ -2,7 +2,7 @@ // ¥×¥é¥°¥¤¥ó attach // changed by Y.MASUI http://masui.net/pukiwiki/ -// $Id: attach.inc.php,v 1.4 2002/06/26 06:23:57 masui Exp $ +// $Id: attach.inc.php,v 1.5 2002/07/01 07:08:57 masui Exp $ // set PHP value to enable file upload ini_set("file_uploads","1"); @@ -17,7 +17,7 @@ ini_set("upload_max_filesize","2M"); define("MAX_FILESIZE",1000000); // file icon image -define("FILE_ICON",""); +define("FILE_ICON","\"file\""); function plugin_attach_convert() { @@ -51,13 +51,13 @@ function plugin_attach_convert() if(file_exists(UPLOAD_DIR.$file.'.log')) { $list = file(UPLOAD_DIR.$file.'.log'); - $counter = ' ' . chop($list[0]) . '·ï'; + $counter = ' '; } $del = "[$_btn_delete]"; $open = "$icon$filename$counter\n"; - $into = "$open $del"; + $into = "$open $del"; $attach_files[$lastmod] = $into; } @@ -78,16 +78,18 @@ function plugin_attach_convert() if($args[0]!==FALSE) { - $ret.= "

\n"; + $ret.= "
\n"; $ret.= "

\n"; - $ret.= "\n"; + $ret.= "
\n"; + $ret.= "\n"; $ret.= "\n"; - $ret.= "\n"; - $ret.= "[$_msg_attach_filelist]
\n"; - $ret.= "".str_replace('$1',$max_size,$_msg_maxsize)."
\n"; - $ret.= "$_msg_attachfile: \n"; - $ret.= "
\n"; + $ret.= "\n"; + $ret.= "[$_msg_attach_filelist]
\n"; + $ret.= "".str_replace('$1',$max_size,$_msg_maxsize)."
\n"; + $ret.= "$_msg_attachfile: \n"; + $ret.= "
\n"; + $ret.= "
\n"; $ret.= "
\n"; } @@ -127,10 +129,12 @@ function plugin_attach_action() { if($vars["mode"] == "confirm") { $form = "
\n"; - $form .= "\n"; - $form .= "\n"; - $form .= "\n"; - $form .= "\n"; + $form .= "
\n"; + $form .= "\n"; + $form .= "\n"; + $form .= "\n"; + $form .= "\n"; + $form .= "
\n"; $form .= "
"; $retvars["body"] = sprintf($_msg_confirm_delete,$vars["delfile"],$form); @@ -197,7 +201,7 @@ function plugin_attach_action() $open = "$filename"; - $aryret[$pagename] .= "
  • $open $del
    • \n"; + $aryret[$pagename] .= "
  • $open $del
    • \n"; } closedir($dir); ksort($aryret); @@ -220,17 +224,17 @@ function plugin_attach_action() $max_size = number_format(MAX_FILESIZE/1000); $max_size.= "KB"; - $ret.= "
    \n"; $ret.= "
    \n"; - $ret.= "\n"; - $ret.= "\n"; - $ret.= "\n"; - $ret.= "[$_msg_attach_filelist]
    \n"; - $ret.= "".str_replace('$1',$max_size,$_msg_maxsize)."
    \n"; - $ret.= "$_msg_attachfile: \n"; - $ret.= "
    \n"; - $ret.= "
    \n"; + $ret.= "
    \n"; + $ret.= "\n"; + $ret.= "\n"; + $ret.= "\n"; + $ret.= "[$_msg_attach_filelist]
    \n"; + $ret.= "".str_replace('$1',$max_size,$_msg_maxsize)."
    \n"; + $ret.= "$_msg_attachfile: \n"; + $ret.= "
    \n"; $ret.= "
    \n"; + $ret.= "\n"; $retvars["msg"] = $_title_upload; $retvars["body"] = $ret; diff --git a/plugin/calendar.inc.php b/plugin/calendar.inc.php index 3483521..8acc269 100644 --- a/plugin/calendar.inc.php +++ b/plugin/calendar.inc.php @@ -1,5 +1,5 @@ - -
    '.$m_name.'
    ['.$pre.']
    + +
    '.$m_name.'
    ['.$pre.']
    @@ -105,8 +105,8 @@ function plugin_calendar_convert() foreach($weeklabels as $label) { $ret .= ' - -
    '.$label.'
    + +
    '.$label.'
    '; } @@ -123,15 +123,15 @@ function plugin_calendar_convert() else $refer = ""; if($cmd == "read" && !is_page($page)) - $link = "$day"; + $link = "$day"; else - $link = "$day"; + $link = "$day"; if($fweek) { for($i=0;$i<$wday;$i++) { // Blank - $ret .= " ¡¡\n"; + $ret .= " ¡¡\n"; } $fweek=false; } @@ -140,22 +140,22 @@ function plugin_calendar_convert() if(!$other_month && ($day == $today[mday]) && ($m_num == $today[mon]) && ($year == $today[year])) { // Today - $ret .= " $link\n"; + $ret .= " $link\n"; } else if($wday == 0) { // Sunday - $ret .= " $link\n"; + $ret .= " $link\n"; } else if($wday == 6) { // Saturday - $ret .= " $link\n"; + $ret .= " $link\n"; } else { // Weekday - $ret .= " $link\n"; + $ret .= " $link\n"; } $day++; $wday++; @@ -165,7 +165,7 @@ function plugin_calendar_convert() { while($wday < 7) { // Blank - $ret .= " ¡¡\n"; + $ret .= " ¡¡\n"; $wday++; } } diff --git a/plugin/calendar2.inc.php b/plugin/calendar2.inc.php index 3f4e700..985f896 100644 --- a/plugin/calendar2.inc.php +++ b/plugin/calendar2.inc.php @@ -1,5 +1,5 @@ - -
    << '.$m_name.' >>
    + +
    << '.$m_name.' >>
    @@ -125,8 +125,8 @@ function plugin_calendar2_convert() - @@ -136,8 +136,8 @@ function plugin_calendar2_convert() foreach($weeklabels as $label) { $ret .= ' - '; } @@ -154,15 +154,15 @@ function plugin_calendar2_convert() else $refer = ""; if($cmd == "read" && !is_page($page)) - $link = "$day"; + $link = "$day"; else - $link = "$day"; + $link = "$day"; if($fweek) { for($i=0;$i<$wday;$i++) { // Blank - $ret .= " \n"; + $ret .= " \n"; } $fweek=false; } @@ -171,22 +171,22 @@ function plugin_calendar2_convert() if(!$other_month && ($day == $today[mday]) && ($m_num == $today[mon]) && ($year == $today[year])) { // Today - $ret .= " \n"; + $ret .= " \n"; } else if($wday == 0) { // Sunday - $ret .= " \n"; + $ret .= " \n"; } else if($wday == 6) { // Saturday - $ret .= " \n"; + $ret .= " \n"; } else { // Weekday - $ret .= " \n"; + $ret .= " \n"; } $day++; $wday++; @@ -196,7 +196,7 @@ function plugin_calendar2_convert() { while($wday < 7) { // Blank - $ret .= " \n"; + $ret .= " \n"; $wday++; } } @@ -207,7 +207,7 @@ function plugin_calendar2_convert() $page_url = rawurlencode($page); if(is_page($page)) { $str = convert_html(join("",file(get_filename(encode($page))))); - $str .= "
    [¤³¤ÎÆüµ­¤òÊÔ½¸]"; + $str .= "
    [¤³¤ÎÆüµ­¤òÊÔ½¸]"; } else { $str = make_link(sprintf('[[%s%4d-%02d-%02d]]',$prefix, $today[year], $today[mon], $today[mday])).'¤Ï¶õ¤Ç¤¹¡£'; diff --git a/plugin/comment.inc.php b/plugin/comment.inc.php index 7b34482..a3a570c 100644 --- a/plugin/comment.inc.php +++ b/plugin/comment.inc.php @@ -1,5 +1,5 @@ \n"; + $nametags = "$_btn_name\n"; if(is_array($options) && in_array("noname",$options)) { $nametags = $_msg_comment; } @@ -152,17 +152,19 @@ function plugin_comment_convert() } if((arg_check("read")||$vars["cmd"] == ""||arg_check("unfreeze")||arg_check("freeze")||$vars["write"]||$vars["comment"])) - $button = "\n"; - - $string = "

    \n" - ."\n" - ."\n" - ."\n" - ."\n" - ."\n" + $button = "\n"; + + $string = "
    \n" + ."

    \n" + ."\n" + ."\n" + ."\n" + ."\n" + ."\n" ."$nametags" - ."\n" + ."\n" .$button + ."
    \n" .""; $comment_no++; diff --git a/plugin/counter.inc.php b/plugin/counter.inc.php index 18fc451..853a225 100644 --- a/plugin/counter.inc.php +++ b/plugin/counter.inc.php @@ -5,7 +5,7 @@ * CopyRight 2002 Y.MASUI GPL2 * http://masui.net/pukiwiki/ masui@masui.net * - * $Id: counter.inc.php,v 1.2 2002/06/26 06:23:57 masui Exp $ + * $Id: counter.inc.php,v 1.3 2002/07/01 07:08:57 masui Exp $ */ // counter file @@ -48,7 +48,7 @@ function plugin_counter_convert() fputs($nf,"$ip\n"); fclose($nf); - return "Counter: $count, today: $today_count, yesterday: $yesterday_count"; + return "Counter: $count, today: $today_count, yesterday: $yesterday_count"; } ?> diff --git a/plugin/img.inc.php b/plugin/img.inc.php index de448cf..b5e508e 100644 --- a/plugin/img.inc.php +++ b/plugin/img.inc.php @@ -1,5 +1,5 @@ "; + else { + return "
    "; + } + return "
    \"\"
    "; } ?> diff --git a/plugin/insert.inc.php b/plugin/insert.inc.php index 1053893..399c969 100644 --- a/plugin/insert.inc.php +++ b/plugin/insert.inc.php @@ -1,5 +1,5 @@ \n" - ."\n" - ."\n" - ."
    \n" + ,"
    \n" + ."\n" + ."\n" + ."
    \n" + ,"
    \n" ."\n"; } else @@ -105,15 +107,17 @@ function plugin_insert_convert() global $_btn_insert,$vars; if((arg_check("read")||$vars["cmd"] == ""||arg_check("unfreeze")||arg_check("freeze")||$vars["write"]||$vars["insert"])) - $button = "\n"; + $button = "\n"; $string = "\n" - ."\n" - ."\n" - ."\n" - ."\n" - ."
    \n" + ."
    \n" + ."\n" + ."\n" + ."\n" + ."\n" + ."
    \n" .$button + ."
    \n" .""; $insert_no++; diff --git a/plugin/lookup.inc.php b/plugin/lookup.inc.php index 6eeb89d..189c228 100644 --- a/plugin/lookup.inc.php +++ b/plugin/lookup.inc.php @@ -1,5 +1,5 @@ \n"; - $ret.= "\n"; - $ret.= "\n"; - $ret.= "\n"; + $ret.= "
    \n"; + $ret.= "\n"; + $ret.= "\n"; + $ret.= "\n"; $ret.= "$iwn:\n"; - $ret.= "\n"; - $ret.= "\n"; + $ret.= "\n"; + $ret.= "\n"; + $ret.= "
    \n"; $ret.= "\n"; return $ret; diff --git a/plugin/memo.inc.php b/plugin/memo.inc.php index 5abdd13..af3d370 100644 --- a/plugin/memo.inc.php +++ b/plugin/memo.inc.php @@ -1,5 +1,5 @@ \n" - ."\n" - ."\n" - ."
    \n" + ."
    \n" + ."\n" + ."\n" + ."
    \n" + ."
    \n" ."\n"; } else @@ -110,15 +112,17 @@ function plugin_memo_convert() $data = str_replace("\\n","\n",$aryargs[0]); if((arg_check("read")||$vars["cmd"] == ""||arg_check("unfreeze")||arg_check("freeze")||$vars["write"]||$vars["memo"])) - $button = "\n"; + $button = "\n"; $string = "\n" - ."\n" - ."\n" - ."\n" - ."\n" - ."
    \n" + ."
    \n" + ."\n" + ."\n" + ."\n" + ."\n" + ."
    \n" .$button + ."
    \n" .""; $memo_no++; diff --git a/plugin/newpage.inc.php b/plugin/newpage.inc.php index dbe2495..2924102 100644 --- a/plugin/newpage.inc.php +++ b/plugin/newpage.inc.php @@ -1,5 +1,5 @@ \n"; - $ret.= "\n"; - $ret.= "\n"; + $ret.= "
    \n"; + $ret.= "\n"; + $ret.= "\n"; $ret.= "$_msg_newpage: "; - $ret.= "\n"; - $ret.= "\n"; + $ret.= "\n"; + $ret.= "\n"; + $ret.= "
    \n"; $ret.= "\n"; return $ret; @@ -31,11 +33,13 @@ function plugin_newpage_action() if(!$vars["page"]) { $retvars["msg"] = $_msg_newpage; $retvars["body"] = "\n"; - $retvars["body"].= "\n"; - $retvars["body"].= "\n"; + $retvars["body"].= "
    \n"; + $retvars["body"].= "\n"; + $retvars["body"].= "\n"; $retvars["body"].= "$_msg_newpage: "; - $retvars["body"].= "\n"; - $retvars["body"].= "\n"; + $retvars["body"].= "\n"; + $retvars["body"].= "\n"; + $retvars["body"].= "
    \n"; $retvars["body"].= "\n"; return $retvars; diff --git a/plugin/recent.inc.php b/plugin/recent.inc.php index d57428a..535b742 100644 --- a/plugin/recent.inc.php +++ b/plugin/recent.inc.php @@ -11,14 +11,14 @@ * * 2002.06.17: plugin_recent_init()¤òÀßÄê * - * $Id: recent.inc.php,v 1.2 2002/06/26 06:23:57 masui Exp $ + * $Id: recent.inc.php,v 1.3 2002/07/01 07:08:57 masui Exp $ */ function plugin_recent_init() { $_plugin_recent_messages = array( '_recent_plugin_li'=>'¡¦', - '_recent_plugin_frame '=>'
    ºÇ¿·¤Î%d·ï
    %s'); + '_recent_plugin_frame '=>'
    ºÇ¿·¤Î%d·ï
    %s'); set_plugin_messages($_plugin_recent_messages); } @@ -53,13 +53,14 @@ function plugin_recent_convert() if(preg_match("/([0-9]{4}-[0-9]{2}-[0-9]{2})/",$line,$match)) { if($date != $match[0]) { if($date != '') { - $items .= "
    "; + $items .= "
    "; } - $items .= "".$match[0]."
    "; + $items .= "".$match[0]."
    "; $date = $match[0]; } } - $items .= $_recent_plugin_li."".$title."
    \n"; + $title = htmlspecialchars($title); + $items .= $_recent_plugin_li."".$title."
    \n"; $cnt++; } } diff --git a/plugin/template.inc.php b/plugin/template.inc.php index 91a8c89..9f3cf14 100644 --- a/plugin/template.inc.php +++ b/plugin/template.inc.php @@ -1,5 +1,5 @@ \n\n"; + $help = "
    \n\n"; if($function_freeze) - $str_freeze = ''; + $str_freeze = ''; $retvar["body"] = '
    -
    << '.$m_name.' >>
    ['.$pre.']
    +     		+
    << '.$m_name.' >>
    ['.$pre.']
    -
    '.$label.'
    +     		+
    '.$label.'
    		  $link$link$link$link$link$link$link$link  
    - - - - - + +
    + '.$template.'
    - - + + +
    - - + + '.$add_top.' - '.$_btn_notchangetimestamp.' + '.$_btn_notchangetimestamp.'
    + +
    + -
    + '.$str_freeze.'
    + ' . $help; $retvar["msg"] = "$1 ¤ÎÊÔ½¸"; @@ -88,32 +91,32 @@ $retvar["body"] = ' $begin_select = ""; $end_select = ""; $lines = @file(get_filename(encode($vars["refer"]))); - $begin_select.= "³«»Ï¹Ô:
    \n"; for($i=0;$i$lines[$i]\n"; } - $begin_select.= "
    \n
    \n"; + $begin_select.= "
    \n
    \n"; - $end_select.= "½ªÎ»¹Ô:
    \n"; for($i=0;$i$lines[$i]\n"; } - $end_select.= "
    \n
    \n"; + $end_select.= "
    \n
    \n"; /* $select = ""; $lines = @file(get_filename(encode($vars["refer"]))); $select.= "\n"; - $select.= "\n"; + $select.= "\n"; for($i=0;$i\n"; + $select.= "\n"; $select.= ""; $select.= ""; } - $select.= "
    ³«»Ï½ªÎ» 
    ³«»Ï½ªÎ» 
    "; - $select.= "\n"; + $select.= "\n"; $select.= ""; $select.= "$lines[$i]"; $select.= "

    \n"; + $select.= "
    \n"; */ } $ret.= "
    \n"; - $ret.= "\n"; - $ret.= "\n"; - //$ret.= "¥Ú¡¼¥¸Ì¾: \n"; - //$ret.= "
    \n
    \n"; + $ret.= "
    \n"; + $ret.= "\n"; + $ret.= "\n"; + //$ret.= "¥Ú¡¼¥¸Ì¾: \n"; + //$ret.= "
    \n
    \n"; $ret.= $begin_select; $ret.= $end_select; //$ret.= $select; - $ret.= "¥Ú¡¼¥¸Ì¾: \n"; - $ret.= "\n"; + $ret.= "¥Ú¡¼¥¸Ì¾: \n"; + $ret.= "\n"; + $ret.= "
    \n"; $ret.= "
    \n"; $retvar["msg"] = "$1 ¤ò¥Æ¥ó¥×¥ì¡¼¥È¤Ë¤·¤ÆºîÀ®"; diff --git a/plugin/version.inc.php b/plugin/version.inc.php index fcdb145..07a0a94 100644 --- a/plugin/version.inc.php +++ b/plugin/version.inc.php @@ -1,8 +1,8 @@ ".S_VERSION.""; + return "".S_VERSION.""; } ?> diff --git a/plugin/vote.inc.php b/plugin/vote.inc.php index ad04a56..4a14893 100644 --- a/plugin/vote.inc.php +++ b/plugin/vote.inc.php @@ -1,5 +1,5 @@ \n" - ."\n" - ."\n" - ."
    \n" + ."
    \n" + ."\n" + ."\n" + ."
    \n" + ."
    \n" ."\n"; } else @@ -107,16 +109,15 @@ function plugin_vote_convert() $string = "" . "
    \n" - . "\n" - + . "
    \n" . "\n" - . "\n" - . "\n" + . "\n" + . "\n" . "\n"; $tdcnt = 0; @@ -137,11 +138,11 @@ function plugin_vote_convert() $string .= "" . "" - . ""; + . "" . "\n"; } - $string .= "
    The choices" - . "\n" - . "\n" - . "\n" - . "\n" - . "VotesThe choices" + . "\n" + . "\n" + . "\n" + . "\n" + . "Votes
    $link$cnt  $cnt  
    \n" + $string .= "\n"; $vote_no++; diff --git a/plugin/yetlist.inc.php b/plugin/yetlist.inc.php index 5cb4874..00aeb2b 100644 --- a/plugin/yetlist.inc.php +++ b/plugin/yetlist.inc.php @@ -1,5 +1,5 @@ $wbn ($link_ref)\n"; + $ret["body"] .= "
  • $wbn ($link_ref)
    • \n"; } -- 2.11.0