ぱんだ:開発日記/2002-11-29参照

diff --git a/init.php b/init.php
index 8774a35..f17928c 100644 (file)
--- a/init.php
+++ b/init.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: init.php,v 1.18 2002/11/29 00:09:00 panda Exp $
+// $Id: init.php,v 1.19 2002/11/29 00:11:12 panda Exp $
 /////////////////////////////////////////////////
 
 // ÀßÄê¥Õ¥¡¥¤¥ë¤Î¾ì½ê
@@ -21,11 +21,6 @@ define("MUTIME",getmicrotime());
 if($script == "") {
        $script = (getenv('SERVER_PORT')==443?'https://':('http://')).getenv('SERVER_NAME').(getenv('SERVER_PORT')==80?'':(':'.getenv('SERVER_PORT'))).getenv('SCRIPT_NAME');
 }
-       $script =
-                ($_SERVER['SERVER_PORT'] == 443 ? 'https://' : 'http://')
-               . $_SERVER['SERVER_NAME']
-               .($_SERVER['SERVER_PORT'] == 80 ? '' : ':'.$_SERVER['SERVER_PORT'])
-               . $_SERVER['SCRIPT_NAME'];
 
 $WikiName = '[A-Z][a-z]+(?:[A-Z][a-z]+)+';
 //$BracketName = '\[\[(:?[^\s\]#&<>":]+:?)\]\]';

diff --git a/ja.lng b/ja.lng
index 78d725e..3e818a0 100644 (file)
--- a/ja.lng
+++ b/ja.lng
@@ -1,4 +1,4 @@
-<?
+<?php
 ///////////////////////////////////////
 // PukiWiki message file (japanese/EUC)
 
@@ -129,6 +129,10 @@ $_msg_newpage = '
 $_btn_insert = 'ÄɲÃ';
 
 ///////////////////////////////////////
+// memo
+$_btn_memo_update = '¥á¥â¹¹¿·';
+
+///////////////////////////////////////
 // recent
 $_recent_plugin_frame = '<h5 class="side_label">ºÇ¿·¤Î%d·ï</h5><span class="small">%s</span>';
 $_recent_plugin_li = '¡¦';

diff --git a/make_link.php b/make_link.php
index 92b0a5a..6be64e1 100644 (file)
--- a/make_link.php
+++ b/make_link.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // Last-Update:2002-09-24 rev.1
 
 // ¥ê¥ó¥¯¤òÉղ乤ë
@@ -149,21 +149,29 @@ class link
 }
 class link_url extends link
 {
-       var $is_image;
+       var $is_image,$image;
        function link_url($name,$alias)
        {
                parent::link($name,'url',($alias == '') ? $name : $alias);
-               $this->is_image = preg_match("/\.(gif|png|jpeg|jpg)$/i",$name);
                
+               if ($alias == '' and preg_match("/\.(gif|png|jpeg|jpg)$/i",$name)) {
+                       $this->is_image = TRUE;
+                       $this->image = "<img src=\"$name\" border=\"0\" alt=\"$alias\">";
+               } else if (preg_match("/\.(gif|png|jpeg|jpg)$/i",$alias)) {
+                       $this->is_image = TRUE;
+                       $this->image = "<img src=\"$alias\" border=\"0\" alt=\"$name\">";
+               } else {
+                       $this->is_image = FALSE;
+                       $this->image = '';
+               }
        }
        function toString()
        {
                global $link_target;
 
-               $body = $this->is_image ?
-                       "<img src=\"{$this->name}\" border=\"0\" alt=\"{$this->alias}\">" : $this->alias;
-
-               return "<a href=\"{$this->name}\" target=\"$link_target\">$body</a>";
+               return "<a href=\"{$this->name}\" target=\"$link_target\">"
+                       .($this->is_image ? $this->image : $this->alias)
+                       .'</a>';
        }
 }
 class link_mailto extends link
@@ -212,7 +220,7 @@ class link_wikiname extends link
                $this->rawname = rawurlencode($name);
                $this->rawrefer = rawurlencode($refer);
 
-               if ($vars['page'] != $name)
+               if ($vars['page'] != $name and is_page($name))
                        $related['t'.filemtime(get_filename(encode($name)))] = "<a href=\"$script?{$this->rawname}\">{$this->special}</a>".$this->passage();
        }
 

diff --git a/plugin.php b/plugin.php
index 2bb1849..5ad1b77 100644 (file)
--- a/plugin.php
+++ b/plugin.php
@@ -1,6 +1,6 @@
-<?
+<?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: plugin.php,v 1.1 2002/06/21 05:21:46 masui Exp $
+// $Id: plugin.php,v 1.2 2002/11/29 00:09:00 panda Exp $
 /////////////////////////////////////////////////
 
 // ¥×¥é¥°¥¤¥óÍѤË̤ÄêµÁ¤ÎÊÑ¿ô¤òÀßÄê

diff --git a/plugin/aname.inc.php b/plugin/aname.inc.php
index d1e5969..9cd7a94 100644 (file)
--- a/plugin/aname.inc.php
+++ b/plugin/aname.inc.php
@@ -1,5 +1,5 @@
-<?
-// $Id: aname.inc.php,v 1.4 2002/08/21 17:32:04 masui Exp $
+<?php
+// $Id: aname.inc.php,v 1.5 2002/11/29 00:09:01 panda Exp $
 
 function plugin_aname_convert()
 {

diff --git a/plugin/anchor.inc.php b/plugin/anchor.inc.php
index 94251d7..4578df5 100644 (file)
--- a/plugin/anchor.inc.php
+++ b/plugin/anchor.inc.php
@@ -1,5 +1,5 @@
-<?
-// $Id: anchor.inc.php,v 1.2 2002/06/26 06:23:57 masui Exp $
+<?php
+// $Id: anchor.inc.php,v 1.3 2002/11/29 00:09:01 panda Exp $
 
 function plugin_anchor_convert()
 {

diff --git a/plugin/article.inc.php b/plugin/article.inc.php
index f14e305..ea76cf8 100644 (file)
--- a/plugin/article.inc.php
+++ b/plugin/article.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
  /*
  
  PukiWiki BBSÉ÷¥×¥é¥°¥¤¥ó
@@ -19,7 +19,7 @@
  -Åê¹ÆÆâÍƤΥ᡼¥ë¼«Æ°ÇÛ¿®Àè
  ¤òÀßÄê¤Î¾å¡¢¤´»ÈÍѤ¯¤À¤µ¤¤¡£
 
- $Id: article.inc.php,v 1.5 2002/07/02 04:20:20 masui Exp $
+ $Id: article.inc.php,v 1.6 2002/11/29 00:09:01 panda Exp $
  
  */
 

diff --git a/plugin/attach.inc.php b/plugin/attach.inc.php
index 6fd54c7..f008593 100644 (file)
--- a/plugin/attach.inc.php
+++ b/plugin/attach.inc.php
@@ -1,8 +1,8 @@
-<?
+<?php
 // ¥×¥é¥°¥¤¥ó attach
 
 // changed by Y.MASUI <masui@hisec.co.jp> http://masui.net/pukiwiki/
-// $Id: attach.inc.php,v 1.9 2002/08/21 17:22:34 masui Exp $
+// $Id: attach.inc.php,v 1.10 2002/11/29 00:09:01 panda Exp $
 
 // set PHP value to enable file upload
 ini_set("file_uploads","1");

diff --git a/plugin/calendar.inc.php b/plugin/calendar.inc.php
index 5c9d84b..6c7920f 100644 (file)
--- a/plugin/calendar.inc.php
+++ b/plugin/calendar.inc.php
@@ -1,5 +1,5 @@
-<?
-// $Id: calendar.inc.php,v 1.8 2002/09/15 07:05:52 masui Exp $
+<?php
+// $Id: calendar.inc.php,v 1.9 2002/11/29 00:09:01 panda Exp $
 
 function plugin_calendar_convert()
 {
@@ -130,7 +130,7 @@ function plugin_calendar_convert()
                {
                        for($i=0;$i<$wday;$i++)
                        { // Blank 
-                               $ret .= "    <td align=\"center\" class=\"style_td_blank\">&nobr;</td>\n"; 
+                               $ret .= "    <td align=\"center\" class=\"style_td_blank\">&nbsp;</td>\n"; 
                        } 
                $fweek=false;
                }
@@ -164,7 +164,7 @@ function plugin_calendar_convert()
        {
                while($wday < 7)
                { // Blank 
-                       $ret .= "    <td align=\"center\" class=\"style_td_blank\">&nobr;</td>\n";
+                       $ret .= "    <td align=\"center\" class=\"style_td_blank\">&nbsp;</td>\n";
                $wday++;
                } 
        }

diff --git a/plugin/calendar2.inc.php b/plugin/calendar2.inc.php
index 69fdcfd..505dc28 100644 (file)
--- a/plugin/calendar2.inc.php
+++ b/plugin/calendar2.inc.php
@@ -1,5 +1,5 @@
-<?
-// $Id: calendar2.inc.php,v 1.10 2002/09/04 06:49:13 masui Exp $
+<?php
+// $Id: calendar2.inc.php,v 1.11 2002/11/29 00:09:01 panda Exp $
 
 function plugin_calendar2_convert()
 {

diff --git a/plugin/calendar_edit.inc.php b/plugin/calendar_edit.inc.php
index ed1e75c..a0e0e5d 100644 (file)
--- a/plugin/calendar_edit.inc.php
+++ b/plugin/calendar_edit.inc.php
@@ -1,5 +1,5 @@
-<?
-// $Id: calendar_edit.inc.php,v 1.3 2002/06/26 06:23:57 masui Exp $
+<?php
+// $Id: calendar_edit.inc.php,v 1.4 2002/11/29 00:09:01 panda Exp $
 
 function plugin_calendar_edit_convert()
 {

diff --git a/plugin/calendar_read.inc.php b/plugin/calendar_read.inc.php
index 81dc12c..760d18b 100644 (file)
--- a/plugin/calendar_read.inc.php
+++ b/plugin/calendar_read.inc.php
@@ -1,5 +1,5 @@
-<?
-// $Id: calendar_read.inc.php,v 1.3 2002/06/26 06:23:57 masui Exp $
+<?php
+// $Id: calendar_read.inc.php,v 1.4 2002/11/29 00:09:01 panda Exp $
 
 function plugin_calendar_read_convert()
 {

diff --git a/plugin/comment.inc.php b/plugin/comment.inc.php
index 5a649a9..a9674d9 100644 (file)
--- a/plugin/comment.inc.php
+++ b/plugin/comment.inc.php
@@ -1,5 +1,5 @@
-<?
-// $Id: comment.inc.php,v 1.8 2002/07/16 11:26:55 masui Exp $
+<?php
+// $Id: comment.inc.php,v 1.9 2002/11/29 00:09:01 panda Exp $
 
 global $name_cols, $comment_cols, $msg_format, $name_format;
 global $msg_format, $now_format, $comment_format;

diff --git a/plugin/counter.inc.php b/plugin/counter.inc.php
index 853a225..106f4b5 100644 (file)
--- a/plugin/counter.inc.php
+++ b/plugin/counter.inc.php
@@ -1,11 +1,11 @@
-<?
+<?php
 /*
  * PukiWiki ¥«¥¦¥ó¥¿¡¼¥×¥é¥°¥¤¥ó
  *
  * CopyRight 2002 Y.MASUI GPL2
  * http://masui.net/pukiwiki/ masui@masui.net
  *
- * $Id: counter.inc.php,v 1.3 2002/07/01 07:08:57 masui Exp $
+ * $Id: counter.inc.php,v 1.4 2002/11/29 00:09:01 panda Exp $
  */
 
 // counter file

diff --git a/plugin/img.inc.php b/plugin/img.inc.php
index 59d77df..a14a67b 100644 (file)
--- a/plugin/img.inc.php
+++ b/plugin/img.inc.php
@@ -1,5 +1,5 @@
-<?
-// $Id: img.inc.php,v 1.4 2002/07/02 05:38:17 masui Exp $
+<?php
+// $Id: img.inc.php,v 1.5 2002/11/29 00:09:01 panda Exp $
 function plugin_img_convert()
 {
        if(func_num_args()!=2) {

diff --git a/plugin/insert.inc.php b/plugin/insert.inc.php
index 8cd13e1..0c80d0a 100644 (file)
--- a/plugin/insert.inc.php
+++ b/plugin/insert.inc.php
@@ -1,5 +1,5 @@
-<?
-// $Id: insert.inc.php,v 1.4 2002/07/18 16:28:33 masui Exp $
+<?php
+// $Id: insert.inc.php,v 1.5 2002/11/29 00:09:01 panda Exp $
 
 /////////////////////////////////////////////////
 // ¥Æ¥­¥¹¥È¥¨¥ê¥¢¤Î¥«¥é¥à¿ô
@@ -109,10 +109,12 @@ function plugin_insert_convert()
        if((arg_check("read")||$vars["cmd"] == ""||arg_check("unfreeze")||arg_check("freeze")||$vars["write"]||$vars["insert"]))
                $button = "<input type=\"submit\" name=\"insert\" value=\"$_btn_insert\" />\n";
 
+       $s_page = htmlspecialchars($vars['page']);
+       
        $string = "<form action=\"$script\" method=\"post\">\n"
                 ."<div>\n"
                 ."<input type=\"hidden\" name=\"insert_no\" value=\"$insert_no\" />\n"
-                ."<input type=\"hidden\" name=\"refer\" value=\"$vars[page]\" />\n"
+                ."<input type=\"hidden\" name=\"refer\" value=\"$s_page\" />\n"
                 ."<input type=\"hidden\" name=\"plugin\" value=\"insert\" />\n"
                 ."<input type=\"hidden\" name=\"digest\" value=\"$digest\" />\n"
                 ."<textarea name=\"msg\" rows=\"".INSERT_ROWS."\" cols=\"".INSERT_COLS."\">\n</textarea><br />\n"

diff --git a/plugin/lookup.inc.php b/plugin/lookup.inc.php
index bfbd93e..cfe108a 100644 (file)
--- a/plugin/lookup.inc.php
+++ b/plugin/lookup.inc.php
@@ -1,5 +1,5 @@
-<?
-// $Id: lookup.inc.php,v 1.5 2002/07/12 11:53:56 masui Exp $
+<?php
+// $Id: lookup.inc.php,v 1.6 2002/11/29 00:09:01 panda Exp $
 
 function plugin_lookup_convert()
 {

diff --git a/plugin/ls.inc.php b/plugin/ls.inc.php
index 6348ec1..3c490ac 100644 (file)
--- a/plugin/ls.inc.php
+++ b/plugin/ls.inc.php
@@ -1,11 +1,11 @@
-<?
+<?php
 /*
  * PukiWiki ls¥×¥é¥°¥¤¥ó
  *
  * CopyRight 2002 Y.MASUI GPL2
  * http://masui.net/pukiwiki/ masui@masui.net
  *
- * $Id: ls.inc.php,v 1.3 2002/06/26 06:23:57 masui Exp $
+ * $Id: ls.inc.php,v 1.4 2002/11/29 00:09:01 panda Exp $
  */
 
 function plugin_ls_convert()

diff --git a/plugin/memo.inc.php b/plugin/memo.inc.php
index af3d370..5ce3f11 100644 (file)
--- a/plugin/memo.inc.php
+++ b/plugin/memo.inc.php
@@ -1,5 +1,5 @@
-<?
-// $Id: memo.inc.php,v 1.3 2002/07/01 07:08:57 masui Exp $
+<?php
+// $Id: memo.inc.php,v 1.4 2002/11/29 00:09:01 panda Exp $
 
 /////////////////////////////////////////////////
 // ¥Æ¥­¥¹¥È¥¨¥ê¥¢¤Î¥«¥é¥à¿ô
@@ -114,10 +114,12 @@ function plugin_memo_convert()
        if((arg_check("read")||$vars["cmd"] == ""||arg_check("unfreeze")||arg_check("freeze")||$vars["write"]||$vars["memo"]))
                $button = "<input type=\"submit\" name=\"memo\" value=\"$_btn_memo_update\" />\n";
 
+       $s_page = htmlspecialchars($vars['page']);
+       
        $string = "<form action=\"$script\" method=\"post\" class=\"memo\">\n"
                 ."<div>\n"
                 ."<input type=\"hidden\" name=\"memo_no\" value=\"$memo_no\" />\n"
-                ."<input type=\"hidden\" name=\"refer\" value=\"$vars[page]\" />\n"
+                ."<input type=\"hidden\" name=\"refer\" value=\"$s_page\" />\n"
                 ."<input type=\"hidden\" name=\"plugin\" value=\"memo\" />\n"
                 ."<input type=\"hidden\" name=\"digest\" value=\"$digest\" />\n"
                 ."<textarea name=\"msg\" rows=\"".MEMO_ROWS."\" cols=\"".MEMO_COLS."\">\n$data</textarea><br />\n"

diff --git a/plugin/navi.inc.php b/plugin/navi.inc.php
index 07bcec6..9b930ee 100644 (file)
--- a/plugin/navi.inc.php
+++ b/plugin/navi.inc.php
@@ -1,30 +1,37 @@
-<?
-// ¥×¥é¥°¥¤¥ó navi
+<?php
+/*
+Last-Update:2002-10-15 rev.2
 
-// http://home.arino.jp/index.php?%5B%5Bnavi.inc.php%5D%5D
+*¥×¥é¥°¥¤¥ó navi
 
-// DobBookÉ÷¤Î¥Ê¥Ó¥²¡¼¥·¥ç¥ó¥Ð¡¼¤òɽ¼¨¤¹¤ë
+http://home.arino.jp/index.php?%5B%5Bnavi.inc.php%5D%5D
 
-// Usage
-// #navi(page)
-//
-// page : HOME¤È¤Ê¤ë¥Ú¡¼¥¸¡£¾Êά¤¹¤ë¤È¼«¥Ú¡¼¥¸¤òÌܼ¡¤È¤¹¤ë¡£
+DobBookÉ÷¤Î¥Ê¥Ó¥²¡¼¥·¥ç¥ó¥Ð¡¼¤òɽ¼¨¤¹¤ë
 
-// 1²óÌܤλ²¾È(HOME) : ¥Ú¡¼¥¸°ìÍ÷¤òls.inc.phpÉ÷¤Ëɽ¼¨¤¹¤ë
-//
-// 1²óÌܤλ²¾È(HOME°Ê³°)
-// header : ¥Ø¥Ã¥ÀÉ÷
-//  prev       next
-// -----------------
+*Usage
+ #navi(page)
 
-// 2²óÌܤλ²¾È
-// footer : ¥Õ¥Ã¥¿É÷
-// ------------------
-//  prev  home  next
-//  title  up  title
+*¥Ñ¥é¥á¡¼¥¿
+-page~
+ HOME¤È¤Ê¤ë¥Ú¡¼¥¸¡£¾Êά¤¹¤ë¤È¼«¥Ú¡¼¥¸¤òHOME¤È¤¹¤ë¡£
 
-// 1¥Ú¡¼¥¸¤Ç2²ó¸Æ¤Ð¤ì¤ë¤³¤È¤ò¹Íθ¤·¤Æ¡¢´ØÏ¢ÊÑ¿ô¤Ï¥°¥í¡¼¥Ð¥ë¤Ë»ý¤Ä¡£
+*Æ°ºî
 
+1¥Ú¡¼¥¸¤Ç2²ó¸Æ¤Ð¤ì¤ë¤³¤È¤ò¹Íθ¤·¤Æ¡¢´ØÏ¢ÊÑ¿ô¤Ï¥°¥í¡¼¥Ð¥ë¤Ë»ý¤Ä¡£
+
+-1²óÌܤλ²¾È(HOME)~
+ ¥Ú¡¼¥¸°ìÍ÷¤òls.inc.phpÉ÷¤Ëɽ¼¨¤¹¤ë
+-1²óÌܤλ²¾È(HOME°Ê³°)
+ header : ¥Ø¥Ã¥ÀÉ÷
+  prev       next
+ -----------------
+-2²óÌܤλ²¾È
+ footer : ¥Õ¥Ã¥¿É÷
+ ------------------
+  prev  home  next
+  title  up  title
+
+*/
 function plugin_navi_convert() {
        global $vars, $script;
        global $_navi_pages;
@@ -112,7 +119,7 @@ EOD;
                $ret .= "<ul>";
                foreach ($pages as $page) {
                        if (strip_bracket($page) == strip_bracket($home)) { continue; }
-                       $ret .= "<li>".make_link("[[$page]]");
+                       $ret .= "<li>".make_link("[[$page]]")."</li>";
                }
                $ret .= "</ul>";
        } else {

diff --git a/plugin/newpage.inc.php b/plugin/newpage.inc.php
index 2924102..500bca6 100644 (file)
--- a/plugin/newpage.inc.php
+++ b/plugin/newpage.inc.php
@@ -1,5 +1,5 @@
-<?
-// $Id: newpage.inc.php,v 1.3 2002/07/01 07:08:57 masui Exp $
+<?php
+// $Id: newpage.inc.php,v 1.4 2002/11/29 00:09:01 panda Exp $
 
 function plugin_newpage_init()
 {

diff --git a/plugin/online.inc.php b/plugin/online.inc.php
index fb91b9f..172d986 100644 (file)
--- a/plugin/online.inc.php
+++ b/plugin/online.inc.php
@@ -1,5 +1,5 @@
-<?
-// $Id: online.inc.php,v 1.3 2002/06/26 06:23:57 masui Exp $
+<?php
+// $Id: online.inc.php,v 1.4 2002/11/29 00:09:01 panda Exp $
 
 // user list file
 define(USR_LST, "counter/user.dat");

diff --git a/plugin/pcomment.inc.php b/plugin/pcomment.inc.php
index 846d1ab..1bfd7c2 100644 (file)
--- a/plugin/pcomment.inc.php
+++ b/plugin/pcomment.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /*
 Last-Update:2002-09-12 rev.15
 

diff --git a/plugin/recent.inc.php b/plugin/recent.inc.php
index 8212261..4ce3444 100644 (file)
--- a/plugin/recent.inc.php
+++ b/plugin/recent.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 /*
  * PukiWiki ºÇ¿·¤Î?·ï¤òɽ¼¨¤¹¤ë¥×¥é¥°¥¤¥ó
  *

diff --git a/plugin/source.inc.php b/plugin/source.inc.php
index 2826b1d..979dda9 100644 (file)
--- a/plugin/source.inc.php
+++ b/plugin/source.inc.php
@@ -1,5 +1,5 @@
-<?
-// $Id: source.inc.php,v 1.2 2002/06/26 06:23:57 masui Exp $
+<?php
+// $Id: source.inc.php,v 1.3 2002/11/29 00:09:01 panda Exp $
 
 function plugin_source_action()
 {

diff --git a/plugin/template.inc.php b/plugin/template.inc.php
index 9f3cf14..8ebce5a 100644 (file)
--- a/plugin/template.inc.php
+++ b/plugin/template.inc.php
@@ -1,5 +1,5 @@
-<?
-// $Id: template.inc.php,v 1.4 2002/07/01 07:08:57 masui Exp $
+<?php
+// $Id: template.inc.php,v 1.5 2002/11/29 00:09:01 panda Exp $
 
 define("MAX_LEN",60);
 function plugin_template_action()

diff --git a/plugin/update.inc.php b/plugin/update.inc.php
index 963cb85..5695748 100644 (file)
--- a/plugin/update.inc.php
+++ b/plugin/update.inc.php
@@ -1,5 +1,5 @@
-<?
-// $Id: update.inc.php,v 1.2 2002/06/26 06:23:57 masui Exp $
+<?php
+// $Id: update.inc.php,v 1.3 2002/11/29 00:09:01 panda Exp $
 
 ///////////////////////
 //

diff --git a/plugin/version.inc.php b/plugin/version.inc.php
index 07a0a94..cec68d7 100644 (file)
--- a/plugin/version.inc.php
+++ b/plugin/version.inc.php
@@ -1,5 +1,5 @@
-<?
-// $Id: version.inc.php,v 1.4 2002/07/01 07:08:57 masui Exp $
+<?php
+// $Id: version.inc.php,v 1.5 2002/11/29 00:09:01 panda Exp $
 
 function plugin_version_convert()
 {

diff --git a/plugin/vote.inc.php b/plugin/vote.inc.php
index 6888e5b..6500675 100644 (file)
--- a/plugin/vote.inc.php
+++ b/plugin/vote.inc.php
@@ -1,5 +1,5 @@
-<?
-// $Id: vote.inc.php,v 1.7 2002/07/02 05:02:51 masui Exp $
+<?php
+// $Id: vote.inc.php,v 1.8 2002/11/29 00:09:01 panda Exp $
 
 function plugin_vote_init()
 {
@@ -123,7 +123,7 @@ function plugin_vote_convert()
                . "<input type=\"hidden\" name=\"vote_no\" value=\"".htmlspecialchars($vote_no)."\" />\n"
                . "<input type=\"hidden\" name=\"digest\" value=\"".htmlspecialchars($digest)."\" />\n"
                . "</td>\n"
-               . "<td align=\"center\" class=\"vote_label\"><strong>$_votes_plugin_votes</strong></td>\n"
+               . "<td align=\"center\" class=\"vote_label\"><strong>$_vote_plugin_votes</strong></td>\n"
                . "</tr>\n";
 
        $tdcnt = 0;
@@ -143,7 +143,7 @@ function plugin_vote_convert()
                else           $cls = "vote_td2";
 
                $string .= "<tr>"
-                       .  "<td align=\"left\" class=\"$cls\" style=\"padding-left:1em;padding-right:1em;nowrap=\"nowrap\">$link</td>"
+                       .  "<td align=\"left\" class=\"$cls\" style=\"padding-left:1em;padding-right:1em;\" nowrap=\"nowrap\">$link</td>"
                        .  "<td align=\"right\" class=\"$cls\" nowrap=\"nowrap\">$cnt&nbsp;&nbsp;<input type=\"submit\" name=\"vote_".htmlspecialchars($arg)."\" value=\"$_vote_plugin_votes\" class=\"submit\" /></td>"
                        .  "</tr>\n";
        }

diff --git a/plugin/yetlist.inc.php b/plugin/yetlist.inc.php
index ac5cccb..c0649a9 100644 (file)
--- a/plugin/yetlist.inc.php
+++ b/plugin/yetlist.inc.php
@@ -1,5 +1,5 @@
-<?
-// $Id: yetlist.inc.php,v 1.6 2002/10/15 05:28:09 masui Exp $
+<?php
+// $Id: yetlist.inc.php,v 1.7 2002/11/29 00:09:01 panda Exp $
 
 // modified by PANDA <panda@arino.jp> http://home.arino.jp/
 // Last-Update:2002-09-12 rev.1

diff --git a/pukiwiki.ini.php b/pukiwiki.ini.php
index c12ea9e..7b7a60b 100644 (file)
--- a/pukiwiki.ini.php
+++ b/pukiwiki.ini.php
@@ -1,8 +1,8 @@
-<?\r
+<?php\r
 /////////////////////////////////////////////////\r
 // PukiWiki - Yet another WikiWikiWeb clone.\r
 //\r
-// $Id: pukiwiki.ini.php,v 1.13 2002/09/15 07:05:51 masui Exp $\r
+// $Id: pukiwiki.ini.php,v 1.14 2002/11/29 00:09:00 panda Exp $\r
 //\r
 // PukiWiki setting file\r
 \r
@@ -22,12 +22,16 @@ define("BACKUP_DIR","./backup/");
 define("PLUGIN_DIR","./plugin/");\r
 \r
 /////////////////////////////////////////////////\r
+// Language\r
+define("LANG","ja");\r
+\r
+/////////////////////////////////////////////////\r
 // ¥¹¥­¥ó¥Õ¥¡¥¤¥ë¤Î¾ì½ê¡£\r
-define("SKIN_FILE","./skin/pukiwiki.skin.ja.php");\r
+define("SKIN_FILE","./skin/pukiwiki.skin.".LANG.".php");\r
 \r
 /////////////////////////////////////////////////\r
-// Language\r
-define("LANG","ja");\r
+// ¸À¸ì¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß(ÊÔ½¸¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤)\r
+require(LANG.".lng");\r
 \r
 /////////////////////////////////////////////////\r
 // index.php ¤Ê¤É¤ËÊѹ¹¤·¤¿¾ì¹ç¤Î¥¹¥¯¥ê¥×¥È̾¤ÎÀßÄê\r

diff --git a/pukiwiki.php b/pukiwiki.php
index 46170bd..ecf46c6 100644 (file)
--- a/pukiwiki.php
+++ b/pukiwiki.php
@@ -1,4 +1,4 @@
-<?
+<?php
 // pukiwiki.php - Yet another WikiWikiWeb clone.
 //
 // PukiWiki 1.3.* 
@@ -25,7 +25,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //
-// $Id: pukiwiki.php,v 1.15 2002/10/15 05:28:09 masui Exp $
+// $Id: pukiwiki.php,v 1.16 2002/11/29 00:09:00 panda Exp $
 /////////////////////////////////////////////////
 
 
@@ -174,7 +174,7 @@ else if(arg_check("preview") || $post["preview"] || $post["template"])
        {
                if($post["add_top"]) $checked_top = " checked=\"checked\"";
                $addtag = '<input type="hidden" name="add" value="true" />';
-               $add_top = '<input type="checkbox" name="add_top" value="true"'.$checked_top.' /><span class="small">¥Ú¡¼¥¸¤Î¾å¤ËÄɲÃ</span>';
+               $add_top = '<input type="checkbox" name="add_top" value="true"'.$checked_top.' /><span class="small">$_btn_addtop</span>';
        }
        if($post["notimestamp"]) $checked_time = "checked=\"checked\"";
 
@@ -384,12 +384,12 @@ else if(arg_check("unfreeze") && $vars["page"] && $function_freeze)
 // º¹Ê¬¤Îɽ¼¨
 else if(arg_check("diff"))
 {
-       $pagename = strip_bracket($get["page"]);
+       $pagename = htmlspecialchars(strip_bracket($get["page"]));
        if(!is_page($get["page"]))
        {
                $title = htmlspecialchars($pagename);
                $page = make_search($vars["page"]);
-               $body = "»ØÄꤵ¤ì¤¿¥Ú¡¼¥¸¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£";
+               $body = $_msg_notfound;
        }
        else
        {

diff --git a/readme.txt b/readme.txt
index 15aea94..9cc083c 100644 (file)
--- a/readme.txt
+++ b/readme.txt
@@ -87,7 +87,7 @@ DESCRIPTION
             attach               777\r
             counter              777\r
             skin                 755\r
-            plug-in              755\r
+            plugin               755\r
 \r
    \83f\81[\83^\82Ì\83o\83b\83N\83A\83b\83v\95û\96@\r
 \r

diff --git a/rss.php b/rss.php
index 2e3fed0..4e37fbf 100644 (file)
--- a/rss.php
+++ b/rss.php
@@ -1,6 +1,6 @@
-<?
+<?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: rss.php,v 1.4 2002/07/19 10:38:37 masui Exp $
+// $Id: rss.php,v 1.5 2002/11/29 00:09:00 panda Exp $
 /////////////////////////////////////////////////
 
 // RecentChanges ¤Î RSS ¤ò½ÐÎÏ
@@ -39,6 +39,8 @@ function catrss($rss)
                                $url = $match[1];
                        }
                        
+                       $title = htmlspecialchars($title);
+                       
                        $desc = date("D, d M Y H:i:s T",filemtime(get_filename(encode($match[1]))));
                        
                        if($rss==2)
@@ -59,7 +61,7 @@ function catrss($rss)
        if($rss==1)
        {
 ?>
-<?='<?xml version="1.0" encoding="UTF-8"?>'?>
+<?php echo '<?xml version="1.0" encoding="UTF-8"?>' ?>
 
 
 <!DOCTYPE rss PUBLIC "-//Netscape Communications//DTD RSS 0.91//EN"
@@ -68,20 +70,20 @@ function catrss($rss)
 <rss version="0.91">
 
 <channel>
-<title><?=$page_title_utf8?></title>
-<link><?="http://".SERVER_NAME.PHP_SELF."?$whatsnew"?></link>
+<title><?php echo $page_title_utf8 ?></title>
+<link><?php echo "http://".SERVER_NAME.PHP_SELF."?$whatsnew" ?></link>
 <description>PukiWiki RecentChanges</description>
 <language>ja</language>
 
-<?=$items?>
+<?php echo $items ?>
 </channel>
 </rss>
-<?
+<?php
        }
        else if($rss==2)
        {
 ?>
-<?='<?xml version="1.0" encoding="utf-8"?>'?>
+<?php echo '<?xml version="1.0" encoding="utf-8"?>' ?>
 
 
 <rdf:RDF 
@@ -89,20 +91,20 @@ function catrss($rss)
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
   xml:lang="ja">
 
- <channel rdf:about="<?="http://".SERVER_NAME.PHP_SELF."?rss"?>">
-  <title><?=$page_title_utf8?></title>
-  <link><?="http://".SERVER_NAME.PHP_SELF."?$whatsnew"?></link>
+ <channel rdf:about="<?php echo "http://".SERVER_NAME.PHP_SELF."?rss" ?>">
+  <title><?php echo $page_title_utf8 ?></title>
+  <link><?php echo "http://".SERVER_NAME.PHP_SELF."?$whatsnew" ?></link>
   <description>PukiWiki RecentChanges</description>
   <items>
    <rdf:Seq>
-<?=$rdf_li?>
+<?php echo $rdf_li ?>
    </rdf:Seq>
   </items>
  </channel>
 
-<?=$items?>
+<?php echo $items ?>
 </rdf:RDF>
-<?
+<?php
        }
 }
 ?>

diff --git a/skin/pukiwiki.skin.en.php b/skin/pukiwiki.skin.en.php
index d44ac68..738cdfe 100644 (file)
--- a/skin/pukiwiki.skin.en.php
+++ b/skin/pukiwiki.skin.en.php
@@ -1,21 +1,16 @@
-<? global $page_title; header("Content-Type: text/html; charset=iso-8859-1") ?>
+<?php global $page_title; header("Content-Type: text/html; charset=iso-8859-1") ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
        <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
        <meta http-equiv="content-style-type" content="text/css">
-<?if (! ( ($vars['cmd']==''||$vars['cmd']=='read') && $is_page) ) { ?>
+       <meta http-equiv="content-script-type" content="text/javascript">
+<?php if (! ( ($vars['cmd']==''||$vars['cmd']=='read') && $is_page) ) { ?>
        <meta name="robots" content="noindex,nofollow" />
-<? } ?>
-       <title><?=$page_title ?> - <?=$title?></title>
+<?php } ?>
+       <title><?php echo $page_title ?> - <?php echo $title ?></title>
        <link rel="stylesheet" href="skin/default.en.css" type="text/css" media="screen" charset="iso-8859-1">
-       <script type="text/javascript">
-       <!--
-               function open_mini(URL,width,height){
-                       aWindow = window.open(URL, "mini", "toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=yes,resizable=no,width="+width+",height="+height);
-               }
-       //-->
-       </script>
+       <script language=javascript src="skin/default.js"></script>
 </head>
 <body>
 <div>
@@ -27,56 +22,56 @@
                <td rowspan="2" style="width:20px">
                </td>
                <td valign="bottom">
-                       <strong style="font-size:30px"><?=$page?></strong><br />
+                       <strong style="font-size:30px"><?php echo $page ?></strong><br />
                </td></tr>
                <tr><td valign="top">
-                       <? if($is_page) { ?>
-                       <a style="font-size:8px" href="<?=$script?>?<?=rawurlencode($vars["page"])?>"><?=$script?>?<?=rawurlencode($vars["page"])?></a><br />
-                       <? } ?>
+                       <?php if($is_page) { ?>
+                       <a style="font-size:8px" href="<?php echo $script ?>?<?php echo rawurlencode($vars["page"]) ?>"><?php echo $script ?>?<?php echo rawurlencode($vars["page"]) ?></a><br />
+                       <?php } ?>
                </td></tr>
        </table>
        <br />
-       <? if($is_page) { ?>
-               [ <a href="<?=$script?>?<?=rawurlencode($vars[page])?>">Reload</a> ]
+       <?php if($is_page) { ?>
+               [ <a href="<?php echo $script ?>?<?php echo rawurlencode($vars[page]) ?>">Reload</a> ]
                &nbsp;
-               [ <a href="<?=$script?>?plugin=newpage">New</a>
-               | <a href="<?=$link_edit?>">Edit</a>
-               | <a href="<?=$link_diff?>">Diff</a>
-               | <a href="<?=$script?>?plugin=attach&pcmd=upload&page=<?=rawurlencode($vars[page])?>">Upload</a>
+               [ <a href="<?php echo $script ?>?plugin=newpage">New</a>
+               | <a href="<?php echo $link_edit ?>">Edit</a>
+               | <a href="<?php echo $link_diff ?>">Diff</a>
+               | <a href="<?php echo $script ?>?plugin=attach&pcmd=upload&page=<?php echo rawurlencode($vars[page]) ?>">Upload</a>
                ]
                &nbsp;
-       <? } ?>
-       [ <a href="<?=$link_top?>">Front page</a>
-       | <a href="<?=$link_list?>">List of pages</a>
-       <? if(arg_check("list")) { ?>
-               | <a href="<?=$link_filelist?>">List of page files</a>
-       <? } ?>
-       | <a href="<?=$link_search?>">Search</a>
-       | <a href="<?=$link_whatsnew?>">Recent changes</a>
-       <? if($do_backup) { ?>
-               | <a href="<?=$link_backup?>">Backup</a>
-       <? } ?>
-       | <a href="<?="$script?".rawurlencode("[[Help]]")?>">Help</a>
+       <?php } ?>
+       [ <a href="<?php echo $link_top ?>">Front page</a>
+       | <a href="<?php echo $link_list ?>">List of pages</a>
+       <?php if(arg_check("list")) { ?>
+               | <a href="<?php echo $link_filelist ?>">List of page files</a>
+       <?php } ?>
+       | <a href="<?php echo $link_search ?>">Search</a>
+       | <a href="<?php echo $link_whatsnew ?>">Recent changes</a>
+       <?php if($do_backup) { ?>
+               | <a href="<?php echo $link_backup ?>">Backup</a>
+       <?php } ?>
+       | <a href="<?php echo "$script?".rawurlencode("[[Help]]") ?>">Help</a>
        ]<br />
-       <?=$hr?>
-       <?if($is_page){ ?>
+       <?php echo $hr ?>
+       <?php if($is_page){ ?>
                <table cellspacing="1" cellpadding="0" border="0" width="100%">
                        <tr>
                        <td valign="top" style="width:120px;word-break:break-all;">
-                               <? echo convert_html(@join("",@file(get_filename(encode("MenuBar"))))); ?>
+                               <?php echo convert_html(@join("",@file(get_filename(encode("MenuBar"))))) ?>
                        </td>
                        <td style="width:10px">
                        </td>
                        <td valign="top">
-       <? } ?>
-       <?=$body?>
-       <?if($is_page){ ?>
+       <?php } ?>
+       <?php echo $body ?>
+       <?php if($is_page){ ?>
                        </td>
                        </tr>
                </table>
-       <? } ?>
-       <?=$hr?>
-       <?
+       <?php } ?>
+       <?php echo $hr ?>
+       <?php
                if(file_exists(PLUGIN_DIR."attach.inc.php") && $is_read)
                {
                        require_once(PLUGIN_DIR."attach.inc.php");
@@ -89,38 +84,38 @@
                }
        ?>
        <div style="text-align:right">
-               <? if($is_page) { ?>
-                       <a href="<?=$script?>?<?=rawurlencode($vars[page])?>"><img src="./image/reload.gif" width="20" height="20" border="0" alt="Reload" /></a>
+               <?php if($is_page) { ?>
+                       <a href="<?php echo $script;?>?<?php echo rawurlencode($vars[page]) ?>"><img src="./image/reload.gif" width="20" height="20" border="0" alt="Reload" /></a>
                        &nbsp;
-                       <a href="<?=$script?>?plugin=newpage"><img src="./image/new.gif" width="20" height="20" border="0" alt="New" /></a>
-                       <a href="<?=$link_edit?>"><img src="./image/edit.gif" width="20" height="20" border="0" alt="Edit" /></a>
-                       <a href="<?=$link_diff?>"><img src="./image/diff.gif" width="20" height="20" border="0" alt="Diff" /></a>
+                       <a href="<?php echo $script ?>?plugin=newpage"><img src="./image/new.gif" width="20" height="20" border="0" alt="New" /></a>
+                       <a href="<?php echo $link_edit ?>"><img src="./image/edit.gif" width="20" height="20" border="0" alt="Edit" /></a>
+                       <a href="<?php echo $link_diff ?>"><img src="./image/diff.gif" width="20" height="20" border="0" alt="Diff" /></a>
                        &nbsp;
-               <? } ?>
-               <a href="<?=$link_top?>"><img src="./image/top.gif" width="20" height="20" border="0" alt="Front page" /></a>
-               <a href="<?=$link_list?>"><img src="./image/list.gif" width="20" height="20" border="0" alt="List of pages" /></a>
-               <a href="<?=$link_search?>"><img src="./image/search.gif" width="20" height="20" border="0" alt="Search" /></a>
-               <a href="<?=$link_whatsnew?>"><img src="./image/recentchanges.gif" width="20" height="20" border="0" alt="Recent changes" /></a>
-               <? if($do_backup) { ?>
-                       <a href="<?=$link_backup?>"><img src="./image/backup.gif" width="20" height="20" border="0" alt="Backup" /></a>
-               <? } ?>
+               <?php } ?>
+               <a href="<?php echo $link_top ?>"><img src="./image/top.gif" width="20" height="20" border="0" alt="Front page" /></a>
+               <a href="<?php echo link_list ?>"><img src="./image/list.gif" width="20" height="20" border="0" alt="List of pages" /></a>
+               <a href="<?php echo $link_search ?>"><img src="./image/search.gif" width="20" height="20" border="0" alt="Search" /></a>
+               <a href="<?php echo $link_whatsnew ?>"><img src="./image/recentchanges.gif" width="20" height="20" border="0" alt="Recent changes" /></a>
+               <?php if($do_backup) { ?>
+                       <a href="<?php echo $link_backup ?>"><img src="./image/backup.gif" width="20" height="20" border="0" alt="Backup" /></a>
+               <?php } ?>
                &nbsp;
-               <a href="<?="$script?".rawurlencode("[[Help]]")?>"><img src="./image/help.gif" width="20" height="20" border="0" alt="Help" /></a>
+               <a href="<?php echo "$script?".rawurlencode("[[Help]]") ?>"><img src="./image/help.gif" width="20" height="20" border="0" alt="Help" /></a>
                &nbsp;
-               <a href="<?=$script?>?cmd=rss"><img src="./image/rss.gif" width="36" height="14" border="0" alt="RSS of recent changes" /></a>
+               <a href="<?php echo $script ?>?cmd=rss"><img src="./image/rss.gif" width="36" height="14" border="0" alt="RSS of recent changes" /></a>
        </div>
-       <? if($fmt) { ?>
-                <span class="small">Last-modified: <?=date("D, d M Y H:i:s T",$fmt)?></span> <?=get_pg_passage($vars["page"])?><br />
-       <? } ?>
-       <? if($related) { ?>
-                <span class="small">Link: <?=$related?></span><br />
-       <? } ?>
+       <?php if($fmt) { ?>
+                <span class="small">Last-modified: <?php echo date("D, d M Y H:i:s T",$fmt) ?></span> <?php echo get_pg_passage($vars["page"]) ?><br />
+       <?php } ?>
+       <?php if($related) { ?>
+                <span class="small">Link: <?php echo $related ?></span><br />
+       <?php } ?>
        <br />
        <address>
-               Modified by <a href="<?=$modifierlink?>"><?=$modifier?></a><br /><br />
-               <?=S_COPYRIGHT?><br />
-               Powered by PHP <?=PHP_VERSION?><br /><br />
-               HTML convert time to <?=$taketime?> sec.
+               Modified by <a href="<?php echo $modifierlink ?>"><?php echo $modifier ?></a><br /><br />
+               <?php echo S_COPYRIGHT ?><br />
+               Powered by PHP <?php echo PHP_VERSION ?><br /><br />
+               HTML convert time to <?php echo $taketime ?> sec.
        </address>
 </div>
 </body>

diff --git a/skin/pukiwiki.skin.ja.php b/skin/pukiwiki.skin.ja.php
index e75a703..cb6b023 100644 (file)
--- a/skin/pukiwiki.skin.ja.php
+++ b/skin/pukiwiki.skin.ja.php
@@ -1,22 +1,17 @@
-<? global $page_title; header("Content-Type: text/html; charset=euc-jp") ?>\r
+<?php global $page_title; header("Content-Type: text/html; charset=euc-jp") ?>\r
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">\r
 <html>\r
 <head>\r
        <meta http-equiv="content-type" content="text/html; charset=euc-jp">\r
        <meta http-equiv="content-style-type" content="text/css">\r
-<?if (! ( ($vars['cmd']==''||$vars['cmd']=='read') && $is_page) ) { ?>\r
+       <meta http-equiv="content-script-type" content="text/javascript">\r
+<?php if (! ( ($vars['cmd']==''||$vars['cmd']=='read') && $is_page) ) { ?>\r
        <meta name="robots" content="noindex,nofollow" />\r
-<? } ?>\r
+<?php } ?>\r
 \r
-       <title><?=$page_title ?> - <?=$title?></title>\r
+       <title><?php echo $page_title ?> - <?php echo $title?></title>\r
        <link rel="stylesheet" href="skin/default.ja.css" type="text/css" media="screen" charset="shift_jis">\r
-       <script type="text/javascript">\r
-       <!--\r
-               function open_mini(URL,width,height){\r
-                       aWindow = window.open(URL, "mini", "toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=yes,resizable=no,width="+width+",height="+height);\r
-               }\r
-       //-->\r
-       </script>\r
+       <script language=javascript src="skin/default.js"></script>\r
 </head>\r
 <body>\r
 <div>\r
@@ -28,56 +23,56 @@
                <td rowspan="2" style="width:20px">\r
                </td>\r
                <td valign="bottom">\r
-                       <strong style="font-size:30px"><?=$page?></strong><br />\r
+                       <strong style="font-size:30px"><?php echo $page ?></strong><br />\r
                </td></tr>\r
                <tr><td valign="top">\r
-                       <? if($is_page) { ?>\r
-                       <a style="font-size:8px" href="<?=$script?>?<?=rawurlencode($vars["page"])?>"><?=$script?>?<?=rawurlencode($vars["page"])?></a><br />\r
-                       <? } ?>\r
+                       <?php if($is_page) { ?>\r
+                       <a style="font-size:8px" href="<?php echo $script ?>?<?php echo rawurlencode($vars["page"]) ?>"><?php echo $script ?>?<?php echo rawurlencode($vars["page"]) ?></a><br />\r
+                       <?php } ?>\r
                </td></tr>\r
        </table>\r
        <br />\r
-       <? if($is_page) { ?>\r
-               [ <a href="<?=$script?>?<?=rawurlencode($vars[page])?>">¥ê¥í¡¼¥É</a> ]\r
+       <?php if($is_page) { ?>\r
+               [ <a href="<?php echo "$script?".rawurlencode($vars[page]) ?>">¥ê¥í¡¼¥É</a> ]\r
                &nbsp;\r
-               [ <a href="<?=$script?>?plugin=newpage">¿·µ¬</a>\r
-               | <a href="<?=$link_edit?>">ÊÔ½¸</a>\r
-               | <a href="<?=$link_diff?>">º¹Ê¬</a>\r
-               | <a href="<?=$script?>?plugin=attach&pcmd=upload&page=<?=rawurlencode($vars[page])?>">źÉÕ</a>\r
+               [ <a href="<?php echo $script ?>?plugin=newpage">¿·µ¬</a>\r
+               | <a href="<?php echo $link_edit ?>">ÊÔ½¸</a>\r
+               | <a href="<?php echo $link_diff ?>">º¹Ê¬</a>\r
+               | <a href="<?php echo $script ?>?plugin=attach&pcmd=upload&page=<?php echo rawurlencode($vars[page]) ?>">źÉÕ</a>\r
                ]\r
                &nbsp;\r
-       <? } ?>\r
-       [ <a href="<?=$link_top?>">¥È¥Ã¥×</a>\r
-       | <a href="<?=$link_list?>">°ìÍ÷</a>\r
-       <? if(arg_check("list")) { ?>\r
-               | <a href="<?=$link_filelist?>">¥Õ¥¡¥¤¥ë̾°ìÍ÷</a>\r
-       <? } ?>\r
-       | <a href="<?=$link_search?>">ñ¸ì¸¡º÷</a>\r
-       | <a href="<?=$link_whatsnew?>">ºÇ½ª¹¹¿·</a>\r
-       <? if($do_backup) { ?>\r
-               | <a href="<?=$link_backup?>">¥Ð¥Ã¥¯¥¢¥Ã¥×</a>\r
-       <? } ?>\r
-       | <a href="<?="$script?".rawurlencode("[[¥Ø¥ë¥×]]")?>">¥Ø¥ë¥×</a>\r
+       <?php } ?>\r
+       [ <a href="<?php echo $link_top ?>">¥È¥Ã¥×</a>\r
+       | <a href="<?php echo $link_list ?>">°ìÍ÷</a>\r
+       <?php if(arg_check("list")) { ?>\r
+               | <a href="<?php echo $link_filelist ?>">¥Õ¥¡¥¤¥ë̾°ìÍ÷</a>\r
+       <?php } ?>\r
+       | <a href="<?php echo $link_search ?>">ñ¸ì¸¡º÷</a>\r
+       | <a href="<?php echo $link_whatsnew ?>">ºÇ½ª¹¹¿·</a>\r
+       <?php if($do_backup) { ?>\r
+               | <a href="<?php echo $link_backup ?>">¥Ð¥Ã¥¯¥¢¥Ã¥×</a>\r
+       <?php } ?>\r
+       | <a href="<?php echo "$script?".rawurlencode("[[¥Ø¥ë¥×]]") ?>">¥Ø¥ë¥×</a>\r
        ]<br />\r
-       <?=$hr?>\r
-       <?if($is_page){ ?>\r
+       <?php echo $hr ?>\r
+       <?php if($is_page) { ?>\r
                <table cellspacing="1" cellpadding="0" border="0" width="100%">\r
                        <tr>\r
                        <td valign="top" style="width:120px;word-break:break-all;">\r
-                               <? echo convert_html(@join("",@file(get_filename(encode("MenuBar"))))); ?>\r
+                               <?php echo convert_html(@join("",@file(get_filename(encode("MenuBar"))))) ?>\r
                        </td>\r
                        <td style="width:10px">\r
                        </td>\r
                        <td valign="top">\r
-       <? } ?>\r
-       <?=$body?>\r
-       <?if($is_page){ ?>\r
+       <?php } ?>\r
+       <?php echo $body ?>\r
+       <?php if($is_page) { ?>\r
                        </td>\r
                        </tr>\r
                </table>\r
-       <? } ?>\r
-       <?=$hr?>\r
-       <?\r
+       <?php } ?>\r
+       <?php echo $hr ?>\r
+       <?php\r
                if(file_exists(PLUGIN_DIR."attach.inc.php") && $is_read)\r
                {\r
                        require_once(PLUGIN_DIR."attach.inc.php");\r
@@ -90,38 +85,38 @@
                }\r
        ?>\r
        <div style="text-align:right">\r
-               <? if($is_page) { ?>\r
-                       <a href="<?=$script?>?<?=rawurlencode($vars[page])?>"><img src="./image/reload.gif" width="20" height="20" border="0" alt="¥ê¥í¡¼¥É" /></a>\r
+               <?php if($is_page) { ?>\r
+                       <a href="<?php echo "$script?".rawurlencode($vars[page]) ?>"><img src="./image/reload.gif" width="20" height="20" border="0" alt="¥ê¥í¡¼¥É" /></a>\r
                        &nbsp;\r
-                       <a href="<?=$script?>?plugin=newpage"><img src="./image/new.gif" width="20" height="20" border="0" alt="¿·µ¬" /></a>\r
-                       <a href="<?=$link_edit?>"><img src="./image/edit.gif" width="20" height="20" border="0" alt="ÊÔ½¸" /></a>\r
-                       <a href="<?=$link_diff?>"><img src="./image/diff.gif" width="20" height="20" border="0" alt="º¹Ê¬" /></a>\r
+                       <a href="<?php echo $script ?>?plugin=newpage"><img src="./image/new.gif" width="20" height="20" border="0" alt="¿·µ¬" /></a>\r
+                       <a href="<?php echo $link_edit ?>"><img src="./image/edit.gif" width="20" height="20" border="0" alt="ÊÔ½¸" /></a>\r
+                       <a href="<?php echo $link_diff ?>"><img src="./image/diff.gif" width="20" height="20" border="0" alt="º¹Ê¬" /></a>\r
                        &nbsp;\r
-               <? } ?>\r
-               <a href="<?=$link_top?>"><img src="./image/top.gif" width="20" height="20" border="0" alt="¥È¥Ã¥×" /></a>\r
-               <a href="<?=$link_list?>"><img src="./image/list.gif" width="20" height="20" border="0" alt="°ìÍ÷" /></a>\r
-               <a href="<?=$link_search?>"><img src="./image/search.gif" width="20" height="20" border="0" alt="¸¡º÷" /></a>\r
-               <a href="<?=$link_whatsnew?>"><img src="./image/recentchanges.gif" width="20" height="20" border="0" alt="ºÇ½ª¹¹¿·" /></a>\r
-               <? if($do_backup) { ?>\r
-                       <a href="<?=$link_backup?>"><img src="./image/backup.gif" width="20" height="20" border="0" alt="¥Ð¥Ã¥¯¥¢¥Ã¥×" /></a>\r
-               <? } ?>\r
+               <?php } ?>\r
+               <a href="<?php echo $link_top ?>"><img src="./image/top.gif" width="20" height="20" border="0" alt="¥È¥Ã¥×" /></a>\r
+               <a href="<?php echo $link_list ?>"><img src="./image/list.gif" width="20" height="20" border="0" alt="°ìÍ÷" /></a>\r
+               <a href="<?php echo $link_search ?>"><img src="./image/search.gif" width="20" height="20" border="0" alt="¸¡º÷" /></a>\r
+               <a href="<?php echo $link_whatsnew ?>"><img src="./image/recentchanges.gif" width="20" height="20" border="0" alt="ºÇ½ª¹¹¿·" /></a>\r
+               <?php if($do_backup) { ?>\r
+                       <a href="<?php echo $link_backup ?>"><img src="./image/backup.gif" width="20" height="20" border="0" alt="¥Ð¥Ã¥¯¥¢¥Ã¥×" /></a>\r
+               <?php } ?>\r
                &nbsp;\r
-               <a href="<?="$script?".rawurlencode("[[¥Ø¥ë¥×]]")?>"><img src="./image/help.gif" width="20" height="20" border="0" alt="¥Ø¥ë¥×" /></a>\r
+               <a href="<?php echo "$script?".rawurlencode("[[¥Ø¥ë¥×]]") ?>"><img src="./image/help.gif" width="20" height="20" border="0" alt="¥Ø¥ë¥×" /></a>\r
                &nbsp;\r
-               <a href="<?=$script?>?cmd=rss"><img src="./image/rss.gif" width="36" height="14" border="0" alt="ºÇ½ª¹¹¿·¤ÎRSS" /></a>\r
+               <a href="<?php echo $script ?>?cmd=rss"><img src="./image/rss.gif" width="36" height="14" border="0" alt="ºÇ½ª¹¹¿·¤ÎRSS" /></a>\r
        </div>\r
-       <? if($fmt) { ?>\r
-                <span class="small">Last-modified: <?=date("D, d M Y H:i:s T",$fmt)?></span> <?=get_pg_passage($vars["page"])?><br />\r
-       <? } ?>\r
-       <? if($related) { ?>\r
-                <span class="small">Link: <?=$related?></span><br />\r
-       <? } ?>\r
+       <?php if($fmt) { ?>\r
+                <span class="small">Last-modified: <?php echo date("D, d M Y H:i:s T",$fmt) ?></span> <?php echo get_pg_passage($vars["page"]) ?><br />\r
+       <?php } ?>\r
+       <?php if($related) { ?>\r
+                <span class="small">Link: <?php echo $related ?></span><br />\r
+       <?php } ?>\r
        <br />\r
        <address>\r
-               Modified by <a href="<?=$modifierlink?>"><?=$modifier?></a><br /><br />\r
-               <?=S_COPYRIGHT?><br />\r
-               Powered by PHP <?=PHP_VERSION?><br /><br />\r
-               HTML convert time to <?=$taketime?> sec.\r
+               Modified by <a href="<?php echo $modifierlink ?>"><?php echo $modifier ?></a><br /><br />\r
+               <?php echo S_COPYRIGHT ?><br />\r
+               Powered by PHP <?php echo PHP_VERSION ?><br /><br />\r
+               HTML convert time to <?php echo $taketime ?> sec.\r
        </address>\r
 </div>\r
 </body>\r

diff --git a/template.php b/template.php
index 8be55c1..f39aa55 100644 (file)
--- a/template.php
+++ b/template.php
@@ -1,6 +1,6 @@
-<?
+<?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: template.php,v 1.1 2002/06/21 05:21:46 masui Exp $
+// $Id: template.php,v 1.2 2002/11/29 00:09:00 panda Exp $
 /////////////////////////////////////////////////
 
 function auto_template($page)