Commit: 686561d8eb47507e1c895e7f66cc7b58b17416e5 - pukiwiki (git)

Commit MetaInfo

• Révision: 686561d8eb47507e1c895e7f66cc7b58b17416e5 (tree)
• l'heure: 2002-06-21 14:21:46
• Auteur: masui <masui>
• Commiter: masui

Message de Log

MASUI'z Edition first beta release
-split program files pukiwiki.php -> *.php
-add new plugins
-update plugins
-fix & update

Change Summary

• add: backup.php
• add: devel/make_funclist.sh
• modified: en.lng
• add: file.php
• add: func.php
• add: html.php
• add: init.php
• modified: ja.lng
• add: plugin.php
• modified: plugin/aname.inc.php
• add: plugin/anchor.inc.php
• add: plugin/article.inc.php
• modified: plugin/attach.inc.php
• modified: plugin/calendar.inc.php
• add: plugin/calendar2.inc.php
• modified: plugin/calendar_edit.inc.php
• modified: plugin/calendar_read.inc.php
• modified: plugin/comment.inc.php
• add: plugin/counter.inc.php
• add: plugin/img.inc.php
• add: plugin/insert.inc.php
• modified: plugin/lookup.inc.php
• add: plugin/ls.inc.php
• add: plugin/memo.inc.php
• add: plugin/newpage.inc.php
• modified: plugin/online.inc.php
• modified: plugin/readme.ja.txt
• add: plugin/recent.inc.php
• add: plugin/source.inc.php
• add: plugin/update.inc.php
• modified: plugin/version.inc.php
• add: plugin/vote.inc.php
• modified: pukiwiki.ini.php
• modified: pukiwiki.php
• delete: pukiwiki.skin.en.php => skin/pukiwiki.skin.en.php
• delete: pukiwiki.skin.ja.php => skin/pukiwiki.skin.ja.php
• delete: pukiwiki.skin.php => skin/pukiwiki.skin.php
• modified: readme.txt
• add: rss.php
• add: template.php

Modification

--- /dev/null
+++ b/backup.php
@@ -0,0 +1,238 @@
+<?
+// PukiWiki - Yet another WikiWikiWeb clone.
+// $Id: backup.php,v 1.1 2002/06/21 05:21:46 masui Exp $
+/////////////////////////////////////////////////
+
+// バックアップデータを作成する
+function make_backup($filename,$body,$oldtime)
+{
+	global $splitter,$cycle,$maxage;
+	$aryages = array();
+	$arystrout = array();
+
+	if(function_exists(gzfile))
+		$filename = str_replace(".txt",".gz",$filename);
+
+	$realfilename = BACKUP_DIR.$filename;
+
+	if(time() - @filemtime($realfilename) > (60 * 60 * $cycle))
+	{
+		$aryages = read_backup($filename);
+		if(count($aryages) >= $maxage)
+		{
+			array_shift($aryages);
+		}
+		
+		foreach($aryages as $lines)
+		{
+			foreach($lines as $key => $line)
+			{
+				if($key && $key == "timestamp")
+				{
+					$arystrout[] = "$splitter " . rtrim($line);
+				}
+				else
+				{
+					$arystrout[] = rtrim($line);
+				}
+			}
+		}
+
+		$strout = join("\n",$arystrout);
+		if(!preg_match("/\n$/",$strout) && trim($strout)) $strout .= "\n";
+
+		$body = "$splitter " . $oldtime . "\n" . $body;
+		if(!preg_match("/\n$/",$body)) $body .= "\n";
+
+		$fp = backup_fopen($realfilename,"w");
+		backup_fputs($fp,$strout);
+		backup_fputs($fp,$body);
+		backup_fclose($fp);
+	}
+	
+	return true;
+}
+
+// 特定の世代のバックアップデータを取得
+function get_backup($age,$filename)
+{
+	$aryages = read_backup($filename);
+	
+	foreach($aryages as $key => $lines)
+	{
+		if($key != $age) continue;
+		foreach($lines as $key => $line)
+		{
+			if($key && $key == "timestamp") continue;
+			$retvars[] = $line;
+		}
+	}
+
+	return $retvars;
+}
+
+// バックアップ情報を返す
+function get_backup_info($filename)
+{
+	global $splitter;
+	$lines = array();
+	$retvars = array();
+	$lines = backup_file(BACKUP_DIR.$filename);
+
+	if(!is_array($lines)) return array();
+
+	$age = 0;
+	foreach($lines as $line)
+	{
+		preg_match("/^$splitter\s(\d+)$/",trim($line),$match);
+		if($match[1])
+		{
+			$age++;
+			$retvars[$age] = $match[1];
+		}
+	}
+	
+	return $retvars;
+}
+
+// バックアップデータ全体を取得
+function read_backup($filename)
+{
+	global $splitter;
+	$lines = array();
+	$lines = backup_file(BACKUP_DIR.$filename);
+
+	if(!is_array($lines)) return array();
+
+	$age = 0;
+	foreach($lines as $line)
+	{
+		preg_match("/^$splitter\s(\d+)$/",trim($line),$match);
+		if($match[1])
+		{
+			$age++;
+			$retvars[$age]["timestamp"] = $match[1] . "\n";
+		}
+		else
+		{
+			$retvars[$age][] = $line;
+		}
+	}
+
+	return $retvars;
+}
+
+// バックアップ一覧の取得
+function get_backup_list($_page="")
+{
+	global $script,$date_format,$time_format,$weeklabels,$cantedit;
+	global $_msg_backuplist,$_msg_diff,$_msg_nowdiff,$_msg_source;
+
+	$ins_date = date($date_format,$val);
+	$ins_time = date($time_format,$val);
+	$ins_week = "(".$weeklabels[date("w",$val)].")";
+	$ins = "$ins_date $ins_week $ins_time";
+
+	if (($dir = @opendir(BACKUP_DIR)) && !$_page)
+	{
+		while($file = readdir($dir))
+		{
+			if(function_exists(gzopen))
+				$file = str_replace(".txt",".gz",$file);
+
+			if($file == ".." || $file == ".") continue;
+			$page = decode(trim(preg_replace("/(\.txt)|(\.gz)$/"," ",$file)));
+			if(in_array($page,$cantedit)) continue;
+			$page_url = rawurlencode($page);
+			$name = $page;
+			$name = strip_bracket($name);
+			if(is_page($page))
+				$vals[$name]["link"] = "<li><a href=\"$script?$page_url\">$name</a></li>";
+			else
+				$vals[$name]["link"] = "<li>$name</li>";
+			$vals[$name]["name"] = $page;
+		}
+		closedir($dir);
+		$vals = list_sort($vals);
+		$retvars[] = "<ul>";
+	}
+	else
+	{
+		$page_url = rawurlencode($_page);
+		$name = strip_bracket($_page);
+		$vals[$name]["link"] = "";
+		$vals[$name]["name"] = $_page;
+		$retvars[] = "<ul>";
+		$retvars[] .= "<li><a href=\"$script?cmd=backup\">$_msg_backuplist</a></li>\n";
+	}
+	
+	
+	foreach($vals as $page => $line)
+	{
+		$arybackups = get_backup_info(encode($line["name"]).".txt");
+		$page_url = rawurlencode($line["name"]);
+		if(count($arybackups)) $line["link"] .= "\n<ul>\n";
+		foreach($arybackups as $key => $val)
+		{
+			$ins_date = date($date_format,$val);
+			$ins_time = date($time_format,$val);
+			$ins_week = "(".$weeklabels[date("w",$val)].")";
+			$backupdate = "($ins_date $ins_week $ins_time)";
+			if(!$_page)
+			{
+				$line["link"] .= "<li><a href=\"$script?cmd=backup&page=$page_url&age=$key\">$key $backupdate</a></li>\n";
+			}
+			else
+			{
+				$line["link"] .= "<li><a href=\"$script?cmd=backup&page=$page_url&age=$key\">$key $backupdate</a> [ <a href=\"$script?cmd=backup_diff&page=$page_url&age=$key\">$_msg_diff</a> | <a href=\"$script?cmd=backup_nowdiff&page=$page_url&age=$key\">$_msg_nowdiff</a> | <a href=\"$script?cmd=backup_source&page=$page_url&age=$key\">$_msg_source</a> ]</li>\n";
+			}
+		}
+		if(count($arybackups)) $line["link"] .= "</ul>";
+		$retvars[] = $line["link"];
+	}
+	$retvars[] = "</ul>";
+	
+	return join("\n",$retvars);
+}
+
+// zlib関数が使用できれば、圧縮して使用するためのファイルシステム関数
+function backup_fopen($filename,$mode)
+{
+	if(function_exists(gzopen))
+		return gzopen(str_replace(".txt",".gz",$filename),$mode);
+	else
+		return fopen($filename,$mode);
+}
+
+function backup_fputs($zp,$str)
+{
+	if(function_exists(gzputs))
+		return gzputs($zp,$str);
+	else
+		return fputs($zp,$str);
+}
+
+function backup_fclose($zp)
+{
+	if(function_exists(gzclose))
+		return gzclose($zp);
+	else
+		return fclose($zp);
+}
+
+function backup_file($filename)
+{
+	if(function_exists(gzfile))
+		return @gzfile(str_replace(".txt",".gz",$filename));
+	else
+		return @file($filename);
+}
+
+function backup_delete($filename)
+{
+	if(function_exists(gzopen))
+		return @unlink(str_replace(".txt",".gz",$filename));
+	else
+		return @unlink($filename);
+}
+?>

--- /dev/null
+++ b/devel/make_funclist.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+grep -B1 "^function" ../*.php | sed -e "s/^\.\.\///" | sed "s/[a-z]*\.php\:function[ \t]*//"  

--- a/en.lng
+++ b/en.lng
@@ -79,6 +79,7 @@ $_btn_notchangetimestamp = 'Not change timestamp';
 $_btn_addtop = 'Add to top of page';
 $_btn_template = 'Page for use template';
 $_btn_load = 'Load';
+$_btn_edit = 'Edit';
 
 ///////////////////////////////////////
 // plug-in message
@@ -87,6 +88,7 @@ $_btn_load = 'Load';
 // comment
 $_btn_name = 'Name: ';
 $_btn_comment = 'Submit';
+$_msg_comment = 'Comment: ';
 
 ///////////////////////////////////////
 // attach file
@@ -94,6 +96,7 @@ $_title_uploaded = 'Uploaded file to $1';
 $_title_file_deleted = 'Deleted file in $1';
 $_title_notfound = 'Not found the file in $1';
 $_title_upload = 'Upload at $1';
+$_title_confirm_delete = 'Delete %s';
 
 $_msg_noparm = 'Cannot upload/delete in $1';
 $_msg_already_exists = 'Already exists file in $1';
@@ -102,6 +105,16 @@ $_msg_maxsize = 'Maximum file size is $1.';
 $_msg_delete = 'Delete \'$1\'';
 $_msg_exceed = 'File size is too big to $1';
 $_msg_attachfile = 'Attach file';
+$_msg_confirm_delete = '<center>comfirm Delete '%s'<br>%s</center>';
 $_btn_upload = 'Upload';
 $_btn_delete = 'Del';
+
+///////////////////////////////////////
+// newpage
+$_msg_newpage = 'new page';
+
+///////////////////////////////////////
+// recent
+$_recent_plugin_frame = '<span align="center"><h5 class="side_label">recent(%d)</h5></span><small>%s</small>';
+$_recent_plugin_li = '.';
 ?>

--- /dev/null
+++ b/file.php
@@ -0,0 +1,223 @@
+<?
+// PukiWiki - Yet another WikiWikiWeb clone.
+// $Id: file.php,v 1.1 2002/06/21 05:21:46 masui Exp $
+/////////////////////////////////////////////////
+
+// ソースを取得
+function get_source($page)
+{	
+  if(page_exists($page)) {
+     return file(get_filename(encode($page)));
+  }
+
+  return array();
+}
+
+// ページが存在するか？
+function page_exists($page)
+{
+	return file_exists(get_filename(encode($page)));
+}
+
+// ファイルへの出力
+function file_write($dir,$page,$str)
+{
+	global $post,$update_exec;
+
+	if($str == "")
+	{
+		@unlink($dir.encode($page).".txt");
+	}
+	else
+	{
+		if($post["notimestamp"] && is_page($page))
+		{
+			$timestamp = @filemtime($dir.encode($page).".txt");
+		}
+		$fp = fopen($dir.encode($page).".txt","w");
+		while(!flock($fp,LOCK_EX));
+		fputs($fp,$str);
+		flock($fp,LOCK_UN);
+		fclose($fp);
+		if($timestamp)
+			touch($dir.encode($page).".txt",$timestamp);
+	}
+	
+	if(!$timestamp)
+		put_lastmodified();
+
+	if($update_exec)
+	{
+		system($update_exec." > /dev/null &");
+	}
+}
+
+// 最終更新ページの更新
+function put_lastmodified()
+{
+	global $script,$maxshow,$whatsnew,$date_format,$time_format,$weeklabels,$post,$non_list;
+
+	if($post["notimestamp"]) return;
+
+	$files = get_existpages();
+	foreach($files as $page) {
+		if($page == $whatsnew) continue;
+		if(preg_match("/$non_list/",$page)) continue;
+
+		if(file_exists(get_filename(encode($page))))
+			{
+			$page_url = rawurlencode($page);
+			$lastmodtime = filemtime(get_filename(encode($page)));
+			$lastmod = date($date_format,$lastmodtime)
+				 . " (" . $weeklabels[date("w",$lastmodtime)] . ") "
+				 . date($time_format,$lastmodtime);
+			$putval[$lastmodtime][] = "-$lastmod - $page";
+		}
+	}
+	
+	$cnt = 1;
+	krsort($putval);
+	$fp = fopen(get_filename(encode($whatsnew)),"w");
+	flock($fp,LOCK_EX);
+	foreach($putval as $pages)
+	{
+		foreach($pages as $page)
+		{
+			fputs($fp,$page."\n");
+			$cnt++;
+			if($cnt > $maxshow) break;
+		}
+		if($cnt > $maxshow) break;
+	}
+	flock($fp,LOCK_EX);
+	fclose($fp);
+}
+
+// ファイル名を得る(エンコードされている必要有り)
+function get_filename($pagename)
+{
+	return DATA_DIR.$pagename.".txt";
+}
+
+// ページが存在するかしないか
+function is_page($page,$reload=false)
+{
+	global $InterWikiName,$_ispage;
+
+	if(($_ispage[$page] === true || $_ispage[$page] === false) && !$reload) return $_ispage[$page];
+
+	if(preg_match("/($InterWikiName)/",$page))
+		$_ispage[$page] = false;
+	else if(!page_exists($page))
+		$_ispage[$page] = false;
+	else
+		$_ispage[$page] = true;
+	
+	return $_ispage[$page];
+}
+
+// ページが編集可能か
+function is_editable($page)
+{
+	global $BracketName,$WikiName,$InterWikiName,$cantedit,$_editable;
+
+	if($_editable === true || $_editable === false) return $_editable;
+
+	if(preg_match("/^$InterWikiName$/",$page))
+		$_editable = false;
+	elseif(!preg_match("/^$BracketName$/",$page) && !preg_match("/^$WikiName$/",$page))
+		$_editable = false;
+	else if(in_array($page,$cantedit))
+		$_editable = false;
+	else
+		$_editable = true;
+	
+	return $_editable;
+}
+
+// ページが凍結されているか
+function is_freeze($page)
+{
+	global $_freeze;
+
+	if(!is_page($page)) return false;
+	if($_freeze === true || $_freeze === false) return $_freeze;
+
+	$lines = get_source($page);
+	
+	if($lines[0] == "#freeze\n")
+		$_freeze = true;
+	else
+		$_freeze = false;
+	
+	return $_freeze;
+}
+
+// 指定されたページの経過時刻
+function get_pg_passage($page,$sw=true)
+{
+	global $_pg_passage,$show_passage;
+
+	if(!$show_passage) return "";
+
+	if(isset($_pg_passage[$page]))
+	{
+		if($sw)
+			return $_pg_passage[$page]["str"];
+		else
+			return $_pg_passage[$page]["label"];
+	}
+	if($pgdt = @filemtime(get_filename(encode($page))))
+	{
+		$pgdt = UTIME - $pgdt;
+		if(ceil($pgdt / 60) < 60)
+			$_pg_passage[$page]["label"] = "(".ceil($pgdt / 60)."m)";
+		else if(ceil($pgdt / 60 / 60) < 24)
+			$_pg_passage[$page]["label"] = "(".ceil($pgdt / 60 / 60)."h)";
+		else
+			$_pg_passage[$page]["label"] = "(".ceil($pgdt / 60 / 60 / 24)."d)";
+		
+		$_pg_passage[$page]["str"] = "<small>".$_pg_passage[$page]["label"]."</small>";
+	}
+	else
+	{
+		$_pg_passage[$page]["label"] = "";
+		$_pg_passage[$page]["str"] = "";
+	}
+
+	if($sw)
+		return $_pg_passage[$page]["str"];
+	else
+		return $_pg_passage[$page]["label"];
+}
+
+// Last-Modified ヘッダ
+function header_lastmod($page)
+{
+	global $lastmod;
+	
+	if($lastmod && is_page($page))
+	{
+		header("Last-Modified: ".gmdate("D, d M Y H:i:s", filemtime(get_filename(encode($page))))." GMT");
+	}
+}
+
+// 全ページ名を配列に
+function get_existpages()
+{
+	$aryret = array();
+
+	if ($dir = @opendir(DATA_DIR))
+	{
+		while($file = readdir($dir))
+		{
+			if($file == ".." || $file == "." || strstr($file,".txt")===FALSE) continue;
+			$page = decode(trim(preg_replace("/\.txt$/"," ",$file)));
+			array_push($aryret,$page);
+		}
+		closedir($dir);
+	}
+	
+	return $aryret;
+}
+?>

--- /dev/null
+++ b/func.php
@@ -0,0 +1,340 @@
+<?
+// PukiWiki - Yet another WikiWikiWeb clone.
+// $Id: func.php,v 1.1 2002/06/21 05:21:46 masui Exp $
+/////////////////////////////////////////////////
+
+// 検索
+function do_search($word,$type="AND",$non_format=0)
+{
+	global $script,$whatsnew,$vars;
+	global $_msg_andresult,$_msg_orresult,$_msg_notfoundresult;
+	
+	$database = array();
+	$retval = array();
+	$cnt = 0;
+
+	$files = get_existpages();
+	foreach($files as $page) {
+		$cnt++;
+		if($page == $whatsnew) continue;
+		if($page == $vars["page"] && $non_format) continue;
+		$data[$page] = get_source($page);
+	}
+	
+	$arywords = explode(" ",$word);
+	$result_word = $word;
+	
+	foreach($data as $name => $lines)
+	{
+		$line = join("\n",$lines);
+		
+		$hit = 0;
+		if(strpos($result_word," ") !== FALSE)
+		{
+			foreach($arywords as $word)
+			{
+				if($type=="AND")
+				{
+					if(strpos($line,$word) === FALSE)
+					{
+						$hit = 0;
+						break;
+					}
+					else
+					{
+						$hit = 1;
+					}
+				}
+				else if($type=="OR")
+				{
+					if(strpos($line,$word) !== FALSE)
+						$hit = 1;
+				}
+			}
+			if($hit==1 || strpos($name,$word)!==FALSE)
+			{
+				$page_url = rawurlencode($name);
+				$word_url = rawurlencode($word);
+				$name2 = strip_bracket($name);
+				$str = get_pg_passage($name);
+				$retval[$name2] = "<li><a href=\"$script?$page_url\">$name2</a>$str</li>";
+			}
+		}
+		else
+		{
+			if(stristr($line,$word) || stristr($name,$word))
+			{
+				$page_url = rawurlencode($name);
+				$word_url = rawurlencode($word);
+				$name2 = strip_bracket($name);
+				$link_tag = "<a href=\"$script?$page_url\">$name2</a>";
+				$link_tag .= get_pg_passage($name,false);
+				if($non_format)
+				{
+					$tm = @filemtime(get_filename(encode($name)));
+					$retval[$tm] = $link_tag;
+				}
+				else
+				{
+					$retval[$name2] = "<li>$link_tag</li>";
+				}
+			}
+		}
+	}
+
+	if($non_format)
+		return $retval;
+
+	$retval = list_sort($retval);
+
+	if(count($retval) && !$non_format)
+	{
+		$retvals = "<ul>\n" . join("\n",$retval) . "</ul>\n<br>\n";
+		
+		if($type=="AND")
+			$retvals.= str_replace('$1',$result_word,str_replace('$2',count($retval),str_replace('$3',$cnt,$_msg_andresult)));
+		else
+			$retvals.= str_replace('$1',$result_word,str_replace('$2',count($retval),str_replace('$3',$cnt,$_msg_orresult)));
+
+	}
+	else
+		$retvals .= str_replace('$1',$result_word,$_msg_notfoundresult);
+	return $retvals;
+}
+
+// プログラムへの引数のチェック
+function arg_check($str)
+{
+	global $arg,$vars;
+
+	return preg_match("/^".$str."/",$vars["cmd"]);
+}
+
+// ページリストのソート
+function list_sort($values)
+{
+	if(!is_array($values)) return array();
+	
+	// ksortのみだと、[[日本語]]、[[英文字]]、英文字のみ、に順に並べ替えられる
+	ksort($values);
+
+	$vals1 = array();
+	$vals2 = array();
+	$vals3 = array();
+
+	// 英文字のみ、[[英文字]]、[[日本語]]、の順に並べ替える
+	foreach($values as $key => $val)
+	{
+		if(preg_match("/\[\[[^\w]+\]\]/",$key))
+			$vals3[$key] = $val;
+		else if(preg_match("/\[\[[\W]+\]\]/",$key))
+			$vals2[$key] = $val;
+		else
+			$vals1[$key] = $val;
+	}
+	return array_merge($vals1,$vals2,$vals3);
+}
+
+// ページ名のエンコード
+function encode($key)
+{
+	$enkey = '';
+	$arych = preg_split("//", $key, -1, PREG_SPLIT_NO_EMPTY);
+	
+	foreach($arych as $ch)
+	{
+		$enkey .= sprintf("%02X", ord($ch));
+	}
+
+	return $enkey;
+}
+
+// ファイル名のデコード
+function decode($key)
+{
+	$dekey = '';
+	
+	for($i=0;$i<strlen($key);$i+=2)
+	{
+		$ch = substr($key,$i,2);
+		$dekey .= chr(intval("0x".$ch,16));
+	}
+	return urldecode($dekey);
+}
+
+// InterWikiName List の解釈(返値:２次元配列)
+function open_interwikiname_list()
+{
+	global $interwiki;
+	
+	$retval = array();
+	$aryinterwikiname = get_source($interwiki);
+
+	$cnt = 0;
+	foreach($aryinterwikiname as $line)
+	{
+		if(preg_match("/\[((https?|ftp|news)(\:\/\/[[:alnum:]\+\$\;\?\.%,!#~\*\/\:@&=_\-]+))\s([^\]]+)\]\s?([^\s]*)/",$line,$match))
+		{
+			$retval[$match[4]]["url"] = $match[1];
+			$retval[$match[4]]["opt"] = $match[5];
+		}
+	}
+
+	return $retval;
+}
+
+// [[ ]] を取り除く
+function strip_bracket($str)
+{
+	global $strip_link_wall;
+	
+	if($strip_link_wall)
+	{
+		preg_match("/^\[\[(.*)\]\]$/",$str,$match);
+		if($match[1])
+			$str = $match[1];
+	}
+	return $str;
+}
+
+// テキスト整形ルールを表示する
+function catrule()
+{
+	global $rule_body;
+	return $rule_body;
+}
+
+// エラーメッセージを表示する
+function die_message($msg)
+{
+	$title = $page = "Runtime error";
+
+	$body = "<h3>Runtime error</h3>\n";
+	$body .= "<b>Error message : $msg</b>\n";
+
+	catbody($title,$page,$body);
+
+	die();
+}
+
+// 現在時刻をマイクロ秒で取得
+function getmicrotime()
+{
+	list($usec, $sec) = explode(" ",microtime());
+	return ((float)$sec + (float)$usec);
+}
+
+// 差分の作成
+function do_diff($strlines1,$strlines2)
+{
+	$lines1 = split("\n",$strlines1);
+	$lines2 = split("\n",$strlines2);
+	
+	$same_lines = $diff_lines = $del_lines = $add_lines = $retdiff = array();
+	
+	if(count($lines1) > count($lines2)) { $max_line = count($lines1)+2; }
+	else                                { $max_line = count($lines2)+2; }
+
+	//$same_lines = array_intersect($lines1,$lines2);
+
+	$diff_lines2 = array_diff($lines2,$lines1);
+	$diff_lines = array_merge($diff_lines2,array_diff($lines1,$lines2));
+
+	foreach($diff_lines as $line)
+	{
+		$index = array_search($line,$lines1);
+		if($index > -1)
+		{
+			$del_lines[$index] = $line;
+		}
+		
+		//$index = array_search($line,$lines2);
+		//if($index > -1)
+		//{
+		//	$add_lines[$index] = $line;
+		//}
+	}
+
+	$cnt=0;
+	foreach($lines2 as $line)
+	{
+		$line = rtrim($line);
+		
+		while($del_lines[$cnt])
+		{
+			$retdiff[] = "- ".$del_lines[$cnt];
+			$del_lines[$cnt] = "";
+			$cnt++;
+		}
+		
+		if(in_array($line,$diff_lines))
+		{
+			$retdiff[] = "+ $line";
+		}
+		else
+		{
+			$retdiff[] = "  $line";
+		}		
+
+		$cnt++;
+	}
+	
+	foreach($del_lines as $line)
+	{
+		if(trim($line))
+			$retdiff[] = "- $line";
+	}
+
+	return join("\n",$retdiff);
+}
+
+
+// 差分の作成
+function do_update_diff($oldstr,$newstr)
+{
+	$oldlines = split("\n",$oldstr);
+	$newlines = split("\n",$newstr);
+	
+	$retdiff = $props = array();
+	$auto = true;
+	
+	foreach($newlines as $newline) {
+	  $flg = false;
+	  $cnt = 0;
+	  foreach($oldlines as $oldline) {
+	    if($oldline == $newline) {
+	      if($cnt>0) {
+		for($i=0; $i<$cnt; ++$i) {
+		  array_push($retdiff,array_shift($oldlines));
+		  array_push($props,'! ');
+		  $auto = false;
+		}
+	      }
+	      array_push($retdiff,array_shift($oldlines));
+	      array_push($props,'');
+	      $flg = true;
+	      break;
+	    }
+	    $cnt++;
+	  }
+	  if(!$flg) {
+	    array_push($retdiff,$newline);
+	    array_push($props,'+ ');
+	  }
+	}
+	foreach($oldlines as $oldline) {
+	  array_push($retdiff,$oldline);
+	  array_push($props,'! ');
+	  $auto = false;
+	}
+	if($auto) {
+	  return array(join("\n",$retdiff),$auto);
+	}
+
+	$ret = '';
+	foreach($retdiff as $line) {
+	  $ret .= array_shift($props) . $line . "\n";
+	}
+	return array($ret,$auto);
+}
+?>

--- /dev/null
+++ b/html.php
@@ -0,0 +1,760 @@
+<?
+// PukiWiki - Yet another WikiWikiWeb clone.
+// $Id: html.php,v 1.1 2002/06/21 05:21:46 masui Exp $
+/////////////////////////////////////////////////
+
+// 本文をページ名から出力
+function catbodyall($page,$title="",$pg="")
+{
+	if($title === "") $title = strip_bracket($page);
+	if($pg === "") $pg = make_search($page);
+
+	$body = join("",get_source($page));
+	$body = convert_html($body);
+
+	header_lastmod($vars["page"]);
+	catbody($title,$pg,$body);
+	die();
+}
+
+// 本文を出力
+function catbody($title,$page,$body)
+{
+	global $script,$vars,$arg,$do_backup,$modifier,$modifierlink,$defaultpage,$whatsnew,$hr;
+	global $date_format,$weeklabels,$time_format,$longtaketime,$related_link;
+	global $HTTP_SERVER_VARS,$cantedit;
+
+	if($vars["page"] && !arg_check("backup") && $vars["page"] != $whatsnew)
+	{
+		$is_page = 1;
+	}
+
+	$link_add = "$script?cmd=add&page=".rawurlencode($vars["page"]);
+	$link_edit = "$script?cmd=edit&page=".rawurlencode($vars["page"]);
+	$link_diff = "$script?cmd=diff&page=".rawurlencode($vars["page"]);
+	$link_top = "$script?$defaultpage";
+	$link_list = "$script?cmd=list";
+	$link_filelist = "$script?cmd=filelist";
+	$link_search = "$script?cmd=search";
+	$link_whatsnew = "$script?$whatsnew";
+	$link_backup = "$script?cmd=backup&page=".rawurlencode($vars["page"]);
+	$link_help = "$script?cmd=help";
+
+	if(is_page($vars["page"]) && $is_page)
+	{
+		$fmt = @filemtime(get_filename(encode($vars["page"])));
+	}
+
+	if(is_page($vars["page"]) && $related_link && $is_page && !arg_check("edit") && !arg_check("freeze") && !arg_check("unfreeze"))
+	{
+		$related = make_related($vars["page"],false);
+	}
+
+	if(is_page($vars["page"]) && !in_array($vars["page"],$cantedit) && !arg_check("backup") && !arg_check("edit") && !$vars["preview"])
+	{
+		$is_read = TRUE;
+	}
+
+	//if(!$longtaketime)
+		$longtaketime = getmicrotime() - MUTIME;
+	$taketime = sprintf("%01.03f",$longtaketime);
+
+	require(SKIN_FILE);
+}
+
+// テキスト本体をHTMLに変換する
+function convert_html($string)
+{
+	global $result,$saved,$hr,$script,$page,$vars,$top;
+	global $note_id,$foot_explain,$digest,$note_hr;
+	global $user_rules,$str_rules,$line_rules,$strip_link_wall;
+
+	global $longtaketime;
+
+	$string = rtrim($string);
+	$string = preg_replace("/(\x0D\x0A)/","\n",$string);
+	$string = preg_replace("/(\x0D)/","\n",$string);
+	$string = preg_replace("/(\x0A)/","\n",$string);
+
+	$start_mtime = getmicrotime();
+
+	$digest = md5(@join("",get_source($vars["page"])));
+
+	$content_id = 0;
+	$user_rules = array_merge($str_rules,$line_rules);
+
+	$result = array();
+	$saved = array();
+	$arycontents = array();
+
+	$string = preg_replace("/^#freeze\n/","",$string);
+
+	$lines = split("\n", $string);
+	$note_id = 1;
+	$foot_explain = array();
+
+	$table = 0;
+
+	if(preg_match("/#contents/",$string))
+		$top_link = "<a href=\"#contents\">$top</a>";
+
+	foreach ($lines as $line)
+	{
+		if(!preg_match("/^\/\/(.*)/",$line,$comment_out) && $table != 0)
+		{
+			if(!preg_match("/^\|(.+)\|$/",$line,$out))
+				array_push($result, "</table>");
+			if(!$out[1] || $table != count(explode("|",$out[1])))
+				$table = 0;
+		}
+
+		$comment_out = $comment_out[1];
+
+		if(preg_match("/^(\*{1,3})(.*)/",$line,$out))
+		{
+			$result = array_merge($result,$saved); $saved = array();
+			$str = inline($out[2]);
+			
+			$level = strlen($out[1]) + 1;
+			
+			array_push($result, "<h$level><a name=\"content:$content_id\">$str</a> $top_link</h$level>");
+			$arycontents[] = str_repeat("-",$level-1)."<a href=\"#content:$content_id\">".strip_htmltag($str)."</a>\n";
+			$content_id++;
+		}
+		else if(preg_match("/^(-{1,4})(.*)/",$line,$out))
+		{
+			if(strlen($out[1]) == 4)
+			{
+				$result = array_merge($result,$saved); $saved = array();
+				array_push($result, $hr);
+			}
+			else
+			{
+				back_push('ul', strlen($out[1]));
+				array_push($result, '<li>' . inline($out[2]) . '</li>');
+			}
+		}
+		else if (preg_match("/^:([^:]+):(.*)/",$line,$out))
+		{
+			back_push('dl', 1);
+			array_push($result, '<dt>' . inline($out[1]) . '</dt>', '<dd>' . inline($out[2]) . '</dd>');
+		}
+		else if(preg_match("/^(>{1,3})(.*)/",$line,$out))
+		{
+			back_push('blockquote', strlen($out[1]));
+			array_push($result, ltrim(inline($out[2])));
+		}
+		else if (preg_match("/^\s*$/",$line,$out))
+		{
+			$result = array_merge($result,$saved); $saved = array();
+			//array_unshift($saved, "</p>");
+			array_push($result, "<p>");
+		}
+		else if(preg_match("/^(\s+.*)/",$line,$out))
+		{
+			back_push('pre', 1);
+			array_push($result, htmlspecialchars($out[1],ENT_NOQUOTES));
+		}
+		else if(preg_match("/^\|(.+)\|$/",$line,$out))
+		{
+			$arytable = explode("|",$out[1]);
+
+			if(!$table)
+			{
+				$result = array_merge($result,$saved); $saved = array();
+				array_push($result,"<table class=\"style_table\" cellspacing=\"1\" border=\"0\">");
+				$table = count($arytable);
+			}
+
+			array_push($result,"<tr>");
+			foreach($arytable as $td)
+			{
+				array_push($result,"<td class=\"style_td\">");
+				array_push($result,ltrim(inline($td)));
+				array_push($result,"</td>");
+			}
+			array_push($result,"</tr>");
+
+		}
+		else if(strlen($comment_out) != 0)
+		{
+			array_push($result," <!-- ".htmlspecialchars($comment_out)." -->");
+		}
+		else
+		{
+			array_push($result, inline($line));
+		}
+	}
+	if($table) array_push($result, "</table>");
+
+	$result_last = $result = array_merge($result,$saved); $saved = array();
+
+	if($content_id != 0)
+	{
+		$result = array();
+		$saved = array();
+
+		foreach($arycontents as $line)
+		{
+			if(preg_match("/^(-{1,3})(.*)/",$line,$out))
+			{
+				back_push('ul', strlen($out[1]));
+				array_push($result, '<li>'.$out[2].'</li>');
+			}
+		}
+		$result = array_merge($result,$saved); $saved = array();
+		
+		$contents = "<a name=\"contents\"></a>\n";
+		$contents .= join("\n",$result);
+		if($strip_link_wall)
+		{
+			$contents = preg_replace("/\[\[([^\]]+)\]\]/","$1",$contents);
+		}
+	}
+
+	$result_last = inline2($result_last);
+	
+	$result_last = preg_replace("/^#contents/",$contents,$result_last);
+
+	$str = join("\n", $result_last);
+
+	if($foot_explain)
+	{
+		$str .= "\n";
+		$str .= "$note_hr\n";
+		//$str .= "<p>\n";
+		$str .= join("\n",inline2($foot_explain));
+		//$str .= "</p>\n";
+	}
+
+	$longtaketime = getmicrotime() - $start_mtime;
+
+	$str = preg_replace("/&((amp)|(quot)|(nbsp)|(lt)|(gt));/","&$1;",$str);
+
+	return $str;
+}
+
+// $tagのタグを$levelレベルまで詰める。
+function back_push($tag, $level)
+{
+	global $result,$saved;
+	
+	while (count($saved) > $level) {
+		array_push($result, array_shift($saved));
+	}
+	if ($saved[0] != "</$tag>") {
+		$result = array_merge($result,$saved); $saved = array();
+	}
+	while (count($saved) < $level) {
+		array_unshift($saved, "</$tag>");
+		array_push($result, "<$tag>");
+	}
+}
+
+// リンクの付加その他
+function inline($line)
+{
+	$line = htmlspecialchars($line);
+
+	$line = preg_replace("/(
+
+					(\(\(([^\(\)]+)\)\))
+					|
+					(\(\((.+)\)\))
+
+				)/ex","make_note(\"$1\")",$line);
+
+	return $line;
+}
+
+// リンクの付加その他2
+function inline2($str)
+{
+	global $WikiName,$BracketName,$InterWikiName,$vars,$related,$related_link,$script;
+	$cnts_plain = array();
+	$cnts_plugin = array();
+	$arykeep = array();
+
+	for($cnt=0;$cnt<count($str);$cnt++)
+	{
+		if(preg_match("/^(\s)/",$str[$cnt]))
+		{
+			$arykeep[$cnt] = $str[$cnt];
+			$str[$cnt] = "";
+			$cnts_plain[] = $cnt;
+		}
+		else if(preg_match("/^\#([^\(]+)\(?(.*)\)?$/",$str[$cnt],$match))
+		{
+		  if(exist_plugin_convert($match[1])) {
+			$aryplugins[$cnt] = $str[$cnt];
+			$str[$cnt] = "";
+			$cnts_plugin[] = $cnt;
+		  }
+		}
+	}
+
+	$str = preg_replace("/'''([^']+?)'''/s","<i>$1</i>",$str);	// Italic
+
+	$str = preg_replace("/''([^']+?)''/s","<b>$1</b>",$str);	// Bold
+
+	$str = preg_replace("/
+		(
+			(\[\[([^\]]+)\:(https?|ftp|news)(:\/\/[-_.!~*'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)\]\])
+			|
+			(\[(https?|ftp|news)(:\/\/[-_.!~*'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)\s([^\]]+)\])
+			|
+			(https?|ftp|news)(:\/\/[-_.!~*'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)
+			|
+			([[:alnum:]\-_.]+@[[:alnum:]\-_]+\.[[:alnum:]\-_\.]+)
+			|
+			(\[\[([^\]]+)\:([[:alnum:]\-_.]+@[[:alnum:]\-_]+\.[[:alnum:]\-_\.]+)\]\])
+			|
+			($InterWikiName)
+			|
+			($BracketName)
+			|
+			($WikiName)
+		)/ex","make_link('$1')",$str);
+
+	$str = preg_replace("/#related/",make_related($vars["page"],true),$str);
+
+	$str = make_user_rules($str);
+
+	$aryplugins = preg_replace("/^\#([^\(]+)$/ex","do_plugin_convert('$1','$2')",$aryplugins);
+	$aryplugins = preg_replace("/^\#([^\(]+)\((.*)\)$/ex","do_plugin_convert('$1','$2')",$aryplugins);
+
+	$tmp = $str;
+	$str = preg_replace("/^#norelated$/","",$str);
+	if($tmp != $str)
+		$related_link = 0;
+
+	foreach($cnts_plain as $cnt)
+		$str[$cnt] = $arykeep[$cnt];
+
+	foreach($cnts_plugin as $cnt)
+		$str[$cnt] = $aryplugins[$cnt];
+
+	return $str;
+}
+
+// 一覧の取得
+function get_list($withfilename)
+{
+	global $script,$list_index,$top,$non_list,$whatsnew;
+	global $_msg_symbol,$_msg_other;
+	
+	$retval = array();
+	$files = get_existpages();
+	foreach($files as $page) {
+		if(preg_match("/$non_list/",$page) && !$withfilename) continue;
+		if($page == $whatsnew) continue;
+		$page_url = rawurlencode($page);
+		$page2 = strip_bracket($page);
+		$pg_passage = get_pg_passage($page);
+		$retval[$page2] .= "<li><a href=\"$script?$page_url\">$page2</a>$pg_passage</li>\n";
+		if($withfilename)
+		{
+			$retval[$page2] .= "<ul><li>$file</li></ul>\n";
+		}
+	}
+	
+	$retval = list_sort($retval);
+	
+	if($list_index)
+	{
+		$head_str = "";
+		$etc_sw = 0;
+		$symbol_sw = 0;
+		$top_link = "";
+		foreach($retval as $page => $link)
+		{
+			$head = substr($page,0,1);
+			if($head_str != $head && !$etc_sw)
+			{
+				$retval2[$page] = "";
+				
+				if(preg_match("/([A-Z])|([a-z])/",$head,$match))
+				{
+					if($match[1])
+						$head_nm = "High:$head";
+					else
+						$head_nm = "Low:$head";
+					
+					if($head_str) $retval2[$page] = "</ul>\n";
+					$retval2[$page] .= "<li><a href=\"#top:$head_nm\" name=\"$head_nm\"><b>$head</b></a></li>\n<ul>\n";
+					$head_str = $head;
+					if($top_link) $top_link .= "|";
+					$top_link .= "<a href=\"#$head_nm\" name=\"top:$head_nm\"><b>&nbsp;".$head."&nbsp;</b></a>";
+				}
+				else if(preg_match("/[ -~]/",$head))
+				{
+					if(!$symbol_sw)
+					{
+						if($head_str) $retval2[$page] = "</ul>\n";
+						$retval2[$page] .= "<li><a href=\"#top:symbol\" name=\"symbol\"><b>$_msg_symbol</b></a></li>\n<ul>\n";
+						$head_str = $head;
+						if($top_link) $top_link .= "|";
+						$top_link .= "<a href=\"#symbol\" name=\"top:symbol\"><b>$_msg_symbol</b></a>";
+						$symbol_sw = 1;
+					}
+				}
+				else
+				{
+					if($head_str) $retval2[$page] = "</ul>\n";
+					$retval2[$page] .= "<li><a href=\"#top:etc\" name=\"etc\"><b>$_msg_other</b></a></li>\n<ul>\n";
+					$etc_sw = 1;
+					if($top_link) $top_link .= "|";
+					$top_link .= "<a href=\"#etc\" name=\"top:etc\"><b>$_msg_other</b></a>";
+				}
+			}
+			$retval2[$page] .= $link;
+		}
+		$retval2[] = "</ul>\n";
+		
+		$top_link = "<div align=\"center\"><a name=\"top\">$top_link</a></div><br>\n";
+		
+		array_unshift($retval2,$top_link);
+	}
+	else
+	{
+		$retval2 = $retval;
+	}
+	
+	return join("",$retval2);
+}
+
+// 編集フォームの表示
+function edit_form($postdata,$page,$add=0)
+{
+	global $script,$rows,$cols,$hr,$vars,$function_freeze;
+	global $_btn_addtop,$_btn_preview,$_btn_update,$_btn_freeze,$_msg_help,$_btn_notchangetimestamp;
+	global $whatsnew,$_btn_template,$_btn_load,$non_list,$load_template_func;
+
+	$digest = md5(@join("",get_source($page)));
+
+	if($add)
+	{
+		$addtag = '<input type="hidden" name="add" value="true">';
+		$add_top = '<input type="checkbox" name="add_top" value="true"><small>'.$_btn_addtop.'</small>';
+	}
+
+	if($vars["help"] == "true")
+		$help = $hr.catrule();
+	else
+		$help = "<br>\n<ul><li><a href=\"$script?cmd=edit&help=true&page=".rawurlencode($page)."\">$_msg_help</a></ul></li>\n";
+
+	if($function_freeze)
+		$str_freeze = '<input type="submit" name="freeze" value="'.$_btn_freeze.'" accesskey="f">';
+
+	if($load_template_func)
+	{
+		$vals = array();
+
+		$files = get_existpages();
+		foreach($files as $pg_org) {
+			if($pg_org == $whatsnew) continue;
+			if(preg_match("/$non_list/",$pg_org)) continue;
+			$name = strip_bracket($pg_org);
+			$vals[$name] = "    <option value=\"$pg_org\">$name</option>";
+		}
+		@ksort($vals);
+		
+		$template = "   <select name=\"template_page\">\n"
+			   ."    <option value=\"\">-- $_btn_template --</option>\n"
+			   .join("\n",$vals)
+			   ."   </select>\n"
+			   ."   <input type=\"submit\" name=\"template\" value=\"$_btn_load\" accesskey=\"r\"><br>\n";
+
+		if($vars["refer"]) $refer = $vars["refer"]."\n\n";
+	}
+
+return '
+<form action="'.$script.'" method="post">
+<input type="hidden" name="page" value="'.$page.'">
+<input type="hidden" name="digest" value="'.$digest.'">
+'.$addtag.'
+<table cellspacing="3" cellpadding="0" border="0">
+ <tr>
+  <td colspan="2" align="right">
+'.$template.'
+  </td>
+ </tr>
+ <tr>
+  <td colspan="2" align="right">
+   <textarea name="msg" rows="'.$rows.'" cols="'.$cols.'" wrap="virtual">
+'.htmlspecialchars($refer.$postdata).'</textarea>
+  </td>
+ </tr>
+ <tr>
+  <td>
+   <input type="submit" name="preview" value="'.$_btn_preview.'" accesskey="p">
+   <input type="submit" name="write" value="'.$_btn_update.'" accesskey="s">
+   '.$add_top.'
+   <input type="checkbox" name="notimestamp" value="true"><small>'.$_btn_notchangetimestamp.'</small>
+  </td>
+  </form>
+  <form action="'.$script.'?cmd=freeze" method="post">
+   <input type="hidden" name="page" value="'.$vars["page"].'">
+  <td align="right">
+   '.$str_freeze.'
+  </td>
+  </form>
+ </tr>
+</table>
+' . $help;
+}
+
+// 関連するページ
+function make_related($page,$_isrule)
+{
+	global $related_str,$rule_related_str,$related,$_make_related,$vars;
+
+	$page_name = strip_bracket($vars["page"]);
+
+	if(!is_array($_make_related))
+	{
+		$aryrelated = do_search($page,"OR",1);
+
+		if(is_array($aryrelated))
+		{
+			foreach($aryrelated as $key => $val)
+			{
+				$new_arylerated[$key.md5($val)] = $val;
+			}
+		}
+
+		if(is_array($related))
+		{
+			foreach($related as $key => $val)
+			{
+				$new_arylerated[$key.md5($val)] = $val;
+			}
+		}
+
+		@krsort($new_arylerated);
+		$_make_related = @array_unique($new_arylerated);
+	}
+
+	if($_isrule)
+	{
+		if(is_array($_make_related))
+		{
+			foreach($_make_related as $str)
+			{
+				preg_match("/<a\shref=\"([^\"]+)\">([^<]+)<\/a>(.*)/",$str,$out);
+				
+				if($out[3]) $title = " title=\"$out[2] $out[3]\"";
+				
+				$aryret[$out[2]] = "<a href=\"$out[1]\"$title>$out[2]</a>";
+			}
+			@ksort($aryret);
+		}
+	}
+	else
+	{
+		$aryret = $_make_related;
+	}
+
+	if($_isrule) $str = $rule_related_str;
+	else         $str = $related_str;
+
+	return @join($str,$aryret);
+}
+
+// 注釈処理
+function make_note($str)
+{
+	global $note_id,$foot_explain;
+
+	$str = preg_replace("/^\(\(/","",$str);
+	$str = preg_replace("/\)\)$/","",$str);
+
+	$str= str_replace("\\'","'",$str);
+
+	$str = make_user_rules($str);
+
+	$foot_explain[] = "<a name=\"notefoot:$note_id\" href=\"#notetext:$note_id\"><sup><small>*$note_id</small></sup></a> <small>$str</small><br />\n";
+	$note =  "<a name=\"notetext:$note_id\" href=\"#notefoot:$note_id\"><sup><small>*$note_id</small></sup></a>";
+	$note_id++;
+
+	return $note;
+}
+
+// リンクを付加する
+function make_link($name)
+{
+	global $BracketName,$WikiName,$InterWikiName,$script,$link_target,$interwiki_target;
+	global $related,$show_passage,$vars,$defaultpage;
+
+	$aryconv_htmlspecial = array("&amp;","&lt;","&gt;");
+	$aryconv_html = array("&","<",">");
+
+	$page = $name;
+
+	if(preg_match("/^\[\[([^\]]+)\:((https?|ftp|news)([^\]]+))\]\]$/",$name,$match))
+	{
+		$match[2] = str_replace($aryconv_htmlspecial,$aryconv_html,$match[2]);
+		return "<a href=\"$match[2]\" target=\"$link_target\">$match[1]</a>";
+	}
+	else if(preg_match("/^\[((https?|ftp|news)([^\]\s]+))\s([^\]]+)\]$/",$name,$match))
+	{
+		$match[1] = str_replace($aryconv_htmlspecial,$aryconv_html,$match[1]);
+		return "<a href=\"$match[1]\" target=\"$link_target\">$match[4]</a>";
+	}
+	else if(preg_match("/^(https?|ftp|news).*?(\.gif|\.png|\.jpeg|\.jpg)?$/",$name,$match))
+	{
+		$name = str_replace($aryconv_htmlspecial,$aryconv_html,$name);
+		if($match[2])
+			return "<a href=\"$name\" target=\"$link_target\"><img src=\"$name\" border=\"0\"></a>";
+		else
+			return "<a href=\"$name\" target=\"$link_target\">$page</a>";
+	}
+	else if(preg_match("/^\[\[([^\]]+)\:([[:alnum:]\-_.]+@[[:alnum:]\-_]+\.[[:alnum:]\-_\.]+)\]\]/",$name,$match))
+	{
+		$match[1] = str_replace($aryconv_htmlspecial,$aryconv_html,$match[1]);
+		$match[2] = str_replace($aryconv_htmlspecial,$aryconv_html,$match[2]);
+
+		return "<a href=\"mailto:$match[2]\">$match[1]</a>";
+	}
+	else if(preg_match("/^([[:alnum:]\-_]+@[[:alnum:]\-_]+\.[[:alnum:]\-_\.]+)/",$name))
+	{
+		$name = str_replace($aryconv_htmlspecial,$aryconv_html,$name);
+		return "<a href=\"mailto:$name\">$page</a>";
+	}
+	else if(preg_match("/^($InterWikiName)$/",str_replace($aryconv_htmlspecial,$aryconv_html,$name)))
+	{
+		$page = strip_bracket($page);
+		$percent_name = str_replace($aryconv_htmlspecial,$aryconv_html,$name);
+		$percent_name = rawurlencode($percent_name);
+
+		return "<a href=\"$script?$percent_name\" target=\"$interwiki_target\">$page</a>";
+	}
+	else if(preg_match("/^($BracketName)|($WikiName)$/",str_replace($aryconv_htmlspecial,$aryconv_html,$name)))
+	{
+		if(preg_match("/^([^>]+)>([^>]+)$/",strip_bracket(str_replace($aryconv_htmlspecial,$aryconv_html,$name)),$match))
+		{
+			$page = $match[1];
+			$name = $match[2];
+			if(!preg_match("/^($BracketName)|($WikiName)$/",$page))
+				$page = "[[$page]]";
+			if(!preg_match("/^($BracketName)|($WikiName)$/",$name))
+				$name = "[[$name]]";
+		}
+		
+		if(preg_match("/^\[\[\.\/([^\]]*)\]\]/",str_replace($aryconv_htmlspecial,$aryconv_html,$name),$match))
+		{
+			if(!$match[1])
+				$name = $vars["page"];
+			else
+				$name = "[[".strip_bracket($vars[page])."/$match[1]]]";
+		}
+		else if(preg_match("/^\[\[\..\/([^\]]+)\]\]/",str_replace($aryconv_htmlspecial,$aryconv_html,$name),$match))
+		{
+			for($i=0;$i<substr_count($name,"../");$i++)
+				$name = preg_replace("/(.+)\/([^\/]+)$/","$1",strip_bracket($vars["page"]));
+
+			if(!preg_match("/^($BracketName)|($WikiName)$/",$name))
+				$name = "[[$name]]";
+			
+			if($vars["page"]==$name)
+				$name = "[[$match[1]]]";
+			else
+				$name = "[[".strip_bracket($name)."/$match[1]]]";
+		}
+		else if($name == "[[../]]")
+		{
+			$name = preg_replace("/(.+)\/([^\/]+)$/","$1",strip_bracket($vars["page"]));
+			
+			if(!preg_match("/^($BracketName)|($WikiName)$/",$name))
+				$name = "[[$name]]";
+			if($vars["page"]==$name)
+				$name = $defaultpage;
+		}
+		
+		$page = strip_bracket($page);
+		$pagename = strip_bracket($name);
+		$percent_name = str_replace($aryconv_htmlspecial,$aryconv_html,$name);
+		$percent_name = rawurlencode($percent_name);
+
+		$refer = rawurlencode($vars["page"]);
+		if(is_page($name))
+		{
+			$str = get_pg_passage($name,false);
+			$tm = @filemtime(get_filename(encode($name)));
+			if($vars["page"] != $name)
+				$related[$tm] = "<a href=\"$script?$percent_name\">$pagename</a>$str";
+			if($show_passage)
+			{
+				$str_title = "title=\"$pagename $str\"";
+			}
+			return "<a href=\"$script?$percent_name\" $str_title>$page</a>";
+		}
+		else
+			return "<span class=\"noexists\">$page<a href=\"$script?cmd=edit&page=$percent_name&refer=$refer\">?</a></span>";
+	}
+	else
+	{
+		return $page;
+	}
+}
+
+// ユーザ定義ルール(ソースを置換する)
+function user_rules_str($str)
+{
+	global $str_rules;
+
+	$arystr = split("\n",$str);
+
+	// 日付・時刻置換処理
+	foreach($arystr as $str)
+	{
+		if(substr($str,0,1) != " ")
+		{
+			foreach($str_rules as $rule => $replace)
+			{
+				$str = preg_replace("/$rule/",$replace,$str);
+			}
+		}
+		$retvars[] = $str;
+	}
+
+	return join("\n",$retvars);
+}
+
+// ユーザ定義ルール(ソースは置換せずコンバート)
+function make_user_rules($str)
+{
+	global $user_rules;
+
+	foreach($user_rules as $rule => $replace)
+	{
+		$str = preg_replace("/$rule/",$replace,$str);
+	}
+
+	return $str;
+}
+
+// HTMLタグを取り除く
+function strip_htmltag($str)
+{
+	//$str = preg_replace("/<a[^>]+>\?<\/a>/","",$str);
+	return preg_replace("/<[^>]+>/","",$str);
+}
+
+// ページ名からページ名を検索するリンクを作成
+function make_search($page)
+{
+	global $script,$WikiName;
+
+	$page = htmlspecialchars($page);
+	$name = strip_bracket($page);
+	$url = rawurlencode($page);
+
+	//WikiWikiWeb like...
+	//if(preg_match("/^$WikiName$/",$page))
+	//	$name = preg_replace("/([A-Z][a-z]+)/","$1 ",$name);
+
+	return "<a href=\"$script?cmd=search&word=$url\">$name</a> ";
+}
+
+?>

--- /dev/null
+++ b/init.php
@@ -0,0 +1,103 @@
+<?
+// PukiWiki - Yet another WikiWikiWeb clone.
+// $Id: init.php,v 1.1 2002/06/21 05:21:46 masui Exp $
+/////////////////////////////////////////////////
+
+// 設定ファイルの場所
+define("INI_FILE","./pukiwiki.ini.php");
+
+//** 初期設定 **
+
+define("S_VERSION","1.3.1(MASUI'z Edition)");
+define("S_COPYRIGHT","<b>\"PukiWiki\" ".S_VERSION."</b> Copyright &copy; 2001,2002 <a href=\"mailto:[e-mail]\">sng</a>, <a href=\"http://masui.net/pukiwiki/\">MASUI</a>. License is <a href=\"http://www.gnu.org/\">GNU/GPL</a>.");
+define("UTIME",time());
+define("HTTP_USER_AGENT",$HTTP_SERVER_VARS["HTTP_USER_AGENT"]);
+define("PHP_SELF",$HTTP_SERVER_VARS["PHP_SELF"]);
+define("SERVER_NAME",$HTTP_SERVER_VARS["SERVER_NAME"]);
+
+define("MUTIME",getmicrotime());
+
+$script = getenv('SCRIPT_NAME');
+
+$WikiName = '([A-Z][a-z]+([A-Z][a-z]+)+)';
+$BracketName = '\[\[(\[*[^\s\]]+?\]*)\]\]';
+$InterWikiName = '\[\[(\[*[^\s\]]+?\]*):(\[*[^>\]]+?\]*)\]\]';
+
+//** 入力値の整形 **
+
+$post = $HTTP_POST_VARS;
+$get = $HTTP_GET_VARS;
+
+if($get["page"]) $get["page"] = rawurldecode($get["page"]);
+if($post["word"]) $post["word"] = rawurldecode($post["word"]);
+if($get["word"]) $get["word"] = rawurldecode($get["word"]);
+if(get_magic_quotes_gpc())
+{
+	if($get["page"]) $get["page"] = stripslashes($get["page"]);
+	if($post["page"]) $post["page"] = stripslashes($post["page"]);
+	if($get["word"]) $get["word"] = stripslashes($get["word"]);
+	if($post["word"]) $post["word"] = stripslashes($post["word"]);
+	if($post["msg"]) $post["msg"] = stripslashes($post["msg"]);
+}
+if($post["msg"])
+{
+	$post["msg"] = preg_replace("/<\/(textarea[^>]*)>/i", "&lt;/$1&gt;", $post["msg"]);
+	$post["msg"] = preg_replace("/(\x0D\x0A)/","\n",$post["msg"]);
+	$post["msg"] = preg_replace("/(\x0D)/","\n",$post["msg"]);
+	$post["msg"] = preg_replace("/(\x0A)/","\n",$post["msg"]);
+}
+
+$vars = array_merge($post,$get);
+$arg = rawurldecode($HTTP_SERVER_VARS["argv"][0]);
+
+//** 初期処理 **
+
+$update_exec = "";
+
+// 設定ファイルの読込
+@require(INI_FILE);
+@require(LANG.".lng");
+
+// 設定ファイルの変数チェック
+$wrong_ini_file = "";
+if(!isset($rss_max)) $wrong_ini_file .= '$rss_max ';
+if(!isset($page_title)) $wrong_ini_file .= '$page_title ';
+if(!isset($note_hr)) $wrong_ini_file .= '$note_hr ';
+if(!isset($related_link)) $wrong_ini_file .= '$related_link ';
+if(!isset($show_passage)) $wrong_ini_file .= '$show_passage ';
+if(!isset($rule_related_str)) $wrong_ini_file .= '$rule_related_str ';
+if(!isset($load_template_func)) $wrong_ini_file .= '$load_template_func ';
+if(!defined("LANG")) $wrong_ini_file .= 'LANG ';
+if(!defined("PLUGIN_DIR")) $wrong_ini_file .= 'PLUGIN_DIR ';
+
+if(!is_writable(DATA_DIR))
+	die_message("DATA_DIR is not found or not writable.");
+if(!is_writable(DIFF_DIR))
+	die_message("DIFF_DIR is not found or not writable.");
+if($do_backup && !is_writable(BACKUP_DIR))
+	die_message("BACKUP_DIR is not found or not writable.");
+if(!file_exists(INI_FILE))
+	die_message("INI_FILE is not found.");
+if($wrong_ini_file)
+	die_message("The setting file runs short of information.<br>The version of a setting file may be old.<br><br>These option are not found : $wrong_ini_file");
+//if(ini_get("register_globals") !== "0")
+//	die_message("Wrong PHP4 setting in 'register_globals',set value 'Off' to httpd.conf or .htaccess.");
+if(!file_exists(SKIN_FILE))
+	die_message("SKIN_FILE is not found.");
+if(!file_exists(LANG.".lng"))
+	die_message(LANG.".lng(language file) is not found.");
+
+if(!file_exists(get_filename(encode($defaultpage))))
+	touch(get_filename(encode($defaultpage)));
+if(!file_exists(get_filename(encode($whatsnew))))
+	touch(get_filename(encode($whatsnew)));
+if(!file_exists(get_filename(encode($interwiki))))
+	touch(get_filename(encode($interwiki)));
+
+$ins_date = date($date_format,UTIME);
+$ins_time = date($time_format,UTIME);
+$ins_week = "(".$weeklabels[date("w",UTIME)].")";
+
+$now = "$ins_date $ins_week $ins_time";
+
+?>

--- a/ja.lng
+++ b/ja.lng
@@ -39,8 +39,12 @@ $_msg_add = '
 $_msg_preview = '以下のプレビューを確認して、よければページ下部のボタンで更新してください。';
 $_msg_preview_delete = '（ページの内容は空です。更新するとこのページは削除されます。）';
 $_msg_collided = 'あなたがこのページを編集している間に、他の人が同じページを更新してしまったようです。<br>
-以下にあなたの編集したテキストがありますので、あなたの編集内容が失われないように<br>
-エディタにコピー＆ペーストしてください。その後で最新の内容から再度編集し直してください。';
+今回追加した行は +で始まっています。<br>
+!で始まる行が変更された可能性があります。<br>
+!や+で始まる行を修正して再度ページの更新を行ってください。<br>';
+$_msg_collided_auto = 'あなたがこのページを編集している間に、他の人が同じページを更新してしまったようです。<br>
+自動で衝突を解消しましたが、問題がある可能性があります。<br>
+確認後、[ページの更新]を押してください。<br>';
 $_msg_freezing = '凍結用のパスワードを入力してください。';
 $_msg_unfreezing = '凍結解除用のパスワードを入力してください。';
 $_msg_invalidpass = 'パスワードが間違っています。';
@@ -78,6 +82,7 @@ $_btn_notchangetimestamp = '
 $_btn_addtop = 'ページの上に追加';
 $_btn_template = '雛形とするページ';
 $_btn_load = '読込';
+$_btn_edit = '編集';
 
 ///////////////////////////////////////
 // plug-in message
@@ -86,6 +91,10 @@ $_btn_load = '
 // comment
 $_btn_name = 'お名前: ';
 $_btn_comment = 'コメントの挿入';
+$_msg_comment = 'コメント: ';
+$_title_comment_collided = '$1 で【更新の衝突】が起きました';
+$_msg_comment_collided = 'あなたがこのページを編集している間に、他の人が同じページを更新してしまったようです。<br>
+コメントを追加しましたが、違う位置に挿入されているかもしれません。<p>';
 
 ///////////////////////////////////////
 // attach file
@@ -93,6 +102,7 @@ $_title_uploaded = '$1 
 $_title_file_deleted = '$1 からファイルを削除しました';
 $_title_notfound = '$1 にそのファイルは見つかりません';
 $_title_upload = '$1 への添付';
+$_title_confirm_delete = '%s を削除します';
 
 $_msg_noparm = '$1 へはアップロード・削除はできません';
 $_msg_already_exists = '$1 に同じファイル名が存在します';
@@ -101,7 +111,17 @@ $_msg_maxsize = '
 $_msg_delete = '\'$1\' を削除します';
 $_msg_exceed = '$1 へのファイルサイズが大きすぎます';
 $_msg_attachfile = '添付ファイル';
+$_msg_confirm_delete = '<center>%s を削除します。<br>%s</center>';
 
 $_btn_upload = 'アップロード';
 $_btn_delete = '削除';
+
+///////////////////////////////////////
+// newpage
+$_msg_newpage = 'ページ新規作成';
+
+///////////////////////////////////////
+// recent
+$_recent_plugin_frame = '<span align="center"><h5 class="side_label">最新の%d件</h5></span><small>%s</small>';
+$_recent_plugin_li = '・';
 ?>

--- /dev/null
+++ b/plugin.php
@@ -0,0 +1,96 @@
+<?
+// PukiWiki - Yet another WikiWikiWeb clone.
+// $Id: plugin.php,v 1.1 2002/06/21 05:21:46 masui Exp $
+/////////////////////////////////////////////////
+
+// プラグイン用に未定義の変数を設定
+function set_plugin_messages($messages)
+{
+  foreach ($messages as $name=>$val) {
+    global $$name;
+    if(!isset($$name)) {
+      $$name = $val;
+    }
+  }
+}
+
+//プラグイン(action)が存在するか
+function exist_plugin_action($name) {
+  if(!file_exists(PLUGIN_DIR.$name.".inc.php"))
+    {
+      return false;
+    }
+  else
+    {
+      require_once(PLUGIN_DIR.$name.".inc.php");
+      if(!function_exists("plugin_".$name."_action"))
+	{
+	  return false;
+	}
+    }
+  return true;
+}
+
+//プラグイン(convert)が存在するか
+function exist_plugin_convert($name) {
+  if(!file_exists(PLUGIN_DIR.$name.".inc.php"))
+    {
+      return false;
+    }
+  else
+    {
+      require_once(PLUGIN_DIR.$name.".inc.php");
+      if(!function_exists("plugin_".$name."_convert"))
+	{
+	  return false;
+	}
+    }
+  return true;
+}
+
+//プラグインの初期化を実行
+function do_plugin_init($name) {
+  $funcname = "plugin_".$name."_init";
+  if(!function_exists($funcname))
+    {
+      return false;
+    }
+  
+  $func_check = "_funccheck_".$funcname;
+  global $$func_check;
+  if($$func_check)
+    {
+      return false;
+    }
+  $$func_check = true;
+  return @call_user_func($funcname);
+}
+
+//プラグイン(action)を実行
+function do_plugin_action($name) {
+  if(!exist_plugin_action($name)) {
+    return array();
+  }
+  do_plugin_init($name);
+  return @call_user_func("plugin_".$name."_action");
+}
+
+//プラグイン(convert)を実行
+function do_plugin_convert($plugin_name,$plugin_args)
+{
+  $invalid_return = "#${plugin_name}(${plugin_args})";
+  
+  if($plugin_args !== "")
+    $aryargs = explode(",",$plugin_args);
+  else
+    $aryargs = array();
+
+  do_plugin_init($plugin_name);
+  $retvar = call_user_func_array("plugin_${plugin_name}_convert",$aryargs);
+  
+  if($retvar === FALSE) return $invalid_return;
+  else                  return $retvar;
+}
+
+
+?>
\ No newline at end of file

--- a/plugin/aname.inc.php
+++ b/plugin/aname.inc.php
@@ -1,11 +1,11 @@
-<?
-function plugin_aname_convert()
-{
-	if(func_num_args())
-		$aryargs = func_get_args();
-	else
-		$aryargs = array();
-
-	return "<a name=\"$aryargs[0]\"></a>";
-}
-?>
+<?
+function plugin_aname_convert()
+{
+	if(func_num_args())
+		$aryargs = func_get_args();
+	else
+		$aryargs = array();
+
+	return "<a name=\"$aryargs[0]\"></a>";
+}
+?>

--- /dev/null
+++ b/plugin/anchor.inc.php
@@ -0,0 +1,29 @@
+<?
+function plugin_anchor_convert()
+{
+	global $WikiName,$BracketName,$script,$vars;
+
+	if(func_num_args() == 1)
+		$aryargs = func_get_args();
+	else
+		return FALSE;
+
+	list($wbn,$aname) = explode("#",$aryargs[0]);
+
+	if(!$aname) return FALSE;
+
+	if(!preg_match("/^$WikiName|$BracketName$/",$wbn) && $wbn)
+		$wbn = "[[$wbn]]";
+
+	if(!preg_match("/^$WikiName|$BracketName$/",$aryargs[0]))
+		$page = "[[$aryargs[0]]]";
+	else
+		$page = $aryargs[0];
+
+	$page = strip_bracket($page);
+
+	if($wbn) $wbn = "$script?".rawurlencode($wbn);
+
+	return "<a href=\"$wbn#$aname\">$page</a>";
+}
+?>

--- /dev/null
+++ b/plugin/article.inc.php
@@ -0,0 +1,228 @@
+<?
+ /*
+ 
+ PukiWiki BBS風プラグイン
+
+ CopyRight 2002 OKAWARA,Satoshi
+ http://www.dml.co.jp/~kawara/pukiwiki/pukiwiki.php
+ [e-mail]
+ 
+ LANGUAGEファイルに下記の値を追加してからご使用ください
+	$_btn_name = 'お名前';
+	$_btn_article = '記事の投稿';
+	$_btn_subject = '題名: ';
+
+ ※$_btn_nameはcommentプラグインで既に設定されている場合があります
+ 
+ 投稿内容の自動メール転送機能をご使用になりたい場合は
+ -投稿内容のメール自動配信
+ -投稿内容のメール自動配信先
+ を設定の上、ご使用ください。
+ 
+ */
+
+/////////////////////////////////////////////////
+// テキストエリアのカラム数
+define("article_COLS",70);
+/////////////////////////////////////////////////
+// テキストエリアの行数
+define("article_ROWS",5);
+/////////////////////////////////////////////////
+// 名前テキストエリアのカラム数
+define("NAME_COLS",24);
+/////////////////////////////////////////////////
+// 題名テキストエリアのカラム数
+define("SUBJECT_COLS",60);
+/////////////////////////////////////////////////
+// 名前の挿入フォーマット
+$name_format = '[[$name]]';
+/////////////////////////////////////////////////
+// 題名の挿入フォーマット
+$subject_format = '**$subject';
+/////////////////////////////////////////////////
+// 題名が未記入の場合の表記 
+$no_subject = '無題';
+/////////////////////////////////////////////////
+// 挿入する位置 1:欄の前 0:欄の後
+define("ARTICLE_INS",0);
+/////////////////////////////////////////////////
+// 書き込みの下に一行コメントを入れる 1:入れる 0:入れない
+define("ARTICLE_COMMENT",1);
+/////////////////////////////////////////////////
+// 改行を自動的変換 1:する 0:しない
+define("ARTICLE_AUTO_BR",1);
+
+/////////////////////////////////////////////////
+// 投稿内容のメール自動配信 1:する 0:しない
+define("MAIL_AUTO_SEND",0);
+/////////////////////////////////////////////////
+// 投稿内容のメール送信時の送信者メールアドレス
+define("MAIL_FROM",'');
+/////////////////////////////////////////////////
+// 投稿内容のメール送信時の題名
+define("MAIL_SUBJECT_PREFIX",'[someone\'sPukiWiki]');
+/////////////////////////////////////////////////
+// 投稿内容のメール自動配信先
+$_mailto = array (
+	''
+);
+
+
+function plugin_article_action()
+{
+	global $post,$vars,$script,$cols,$rows,$del_backup,$do_backup,$now;
+	global $name_format, $subject_format, $no_subject;
+	global $_title_collided,$_msg_collided,$_title_updated;
+	global $_mailto;
+
+	if($post["msg"])
+	{
+		$postdata = "";
+		$postdata_old  = file(get_filename(encode($post["refer"])));
+		$article_no = 0;
+
+		if($post[name])
+		{
+			$name = str_replace('$name',$post[name],$name_format);
+		}
+		if($post[subject])
+		{
+			$subject = str_replace('$subject',$post[subject],$subject_format);
+		} else {
+			$subject = str_replace('$subject',$no_subject,$subject_format);
+		}
+
+		$article  = $subject."\n>";
+		$article .= $name." (".$now.")\n>~\n";
+
+		if(ARTICLE_AUTO_BR){
+			//改行の取り扱いはけっこう厄介。特にURLが絡んだときは…
+			$article_body = $post[msg];
+			$article_body = str_replace("\n","\n>~\n",$article_body);
+			$article_body = preg_replace("/\n\n/","\n",$article_body);
+			$article .= $article_body;
+		} else {
+			$article .= ">".$post[msg];
+		}
+
+		if(ARTICLE_COMMENT){
+			$article .= "\n\n#comment\n";
+		}
+
+		foreach($postdata_old as $line)
+		{
+			if(!ARTICLE_INS) $postdata .= $line;
+			if(preg_match("/^#article$/",$line))
+			{
+				if($article_no == $post["article_no"] && $post[msg]!="")
+				{
+					$postdata .= "$article\n";
+				}
+				$article_no++;
+			}
+			if(ARTICLE_INS) $postdata .= $line;
+		}
+
+		$postdata_input = "$article\n";
+	}
+	else
+		return;
+
+	if(md5(@join("",@file(get_filename(encode($post["refer"]))))) != $post["digest"])
+	{
+		$title = $_title_collided;
+
+		$body = "$_msg_collided\n";
+
+		$body .= "<form action=\"$script?cmd=preview\" method=\"post\">\n"
+			."<input type=\"hidden\" name=\"refer\" value=\"".$post["refer"]."\">\n"
+			."<input type=\"hidden\" name=\"digest\" value=\"".$post["digest"]."\">\n"
+			."<textarea name=\"msg\" rows=\"$rows\" cols=\"$cols\" wrap=\"virtual\" id=\"textarea\">$postdata_input</textarea><br>\n"
+			."</form>\n";
+	}
+	else
+	{
+		$postdata = user_rules_str($postdata);
+
+		// 差分ファイルの作成
+		if(is_page($post["refer"]))
+			$oldpostdata = join("",file(get_filename(encode($post["refer"]))));
+		else
+			$oldpostdata = "\n";
+		if($postdata)
+			$diffdata = do_diff($oldpostdata,$postdata);
+		file_write(DIFF_DIR,$post["refer"],$diffdata);
+
+		// バックアップの作成
+		if(is_page($post["refer"]))
+			$oldposttime = filemtime(get_filename(encode($post["refer"])));
+		else
+			$oldposttime = time();
+
+		// 編集内容が何も書かれていないとバックアップも削除する?しないですよね。
+		if(!$postdata && $del_backup)
+			backup_delete(BACKUP_DIR.encode($post["refer"]).".txt");
+		else if($do_backup && is_page($post["refer"]))
+			make_backup(encode($post["refer"]).".txt",$oldpostdata,$oldposttime);
+
+		// ファイルの書き込み
+		file_write(DATA_DIR,$post["refer"],$postdata);
+
+		// 投稿内容のメール自動送信
+		if(MAIL_AUTO_SEND){
+			$mailaddress = implode(',' ,$_mailto);
+			$mailsubject = MAIL_SUBJECT_PREFIX." ".str_replace("**","",$subject);
+			if($post["name"]){
+				$mailsubject .= '/'.$post["name"];
+			}
+			$mailsubject = mb_encode_mimeheader($mailsubject);
+
+			$mailbody = $post["msg"];
+			$mailbody .= "\n\n---\n";
+			$mailbody .= "投稿者: ".$post["name"]." ($now)\n";
+			$mailbody .= "投稿先: ".$post["refer"]."\n";
+			$mailbody .= "　 URL: ".$script.'?'.rawurlencode($post["refer"])."\n";
+			$mailbody = mb_convert_encoding( $mailbody, "JIS" );
+
+			$mailaddheader = "From: ".MAIL_FROM;
+
+			mail($mailaddress, $mailsubject, $mailbody, $mailaddheader);
+		}
+
+		// is_pageのキャッシュをクリアする。
+		is_page($post["refer"],true);
+
+		$title = $_title_updated;
+	}
+	$retvars["msg"] = $title;
+	$retvars["body"] = $body;
+
+	$post["page"] = $post["refer"];
+	$vars["page"] = $post["refer"];
+
+	return $retvars;
+}
+function plugin_article_convert()
+{
+	global $script,$article_no,$vars,$digest;
+	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 = "<input type=\"submit\" name=\"article\" value=\"$_btn_article\">\n";
+
+	$string = "<form action=\"$script\" method=\"post\">\n"
+		 ."<input type=\"hidden\" name=\"article_no\" value=\"$article_no\">\n"
+		 ."<input type=\"hidden\" name=\"refer\" value=\"$vars[page]\">\n"
+		 ."<input type=\"hidden\" name=\"plugin\" value=\"article\">\n"
+		 ."<input type=\"hidden\" name=\"digest\" value=\"$digest\">\n"
+		 ."$_btn_name<input type=\"text\" name=\"name\" size=\"".NAME_COLS."\"><br>\n"
+		 ."$_btn_subject<input type=\"text\" name=\"subject\" size=\"".SUBJECT_COLS."\"><br>\n"
+		 ."<textarea name=\"msg\" rows=\"".article_ROWS."\" cols=\"".article_COLS."\">\n</textarea><br>\n"
+		 .$button
+		 ."</form>";
+
+	$article_no++;
+
+	return $string;
+}
+?>

--- a/plugin/attach.inc.php
+++ b/plugin/attach.inc.php
@@ -1,6 +1,8 @@
 <?
 // プラグイン attach
 
+// changed by Y.MASUI <[e-mail]> http://masui.net/pukiwiki/
+
 // set PHP value to enable file upload
 ini_set("file_uploads","1");
 
@@ -31,7 +33,7 @@ function plugin_attach_convert()
 		while($file = readdir($dir))
 		{
 			if($file == ".." || $file == ".") continue;
-			if(!preg_match("/^${decoded_pgname}_(.*)$/",$file,$match)) continue;
+			if(!preg_match("/^${decoded_pgname}_([^.]+)$/",$file,$match)) continue;
 			
 			$lastmod = date("Y/m/d H:i:s",filemtime(UPLOAD_DIR.$file));
 			
@@ -44,8 +46,15 @@ function plugin_attach_convert()
 			$filename_url = rawurlencode($filename);
 			$refername_url = rawurlencode($vars[page]);
 			
-			$del = "[<a href=\"$script?plugin=attach&delfile=${filename_url}&refer=${refername_url}\" title=\"".str_replace('$1',$filename,$_msg_delete)."\">$_btn_delete</a>]";
-			$open = "<a href=\"$script?plugin=attach&openfile=${filename_url}&refer=${refername_url}\" title=\"$lastmod $file_size\">$icon$filename</a>\n";
+			$counter = '';
+			if(file_exists(UPLOAD_DIR.$file.'.log')) {
+				$list = file(UPLOAD_DIR.$file.'.log');
+				
+				$counter = ' <small>' . chop($list[0]) . '件</small>';
+			}
+			
+			$del = "[<a href=\"$script?plugin=attach&mode=confirm&delfile=${filename_url}&refer=${refername_url}\" title=\"".str_replace('$1',$filename,$_msg_delete)."\">$_btn_delete</a>]";
+			$open = "<a href=\"$script?plugin=attach&openfile=${filename_url}&refer=${refername_url}\" title=\"$lastmod $file_size\">$icon$filename</a>$counter\n";
 			
 			$into = "$open <small>$del</small>";
 			
@@ -87,11 +96,12 @@ function plugin_attach_action()
 {
 	global $vars,$script,$max_size,$HTTP_POST_FILES;
 	global $_title_uploaded,$_title_file_deleted,$_title_notfound,$_msg_noparm,$_msg_already_exists,$_msg_attach_filelist,$_msg_delete,$_msg_exceed,$_btn_delete;
-	global $_msg_maxsize,$_btn_upload,$_msg_attachfile,$_title_upload;
+	global $_msg_maxsize,$_btn_upload,$_msg_attachfile,$_title_upload,$_title_confirm_delete,$_msg_confirm_delete;
 	
 	$postfiles = $HTTP_POST_FILES;
 	$icon = FILE_ICON;
 
+	$vars["mode"] = rawurldecode($vars["mode"]);
 	$vars["openfile"] = rawurldecode($vars["openfile"]);
 	$vars["delfile"] = rawurldecode($vars["delfile"]);
 	$vars["refer"] = rawurldecode($vars["refer"]);
@@ -114,18 +124,32 @@ function plugin_attach_action()
 	}
 	else if($vars["delfile"])
 	{
-		$filename = encode($vars["refer"])."_".encode($vars["delfile"]);
-		if(is_freeze($vars["refer"]) || !is_editable($vars["refer"])) return array("msg" => $_msg_noparm);
+                if($vars["mode"] == "confirm") {
+		  $form = "<form action=\"$script\" method=\"post\">\n";
+		  $form .= "<input type=\"hidden\" name=\"plugin\" value=\"attach\">\n";
+		  $form .= "<input type=\"hidden\" name=\"refer\" value=\"$vars[refer]\">\n";
+		  $form .= "<input type=\"hidden\" name=\"delfile\" value=\"$vars[delfile]\">\n";
+		  $form .= "<input type=\"submit\" value=\"$_btn_delete\">\n";
+		  $form .= "</form>";
+
+		  $retvars["body"] = sprintf($_msg_confirm_delete,$vars["delfile"],$form);
+		  $retvars["msg"] = sprintf($_title_confirm_delete,$vars["delfile"]);
+		  return $retvars;
+		}
+		else {
+		  $filename = encode($vars["refer"])."_".encode($vars["delfile"]);
+		  if(is_freeze($vars["refer"]) || !is_editable($vars["refer"])) return array("msg" => $_msg_noparm);
 		
-		if(!file_exists(UPLOAD_DIR.$filename))
+		  if(!file_exists(UPLOAD_DIR.$filename))
 			return array("msg" => $_title_notfound);
 		
-		@unlink(UPLOAD_DIR.$filename);
+		  @unlink(UPLOAD_DIR.$filename);
 
-		if(file_exists(DATA_DIR.encode($vars["refer"]).".txt"))
-			@touch(DATA_DIR.encode($vars["refer"]).".txt");
+		  if(file_exists(DATA_DIR.encode($vars["refer"]).".txt"))
+		    @touch(DATA_DIR.encode($vars["refer"]).".txt");
 		
-		return array("msg" => $_title_file_deleted);
+		  return array("msg" => $_title_file_deleted);
+		}
 	}
 	else if($vars["openfile"])
 	{
@@ -145,9 +169,10 @@ function plugin_attach_action()
 			$pgname_keep = "";
 			$retbody = "";
 			$aryret = array();
+			$pagenames = array();
 			while($file = readdir($dir))
 			{
-				if($file == ".." || $file == ".") continue;
+				if($file == ".." || $file == "." || strstr($file,".log")!=FALSE) continue;
 				
 				settype($dfile_size,"double");
 				$dfile_size = round(filesize(UPLOAD_DIR.$file)/1000,1);
@@ -163,34 +188,22 @@ function plugin_attach_action()
 				$passage = get_pg_passage($pagename);
 				
 				$pagename = strip_bracket($pagename);
-				$page = "<a href=\"$script?${pagename_url}\">$pagename</a>$passage\n";
-				
-				$strtmp = "";
-				if($pgname_keep != $pagename)
-				{
-					if($pgname_keep!="")
-						$strtmp .= "</ul>\n";
-					
-					$strtmp .= "<li>$page</li>\n";
-					$strtmp .= "<ul>\n";
-					$aryret[$pagename] = $strtmp;
-					$pgname_keep = $pagename;
-				}
+				$pagenames[$pagename] = "<li><a href=\"$script?${pagename_url}\">$pagename</a>$passage</li>\n";
 				
 				$lastmod = date("Y/m/d H:i:s",filemtime(UPLOAD_DIR.$file));
 				
-				$del = "[<a href=\"$script?plugin=attach&delfile=${filename_url}&refer=${pagename_url}\" title=\"".str_replace('$1',$filename,$_msg_delete)."\">$_btn_delete</a>]";
+				$del = "[<a href=\"$script?plugin=attach&mode=confirm&delfile=${filename_url}&refer=${pagename_url}\" title=\"".str_replace('$1',$filename,$_msg_delete)."\">$_btn_delete</a>]";
 				
 				$open = "<a href=\"$script?plugin=attach&openfile=${filename_url}&refer=${pagename_url}\" title=\"$lastmod $file_size\">$filename</a>";
 
-				
-				$into = "<li>$open <small>$del</small></li>\n";
-				
-				$aryret[$pagename.$filename] = $into;
+				$aryret[$pagename] .= "<li>$open <small>$del</small></li>\n";
 			}
 			closedir($dir);
 			ksort($aryret);
-			$retbody = join("",$aryret);
+			$retbody = '';
+			foreach($aryret as $pagename => $list) {
+				$retbody .= $pagenames[$pagename] . "<ul>\n" . $list . "</ul>\n";
+			}
 		}
 		
 		$retvars["msg"] = $_msg_attach_filelist;
@@ -233,7 +246,18 @@ function attach_filelist()
 function download_file($path_file,$filename)
 {
 	$content_length = filesize($path_file);
-
+	
+	$list = array(1);
+	if(file_exists($path_file.'.log')) {
+		$list = file($path_file.'.log');
+		$list[0] = chop($list[0]) + 1;
+	}
+	$fp = fopen($path_file.'.log','w');
+	foreach ($list as $l) {
+		fputs($fp,$l);
+	}
+	fclose($fp);
+	
 	// for japanese
 	if(function_exists("mb_convert_encoding"))
 		$filename = mb_convert_encoding($filename,"SJIS","auto");

--- a/plugin/calendar.inc.php
+++ b/plugin/calendar.inc.php
@@ -1,174 +1,174 @@
-<?
-function plugin_calendar_convert()
-{
-	global $script,$weeklabels,$vars,$command,$WikiName,$BracketName;
-	
-	$args = func_get_args();
-	
-	if(func_num_args() == 0)
-	{
-		$date_str = date("Ym");
-		$pre = $vars[page];
-		$prefix = preg_replace("/^\[\[(.*)\]\]$/","$1",$vars[page])."/";
-	}
-	else if(func_num_args() == 1)
-	{
-		if(is_numeric($args[0]) && strlen($args[0]) == 6)
-		{
-			$date_str = $args[0];
-			$pre = $vars[page];
-			$prefix = preg_replace("/^\[\[(.*)\]\]$/","$1",$vars[page])."/";
-		}
-		else
-		{
-			$date_str = date("Ym");
-			$pre = $args[0];
-			$prefix = $args[0];
-		}
-	}
-	else if(func_num_args() == 2)
-	{
-		if(is_numeric($args[0]) && strlen($args[0]) == 6)
-		{
-			$date_str = $args[0];
-			$pre = $args[1];
-			$prefix = $args[1];
-		}
-		else if(is_numeric($args[1]) && strlen($args[1]) == 6)
-		{
-			$date_str = $args[1];
-			$pre = $args[0];
-			$prefix = $args[0];
-		}
-		else
-		{
-			$date_str = date("Ym");
-			$pre = $vars[page];
-			$prefix = preg_replace("/^\[\[(.*)\]\]$/","$1",$vars[page])."/";
-		}
-	}
-	else
-	{
-		return FALSE;
-	}
-
-	if(!$command) $cmd = "read";
-	else          $cmd = $command;
-	
-	$prefix = strip_tags($prefix);
-	
-	$yr = substr($date_str,0,4);
-	$mon = substr($date_str,4,2);
-	if($yr != date("Y") || $mon != date("m"))
-	{
-		$now_day = 1;
-		$other_month = 1;
-	}
-	else
-	{
-		$now_day = date("d");
-		$other_month = 0;
-	}
-	$today = getdate(mktime(0,0,0,$mon,$now_day,$yr));
-	
-	$m_num = $today[mon];
-	$d_num = $today[mday];
-	$year = $today[year];
-	$f_today = getdate(mktime(0,0,0,$m_num,1,$year));
-	$wday = $f_today[wday];
-	$day = 1;
-	$fweek = true;
-
-	$m_name = "$year.$m_num ($cmd)";
-
-	if(!preg_match("/^(($WikiName)|($BracketName))$/",$pre))
-		$prefix_url = "[[".$pre."]]";
-	else
-		$prefix_url = $pre;
-
-	$prefix_url = rawurlencode($prefix_url);
-	$pre = strip_bracket($pre);
-
-	$ret .= '
-<table class="style_calendar" cellspacing="1" width="150" border="0">
-  <tbody>
-  <tr>
-    <td align="middle" class="style_td_caltop" colspan="7" height="15">
-      <div align="center"><small><b>'.$m_name.'</b><br>[<a href="'.$script.'?'.$prefix_url.'">'.$pre.'</a>]</small></div>
-    </td>
-  </tr>
-  <tr>
-';
-
-	foreach($weeklabels as $label)
-	{
-		$ret .= '
-    <td align="middle" class="style_td_week" height="15">
-      <div align="center"><small><b>'.$label.'</b></small></div>
-    </td>';
-	}
-
-	$ret .= "</tr>\n<tr>\n";
-
-	while(checkdate($m_num,$day,$year))
-	{
-		$dt = sprintf("%4d%02d%02d", $year, $m_num, $day);
-		$name = "$prefix$dt";
-		$page = "[[$prefix$dt]]";
-		$page_url = rawurlencode("[[$prefix$dt]]");
-		
-		if($cmd == "edit") $refer = "&refer=$page_url";
-		else               $refer = "";
-		
-		if($cmd == "read" && !is_page($page))
-			$link = "<b>$day</b>";
-		else
-			$link = "<a href=\"$script?cmd=$cmd&page=$page_url$refer\" title=\"$name\"><b>$day</b></a>";
-
-		if($fweek)
-		{
-			for($i=0;$i<$wday;$i++)
-			{ // Blank 
-				$ret .= "    <td width=\"14%\" align=\"center\" class=\"style_td_blank\" height=\"19\">　</td>\n"; 
-			} 
-		$fweek=false;
-		}
-
-		if($wday == 0) $ret .= "  </tr><tr>\n";
-		if(!$other_month && ($day == $today[mday]) && ($m_num == $today[mon]) && ($year == $today[year]))
-		{
-			//  Today 
-			$ret .= "    <td width=\"14%\" align=\"center\" class=\"style_td_today\" height=\"19\"><small>$link</small></td>\n"; 
-		}
-		else if($wday == 0)
-		{
-			//  Sunday 
-			$ret .= "    <td width=\"14%\" align=\"center\" class=\"style_td_sun\" height=\"19\"><small>$link</small></td>\n";
-		}
-		else if($wday == 6)
-		{
-			//  Saturday 
-			$ret .= "    <td width=\"14%\" align=\"center\" class=\"style_td_sat\" height=\"19\"><small>$link</small></td>\n";
-		}
-		else
-		{
-			// Weekday 
-			$ret .= "    <td width=\"14%\" align=\"center\" class=\"style_td\" height=\"19\"><small>$link</small></td>\n";
-		}
-		$day++;
-		$wday++;
-		$wday = $wday % 7;
-	}
-	if($wday > 0)
-	{
-		while($wday < 7)
-		{ // Blank 
-			$ret .= "    <td width=\"14%\" align=\"center\" class=\"style_td_blank\" height=\"19\">　</td>\n";
-		$wday++;
-		} 
-	}
-
-	$ret .= "  </tr>\n</table>\n";
-	return $ret;
-}
+<?
+function plugin_calendar_convert()
+{
+	global $script,$weeklabels,$vars,$command,$WikiName,$BracketName;
+	
+	$args = func_get_args();
+	
+	if(func_num_args() == 0)
+	{
+		$date_str = date("Ym");
+		$pre = $vars[page];
+		$prefix = preg_replace("/^\[\[(.*)\]\]$/","$1",$vars[page])."/";
+	}
+	else if(func_num_args() == 1)
+	{
+		if(is_numeric($args[0]) && strlen($args[0]) == 6)
+		{
+			$date_str = $args[0];
+			$pre = $vars[page];
+			$prefix = preg_replace("/^\[\[(.*)\]\]$/","$1",$vars[page])."/";
+		}
+		else
+		{
+			$date_str = date("Ym");
+			$pre = $args[0];
+			$prefix = $args[0];
+		}
+	}
+	else if(func_num_args() == 2)
+	{
+		if(is_numeric($args[0]) && strlen($args[0]) == 6)
+		{
+			$date_str = $args[0];
+			$pre = $args[1];
+			$prefix = $args[1];
+		}
+		else if(is_numeric($args[1]) && strlen($args[1]) == 6)
+		{
+			$date_str = $args[1];
+			$pre = $args[0];
+			$prefix = $args[0];
+		}
+		else
+		{
+			$date_str = date("Ym");
+			$pre = $vars[page];
+			$prefix = preg_replace("/^\[\[(.*)\]\]$/","$1",$vars[page])."/";
+		}
+	}
+	else
+	{
+		return FALSE;
+	}
+
+	if(!$command) $cmd = "read";
+	else          $cmd = $command;
+	
+	$prefix = strip_tags($prefix);
+	
+	$yr = substr($date_str,0,4);
+	$mon = substr($date_str,4,2);
+	if($yr != date("Y") || $mon != date("m"))
+	{
+		$now_day = 1;
+		$other_month = 1;
+	}
+	else
+	{
+		$now_day = date("d");
+		$other_month = 0;
+	}
+	$today = getdate(mktime(0,0,0,$mon,$now_day,$yr));
+	
+	$m_num = $today[mon];
+	$d_num = $today[mday];
+	$year = $today[year];
+	$f_today = getdate(mktime(0,0,0,$m_num,1,$year));
+	$wday = $f_today[wday];
+	$day = 1;
+	$fweek = true;
+
+	$m_name = "$year.$m_num ($cmd)";
+
+	if(!preg_match("/^(($WikiName)|($BracketName))$/",$pre))
+		$prefix_url = "[[".$pre."]]";
+	else
+		$prefix_url = $pre;
+
+	$prefix_url = rawurlencode($prefix_url);
+	$pre = strip_bracket($pre);
+
+	$ret .= '
+<table class="style_calendar" cellspacing="1" width="150" border="0">
+  <tbody>
+  <tr>
+    <td align="middle" class="style_td_caltop" colspan="7" height="15">
+      <div align="center"><small><b>'.$m_name.'</b><br>[<a href="'.$script.'?'.$prefix_url.'">'.$pre.'</a>]</small></div>
+    </td>
+  </tr>
+  <tr>
+';
+
+	foreach($weeklabels as $label)
+	{
+		$ret .= '
+    <td align="middle" class="style_td_week" height="15">
+      <div align="center"><small><b>'.$label.'</b></small></div>
+    </td>';
+	}
+
+	$ret .= "</tr>\n<tr>\n";
+
+	while(checkdate($m_num,$day,$year))
+	{
+		$dt = sprintf("%4d%02d%02d", $year, $m_num, $day);
+		$name = "$prefix$dt";
+		$page = "[[$prefix$dt]]";
+		$page_url = rawurlencode("[[$prefix$dt]]");
+		
+		if($cmd == "edit") $refer = "&refer=$page_url";
+		else               $refer = "";
+		
+		if($cmd == "read" && !is_page($page))
+			$link = "<b>$day</b>";
+		else
+			$link = "<a href=\"$script?cmd=$cmd&page=$page_url$refer\" title=\"$name\"><b>$day</b></a>";
+
+		if($fweek)
+		{
+			for($i=0;$i<$wday;$i++)
+			{ // Blank 
+				$ret .= "    <td width=\"14%\" align=\"center\" class=\"style_td_blank\" height=\"19\">｡｡</td>\n"; 
+			} 
+		$fweek=false;
+		}
+
+		if($wday == 0) $ret .= "  </tr><tr>\n";
+		if(!$other_month && ($day == $today[mday]) && ($m_num == $today[mon]) && ($year == $today[year]))
+		{
+			//  Today 
+			$ret .= "    <td width=\"14%\" align=\"center\" class=\"style_td_today\" height=\"19\"><small>$link</small></td>\n"; 
+		}
+		else if($wday == 0)
+		{
+			//  Sunday 
+			$ret .= "    <td width=\"14%\" align=\"center\" class=\"style_td_sun\" height=\"19\"><small>$link</small></td>\n";
+		}
+		else if($wday == 6)
+		{
+			//  Saturday 
+			$ret .= "    <td width=\"14%\" align=\"center\" class=\"style_td_sat\" height=\"19\"><small>$link</small></td>\n";
+		}
+		else
+		{
+			// Weekday 
+			$ret .= "    <td width=\"14%\" align=\"center\" class=\"style_td\" height=\"19\"><small>$link</small></td>\n";
+		}
+		$day++;
+		$wday++;
+		$wday = $wday % 7;
+	}
+	if($wday > 0)
+	{
+		while($wday < 7)
+		{ // Blank 
+			$ret .= "    <td width=\"14%\" align=\"center\" class=\"style_td_blank\" height=\"19\">｡｡</td>\n";
+		$wday++;
+		} 
+	}
+
+	$ret .= "  </tr>\n</table>\n";
+	return $ret;
+}
 ?>
\ No newline at end of file

--- /dev/null
+++ b/plugin/calendar2.inc.php
@@ -0,0 +1,243 @@
+<?
+
+function plugin_calendar2_convert()
+{
+	global $script,$weeklabels,$vars,$command,$WikiName,$BracketName;
+	
+	$args = func_get_args();
+	
+	if(func_num_args() == 0)
+	{
+		$date_str = date("Ym");
+		$pre = strip_bracket($vars['page']);
+		$prefix = strip_bracket($vars['page'])."/";
+	}
+	else if(func_num_args() == 1)
+	{
+		if(is_numeric($args[0]) && strlen($args[0]) == 6)
+		{
+			$date_str = $args[0];
+			$pre = strip_bracket($vars['page']);
+			$prefix = strip_bracket($vars['page'])."/";
+		}
+		else
+		{
+			$date_str = date("Ym");
+			$pre = strip_bracket($args[0]);
+			$prefix = strip_bracket($args[0]);
+		}
+	}
+	else if(func_num_args() == 2)
+	{
+		if(is_numeric($args[0]) && strlen($args[0]) == 6)
+		{
+			$date_str = $args[0];
+			$pre = strip_bracket($args[1]);
+			$prefix = strip_bracket($args[1]);
+		}
+		else if(is_numeric($args[1]) && strlen($args[1]) == 6)
+		{
+			$date_str = $args[1];
+			$pre = strip_bracket($args[0]);
+			$prefix = strip_bracket($args[0]).'/';
+		}
+		else
+		{
+			$date_str = date("Ym");
+			$pre = strip_bracket($vars[page]);
+			$prefix = strip_bracket($vars[page])."/";
+		}
+	}
+	else
+	{
+		return FALSE;
+	}
+	if($pre == "*") {
+		$prefix = '';
+		$pre = '';
+	}
+	$prefix_ = rawurlencode($pre);
+	$prefix = strip_tags($prefix);
+	
+	if(!$command) $cmd = "read";
+	else          $cmd = $command;
+	
+	
+	$yr = substr($date_str,0,4);
+	$mon = substr($date_str,4,2);
+	if($yr != date("Y") || $mon != date("m")) {
+		$now_day = 1;
+		$other_month = 1;
+	}
+	else {
+		$now_day = date("d");
+		$other_month = 0;
+	}
+	$today = getdate(mktime(0,0,0,$mon,$now_day,$yr));
+	
+	$m_num = $today[mon];
+	$d_num = $today[mday];
+	$year = $today[year];
+	$f_today = getdate(mktime(0,0,0,$m_num,1,$year));
+	$wday = $f_today[wday];
+	$day = 1;
+	$fweek = true;
+
+	$m_name = "$year.$m_num ($cmd)";
+
+	if(!preg_match("/^(($WikiName)|($BracketName))$/",$pre))
+		$prefix_url = "[[".$pre."]]";
+	else
+		$prefix_url = $pre;
+
+	$prefix_url = rawurlencode($prefix_url);
+	$pre = strip_bracket($pre);
+	
+	$ret .= '<table border="0" width="100%"><tr><td valign="top">';
+	
+	$y = substr($date_str,0,4)+0;
+	$m = substr($date_str,4,2)+0;
+	
+	$prev_date_str = sprintf("%04d%02d",$y,$m-1);
+	if($m-1<1) {
+		$prev_date_str = sprintf("%04d%02d",$y-1,12);
+	}
+	$next_date_str = sprintf("%04d%02d",$y,$m+1);
+	if($m+1>12) {
+		$next_date_str = sprintf("%04d%02d",$y+1,1);
+	}
+	
+	if($prefix == "") {
+		$ret .= '
+<table class="style_calendar" cellspacing="1" width="150" border="0">
+  <tbody>
+  <tr>
+    <td align="middle" class="style_td_caltop" colspan="7" height="15">
+      <div align="center"><small><a href="'.$script.'?plugin=calendar2&file='.$prefix_.'&date='.$prev_date_str.'">&lt;&lt;</a> <b>'.$m_name.'</b> <a href="'.$script.'?plugin=calendar2&file='.$prefix_.'&date='.$next_date_str.'">&gt;&gt;</a></small></div>
+    </td>
+  </tr>
+  <tr>
+';
+	}
+	else {
+		$ret .= '
+<table class="style_calendar" cellspacing="1" width="150" border="0">
+  <tbody>
+  <tr>
+    <td align="middle" class="style_td_caltop" colspan="7" height="15">
+      <div align="center"><small><a href="'.$script.'?plugin=calendar2&file='.$prefix_.'&date='.$prev_date_str.'">&lt;&lt;</a> <b>'.$m_name.'</b> <a href="'.$script.'?plugin=calendar2&file='.$prefix_.'&date='.$next_date_str.'">&gt;&gt;</a><br>[<a href="'.$script.'?'.$prefix_url.'">'.$pre.'</a>]</small></div>
+    </td>
+  </tr>
+  <tr>
+';
+	}
+	
+	foreach($weeklabels as $label)
+	{
+		$ret .= '
+    <td align="middle" class="style_td_week" height="15">
+      <div align="center"><small><b>'.$label.'</b></small></div>
+    </td>';
+	}
+
+	$ret .= "</tr>\n<tr>\n";
+
+	while(checkdate($m_num,$day,$year))
+	{
+		$dt = sprintf("%4d-%02d-%02d", $year, $m_num, $day);
+		$name = "$prefix$dt";
+		$page = "[[$prefix$dt]]";
+		$page_url = rawurlencode("[[$prefix$dt]]");
+		
+		if($cmd == "edit") $refer = "&refer=$page_url";
+		else               $refer = "";
+		
+		if($cmd == "read" && !is_page($page))
+			$link = "<small><a href=\"$script?cmd=$cmd&page=$page_url$refer\" title=\"$name\">$day</a></small>";
+		else
+			$link = "<a href=\"$script?cmd=$cmd&page=$page_url$refer\" title=\"$name\"><b>$day</b></a>";
+
+		if($fweek)
+		{
+			for($i=0;$i<$wday;$i++)
+			{ // Blank 
+				$ret .= "    <td width=\"14%\" align=\"center\" class=\"style_td_blank\" height=\"19\">&nbsp;</td>\n"; 
+			} 
+		$fweek=false;
+		}
+
+		if($wday == 0) $ret .= "  </tr><tr>\n";
+		if(!$other_month && ($day == $today[mday]) && ($m_num == $today[mon]) && ($year == $today[year]))
+		{
+			//  Today 
+			$ret .= "    <td width=\"14%\" align=\"center\" class=\"style_td_today\" height=\"19\">$link</td>\n"; 
+		}
+		else if($wday == 0)
+		{
+			//  Sunday 
+			$ret .= "    <td width=\"14%\" align=\"center\" class=\"style_td_sun\" height=\"19\">$link</td>\n";
+		}
+		else if($wday == 6)
+		{
+			//  Saturday 
+			$ret .= "    <td width=\"14%\" align=\"center\" class=\"style_td_sat\" height=\"19\">$link</td>\n";
+		}
+		else
+		{
+			// Weekday 
+			$ret .= "    <td width=\"14%\" align=\"center\" class=\"style_td\" height=\"19\">$link</td>\n";
+		}
+		$day++;
+		$wday++;
+		$wday = $wday % 7;
+	}
+	if($wday > 0)
+	{
+		while($wday < 7)
+		{ // Blank 
+			$ret .= "    <td width=\"14%\" align=\"center\" class=\"style_td_blank\" height=\"19\">&nbsp;</td>\n";
+		$wday++;
+		} 
+	}
+
+	$ret .= "  </tr>\n</table>\n";
+	
+	$page = sprintf("[[%s%4d-%02d-%02d]]", $prefix, $today[year], $today[mon], $today[mday]);
+	$page_url = rawurlencode($page);
+	if(is_page($page)) {
+		$str = convert_html(join("",file(get_filename(encode($page)))));
+		$str .= "<hr><small><a href=\"$script?cmd=edit&page=$page\">[この日記を編集]</a></small>";
+	}
+	else {
+		$str = make_link(sprintf('[[%s%4d-%02d-%02d]]',$prefix, $today[year], $today[mon], $today[mday])).'は空です。';
+	}
+	
+	$ret .= "</td><td valign=\"top\">".$str."</td></tr></table>";
+	
+	return $ret;
+}
+
+function plugin_calendar2_action()
+{
+	global $command,$vars;
+	
+	$command = 'read';
+	$page = strip_bracket($vars['page']);
+	$vars['page'] = '*';
+	if($vars['file']) $vars['page'] = $vars['file'];
+	
+	$date = $vars['date'];
+	if($date=='') {
+		$date = date("Ym");
+	}
+	
+	$aryargs = array($vars['page'],$date);
+	$ret["msg"] = "calendar ".$vars['page']."/".$vars['date'];
+	$ret["body"] = call_user_func_array("plugin_calendar2_convert",$aryargs);
+	
+	$vars['page'] = $page;
+	
+	return $ret;
+}
+
+?>
\ No newline at end of file

--- a/plugin/calendar_edit.inc.php
+++ b/plugin/calendar_edit.inc.php
@@ -1,24 +1,24 @@
-<?
-function plugin_calendar_edit_convert()
-{
-	global $command;
-	
-	$command = edit;
-
-	if(func_num_args())
-		$aryargs = func_get_args();
-	else
-		$aryargs = array();
-
-	
-	if(file_exists(PLUGIN_DIR."calendar.inc.php"))
-	{
-		require_once PLUGIN_DIR."calendar.inc.php";
-		return call_user_func_array("plugin_calendar_convert",$aryargs);
-	}
-	else
-	{
-		return FALSE;
-	}
-}
-?>
+<?
+function plugin_calendar_edit_convert()
+{
+	global $command;
+	
+	$command = edit;
+
+	if(func_num_args())
+		$aryargs = func_get_args();
+	else
+		$aryargs = array();
+
+	
+	if(file_exists(PLUGIN_DIR."calendar.inc.php"))
+	{
+		require_once PLUGIN_DIR."calendar.inc.php";
+		return call_user_func_array("plugin_calendar_convert",$aryargs);
+	}
+	else
+	{
+		return FALSE;
+	}
+}
+?>

--- a/plugin/calendar_read.inc.php
+++ b/plugin/calendar_read.inc.php
@@ -1,23 +1,23 @@
-<?
-function plugin_calendar_read_convert()
-{
-	global $command;
-	
-	$command = read;
-
-	if(func_num_args())
-		$aryargs = func_get_args();
-	else
-		$aryargs = array();
-	
-	if(file_exists(PLUGIN_DIR."calendar.inc.php"))
-	{
-		require_once PLUGIN_DIR."calendar.inc.php";
-		return call_user_func_array("plugin_calendar_convert",$aryargs);
-	}
-	else
-	{
-		return FALSE;
-	}
-}
-?>
+<?
+function plugin_calendar_read_convert()
+{
+	global $command;
+	
+	$command = read;
+
+	if(func_num_args())
+		$aryargs = func_get_args();
+	else
+		$aryargs = array();
+	
+	if(file_exists(PLUGIN_DIR."calendar.inc.php"))
+	{
+		require_once PLUGIN_DIR."calendar.inc.php";
+		return call_user_func_array("plugin_calendar_convert",$aryargs);
+	}
+	else
+	{
+		return FALSE;
+	}
+}
+?>

--- a/plugin/comment.inc.php
+++ b/plugin/comment.inc.php
@@ -1,148 +1,170 @@
-<?
-global $name_cols,$comment_cols;
-
-/////////////////////////////////////////////////
-// コメントの名前テキストエリアのカラム数
-$name_cols = 15;
-/////////////////////////////////////////////////
-// コメントのテキストエリアのカラム数
-$comment_cols = 70;
-/////////////////////////////////////////////////
-// コメントの挿入フォーマット(名前)
-$name_format = '[[$name]]';
-/////////////////////////////////////////////////
-// コメントの挿入フォーマット(コメント内容)
-$comment_format = '$now $name $msg';
-/////////////////////////////////////////////////
-// コメントを挿入する位置 1:欄の前 0:欄の後
-$comment_ins = 1;
-
-
-// initialize
-$comment_no = 0;
-
-function plugin_comment_action()
-{
-	global $post,$vars,$script,$cols,$rows,$del_backup,$do_backup,$update_exec,$now;
-	global $name_cols,$comment_cols,$name_format,$comment_format,$comment_ins;
-	global $_title_collided,$_msg_collided,$_title_updated;
-
-	if($post["msg"])
-	{
-		$post["msg"] = preg_replace("/\n/","",$post["msg"]);
-
-		$postdata = "";
-		$postdata_old  = file(get_filename(encode($post["refer"])));
-		$comment_no = 0;
-
-		if($post[name])
-		{
-			$name = str_replace('$name',$post[name],$name_format);
-		}
-		if($post[msg])
-		{
-			if(preg_match("/^(-{1,2})(.*)/",$post[msg],$match))
-			{
-				$head = $match[1];
-				$post[msg] = $match[2];
-			}
-			
-			$comment = str_replace('$msg',$post[msg],$comment_format);
-			$comment = str_replace('$name',$name,$comment);
-			$comment = str_replace('$now',$now,$comment);
-		}
-		$comment = $head.$comment;
-
-		foreach($postdata_old as $line)
-		{
-			if(!$comment_ins) $postdata .= $line;
-			if(preg_match("/^#comment/",$line))
-			{
-				if($comment_no == $post["comment_no"] && $post[msg]!="")
-				{
-					$postdata .= "-$comment\n";
-				}
-				$comment_no++;
-			}
-			if($comment_ins) $postdata .= $line;
-		}
-
-		$postdata_input = "-$comment\n";
-	}
-	
-	if(md5(@join("",@file(get_filename(encode($post["refer"]))))) != $post["digest"])
-	{
-		$title = $_title_collided;
-		
-		$body = "$_msg_collided\n";
-
-		$body .= "<form action=\"$script?cmd=preview\" method=\"post\">\n"
-			."<input type=\"hidden\" name=\"refer\" value=\"".$post["refer"]."\">\n"
-			."<input type=\"hidden\" name=\"digest\" value=\"".$post["digest"]."\">\n"
-			."<textarea name=\"msg\" rows=\"$rows\" cols=\"$cols\" wrap=\"virtual\" id=\"textarea\">$postdata_input</textarea><br>\n"
-			."</form>\n";
-	}
-	else
-	{
-		$postdata = user_rules_str($postdata);
-
-		// 差分ファイルの作成
-		if(is_page($post["refer"]))
-			$oldpostdata = join("",file(get_filename(encode($post["refer"]))));
-		else
-			$oldpostdata = "\n";
-		if($postdata)
-			$diffdata = do_diff($oldpostdata,$postdata);
-		file_write(DIFF_DIR,$post["refer"],$diffdata);
-
-		// バックアップの作成
-		if(is_page($post["refer"]))
-			$oldposttime = filemtime(get_filename(encode($post["refer"])));
-		else
-			$oldposttime = time();
-
-		// 編集内容が何も書かれていないとバックアップも削除する?しないですよね。
-		if(!$postdata && $del_backup)
-			backup_delete(BACKUP_DIR.encode($post["refer"]).".txt");
-		else if($do_backup && is_page($post["refer"]))
-			make_backup(encode($post["refer"]).".txt",$oldpostdata,$oldposttime);
-
-		// ファイルの書き込み
-		file_write(DATA_DIR,$post["refer"],$postdata);
-
-		// is_pageのキャッシュをクリアする。
-		is_page($post["refer"],true);
-
-		$title = $_title_updated;
-	}
-	$retvars["msg"] = $title;
-	$retvars["body"] = $body;
-	
-	$post["page"] = $post["refer"];
-	$vars["page"] = $post["refer"];
-	
-	return $retvars;
-}
-function plugin_comment_convert()
-{
-	global $script,$comment_no,$vars,$name_cols,$comment_cols,$digest;
-	global $_btn_comment,$_btn_name,$vars;
-
-	if((arg_check("read")||$vars["cmd"] == ""||arg_check("unfreeze")||arg_check("freeze")||$vars["write"]||$vars["comment"]))
-		$button = "<input type=\"submit\" name=\"comment\" value=\"$_btn_comment\">\n";
-
-	$string = "<form action=\"$script\" method=\"post\">\n"
-		 ."<input type=\"hidden\" name=\"comment_no\" value=\"$comment_no\">\n"
-		 ."<input type=\"hidden\" name=\"refer\" value=\"$vars[page]\">\n"
-		 ."<input type=\"hidden\" name=\"plugin\" value=\"comment\">\n"
-		 ."<input type=\"hidden\" name=\"digest\" value=\"$digest\">\n"
-		 ."$_btn_name<input type=\"text\" name=\"name\" size=\"$name_cols\">\n"
-		 ."<input type=\"text\" name=\"msg\" size=\"$comment_cols\">\n"
-		 .$button
-		 ."</form>";
-
-	$comment_no++;
-
-	return $string;
-}
-?>
+<?
+global $name_cols, $comment_cols, $msg_format, $name_format;
+global $msg_format, $now_format, $comment_format;
+global $comment_ins, $comment_mail, $comment_no;
+
+
+/////////////////////////////////////////////////
+// ･ｳ･皈?ﾈ､ﾎﾌｾﾁｰ･ﾆ･ｭ･ｹ･ﾈ･ｨ･?｢､ﾎ･ｫ･鬣狒
+$name_cols = 15;
+/////////////////////////////////////////////////
+// ･ｳ･皈?ﾈ､ﾎ･ﾆ･ｭ･ｹ･ﾈ･ｨ･?｢､ﾎ･ｫ･鬣狒
+$comment_cols = 70;
+/////////////////////////////////////////////////
+// ･ｳ･皈?ﾈ､ﾎﾁﾞﾆ?･ﾕ･ｩ｡ｼ･ﾞ･ﾃ･ﾈ
+$name_format = '[[$name]]';
+$msg_format = '$msg';
+$now_format = 'SIZE(1):$now';
+/////////////////////////////////////////////////
+// ･ｳ･皈?ﾈ､ﾎﾁﾞﾆ?･ﾕ･ｩ｡ｼ･ﾞ･ﾃ･ﾈ(･ｳ･皈?ﾈﾆ簣ﾆ)
+$comment_format = '$msg -- $name $now';
+/////////////////////////////////////////////////
+// ･ｳ･皈?ﾈ､?ﾞﾆ?､ｹ､?ﾌﾃﾖ 1:ﾍ?ﾎﾁｰ 0:ﾍ?ﾎｸ
+$comment_ins = 1;
+/////////////////////////////////////////////////
+// ･ｳ･皈?ﾈ､ｬﾅ?ﾆ､ｵ､?ｿｾ?遑｢ﾆ簣ﾆ､?癸ｼ･?ﾇﾁ??
+$comment_mail = FALSE;
+
+// initialize
+$comment_no = 0;
+
+function plugin_comment_action()
+{
+	global $post,$vars,$script,$cols,$rows,$del_backup,$do_backup,$update_exec,$now;
+	global $name_cols,$comment_cols,$name_format,$msg_format,$now_format,$comment_format,$comment_ins;
+	global $_title_collided,$_msg_collided,$_title_updated;
+	global $_msg_comment_collided,$_title_comment_collided;
+
+	$_comment_format = $comment_format;
+	if($post["nodate"]=="1") {
+		$_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(join("",file(get_filename(encode($post["refer"])))));
+		return $retvars;
+	}
+	if($post["msg"])
+	{
+		$post["msg"] = preg_replace("/\n/","",$post["msg"]);
+
+		$postdata = "";
+		$postdata_old  = file(get_filename(encode($post["refer"])));
+		$comment_no = 0;
+
+		if($post["name"])
+		{
+			$name = str_replace('$name',$post["name"],$name_format);
+		}
+		if($post["msg"])
+		{
+			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;
+		}
+
+		foreach($postdata_old as $line)
+		{
+			if(!$comment_ins) $postdata .= $line;
+			if(preg_match("/^#comment/",$line))
+			{
+				if($comment_no == $post["comment_no"] && $post[msg]!="")
+				{
+					$postdata .= "-$comment\n";
+				}
+				$comment_no++;
+			}
+			if($comment_ins) $postdata .= $line;
+		}
+
+		$postdata_input = "-$comment\n";
+	}
+
+	$title = $_title_updated;
+	if(md5(@join("",@file(get_filename(encode($post["refer"]))))) != $post["digest"])
+	{
+		$title = $_title_comment_collided;
+		$body = $_msg_comment_collided . make_link($post["refer"]);
+	}
+	
+	$postdata = user_rules_str($postdata);
+
+	// ｺｹﾊｬ･ﾕ･｡･､･?ﾎｺ?ｮ
+	if(is_page($post["refer"]))
+		$oldpostdata = join("",file(get_filename(encode($post["refer"]))));
+	else
+		$oldpostdata = "\n";
+	if($postdata)
+		$diffdata = do_diff($oldpostdata,$postdata);
+	file_write(DIFF_DIR,$post["refer"],$diffdata);
+		// ･ﾐ･ﾃ･ｯ･｢･ﾃ･ﾗ､ﾎｺ?ｮ
+	if(is_page($post["refer"]))
+		$oldposttime = filemtime(get_filename(encode($post["refer"])));
+	else
+		$oldposttime = time();
+
+	// ﾊﾔｽｸﾆ簣ﾆ､ｬｲｿ､篆?ｫ､?ﾆ､､､ﾊ､､､ﾈ･ﾐ･ﾃ･ｯ･｢･ﾃ･ﾗ､篌??ｹ､?､ｷ､ﾊ､､､ﾇ､ｹ､隍ﾍ｡｣
+	if(!$postdata && $del_backup)
+		backup_delete(BACKUP_DIR.encode($post["refer"]).".txt");
+	else if($do_backup && is_page($post["refer"]))
+	make_backup(encode($post["refer"]).".txt",$oldpostdata,$oldposttime);
+
+	// ･ﾕ･｡･､･?ﾎｽ?ｭｹ?､ﾟ
+	file_write(DATA_DIR,$post["refer"],$postdata);
+
+	// is_page､ﾎ･ｭ･罕ﾃ･ｷ･螟?ｯ･?｢､ｹ､?｣
+	is_page($post["refer"],true);
+
+	$retvars["msg"] = $title;
+	$retvars["body"] = $body;
+	
+	$post["page"] = $post["refer"];
+	$vars["page"] = $post["refer"];
+	
+	return $retvars;
+}
+function plugin_comment_convert()
+{
+	global $script,$comment_no,$vars,$name_cols,$comment_cols,$digest;
+	global $_btn_comment,$_btn_name,$_msg_comment,$vars;
+
+	$options = func_get_args();
+	
+	$nametags = "$_btn_name<input type=\"text\" name=\"name\" size=\"$name_cols\">\n";
+	if(is_array($options) && in_array("noname",$options)) {
+		$nametags = $_msg_comment;
+	}
+
+	$nodate = '0';
+	if(is_array($options) && in_array("nodate",$options)) {
+		$nodate = '1';
+	}
+
+	if((arg_check("read")||$vars["cmd"] == ""||arg_check("unfreeze")||arg_check("freeze")||$vars["write"]||$vars["comment"]))
+		$button = "<input type=\"submit\" name=\"comment\" value=\"$_btn_comment\">\n";
+
+	$string = "<p><form action=\"$script\" method=\"post\">\n"
+		 ."<input type=\"hidden\" name=\"comment_no\" value=\"$comment_no\">\n"
+		 ."<input type=\"hidden\" name=\"refer\" value=\"$vars[page]\">\n"
+		 ."<input type=\"hidden\" name=\"plugin\" value=\"comment\">\n"
+		 ."<input type=\"hidden\" name=\"nodate\" value=\"$nodate\">\n"
+		 ."<input type=\"hidden\" name=\"digest\" value=\"$digest\">\n"
+		 ."$nametags"
+		 ."<input type=\"text\" name=\"msg\" size=\"$comment_cols\">\n"
+		 .$button
+		 ."</form>";
+
+	$comment_no++;
+
+	return $string;
+}
+?>

--- /dev/null
+++ b/plugin/counter.inc.php
@@ -0,0 +1,52 @@
+<?
+/*
+ * PukiWiki カウンタープラグイン
+ *
+ * CopyRight 2002 Y.MASUI GPL2
+ * http://masui.net/pukiwiki/ [e-mail]
+ */
+
+// counter file
+define(COUNTER_DIR, "./counter/");
+
+function plugin_counter_convert()
+{
+	global $vars;
+	
+	$file = COUNTER_DIR.encode($vars["page"]).".count";
+	if(!file_exists($file))
+	{
+		$nf = fopen($file, "w");
+		fputs($nf,"0\n0\n0\n0\n\n");
+		fclose($nf);
+	}
+	$array = file($file);
+	$count = rtrim($array[0]);
+	$today = rtrim($array[1]);
+	$today_count = rtrim($array[2]);
+	$yesterday_count = rtrim($array[3]);
+	$ip = rtrim($array[4]);
+	if($ip != $_SERVER["REMOTE_ADDR"] && !(arg_check("add") || arg_check("edit") || arg_check("preview") || $vars['preview'] != '' || $vars['write'] != '')) {
+		$t = date("Y/m/d");
+		if($t != $today) {
+			$yesterday_count = $today_count;
+			$today_count = 0;
+			$today = $t;
+		}
+		++$count;
+		++$today_count;
+	}
+	
+	$ip = $_SERVER["REMOTE_ADDR"];
+	$nf = fopen($file, "w");
+	fputs($nf,"$count\n");
+	fputs($nf,"$today\n");
+	fputs($nf,"$today_count\n");
+	fputs($nf,"$yesterday_count\n");
+	fputs($nf,"$ip\n");
+	fclose($nf);
+	
+	return "<font size='1'>Counter: $count, today: $today_count, yesterday: $yesterday_count</font>";
+
+}
+?>

--- /dev/null
+++ b/plugin/img.inc.php
@@ -0,0 +1,20 @@
+<?
+function plugin_img_convert()
+{
+	if(func_num_args()!=2) {
+		return;
+	}
+	$aryargs = func_get_args();
+	$url = $aryargs[0];
+	$align = strtoupper($aryargs[1]);
+	
+	if($align == 'R' || $align == 'RIGHT') {
+		$align = 'right';
+	}
+	else {
+		$align = 'left';
+	}
+	
+	return "<div style=\"float:$align\"><img src=\"$url\"></div>";
+}
+?>

--- /dev/null
+++ b/plugin/insert.inc.php
@@ -0,0 +1,121 @@
+<?
+/////////////////////////////////////////////////
+// テキストエリアのカラム数
+define("INSERT_COLS",70);
+/////////////////////////////////////////////////
+// テキストエリアの行数
+define("INSERT_ROWS",5);
+/////////////////////////////////////////////////
+// 挿入する位置 1:欄の前 0:欄の後
+define("INSERT_INS",1);
+
+function plugin_insert_action()
+{
+	global $post,$vars,$script,$cols,$rows,$del_backup,$do_backup;
+	global $_title_collided,$_msg_collided,$_title_updated;
+
+	if($post["msg"])
+	{
+		$postdata = "";
+		$postdata_old  = file(get_filename(encode($post["refer"])));
+		$insert_no = 0;
+
+		if($post[msg])
+		{
+			$insert = $post[msg];
+		}
+
+		foreach($postdata_old as $line)
+		{
+			if(!INSERT_INS) $postdata .= $line;
+			if(preg_match("/^#insert$/",$line))
+			{
+				if($insert_no == $post["insert_no"] && $post[msg]!="")
+				{
+					$postdata .= "$insert\n";
+				}
+				$insert_no++;
+			}
+			if(INSERT_INS) $postdata .= $line;
+		}
+
+		$postdata_input = "$insert\n";
+	}
+	else
+		return;
+
+	if(md5(@join("",@file(get_filename(encode($post["refer"]))))) != $post["digest"])
+	{
+		$title = $_title_collided;
+
+		$body = "$_msg_collided\n";
+
+		$body .= "<form action=\"$script?cmd=preview\" method=\"post\">\n"
+			."<input type=\"hidden\" name=\"refer\" value=\"".$post["refer"]."\">\n"
+			."<input type=\"hidden\" name=\"digest\" value=\"".$post["digest"]."\">\n"
+			."<textarea name=\"msg\" rows=\"$rows\" cols=\"$cols\" wrap=\"virtual\" id=\"textarea\">$postdata_input</textarea><br>\n"
+			."</form>\n";
+	}
+	else
+	{
+		$postdata = user_rules_str($postdata);
+
+		// 差分ファイルの作成
+		if(is_page($post["refer"]))
+			$oldpostdata = join("",file(get_filename(encode($post["refer"]))));
+		else
+			$oldpostdata = "\n";
+		if($postdata)
+			$diffdata = do_diff($oldpostdata,$postdata);
+		file_write(DIFF_DIR,$post["refer"],$diffdata);
+
+		// バックアップの作成
+		if(is_page($post["refer"]))
+			$oldposttime = filemtime(get_filename(encode($post["refer"])));
+		else
+			$oldposttime = time();
+
+		// 編集内容が何も書かれていないとバックアップも削除する?しないですよね。
+		if(!$postdata && $del_backup)
+			backup_delete(BACKUP_DIR.encode($post["refer"]).".txt");
+		else if($do_backup && is_page($post["refer"]))
+			make_backup(encode($post["refer"]).".txt",$oldpostdata,$oldposttime);
+
+		// ファイルの書き込み
+		file_write(DATA_DIR,$post["refer"],$postdata);
+
+		// is_pageのキャッシュをクリアする。
+		is_page($post["refer"],true);
+
+		$title = $_title_updated;
+	}
+	$retvars["msg"] = $title;
+	$retvars["body"] = $body;
+
+	$post["page"] = $post["refer"];
+	$vars["page"] = $post["refer"];
+
+	return $retvars;
+}
+function plugin_insert_convert()
+{
+	global $script,$insert_no,$vars,$digest;
+	global $_btn_insert,$vars;
+
+	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";
+
+	$string = "<form action=\"$script\" method=\"post\">\n"
+		 ."<input type=\"hidden\" name=\"insert_no\" value=\"$insert_no\">\n"
+		 ."<input type=\"hidden\" name=\"refer\" value=\"$vars[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"
+		 .$button
+		 ."</form>";
+
+	$insert_no++;
+
+	return $string;
+}
+?>

--- a/plugin/lookup.inc.php
+++ b/plugin/lookup.inc.php
@@ -1,37 +1,37 @@
-<?
-function plugin_lookup_convert()
-{
-	global $script,$vars;
-	
-	$args = func_get_args();
-	
-	if(func_num_args() < 2) return FALSE;
-	
-	$iwn = trim(strip_tags($args[0]));
-	$btn = trim(strip_tags($args[1]));
-	$default = trim(strip_tags($args[2]));
-	
-	$ret = "<form action=\"$script\" method=\"post\">\n";
-	$ret.= "<input type=\"hidden\" name=\"plugin\" value=\"lookup\">\n";
-	$ret.= "<input type=\"hidden\" name=\"refer\" value=\"$vars[page]\">\n";
-	$ret.= "<input type=\"hidden\" name=\"inter\" value=\"$iwn\">\n";
-	$ret.= "$iwn:\n";
-	$ret.= "<input type=\"text\" name=\"page\" size=\"30\" value=\"$default\">\n";
-	$ret.= "<input type=\"submit\" value=\"$btn\">\n";
-	$ret.= "</form>\n";
-
-	return $ret;
-}
-function plugin_lookup_action()
-{
-	global $vars,$script;
-	
-	if(!$vars["inter"] || !$vars["page"]) return;
-	
-	$interwikiname = "[[".$vars["inter"].":".$vars["page"]."]]";
-	$interwikiname = rawurlencode($interwikiname);
-	
-	header("Location: $script?$interwikiname");
-	die();
-}
-?>
+<?
+function plugin_lookup_convert()
+{
+	global $script,$vars;
+	
+	$args = func_get_args();
+	
+	if(func_num_args() < 2) return FALSE;
+	
+	$iwn = trim(strip_tags($args[0]));
+	$btn = trim(strip_tags($args[1]));
+	$default = trim(strip_tags($args[2]));
+	
+	$ret = "<form action=\"$script\" method=\"post\">\n";
+	$ret.= "<input type=\"hidden\" name=\"plugin\" value=\"lookup\">\n";
+	$ret.= "<input type=\"hidden\" name=\"refer\" value=\"$vars[page]\">\n";
+	$ret.= "<input type=\"hidden\" name=\"inter\" value=\"$iwn\">\n";
+	$ret.= "$iwn:\n";
+	$ret.= "<input type=\"text\" name=\"page\" size=\"30\" value=\"$default\">\n";
+	$ret.= "<input type=\"submit\" value=\"$btn\">\n";
+	$ret.= "</form>\n";
+
+	return $ret;
+}
+function plugin_lookup_action()
+{
+	global $vars,$script;
+	
+	if(!$vars["inter"] || !$vars["page"]) return;
+	
+	$interwikiname = "[[".$vars["inter"].":".$vars["page"]."]]";
+	$interwikiname = rawurlencode($interwikiname);
+	
+	header("Location: $script?$interwikiname");
+	die();
+}
+?>

--- /dev/null
+++ b/plugin/ls.inc.php
@@ -0,0 +1,62 @@
+<?
+/*
+ * PukiWiki lsプラグイン
+ *
+ * CopyRight 2002 Y.MASUI GPL2
+ * http://masui.net/pukiwiki/ [e-mail]
+ */
+
+function plugin_ls_convert()
+{
+	global $vars, $script;
+	
+	if(func_num_args())
+		$aryargs = func_get_args();
+	else
+		$aryargs = array();
+
+      	$with_title = FALSE;
+	if(array_search('title',$aryargs)!==FALSE) {
+	  $with_title = TRUE;
+	}
+	$ls = $comment = '';
+	$filepattern = encode('[['.strip_bracket($vars["page"]).'/');
+	$filepattern_len = strlen($filepattern);
+	if ($dir = @opendir(DATA_DIR))
+	{
+		while($file = readdir($dir))
+		{
+			if($file == ".." || $file == ".") continue;
+			if(substr($file,0,$filepattern_len)!=$filepattern) continue; 
+			$page = decode(trim(preg_replace("/\.txt$/"," ",$file)));
+			if($with_title) {
+			  $comment = '';
+			  $fd = fopen(DATA_DIR . $file,'r');
+			  if(!feof ($fd)) {
+			    $comment = ereg_replace("^[-*]+",'',fgets($fd,1024));
+			    $comment = ereg_replace("[~\r\n]+$",'',$comment);
+			    $comment = trim($comment);
+			  }
+			  if($comment != '' && substr($comment,0,1) != '#') {
+			    $comment = " - " . convert_html($comment);
+			  }
+			  else {
+			    $comment = '';
+			  }
+			  fclose($fd);
+			}
+      			$url = rawurlencode($page);
+			$name = strip_bracket($page);
+			$title = $name ." " .get_pg_passage($page,false);
+			$ls .= "<li><a href=\"$script?cmd=read&page=$url\" title=\"$title\">$name</a>$comment\n";
+		}
+		closedir($dir);
+	}
+	
+	if($ls=='') {
+	  return '';
+	}
+	
+	return "<ul>$ls</ul>";
+}
+?>

--- /dev/null
+++ b/plugin/memo.inc.php
@@ -0,0 +1,126 @@
+<?
+/////////////////////////////////////////////////
+// テキストエリアのカラム数
+define("MEMO_COLS",80);
+/////////////////////////////////////////////////
+// テキストエリアの行数
+define("MEMO_ROWS",5);
+
+function plugin_memo_action()
+{
+	global $post,$vars,$script,$cols,$rows,$del_backup,$do_backup;
+	global $_title_collided,$_msg_collided,$_title_updated;
+
+	$post["msg"] = preg_replace("/(\x0D\x0A)/","\n",$post["msg"]);
+	$post["msg"] = preg_replace("/(\x0D)/","\n",$post["msg"]);
+	$post["msg"] = preg_replace("/(\x0A)/","\n",$post["msg"]);
+
+	if($post["msg"])
+	{
+		$post["msg"] = str_replace("\n","\\n",$post["msg"]);
+
+		$postdata = "";
+		$postdata_old  = file(get_filename(encode($post["refer"])));
+		$memo_no = 0;
+
+		$memo_body = $post["msg"];
+
+		foreach($postdata_old as $line)
+		{
+			if(preg_match("/^#memo\(?.*\)?$/",$line))
+			{
+				if($memo_no == $post["memo_no"] && $post["msg"]!="")
+				{
+					$postdata .= "#memo($memo_body)\n";
+					$line = "";
+				}
+				$memo_no++;
+			}
+			$postdata .= $line;
+		}
+
+		$postdata_input = "$memo_body\n";
+	}
+	else
+		return;
+	
+	if(md5(@join("",@file(get_filename(encode($post["refer"]))))) != $post["digest"])
+	{
+		$title = $_title_collided;
+		
+		$body = "$_msg_collided\n";
+
+		$body .= "<form action=\"$script?cmd=preview\" method=\"post\">\n"
+			."<input type=\"hidden\" name=\"refer\" value=\"".$post["refer"]."\">\n"
+			."<input type=\"hidden\" name=\"digest\" value=\"".$post["digest"]."\">\n"
+			."<textarea name=\"msg\" rows=\"$rows\" cols=\"$cols\" wrap=\"virtual\" id=\"textarea\">$postdata_input</textarea><br>\n"
+			."</form>\n";
+	}
+	else
+	{
+		$postdata = user_rules_str($postdata);
+
+		// 差分ファイルの作成
+		if(is_page($post["refer"]))
+			$oldpostdata = join("",file(get_filename(encode($post["refer"]))));
+		else
+			$oldpostdata = "\n";
+		if($postdata)
+			$diffdata = do_diff($oldpostdata,$postdata);
+		file_write(DIFF_DIR,$post["refer"],$diffdata);
+
+		// バックアップの作成
+		if(is_page($post["refer"]))
+			$oldposttime = filemtime(get_filename(encode($post["refer"])));
+		else
+			$oldposttime = time();
+
+		// 編集内容が何も書かれていないとバックアップも削除する?しないですよね。
+		if(!$postdata && $del_backup)
+			backup_delete(BACKUP_DIR.encode($post["refer"]).".txt");
+		else if($do_backup && is_page($post["refer"]))
+			make_backup(encode($post["refer"]).".txt",$oldpostdata,$oldposttime);
+
+		// ファイルの書き込み
+		file_write(DATA_DIR,$post["refer"],$postdata);
+
+		// is_pageのキャッシュをクリアする。
+		is_page($post["refer"],true);
+
+		$title = $_title_updated;
+	}
+	$retvars["msg"] = $title;
+	$retvars["body"] = $body;
+	
+	$post["page"] = $post["refer"];
+	$vars["page"] = $post["refer"];
+	
+	return $retvars;
+}
+function plugin_memo_convert()
+{
+	global $script,$memo_no,$vars,$digest;
+	global $_btn_memo_update,$vars;
+
+	if(func_num_args())
+		$aryargs = func_get_args();
+
+	$data = str_replace("\\n","\n",$aryargs[0]);
+
+	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";
+
+	$string = "<form action=\"$script\" method=\"post\" class=\"memo\">\n"
+		 ."<input type=\"hidden\" name=\"memo_no\" value=\"$memo_no\">\n"
+		 ."<input type=\"hidden\" name=\"refer\" value=\"$vars[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"
+		 .$button
+		 ."</form>";
+
+	$memo_no++;
+
+	return $string;
+}
+?>

--- /dev/null
+++ b/plugin/newpage.inc.php
@@ -0,0 +1,52 @@
+<?
+function plugin_newpage_init()
+{
+  $_plugin_recent_messages = array(
+    '_msg_newpage' => 'ページ新規作成'
+  );
+  set_plugin_messages($_plugin_recent_messages);
+}
+
+function plugin_newpage_convert()
+{
+	global $script,$vars,$_btn_edit,$_msg_newpage;
+	
+	$ret = "<form action=\"$script\" method=\"post\">\n";
+	$ret.= "<input type=\"hidden\" name=\"plugin\" value=\"newpage\">\n";
+	$ret.= "<input type=\"hidden\" name=\"refer\" value=\"$vars[page]\">\n";
+	$ret.= "$_msg_newpage: ";
+	$ret.= "<input type=\"text\" name=\"page\" size=\"30\" value=\"\">\n";
+	$ret.= "<input type=\"submit\" value=\"$_btn_edit\">\n";
+	$ret.= "</form>\n";
+
+	return $ret;
+}
+
+function plugin_newpage_action()
+{
+	global $vars,$script,$_btn_edit,$_msg_newpage;
+	
+	if(!$vars["page"]) {
+		$retvars["msg"] = $_msg_newpage;
+		$retvars["body"] = "<form action=\"$script\" method=\"post\">\n";
+		$retvars["body"].= "<input type=\"hidden\" name=\"plugin\" value=\"newpage\">\n";
+		$retvars["body"].= "<input type=\"hidden\" name=\"refer\" value=\"$vars[page]\">\n";
+		$retvars["body"].= "$_msg_newpage: ";
+		$retvars["body"].= "<input type=\"text\" name=\"page\" size=\"30\" value=\"\">\n";
+		$retvars["body"].= "<input type=\"submit\" value=\"$_btn_edit\">\n";
+		$retvars["body"].= "</form>\n";
+
+		return $retvars;
+	}
+	
+	if(!preg_match("/^($BracketName)|($InterWikiName)$/",$vars["page"]))
+	{
+		$vars["page"] = "[[$vars[page]]]";
+	}
+
+	$wikiname = rawurlencode($vars["page"]);
+	
+	header("Location: $script?$wikiname");
+	die();
+}
+?>

--- a/plugin/online.inc.php
+++ b/plugin/online.inc.php
@@ -1,48 +1,48 @@
-<?
-
-// user list file
-define(USR_LST, "user.dat");
-// time out sec
-define(TIMEOUT, 300);
-
-function plugin_online_convert()
-{
-	global $HTTP_SERVER_VARS;
-	
-	if(!file_exists(USR_LST))
-	{
-		$nf = fopen(USR_LST, "w");
-		fclose($nf);
-	}
-	CheckUser($HTTP_SERVER_VARS["REMOTE_ADDR"]);
-	return UserCount();
-}
-
-function CheckUser($addr)
-{
-	$usr_arr = file(USR_LST);
-	$fp = fopen(USR_LST, "w");
-	while(!flock($fp,LOCK_EX));
-	$now = time();
-	for($i = 0; $i < count($usr_arr); $i++)
-	{
-		list($ip_addr,$tim_stmp) = explode("|", $usr_arr[$i]);
-		if(($now-$tim_stmp) < TIMEOUT)
-		{
-			if($ip_addr != $addr)
-			{
-				fputs($fp, "$ip_addr|$tim_stmp");
-			}
-		}
-	}
-	fputs($fp, "$addr|$now\n");
-	flock($fp,LOCK_UN);
-	fclose($fp);
-}
-
-function UserCount()
-{
-	$usr_arr = file(USR_LST);
-	return count($usr_arr);
-}
-?>
+<?
+
+// user list file
+define(USR_LST, "counter/user.dat");
+// time out sec
+define(TIMEOUT, 300);
+
+function plugin_online_convert()
+{
+	global $HTTP_SERVER_VARS;
+	
+	if(!file_exists(USR_LST))
+	{
+		$nf = fopen(USR_LST, "w");
+		fclose($nf);
+	}
+	CheckUser($HTTP_SERVER_VARS["REMOTE_ADDR"]);
+	return UserCount();
+}
+
+function CheckUser($addr)
+{
+	$usr_arr = file(USR_LST);
+	$fp = fopen(USR_LST, "w");
+	while(!flock($fp,LOCK_EX));
+	$now = time();
+	for($i = 0; $i < count($usr_arr); $i++)
+	{
+		list($ip_addr,$tim_stmp) = explode("|", $usr_arr[$i]);
+		if(($now-$tim_stmp) < TIMEOUT)
+		{
+			if($ip_addr != $addr)
+			{
+				fputs($fp, "$ip_addr|$tim_stmp");
+			}
+		}
+	}
+	fputs($fp, "$addr|$now\n");
+	flock($fp,LOCK_UN);
+	fclose($fp);
+}
+
+function UserCount()
+{
+	$usr_arr = file(USR_LST);
+	return count($usr_arr);
+}
+?>

--- a/plugin/readme.ja.txt
+++ b/plugin/readme.ja.txt
@@ -1,64 +1,81 @@
-
-/////////////////////////////////////////////////
-// プラグインディレクトリについて
-
-  PukiWikiのページのHTMLへのコンバート時と、プラグイン機能からの値を受け取って
-  処理を行うプラグインを設置することができます。
-
-  このテキストは、そのプラグインの記述方法についての説明をします。
-
-
-/////////////////////////////////////////////////
-// ページ内でのプラグインの呼び出し
-
-  #プラグイン名
-  #プラグイン名(arg1,arg2...)
-
-    行頭にスペースは含めることはできない。
-    引数内に括弧()を使用することができる。ただし ) 単体は不可。
-    引数を指定しなくても呼び出せる
-
-
-/////////////////////////////////////////////////
-// ファイル名
-
-  プラグイン名.inc.php
-
-
-/////////////////////////////////////////////////
-// 関数
-
-  ■function plugin_プラグイン名_convert()
-
-    HTMLへのコンバート時に呼び出される
-
-    引数は func_get_args() で配列へ格納できる。([0]〜[n])
-    func_num_args() によって、渡された引数の数を求めることができる。
-
-  ■function plugin_プラグイン名_action()
-
-    GET・POSTメソッドでpluginを指定されたときに呼び出される
-
-    返値に array("msg" => "$1 is page") などを返すと $1 をページ名として
-    ページタイトルに置換される
-
-    die() を実行することにより、ページに戻らないようにできる
-
-/////////////////////////////////////////////////
-// ファイル内容
-
-  ユーザに設定させる初期値などについては、define で定義する。
-
-  コンバート時のGET・POSTの出力内容に必要なものは refer と plugin という値で、
-  refer : そのページの名前($vars["page"])
-  plugin : プラグイン名
-  とします。
-
-  以下の値を global でグローバル変数にすることによって値を取得できます。
-
-  $script : スクリプト名
-  $get : GETメソッドによるHTTPからの引数
-  $post : POSTメソッドによるHTTPからの引数
-  $vars : GET・POST両方のメソッドによるHTTPからの引数
-
-  $vars["page"] : 開いているページ名(strip_bracket関数により[[]]を取り除ける)
+/////////////////////////////////////////////////
+// ･ﾗ･鬣ｰ･､･?ﾇ･｣･?ｯ･ﾈ･熙ﾋ､ﾄ､､､ﾆ
+
+  PukiWiki､ﾎ･ﾚ｡ｼ･ｸ､ﾎHTML､ﾘ､ﾎ･ｳ･?ﾐ｡ｼ･ﾈｻ?､ﾈ｡｢･ﾗ･鬣ｰ･､･?｡ﾇｽ､ｫ､鬢ﾎﾃﾍ､??ｱｼ隍ﾃ､ﾆ
+  ｽ靉?､?ﾔ､ｦ･ﾗ･鬣ｰ･､･??ﾟﾃﾖ､ｹ､?ｳ､ﾈ､ｬ､ﾇ､ｭ､ﾞ､ｹ｡｣
+
+  ､ｳ､ﾎ･ﾆ･ｭ･ｹ･ﾈ､ﾏ｡｢､ｽ､ﾎ･ﾗ･鬣ｰ･､･?ﾎｵｭｽﾒﾊ?ﾋ｡､ﾋ､ﾄ､､､ﾆ､ﾎﾀ篶ﾀ､?ｷ､ﾞ､ｹ｡｣
+
+
+/////////////////////////////////////////////////
+// ･ﾚ｡ｼ･ｸﾆ筅ﾇ､ﾎ･ﾗ･鬣ｰ･､･?ﾎｸﾆ､ﾓｽﾐ､ｷ
+
+  #･ﾗ･鬣ｰ･､･?ｾ
+  #･ﾗ･鬣ｰ･､･?ｾ(arg1,arg2...)
+
+    ｹﾔﾆｬ､ﾋ･ｹ･ﾚ｡ｼ･ｹ､ﾏｴﾞ､皃?ｳ､ﾈ､ﾏ､ﾇ､ｭ､ﾊ､､｡｣
+    ｰ??筅ﾋｳ邵ﾌ()､?ﾈﾍﾑ､ｹ､?ｳ､ﾈ､ｬ､ﾇ､ｭ､?｣､ｿ､ﾀ､ｷ ) ﾃｱﾂﾎ､ﾏﾉﾔｲﾄ｡｣
+    ｰ???ﾘﾄ熙ｷ､ﾊ､ｯ､ﾆ､篋ﾆ､ﾓｽﾐ､ｻ､
+
+
+/////////////////////////////////////////////////
+// ･ﾕ･｡･､･?ｾ
+
+  ･ﾗ･鬣ｰ･､･?ｾ.inc.php
+
+
+/////////////////////////////////////////////////
+// ｴﾘｿ
+
+  ｢｣function plugin_･ﾗ･鬣ｰ･､･?ｾ_convert()
+
+    HTML､ﾘ､ﾎ･ｳ･?ﾐ｡ｼ･ﾈｻ?､ﾋｸﾆ､ﾓｽﾐ､ｵ､?
+
+    ｰ??ﾏ func_get_args() ､ﾇﾇﾛﾎ?ﾘｳﾊﾇｼ､ﾇ､ｭ､?｣([0]｡ﾁ[n])
+    func_num_args() ､ﾋ､隍ﾃ､ﾆ｡｢ﾅﾏ､ｵ､?ｿｰ??ﾎｿ??皃皃?ｳ､ﾈ､ｬ､ﾇ､ｭ､?｣
+
+  ｢｣function plugin_･ﾗ･鬣ｰ･､･?ｾ_action()
+
+    GET｡ｦPOST･皈ｽ･ﾃ･ﾉ､ﾇplugin､?ﾘﾄ熙ｵ､?ｿ､ﾈ､ｭ､ﾋｸﾆ､ﾓｽﾐ､ｵ､?
+
+    ﾊﾖﾃﾍ､ﾋ array("msg" => "$1 is page") ､ﾊ､ﾉ､?ﾖ､ｹ､ﾈ $1 ､?ﾚ｡ｼ･ｸﾌｾ､ﾈ､ｷ､ﾆ
+    ･ﾚ｡ｼ･ｸ･ｿ･､･ﾈ･?ﾋﾃﾖｴｹ､ｵ､?
+
+    die() ､?ﾂｹﾔ､ｹ､?ｳ､ﾈ､ﾋ､隍遙｢･ﾚ｡ｼ･ｸ､ﾋﾌ皃鬢ﾊ､､､隍ｦ､ﾋ､ﾇ､ｭ､
+
+  ｢｣function plugin_･ﾗ･鬣ｰ･､･?ｾ_init()
+
+    ･ﾗ･鬣ｰ･､･?ｬﾆﾉ､ﾟｹ?､ﾞ､???､ﾋｸﾆ､ﾓｽﾐ､ｵ､?ﾞ､ｹ｡｣
+
+    $_plugin_recent_messages = array(
+    '_recent_plugin_li'=>'｡ｦ',
+    '_recent_plugin_frame '=>'<span align="center"><h5 class="side_label">ｺﾇｿｷ､ﾎ%dｷ?/h5></span><small>%s</small>'
+    );
+    set_plugin_messages($_plugin_recent_messages);
+
+    ､ﾈ､ｷ､ﾆﾃﾖ､ｯ､ﾈ｡｢*.lng･ﾕ･｡･､･?ﾇ･ﾜ･ｿ･?茹皈ﾃ･ｻ｡ｼ･ｸ､?ﾘﾄ熙ｷ､ﾆ､､､ﾊ､､ｾ?遉ﾋ､ﾎ､ﾟ
+    ･皈ﾃ･ｻ｡ｼ･ｸ､ﾊ､ﾉ､ｬ･ｻ･ﾃ･ﾈ､ｵ､?ﾞ､ｹ｡｣
+    ﾊﾑｿ?ﾊ､ﾉ､ﾎｽ魘?ｽ､篁ﾔ､ｨ､ﾞ､ｹ､ｬ｡｢PukiWiki 1.3.1(MASUI'z Edition)ｰﾊｹﾟ､ﾎ､ﾟ
+    ﾍｭｸ?ﾇ､ｹ､ﾎ､ﾇ｡｢ｸﾅ､､PukiWiki､ｫ､鬢ﾏｸﾆ､ﾐ､?ﾊ､､ｲﾄﾇｽﾀｭ､ｬ､｢､?ｳ､ﾈ､?､､?ﾄ､ｱ､ﾆ
+    ､ｯ､ﾀ､ｵ､､｡｣
+    set_plugin_messagesｴﾘｿ?祓ukiWiki 1.3.1(MASUI'z Edition)ｰﾊｹﾟ､ﾎ､ﾟ､ﾇ､ｹ｡｣
+
+
+/////////////////////////////////////////////////
+// ･ﾕ･｡･､･?簣ﾆ
+
+  ･譯ｼ･ｶ､ﾋﾀﾟﾄ熙ｵ､ｻ､?魘?ﾍ､ﾊ､ﾉ､ﾋ､ﾄ､､､ﾆ､ﾏ｡｢define ､ﾇﾄ?ﾁ､ｹ､?｣
+
+  ･ｳ･?ﾐ｡ｼ･ﾈｻ?､ﾎGET｡ｦPOST､ﾎｽﾐﾎﾏﾆ簣ﾆ､ﾋﾉｬﾍﾗ､ﾊ､筅ﾎ､ﾏ refer ､ﾈ plugin ､ﾈ､､､ｦﾃﾍ､ﾇ｡｢
+  refer : ､ｽ､ﾎ･ﾚ｡ｼ･ｸ､ﾎﾌｾﾁｰ($vars["page"])
+  plugin : ･ﾗ･鬣ｰ･､･?ｾ
+  ､ﾈ､ｷ､ﾞ､ｹ｡｣
+
+  ｰﾊｲｼ､ﾎﾃﾍ､ global ､ﾇ･ｰ･?ｼ･ﾐ･?ﾑｿ?ﾋ､ｹ､?ｳ､ﾈ､ﾋ､隍ﾃ､ﾆﾃﾍ､?霹ﾀ､ﾇ､ｭ､ﾞ､ｹ｡｣
+
+  $script : ･ｹ･ｯ･?ﾗ･ﾈﾌｾ
+  $get : GET･皈ｽ･ﾃ･ﾉ､ﾋ､隍?TTP､ｫ､鬢ﾎｰ?
+  $post : POST･皈ｽ･ﾃ･ﾉ､ﾋ､隍?TTP､ｫ､鬢ﾎｰ?
+  $vars : GET｡ｦPOSTﾎｾﾊ?､ﾎ･皈ｽ･ﾃ･ﾉ､ﾋ､隍?TTP､ｫ､鬢ﾎｰ?
+
+  $vars["page"] : ｳｫ､､､ﾆ､､､?ﾚ｡ｼ･ｸﾌｾ(strip_bracketｴﾘｿ?ﾋ､隍鷦[]]､?隍??ｱ､?

--- /dev/null
+++ b/plugin/recent.inc.php
@@ -0,0 +1,66 @@
+<?
+/*
+ * PukiWiki 最新の?件を表示するプラグイン
+ *
+ * CopyRight 2002 Y.MASUI GPL2
+ * http://masui.net/pukiwiki/ [e-mail]
+ * 
+ * 変更履歴:
+ *  2002.04.08: patさん、みのるさんの指摘により、リンク先が日本語の場合に
+ *              化けるのを修正
+ * 
+ *  2002.06.17: plugin_recent_init()を設定
+ */
+
+function plugin_recent_init()
+{
+  $_plugin_recent_messages = array(
+    '_recent_plugin_li'=>'・',
+    '_recent_plugin_frame '=>'<span align="center"><h5 class="side_label">最新の%d件</h5></span><small>%s</small>');
+  set_plugin_messages($_plugin_recent_messages);
+}
+
+function plugin_recent_convert()
+{
+	global $_recent_plugin_li,$_recent_plugin_frame;
+	global $WikiName,$BracketName,$script,$whatsnew;
+	
+	$recent_lines = 10;
+	if(func_num_args()>0) {
+		$array = func_get_args();
+		$recent_lines = $array[0];
+	}
+	
+	$lines = file(get_filename(encode($whatsnew)));
+	$date = $items = "";
+	$cnt = 0;
+	foreach($lines as $line)
+	{
+		if($cnt > $recent_lines - 1) break;
+		if(preg_match("/(($WikiName)|($BracketName))/",$line,$match))
+		{
+			$name = $match[1];
+			if($match[2])
+			{
+				$title = $match[1];
+			}
+			else
+			{
+				$title = strip_bracket($match[1]);
+ 			}
+			if(preg_match("/([0-9]{4}-[0-9]{2}-[0-9]{2})/",$line,$match)) {
+				if($date != $match[0]) {
+					if($date != '') {
+						$items .= "<br>";
+					}
+					$items .= "<b>".$match[0]."</b><br>";
+					$date = $match[0];
+				}
+			}
+			$items .= $_recent_plugin_li."<a href=\"".$script."?".rawurlencode($name)."\" title=\"$title ".get_pg_passage($name,false)."\">".$title."</a><BR>\n";
+			$cnt++;
+		}
+	}
+	return sprintf($_recent_plugin_frame,$cnt,$items);
+}
+?>

--- /dev/null
+++ b/plugin/source.inc.php
@@ -0,0 +1,12 @@
+<?
+function plugin_source_action()
+{
+	global $post,$vars,$script,$InterWikiName,$WikiName,$BracketName,$defaultpage;
+
+	header("Content-type: text/plain");
+	readfile(get_filename(encode($vars["page"])));
+
+	die();
+}
+
+?>

--- /dev/null
+++ b/plugin/update.inc.php
@@ -0,0 +1,118 @@
+<?
+///////////////////////
+//
+define(PLUGIN_UPDATE_SECRET,'GReenOrRed');
+
+
+function plugin_update_action()
+{
+  global $vars,$script,$do_backup,$del_backup;
+
+  $page = $vars["page"];
+ 
+  header("Content-type: text/plain");
+ 
+  // 差分ファイルの作成
+  if(is_page($vars["page"]))
+    $oldpostdata = join("",get_source($page));
+  else
+    $oldpostdata = "";
+
+  list($postdata,$auto) = plugin_update_diff($oldpostdata,$vars['body']);
+  $postdata = user_rules_str($postdata);
+  if($postdata == $oldpostdata) {
+    print "status noupdate\n\n";
+    die;
+  }
+  
+  if($postdata)
+    $diffdata = do_diff($oldpostdata,$postdata);
+  file_write(DIFF_DIR,$page,$diffdata);
+  
+  // バックアップの作成
+  if(is_page($page))
+    $oldposttime = filemtime(get_filename(encode($page)));
+  else
+    $oldposttime = time();
+  
+  // 編集内容が何も書かれていないとバックアップも削除する?しないですよね。
+  if(!$postdata && $del_backup)
+    backup_delete(BACKUP_DIR.encode($vars["page"]).".txt");
+  else if($do_backup && is_page($vars["page"]))
+    make_backup(encode($vars["page"]).".txt",$oldpostdata,$oldposttime);
+  
+  // ファイルの書き込み
+  file_write(DATA_DIR,$vars["page"],$postdata);
+  
+  // is_pageのキャッシュをクリアする。
+  is_page($vars["page"],true);
+  
+  if($auto) {
+    print "status updated\n";
+  }
+  else {
+    print "status collided\n";
+  }
+  print "\n".$postdata;
+  
+  die();
+}
+
+// 差分の作成
+function plugin_update_diff($oldstr,$newstr)
+{
+  $oldlines = split("\n",ereg_replace("[\r\n\t ]+$",'',$oldstr));
+  $newlines = split("\n",ereg_replace("[\r\n\t ]+$",'',$newstr));
+
+  if(sizeof($oldlines)==1 && $oldlines[0]=='') {
+    $oldlines = array();
+  }
+  if(sizeof($newlines)==1 && $newlines[0]=='') {
+    $newlines = array();
+  }
+ 
+  $retdiff = $props = array();
+  $auto = true;
+  
+  foreach($newlines as $newline) {
+    $flg = false;
+    $cnt = 0;
+    foreach($oldlines as $oldline) {
+      if($oldline == $newline) {
+	if($cnt>0) {
+	  for($i=0; $i<$cnt; ++$i) {
+	    array_push($retdiff,array_shift($oldlines));
+	    array_push($props,'! ');
+	    $auto = false;
+	  }
+	}
+	array_push($retdiff,array_shift($oldlines));
+	array_push($props,'');
+	$flg = true;
+	break;
+      }
+      $cnt++;
+    }
+    if(!$flg) {
+      array_push($retdiff,$newline);
+#      array_push($props,'+ ');
+      array_push($props,'');
+    }
+  }
+  foreach($oldlines as $oldline) {
+    array_push($retdiff,$oldline);
+    array_push($props,'! ');
+    $auto = false;
+  }
+  if($auto) {
+    return array(join("\n",$retdiff),$auto);
+  }
+  
+  $ret = '';
+  foreach($retdiff as $line) {
+    $ret .= array_shift($props) . $line . "\n";
+  }
+  return array($ret,$auto);
+}
+
+?>

--- a/plugin/version.inc.php
+++ b/plugin/version.inc.php
@@ -1,6 +1,6 @@
-<?
-function plugin_version_convert()
-{
-	return "<b>".S_VERSION."</b>";
-}
-?>
+<?
+function plugin_version_convert()
+{
+	return "<b>".S_VERSION."</b>";
+}
+?>

--- /dev/null
+++ b/plugin/vote.inc.php
@@ -0,0 +1,150 @@
+<?
+
+function plugin_vote_action()
+{
+	global $post,$vars,$script,$cols,$rows,$del_backup,$do_backup;
+	global $_title_collided,$_msg_collided,$_title_updated;
+
+	$postdata_old  = file(get_filename(encode($post["refer"])));
+	$vote_no = 0;
+
+	foreach($postdata_old as $line)
+	{
+		if(preg_match("/^#vote\((.*)\)$/",$line,$arg))
+		{
+			if($vote_no == $post["vote_no"])
+			{
+				$args = explode(",",$arg[1]);
+
+				foreach($args as $arg)
+				{
+					if(preg_match("/^(.+)\[(\d+)\]$/",$arg,$match))
+					{
+						$arg = $match[1];
+						$cnt = $match[2];
+					}
+					else
+					{
+						$cnt = 0;
+					}
+
+					if($post["vote"][preg_replace("/\]\]$/","",$arg)]) $cnt++;
+
+					$votes[] = $arg.'['.$cnt.']';
+				}
+
+				$vote_str = "#vote(" . @join(",",$votes) . ")\n";
+
+				$postdata_input = $vote_str;
+				$postdata .= $vote_str;
+				$line = "";
+			}
+			$vote_no++;
+		}
+		$postdata .= $line;
+	}
+
+	if(md5(@join("",@file(get_filename(encode($post["refer"]))))) != $post["digest"])
+	{
+		$title = $_title_collided;
+
+		$body = "$_msg_collided\n";
+
+		$body .= "<form action=\"$script?cmd=preview\" method=\"post\">\n"
+			."<input type=\"hidden\" name=\"refer\" value=\"".$post["refer"]."\">\n"
+			."<input type=\"hidden\" name=\"digest\" value=\"".$post["digest"]."\">\n"
+			."<textarea name=\"msg\" rows=\"$rows\" cols=\"$cols\" wrap=\"virtual\" id=\"textarea\">$postdata_input</textarea><br>\n"
+			."</form>\n";
+	}
+	else
+	{
+		// ?・?a?t?@?C???I?i?¬
+		if(is_page($post["refer"]))
+			$oldpostdata = join("",file(get_filename(encode($post["refer"]))));
+		else
+			$oldpostdata = "\n";
+		if($postdata)
+			$diffdata = do_diff($oldpostdata,$postdata);
+		file_write(DIFF_DIR,$post["refer"],$diffdata);
+
+		// ?o?b?N?A?b?v?I?i?¬
+		if(is_page($post["refer"]))
+			$oldposttime = filemtime(get_filename(encode($post["refer"])));
+		else
+			$oldposttime = time();
+
+		// ?O?W“a?e?a‰??a?‘?c?e?A?¢?E?¢?A?o?b?N?A?b?v?a?i???・?e??μ?E?¢?A?・?a?E?B
+		if(!$postdata && $del_backup)
+			backup_delete(BACKUP_DIR.encode($post["refer"]).".txt");
+		else if($do_backup && is_page($post["refer"]))
+			make_backup(encode($post["refer"]).".txt",$oldpostdata,$oldposttime);
+
+		// ?t?@?C???I?‘?≪???Y
+		file_write(DATA_DIR,$post["refer"],$postdata);
+
+		// is_page?I?L???b?V?…?d?N???A?・?e?B
+		is_page($post["refer"],true);
+
+		$title = $_title_updated;
+	}
+
+	$retvars["msg"] = $title;
+	$retvars["body"] = $body;
+
+	$post["page"] = $post["refer"];
+	$vars["page"] = $post["refer"];
+
+	return $retvars;
+}
+function plugin_vote_convert()
+{
+	global $script,$vars,$vote_no,$digest;
+
+	$args = func_get_args();
+
+	if(!func_num_args()) return FALSE;
+
+	$string = "<table cellspacing=\"0\" cellpadding=\"2\" border=\"0\">\n"
+
+		. "<form action=\"$script\" method=\"post\">\n"
+		. "<input type=\"hidden\" name=\"plugin\" value=\"vote\">\n"
+		. "<input type=\"hidden\" name=\"refer\" value=\"$vars[page]\">\n"
+		. "<input type=\"hidden\" name=\"vote_no\" value=\"$vote_no\">\n"
+		. "<input type=\"hidden\" name=\"digest\" value=\"$digest\">\n"
+
+		. "<tr>\n"
+		. "<td align=\"left\" class=\"vote_label\"><b>The choices</b></td>\n"
+		. "<td align=\"center\" class=\"vote_label\"><b>Votes</b></td>\n"
+		. "</tr>\n";
+
+	$tdcnt = 0;
+	foreach($args as $arg)
+	{
+		$cnt = 0;
+
+		if(preg_match("/^(.+)\[(\d+)\]$/",$arg,$match))
+		{
+			$arg = $match[1];
+			$cnt = $match[2];
+		}
+
+		$link = make_link($arg);
+
+		if($tdcnt++ % 2) $cls = "vote_td1";
+		else           $cls = "vote_td2";
+
+		$string .= "<tr>"
+			.  "<td width=\"80%\" class=\"$cls\" nowrap>$link</td>"
+			.  "<td class=\"$cls\" nowrap>$cnt&nbsp;&nbsp;<input type=\"submit\" name=\"vote[$arg]\" value=\"Vote\"></td>"
+			.  "</tr>\n";
+	}
+
+	$string .= "</form>\n"
+		.  "</table>\n";
+
+	$vote_no++;
+
+	return $string;
+}
+?>
+

--- a/pukiwiki.ini.php
+++ b/pukiwiki.ini.php
@@ -1,5 +1,9 @@
 <?
 /////////////////////////////////////////////////
+// PukiWiki - Yet another WikiWikiWeb clone.
+//
+// $Id: pukiwiki.ini.php,v 1.2 2002/06/21 05:21:46 masui Exp $
+//
 // PukiWiki setting file
 
 /////////////////////////////////////////////////
@@ -19,7 +23,7 @@ define("PLUGIN_DIR","./plugin/");
 
 /////////////////////////////////////////////////
 // スキンファイルの場所。
-define("SKIN_FILE","./pukiwiki.skin.ja.php");
+define("SKIN_FILE","./skin/pukiwiki.skin.ja.php");
 
 /////////////////////////////////////////////////
 // Language
@@ -154,11 +158,19 @@ $splitter = ">>>>>>>>>>";
 /////////////////////////////////////////////////
 // 一覧・更新一覧に含めないページ名(正規表現で)
 $non_list = "^(\[\[\:)";
+
 /////////////////////////////////////////////////
 // 雛形とするページの読み込みを表示させるか
 $load_template_func = 1;
 
 /////////////////////////////////////////////////
+// ページ名に従って自動で、雛形とするページの読み込み
+$auto_template_func = 1;
+$auto_template_rules = array(
+'\[\[((.+)\/([^\/]+))\]\]' => '[[\2/template]]'
+);
+
+/////////////////////////////////////////////////
 // ユーザ定義ルール
 //
 //  正規表現で記述してください。?(){}-*./+\$^|など
@@ -173,6 +185,7 @@ $str_rules = array(
 "date\?" => date($date_format,UTIME),
 "time\?" => date($time_format,UTIME),
 );
+
 /////////////////////////////////////////////////
 // ユーザ定義ルール(コンバート時に置換、直接しない)
 $line_rules = array(
@@ -369,4 +382,4 @@ now? 
 </ul>
 ';
 
-?>
\ No newline at end of file
+?>

--- a/pukiwiki.php
+++ b/pukiwiki.php
@@ -1,2400 +1,732 @@
-<?
-// pukiwiki.php - Yet another WikiWikiWeb clone.
-//
-// Copyright (C) 2001,2002 by sng.
-// <[e-mail]>
-// http://factage.com/sng/pukiwiki/
-//
-// Special thanks
-//  YukiWiki by Hiroshi Yuki
-//  <[e-mail]>
-//  http://www.hyuki.com/yukiwiki/
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-//# $Id: pukiwiki.php,v 1.1 2002/06/20 13:59:31 masui Exp $
-/////////////////////////////////////////////////
-
-/////////////////////////////////////////////////
-// 設定ファイルの場所
-define("INI_FILE","./pukiwiki.ini.php");
-
-//** 初期設定 **
-
-define("S_VERSION","1.3");
-define("UTIME",time());
-define("HTTP_USER_AGENT",$HTTP_SERVER_VARS["HTTP_USER_AGENT"]);
-define("PHP_SELF",$HTTP_SERVER_VARS["PHP_SELF"]);
-define("SERVER_NAME",$HTTP_SERVER_VARS["SERVER_NAME"]);
-
-define("MUTIME",getmicrotime());
-
-$script = basename($PHP_SELF);
-
-$WikiName = '([A-Z][a-z]+([A-Z][a-z]+)+)';
-$BracketName = '\[\[(\[*[^\s\]]+?\]*)\]\]';
-$InterWikiName = '\[\[(\[*[^\s\]]+?\]*):(\[*[^>\]]+?\]*)\]\]';
-
-//** 入力値の整形 **
-
-$post = $HTTP_POST_VARS;
-$get = $HTTP_GET_VARS;
-
-if($get["page"]) $get["page"] = rawurldecode($get["page"]);
-if($post["word"]) $post["word"] = rawurldecode($post["word"]);
-if($get["word"]) $get["word"] = rawurldecode($get["word"]);
-if(get_magic_quotes_gpc())
-{
-	if($get["page"]) $get["page"] = stripslashes($get["page"]);
-	if($post["page"]) $post["page"] = stripslashes($post["page"]);
-	if($get["word"]) $get["word"] = stripslashes($get["word"]);
-	if($post["word"]) $post["word"] = stripslashes($post["word"]);
-	if($post["msg"]) $post["msg"] = stripslashes($post["msg"]);
-}
-if($post["msg"])
-{
-	$post["msg"] = preg_replace("/<\/(textarea[^>]*)>/i", "&lt;/$1&gt;", $post["msg"]);
-	$post["msg"] = preg_replace("/(\x0D\x0A)/","\n",$post["msg"]);
-	$post["msg"] = preg_replace("/(\x0D)/","\n",$post["msg"]);
-	$post["msg"] = preg_replace("/(\x0A)/","\n",$post["msg"]);
-}
-
-$vars = array_merge($post,$get);
-$arg = rawurldecode($HTTP_SERVER_VARS["argv"][0]);
-
-//** 初期処理 **
-
-$update_exec = "";
-
-// 設定ファイルの読込
-@require(INI_FILE);
-@require(LANG.".lng");
-
-// 設定ファイルの変数チェック
-$wrong_ini_file = "";
-if(!isset($rss_max)) $wrong_ini_file .= '$rss_max ';
-if(!isset($page_title)) $wrong_ini_file .= '$page_title ';
-if(!isset($note_hr)) $wrong_ini_file .= '$note_hr ';
-if(!isset($related_link)) $wrong_ini_file .= '$related_link ';
-if(!isset($show_passage)) $wrong_ini_file .= '$show_passage ';
-if(!isset($rule_related_str)) $wrong_ini_file .= '$rule_related_str ';
-if(!isset($load_template_func)) $wrong_ini_file .= '$load_template_func ';
-if(!defined("LANG")) $wrong_ini_file .= 'LANG ';
-if(!defined("PLUGIN_DIR")) $wrong_ini_file .= 'PLUGIN_DIR ';
-
-if(!is_writable(DATA_DIR))
-	die_message("DATA_DIR is not found or not writable.");
-if(!is_writable(DIFF_DIR))
-	die_message("DIFF_DIR is not found or not writable.");
-if($do_backup && !is_writable(BACKUP_DIR))
-	die_message("BACKUP_DIR is not found or not writable.");
-if(!file_exists(INI_FILE))
-	die_message("INI_FILE is not found.");
-if($wrong_ini_file)
-	die_message("The setting file runs short of information.<br>The version of a setting file may be old.<br><br>These option are not found : $wrong_ini_file");
-//if(ini_get("register_globals") !== "0")
-//	die_message("Wrong PHP4 setting in 'register_globals',set value 'Off' to httpd.conf or .htaccess.");
-if(!file_exists(SKIN_FILE))
-	die_message("SKIN_FILE is not found.");
-if(!file_exists(LANG.".lng"))
-	die_message(LANG.".lng(language file) is not found.");
-
-if(!file_exists(get_filename(encode($defaultpage))))
-	touch(get_filename(encode($defaultpage)));
-if(!file_exists(get_filename(encode($whatsnew))))
-	touch(get_filename(encode($whatsnew)));
-if(!file_exists(get_filename(encode($interwiki))))
-	touch(get_filename(encode($interwiki)));
-
-$ins_date = date($date_format,UTIME);
-$ins_time = date($time_format,UTIME);
-$ins_week = "(".$weeklabels[date("w",UTIME)].")";
-
-$now = "$ins_date $ins_week $ins_time";
-
-// ** メイン処理 **
-
-// Plug-in hook
-if(isset($vars["plugin"]))
-{
-	if(!file_exists(PLUGIN_DIR.$vars["plugin"].".inc.php"))
-	{
-		$vars["plugin"] = "";
-	}
-	else
-	{
-		require_once(PLUGIN_DIR.$vars["plugin"].".inc.php");
-		if(!function_exists("plugin_".$vars["plugin"]."_action"))
-		{
-			$vars["plugin"] = "";
-		}
-	}
-}
-
-
-// Plug-in action
-if(!empty($vars["plugin"]))
-{
-	$retvars = @call_user_func("plugin_".$vars["plugin"]."_action");
-	
-	$title = strip_bracket($vars["refer"]);
-	$page = make_search($vars["refer"]);
-	
-	if($retvars["msg"])
-	{
-		$title =  str_replace("$1",$title,$retvars["msg"]);
-		$page =  str_replace("$1",$page,$retvars["msg"]);
-	}
-	
-	if(!empty($retvars["body"]))
-	{
-		$body = $retvars["body"];
-	}
-	else
-	{
-		$cmd = "read";
-		$vars["page"] = $vars["refer"];
-		$body = @join("",@file(get_filename(encode($vars["refer"]))));
-		$body = convert_html($body);
-	}
-}
-// 一覧の表示
-else if(arg_check("list"))
-{
-	header_lastmod($whatsnew);
-	
-	$page = $title = $_title_list;
-	$body = "<ul>\n" . get_list(false) . "</ul>\n";
-}
-// ファイル名一覧の表示
-else if(arg_check("filelist"))
-{
-	header_lastmod($whatsnew);
-
-	$page = $title = $_title_filelist;
-	$body = "<ul>\n" . get_list(true) . "</ul>\n";
-}
-// 編集不可能なページを編集しようとしたとき
-else if(((arg_check("add") || arg_check("edit") || arg_check("preview")) && (is_freeze($vars["page"]) || !is_editable($vars["page"]) || $vars["page"] == "")))
-{
-	$body = $title = str_replace('$1',strip_bracket($vars["page"]),$_title_cannotedit);
-	$page = str_replace('$1',make_search($vars["page"]),$_title_cannotedit);
-
-	if(is_freeze($vars["page"]))
-		$body .= "(<a href=\"$script?cmd=unfreeze&page=".rawurlencode($vars["page"])."\">$_msg_unfreeze</a>)";
-}
-// 追加
-else if(arg_check("add"))
-{
-	$title = str_replace('$1',strip_bracket($get["page"]),$_title_add);
-	$page = str_replace('$1',make_search($get["page"]),$_title_add);
-	$body = "<ul>\n";
-	$body .= "<li>$_msg_add</li>\n";
-	$body .= "</ul>\n";
-	$body .= edit_form("",$get["page"],true);
-}
-// 編集
-else if(arg_check("edit"))
-{
-	$postdata = @join("",@file(get_filename(encode($get["page"]))));
-
-	$title = str_replace('$1',strip_bracket($get["page"]),$_title_edit);
-	$page = str_replace('$1',make_search($get["page"]),$_title_edit);
-	$body = edit_form($postdata,$get["page"]);
-}
-// プレビュー
-else if(arg_check("preview") || $post["preview"] || $post["template"])
-{
-	if($post["template"] && file_exists(get_filename(encode($post["template_page"]))))
-	{
-		$post["msg"] = @join("",@file(get_filename(encode($post["template_page"]))));
-	}
-	
-	$post["msg"] = preg_replace("/^#freeze\n/","",$post["msg"]);
-	$postdata_input = $post["msg"];
-
-	if($post["add"])
-	{
-		if($post["add_top"])
-		{
-			$postdata  = $post["msg"];
-			$postdata .= "\n\n";
-			$postdata .= @join("",@file(get_filename(encode($post["page"]))));
-		}
-		else
-		{
-			$postdata  = @join("",@file(get_filename(encode($post["page"]))));
-			$postdata .= "\n\n";
-			$postdata .= $post["msg"];
-		}
-	}
-	else
-	{
-		$postdata = $post["msg"];
-	}
-
-	$title = str_replace('$1',strip_bracket($post["page"]),$_title_preview);
-	$page = str_replace('$1',make_search($post["page"]),$_title_preview);
-
-	$body = "$_msg_preview<br>\n";
-	if($postdata == "") $body .= "<b>$_msg_preview_delete</b><br>\n";
-	else                $body .= "<br>\n";
-
-	if($postdata != "")
-	{
-		$postdata = convert_html($postdata);
-		
-		$body .= "<table width=\"100%\" bgcolor=\"$preview_color\">\n"
-			."<tr><td>\n"
-			.$postdata
-			."\n</td></tr>\n"
-			."</table>\n";
-	}
-
-	if($post["add"])
-	{
-		if($post["add_top"]) $checked_top = " checked";
-		$addtag = '<input type="hidden" name="add" value="true">';
-		$add_top = '<input type="checkbox" name="add_top" value="true"'.$checked_top.'><small>ページの上に追加</small>';
-	}
-	if($post["notimestamp"]) $checked_time = "checked";
-
-	$body .= "<form action=\"$script\" method=\"post\">\n"
-		."<input type=\"hidden\" name=\"help\" value=\"$post[add]\">\n"
-		."<input type=\"hidden\" name=\"page\" value=\"".$post["page"]."\">\n"
-		."<input type=\"hidden\" name=\"digest\" value=\"".$post["digest"]."\">\n"
-		."$addtag\n"
-		."<textarea name=\"msg\" rows=\"$rows\" cols=\"$cols\" wrap=\"virtual\">\n$postdata_input</textarea><br>\n"
-		."<input type=\"submit\" name=\"preview\" value=\"$_btn_repreview\" accesskey=\"p\">\n"
-		."<input type=\"submit\" name=\"write\" value=\"$_btn_update\" accesskey=\"s\">\n"
-		."$add_top\n"
-		."<input type=\"checkbox\" name=\"notimestamp\" value=\"true\" $checked_time><small>$_btn_notchangetimestamp</small>\n"
-		."</form>\n";
-}
-// 書き込みもしくは追加もしくはコメントの挿入
-else if($post["write"])
-{
-	$post["msg"] = preg_replace("/^#freeze\n/","",$post["msg"]);
-	$postdata_input = $post["msg"];
-
-	if($post["add"])
-	{
-		if($post["add_top"])
-		{
-			$postdata  = $post["msg"];
-			$postdata .= "\n\n";
-			$postdata .= @join("",@file(get_filename(encode($post["page"]))));
-		}
-		else
-		{
-			$postdata  = @join("",@file(get_filename(encode($post["page"]))));
-			$postdata .= "\n\n";
-			$postdata .= $post["msg"];
-		}
-	}
-	else
-	{
-		$postdata = $post["msg"];
-	}
-
-	if(md5(@join("",@file(get_filename(encode($post["page"]))))) != $post["digest"])
-	{
-		$title = str_replace('$1',strip_bracket($post["page"]),$_title_collided);
-		$page = str_replace('$1',make_search($post["page"]),$_title_collided);
-		
-		$body .= "$_msg_collided\n";
-
-		$body .= "<form action=\"$script?cmd=preview\" method=\"post\">\n"
-			."<input type=\"hidden\" name=\"page\" value=\"".$post["page"]."\">\n"
-			."<input type=\"hidden\" name=\"digest\" value=\"".$post["digest"]."\">\n"
-			."<textarea name=\"msg\" rows=\"$rows\" cols=\"$cols\" wrap=\"virtual\" id=\"textarea\">$postdata_input</textarea><br>\n"
-			."</form>\n";
-	}
-	else
-	{
-		$postdata = user_rules_str($postdata);
-
-		// 差分ファイルの作成
-		if(is_page($post["page"]))
-			$oldpostdata = join("",file(get_filename(encode($post["page"]))));
-		else
-			$oldpostdata = "\n";
-		if($postdata)
-			$diffdata = do_diff($oldpostdata,$postdata);
-		file_write(DIFF_DIR,$post["page"],$diffdata);
-
-		// バックアップの作成
-		if(is_page($post["page"]))
-			$oldposttime = filemtime(get_filename(encode($post["page"])));
-		else
-			$oldposttime = time();
-
-		// 編集内容が何も書かれていないとバックアップも削除する?しないですよね。
-		if(!$postdata && $del_backup)
-			backup_delete(BACKUP_DIR.encode($post["page"]).".txt");
-		else if($do_backup && is_page($post["page"]))
-			make_backup(encode($post["page"]).".txt",$oldpostdata,$oldposttime);
-
-		// ファイルの書き込み
-		file_write(DATA_DIR,$post["page"],$postdata);
-
-		// is_pageのキャッシュをクリアする。
-		is_page($post["page"],true);
-
-		if($postdata)
-		{
-			$title = str_replace('$1',strip_bracket($post["page"]),$_title_updated);
-			$page = str_replace('$1',make_search($post["page"]),$_title_updated);
-			$body = convert_html($postdata);
-		}
-		else
-		{
-			$title = str_replace('$1',strip_bracket($post["page"]),$_title_deleted);
-			$page = str_replace('$1',make_search($post["page"]),$_title_deleted);
-			$body = str_replace('$1',strip_bracket($post["page"]),$_title_deleted);
-		}
-	}
-}
-// 凍結
-else if(arg_check("freeze") && $vars["page"] && $function_freeze)
-{
-	if(is_freeze($vars["page"]))
-	{
-		$title = str_replace('$1',strip_bracket($vars["page"]),$_title_isfreezed);
-		$page = str_replace('$1',make_search($vars["page"]),$_title_isfreezed);
-		$body = str_replace('$1',strip_bracket($vars["page"]),$_title_isfreezed);
-	}
-	else if(md5($post["pass"]) == $adminpass)
-	{
-		$postdata = file(get_filename(encode($post["page"])));
-		$postdata = join("",$postdata);
-		$postdata = "#freeze\n".$postdata;
-
-		file_write(DATA_DIR,$vars["page"],$postdata);
-
-		$title = str_replace('$1',strip_bracket($vars["page"]),$_title_freezed);
-		$page = str_replace('$1',make_search($vars["page"]),$_title_freezed);
-		$postdata = join("",file(get_filename(encode($vars["page"]))));
-		$postdata = convert_html($postdata);
-
-		$body = $postdata;
-	}
-	else
-	{
-		$title = str_replace('$1',strip_bracket($vars["page"]),$_title_freeze);
-		$page = str_replace('$1',make_search($vars["page"]),$_title_freeze);
-
-		$body.= "<br>\n";
-		
-		if($post["pass"])
-			$body .= "<b>$_msg_invalidpass</b><br>\n";
-		else
-			$body.= "$_msg_freezing<br>\n";
-		
-		$body.= "<form action=\"$script?cmd=freeze\" method=\"post\">\n";
-		$body.= "<input type=\"hidden\" name=\"page\" value=\"$vars[page]\">\n";
-		$body.= "<input type=\"password\" name=\"pass\" size=\"12\">\n";
-		$body.= "<input type=\"submit\" name=\"ok\" value=\"$_btn_freeze\">\n";
-		$body.= "</form>\n";
-	}
-}
-//凍結の解除
-else if(arg_check("unfreeze") && $vars["page"] && $function_freeze)
-{
-	if(!is_freeze($vars["page"]))
-	{
-		$title = str_replace('$1',strip_bracket($vars["page"]),$_title_isunfreezed);
-		$page = str_replace('$1',make_search($vars["page"]),$_title_isunfreezed);
-		$body = str_replace('$1',strip_bracket($vars["page"]),$_title_isunfreezed);
-	}
-	else if(md5($post["pass"]) == $adminpass)
-	{
-		$postdata = file(get_filename(encode($post["page"])));
-		array_shift($postdata);
-		$postdata = join("",$postdata);
-
-		file_write(DATA_DIR,$vars["page"],$postdata);
-
-		$title = str_replace('$1',strip_bracket($vars["page"]),$_title_unfreezed);
-		$page = str_replace('$1',make_search($vars["page"]),$_title_unfreezed);
-		
-		$postdata = join("",file(get_filename(encode($vars["page"]))));
-		$postdata = convert_html($postdata);
-		
-		$body = $postdata;
-	}
-	else
-	{
-		$title = str_replace('$1',strip_bracket($vars["page"]),$_title_unfreeze);
-		$page = str_replace('$1',make_search($vars["page"]),$_title_unfreeze);
-
-		$body.= "<br>\n";
-
-		if($post["pass"])
-			$body .= "<b>$_msg_invalidpass</b><br>\n";
-		else
-			$body.= "$_msg_unfreezing<br>\n";
-
-		$body.= "<form action=\"$script?cmd=unfreeze\" method=\"post\">\n";
-		$body.= "<input type=\"hidden\" name=\"page\" value=\"$vars[page]\">\n";
-		$body.= "<input type=\"password\" name=\"pass\" size=\"12\">\n";
-		$body.= "<input type=\"submit\" name=\"ok\" value=\"$_btn_unfreeze\">\n";
-		$body.= "</form>\n";
-	}
-}
-// 差分の表示
-else if(arg_check("diff"))
-{
-	$pagename = strip_bracket($get["page"]);
-	if(!is_page($get["page"]))
-	{
-		$title = $pagename;
-		$page = make_search($vars["page"]);
-		$body = "指定されたページは見つかりませんでした。";
-	}
-	else
-	{
-		$link = str_replace('$1',"<a href=\"$script?".rawurlencode($get["page"])."\">$pagename</a>",$_msg_goto);
-		
-		$body =  "<ul>\n"
-			."<li>$_msg_addline</li>\n"
-			."<li>$_msg_delline</li>\n"
-			."<li>$link</li>\n"
-			."</ul>\n"
-			."$hr\n";
-	}
-
-	if(!file_exists(DIFF_DIR.encode($get["page"]).".txt") && is_page($get["page"]))
-	{
-		$title = str_replace('$1',strip_bracket($get["page"]),$_title_diff);
-		$page = str_replace('$1',make_search($get["page"]),$_title_diff);
-
-		$diffdata = file(get_filename(encode($get["page"])));
-		$body .= "<font color=\"blue\">\n"
-			."<pre>\n"
-			.join("",$diffdata)
-			."\n"
-			."</pre>\n"
-			."</font>\n";
-	}
-	else if(file_exists(DIFF_DIR.encode($get["page"]).".txt"))
-	{
-		$title = str_replace('$1',strip_bracket($get["page"]),$_title_diff);
-		$page = str_replace('$1',make_search($get["page"]),$_title_diff);
-
-		$diffdata = file(DIFF_DIR.encode($get["page"]).".txt");
-		$diffdata = preg_replace("/</","&lt;",$diffdata);
-		$diffdata = preg_replace("/>/","&gt;",$diffdata);
-		$diffdata = preg_replace("/^(\-)(.*)/","<font color=\"red\"> $2</font>",$diffdata);
-		$diffdata = preg_replace("/^(\+)(.*)/","<font color=\"blue\"> $2</font>",$diffdata);
-		
-		$body .= "<pre>\n"
-			.join("",$diffdata)
-			."\n"
-			."</pre>\n";
-	}
-}
-// 検索
-else if(arg_check("search"))
-{
-	if($vars["word"])
-	{
-		$title = $page = str_replace('$1',$vars["word"],$_title_result);
-	}
-	else
-	{
-		$page = $title = $_title_search;
-	}
-
-	if($vars["word"])
-		$body = do_search($vars["word"],$vars["type"]);
-	else
-		$body = "<br>\n$_msg_searching";
-
-	if($vars["type"]=="AND" || !$vars["type"]) $and_check = "checked";
-	else if($vars["type"]=="OR")               $or_check = "checked";
-
-	$body .= "<form action=\"$script?cmd=search\" method=\"post\">\n"
-		."<input type=\"text\" name=\"word\" size=\"20\" value=\"".$vars["word"]."\">\n"
-		."<input type=\"radio\" name=\"type\" value=\"AND\" $and_check>$_btn_and\n"
-		."<input type=\"radio\" name=\"type\" value=\"OR\" $or_check>$_btn_or\n"
-		."&nbsp;<input type=\"submit\" value=\"$_btn_search\">\n"
-		."</form>\n";
-}
-// バックアップ
-else if($do_backup && arg_check("backup"))
-{
-	if($get["page"] && $get["age"] && (file_exists(BACKUP_DIR.encode($get["page"]).".txt") || file_exists(BACKUP_DIR.encode($get["page"]).".gz")))
-	{
-		$pagename = strip_bracket($get["page"]);
-		$body =  "<ul>\n";
-
-		$body .= "<li><a href=\"$script?cmd=backup\">$_msg_backuplist</a></li>\n";
-
-		if(!arg_check("backup_diff") && is_page($get["page"]))
-		{
-			$link = str_replace('$1',"<a href=\"$script?cmd=backup_diff&page=".rawurlencode($get["page"])."&age=$get[age]\">$_msg_diff</a>",$_msg_view);
-			$body .= "<li>$link</li>\n";
-		}
-		if(!arg_check("backup_nowdiff") && is_page($get["page"]))
-		{
-			$link = str_replace('$1',"<a href=\"$script?cmd=backup_nowdiff&page=".rawurlencode($get["page"])."&age=$get[age]\">$_msg_nowdiff</a>",$_msg_view);
-			$body .= "<li>$link</li>\n";
-		}
-		if(!arg_check("backup_source"))
-		{
-			$link = str_replace('$1',"<a href=\"$script?cmd=backup_source&page=".rawurlencode($get["page"])."&age=$get[age]\">$_msg_source</a>",$_msg_view);
-			$body .= "<li>$link</li>\n";
-		}
-		if(arg_check("backup_diff") || arg_check("backup_source") || arg_check("backup_nowdiff"))
-		{
-			$link = str_replace('$1',"<a href=\"$script?cmd=backup&page=".rawurlencode($get["page"])."&age=$get[age]\">$_msg_backup</a>",$_msg_view);
-			$body .= "<li>$link</li>\n";
-		}
-		
-		if(is_page($get["page"]))
-		{
-			$link = str_replace('$1',"<a href=\"$script?".rawurlencode($get["page"])."\">$pagename</a>",$_msg_goto);
-			$body .=  "<li>$link</li>\n";
-		}
-		else
-		{
-			$link = str_replace('$1',$pagename,$_msg_deleleted);
-			$body .=  "<li>$link</li>\n";
-		}
-
-		$backups = array();
-		$backups = get_backup_info(encode($get["page"]).".txt");
-		if(count($backups)) $body .= "<ul>\n";
-		foreach($backups as $key => $val)
-		{
-			$ins_date = date($date_format,$val);
-			$ins_time = date($time_format,$val);
-			$ins_week = "(".$weeklabels[date("w",$val)].")";
-			$backupdate = "($ins_date $ins_week $ins_time)";
-			if($key != $get["age"])
-				$body .= "<li><a href=\"$script?cmd=$get[cmd]&page=".rawurlencode($get["page"])."&age=$key\">$key $backupdate</a></li>\n";
-			else
-				$body .= "<li><i>$key $backupdate</i></li>\n";
-		}
-		if(count($backups)) $body .= "</ul>\n";
-		
-		if(arg_check("backup_diff"))
-		{
-			$title = str_replace('$1',$pagename,$_title_backupdiff)."(No.$get[age])";
-			$page = str_replace('$1',make_search($get["page"]),$_title_backupdiff)."(No.$get[age])";
-			
-			$backupdata = @join("",get_backup($get[age]-1,encode($get["page"]).".txt"));
-			$postdata = @join("",get_backup($get[age],encode($get["page"]).".txt"));
-			$diffdata = split("\n",do_diff($backupdata,$postdata));
-		}
-		else if(arg_check("backup_nowdiff"))
-		{
-			$title = str_replace('$1',$pagename,$_title_backupnowdiff)."(No.$get[age])";
-			$page = str_replace('$1',make_search($get["page"]),$_title_backupnowdiff)."(No.$get[age])";
-			
-			$backupdata = @join("",get_backup($get[age],encode($get["page"]).".txt"));
-			$postdata = @join("",@file(get_filename(encode($get["page"]))));
-			$diffdata = split("\n",do_diff($backupdata,$postdata));
-		}
-		else if(arg_check("backup_source"))
-		{
-			$title = str_replace('$1',$pagename,$_title_backupsource)."(No.$get[age])";
-			$page = str_replace('$1',make_search($get["page"]),$_title_backupsource)."(No.$get[age])";
-			$backupdata = join("",get_backup($get[age],encode($get["page"]).".txt"));
-			
-			$body.="</ul>\n<pre>\n$backupdata</pre>\n";
-		}
-		else
-		{
-			$pagename = strip_bracket($get["page"]);
-			$title = str_replace('$1',$pagename,$_title_backup)."(No.$get[age])";
-			$page = str_replace('$1',make_search($get["page"]),$_title_backup)."(No.$get[age])";
-			$backupdata = join("",get_backup($get[age],encode($get["page"]).".txt"));
-			$backupdata = convert_html($backupdata);
-			$body .= "</ul>\n"
-				."$hr\n";
-			$body .= $backupdata;
-		}
-		
-		if(arg_check("backup_diff") || arg_check("backup_nowdiff"))
-		{
-			$diffdata = preg_replace("/</","&lt;",$diffdata);
-			$diffdata = preg_replace("/>/","&gt;",$diffdata);
-			$diffdata = preg_replace("/^(\-)(.*)/","<font color=\"red\"> $2</font>",$diffdata);
-			$diffdata = preg_replace("/^(\+)(.*)/","<font color=\"blue\"> $2</font>",$diffdata);
-
-			$body .= "<br>\n"
-				."<li>$_msg_addline</li>\n"
-				."<li>$_msg_delline</li>\n"
-				."</ul>\n"
-				."$hr\n"
-				."<pre>\n".join("\n",$diffdata)."</pre>\n";
-		}
-	}
-	else if($get["page"] && (file_exists(BACKUP_DIR.encode($get["page"]).".txt") || file_exists(BACKUP_DIR.encode($get["page"]).".gz")))
-	{
-		$title = str_replace('$1',strip_bracket($get["page"]),$_title_pagebackuplist);
-		$page = str_replace('$1',make_search($get["page"]),$_title_pagebackuplist);
-		$body = get_backup_list($get["page"]);
-	}
-	else
-	{
-		$page = $title = $_title_backuplist;
-		$body = get_backup_list();
-	}
-}
-// ヘルプの表示
-else if(arg_check("help"))
-{
-	$title = $page = "ヘルプ";
-	$body = catrule();
-}
-// MD5パスワードへの変換
-else if($vars["md5"])
-{
-	$title = $page = "Make password of MD5";
-	$body = "$vars[md5] : ".md5($vars["md5"]);
-}
-else if(arg_check("rss"))
-{
-	if(!arg_check("rss10"))
-		catrss(1);
-	else
-		catrss(2);
-	die();
-}
-// ページの表示とInterWikiNameの解釈
-else if((arg_check("read") && $vars["page"] != "") || (!arg_check("read") && $arg != "" && $vars["page"] == ""))
-{
-	// アクションを明示的に指定していない場合ページ名として解釈
-	if($arg != "" && $vars["page"] == "" && $vars["cmd"] == "")
-	{
-		$post["page"] = $arg;
-		$get["page"] = $arg;
-		$vars["page"] = $arg;
-	}
-	
-	// ページ名がWikiNameでなく、BracketNameでなければBracketNameとして解釈
-	if(!preg_match("/^(($WikiName)|($BracketName)|($InterWikiName))$/",$get["page"]))
-	{
-		$vars["page"] = "[[$vars[page]]]";
-		$get["page"] = $vars["page"];
-	}
-
-	// WikiName、BracketNameが示すページを表示
-	if(is_page($get["page"]))
-	{
-		$postdata = join("",file(get_filename(encode($get["page"]))));
-		$postdata = convert_html($postdata);
-
-		$title = strip_bracket($get["page"]);
-		$page = make_search($get["page"]);
-		$body = $postdata;
-
-		header_lastmod($vars["page"]);
-	}
-	else if(preg_match("/($InterWikiName)/",$get["page"],$match))
-	{
-	// InterWikiNameの判別とページの表示
-		$interwikis = open_interwikiname_list();
-		
-		if(!$interwikis[$match[2]]["url"])
-		{
-			$title = $page = $_title_invalidiwn;
-			$body = str_replace('$1',strip_bracket($get[page]),str_replace('$2',"<a href=\"$script?InterWikiName\">InterWikiName</a>",$_msg_invalidiwn));
-		}
-		else
-		{
-			// 文字エンコーディング
-			if($interwikis[$match[2]]["opt"] == "yw")
-			{
-				// YukiWiki系
-				if(!preg_match("/$WikiName/",$match[3]))
-					$match[3] = "[[".mb_convert_encoding($match[3],"SJIS","auto")."]]";
-			}
-			else if($interwikis[$match[2]]["opt"] == "moin")
-			{
-				// moin系
-				if(function_exists("mb_convert_encoding"))
-				{
-					$match[3] = rawurlencode(mb_convert_encoding($match[3],"EUC-JP","auto"));
-					$match[3] = str_replace("%","_",$match[3]);
-				}
-				else
-					$not_mb = 1;
-			}
-			else if($interwikis[$match[2]]["opt"] == "" || $interwikis[$match[2]]["opt"] == "std")
-			{
-				// 内部文字エンコーディングのままURLエンコード
-				$match[3] = rawurlencode($match[3]);
-			}
-			else if($interwikis[$match[2]]["opt"] == "asis" || $interwikis[$match[2]]["opt"] == "raw")
-			{
-				// URLエンコードしない
-				$match[3] = $match[3];
-			}
-			else if($interwikis[$match[2]]["opt"] != "")
-			{
-				// エイリアスの変換
-				if($interwikis[$match[2]]["opt"] == "sjis")
-					$interwikis[$match[2]]["opt"] = "SJIS";
-				else if($interwikis[$match[2]]["opt"] == "euc")
-					$interwikis[$match[2]]["opt"] = "EUC-JP";
-				else if($interwikis[$match[2]]["opt"] == "utf8")
-					$interwikis[$match[2]]["opt"] = "UTF-8";
-
-				// その他、指定された文字コードへエンコードしてURLエンコード
-				if(function_exists("mb_convert_encoding"))
-					$match[3] = rawurlencode(mb_convert_encoding($match[3],$interwikis[$match[2]]["opt"],"auto"));
-				else
-					$not_mb = 1;
-			}
-
-			if(strpos($interwikis[$match[2]]["url"],'$1') !== FALSE)
-				$url = str_replace('$1',$match[3],$interwikis[$match[2]]["url"]);
-			else
-				$url = $interwikis[$match[2]]["url"] . $match[3];
-
-			if($not_mb)
-			{
-				$title = $page = "Not support mb_jstring.";
-				$body = "This server's PHP does not have \"mb_jstring\" module.Cannot convert encoding.";
-			}
-			else
-			{
-				header("Location: $url");
-				die();
-			}
-		}
-	}
-	// WikiName、BracketNameが見つからず、InterWikiNameでもない場合
-	else
-	{
-		//$title = strip_bracket($get["page"]);
-		//$page = make_search($get["page"]);
-		//$body = "指定されたページは見つかりませんでした。";
-
-		$title = str_replace('$1',strip_bracket($get["page"]),$_title_edit);
-		$page = str_replace('$1',make_search($get["page"]),$_title_edit);
-		$body = edit_form("",$get["page"]);
-	}
-}
-// 何も指定されない場合、トップページを表示
-else
-{
-	$postdata = join("",file(get_filename(encode($defaultpage))));
-
-	$vars["page"] = $defaultpage;
-	$title = strip_bracket($defaultpage);
-	$page = make_search($vars["page"]);
-	$body = convert_html($postdata);
-
-	header_lastmod($vars["page"]);
-}
-
-// ** 出力処理 **
-
-catbody($title,$page,$body);
-
-// ** 各種関数 **
-
-// 本文をページ名から出力
-function catbodyall($page,$title="",$pg="")
-{
-	if($title === "") $title = strip_bracket($page);
-	if($pg === "") $pg = make_search($page);
-
-	$body = join("",file(get_filename(encode($page))));
-	$body = convert_html($body);
-
-	header_lastmod($vars["page"]);
-	catbody($title,$pg,$body);
-	die();
-}
-
-// 本文を出力
-function catbody($title,$page,$body)
-{
-	global $script,$vars,$arg,$do_backup,$modifier,$modifierlink,$defaultpage,$whatsnew,$hr;
-	global $date_format,$weeklabels,$time_format,$longtaketime,$related_link;
-	global $HTTP_SERVER_VARS,$cantedit;
-
-	if($vars["page"] && !arg_check("backup") && $vars["page"] != $whatsnew)
-	{
-		$is_page = 1;
-	}
-
-	$link_add = "$script?cmd=add&page=".rawurlencode($vars["page"]);
-	$link_edit = "$script?cmd=edit&page=".rawurlencode($vars["page"]);
-	$link_diff = "$script?cmd=diff&page=".rawurlencode($vars["page"]);
-	$link_top = "$script?$defaultpage";
-	$link_list = "$script?cmd=list";
-	$link_filelist = "$script?cmd=filelist";
-	$link_search = "$script?cmd=search";
-	$link_whatsnew = "$script?$whatsnew";
-	$link_backup = "$script?cmd=backup&page=".rawurlencode($vars["page"]);
-	$link_help = "$script?cmd=help";
-
-	if(is_page($vars["page"]) && $is_page)
-	{
-		$fmt = @filemtime(get_filename(encode($vars["page"])));
-	}
-
-	if(is_page($vars["page"]) && $related_link && $is_page && !arg_check("edit") && !arg_check("freeze") && !arg_check("unfreeze"))
-	{
-		$related = make_related($vars["page"],false);
-	}
-
-	if(is_page($vars["page"]) && !in_array($vars["page"],$cantedit) && !arg_check("backup") && !arg_check("edit") && !$vars["preview"])
-	{
-		$is_read = TRUE;
-	}
-
-	//if(!$longtaketime)
-		$longtaketime = getmicrotime() - MUTIME;
-	$taketime = sprintf("%01.03f",$longtaketime);
-
-	require(SKIN_FILE);
-}
-
-// ファイルへの出力
-function file_write($dir,$page,$str)
-{
-	global $post,$update_exec;
-
-	if($str == "")
-	{
-		@unlink($dir.encode($page).".txt");
-	}
-	else
-	{
-		if($post["notimestamp"] && is_page($page))
-		{
-			$timestamp = @filemtime($dir.encode($page).".txt");
-		}
-		$fp = fopen($dir.encode($page).".txt","w");
-		while(!flock($fp,LOCK_EX));
-		fputs($fp,$str);
-		flock($fp,LOCK_UN);
-		fclose($fp);
-		if($timestamp)
-			touch($dir.encode($page).".txt",$timestamp);
-	}
-	
-	if(!$timestamp)
-		put_lastmodified();
-
-	if($update_exec)
-	{
-		system($update_exec." > /dev/null &");
-	}
-}
-
-// バックアップ一覧の取得
-function get_backup_list($_page="")
-{
-	global $script,$date_format,$time_format,$weeklabels,$cantedit;
-	global $_msg_backuplist,$_msg_diff,$_msg_nowdiff,$_msg_source;
-
-	$ins_date = date($date_format,$val);
-	$ins_time = date($time_format,$val);
-	$ins_week = "(".$weeklabels[date("w",$val)].")";
-	$ins = "$ins_date $ins_week $ins_time";
-
-	if (($dir = @opendir(BACKUP_DIR)) && !$_page)
-	{
-		while($file = readdir($dir))
-		{
-			if(function_exists(gzopen))
-				$file = str_replace(".txt",".gz",$file);
-
-			if($file == ".." || $file == ".") continue;
-			$page = decode(trim(preg_replace("/(\.txt)|(\.gz)$/"," ",$file)));
-			if(in_array($page,$cantedit)) continue;
-			$page_url = rawurlencode($page);
-			$name = $page;
-			$name = strip_bracket($name);
-			if(is_page($page))
-				$vals[$name]["link"] = "<li><a href=\"$script?$page_url\">$name</a></li>";
-			else
-				$vals[$name]["link"] = "<li>$name</li>";
-			$vals[$name]["name"] = $page;
-		}
-		closedir($dir);
-		$vals = list_sort($vals);
-		$retvars[] = "<ul>";
-	}
-	else
-	{
-		$page_url = rawurlencode($_page);
-		$name = strip_bracket($_page);
-		$vals[$name]["link"] = "";
-		$vals[$name]["name"] = $_page;
-		$retvars[] = "<ul>";
-		$retvars[] .= "<li><a href=\"$script?cmd=backup\">$_msg_backuplist</a></li>\n";
-	}
-	
-	
-	foreach($vals as $page => $line)
-	{
-		$arybackups = get_backup_info(encode($line["name"]).".txt");
-		$page_url = rawurlencode($line["name"]);
-		if(count($arybackups)) $line["link"] .= "\n<ul>\n";
-		foreach($arybackups as $key => $val)
-		{
-			$ins_date = date($date_format,$val);
-			$ins_time = date($time_format,$val);
-			$ins_week = "(".$weeklabels[date("w",$val)].")";
-			$backupdate = "($ins_date $ins_week $ins_time)";
-			if(!$_page)
-			{
-				$line["link"] .= "<li><a href=\"$script?cmd=backup&page=$page_url&age=$key\">$key $backupdate</a></li>\n";
-			}
-			else
-			{
-				$line["link"] .= "<li><a href=\"$script?cmd=backup&page=$page_url&age=$key\">$key $backupdate</a> [ <a href=\"$script?cmd=backup_diff&page=$page_url&age=$key\">$_msg_diff</a> | <a href=\"$script?cmd=backup_nowdiff&page=$page_url&age=$key\">$_msg_nowdiff</a> | <a href=\"$script?cmd=backup_source&page=$page_url&age=$key\">$_msg_source</a> ]</li>\n";
-			}
-		}
-		if(count($arybackups)) $line["link"] .= "</ul>";
-		$retvars[] = $line["link"];
-	}
-	$retvars[] = "</ul>";
-	
-	return join("\n",$retvars);
-}
-
-// 最終更新ページの更新
-function put_lastmodified()
-{
-	global $script,$maxshow,$whatsnew,$date_format,$time_format,$weeklabels,$post,$non_list;
-
-	if($post["notimestamp"]) return;
-
-	if ($dir = @opendir(DATA_DIR))
-	{
-		while($file = readdir($dir))
-		{
-			$page = decode(trim(preg_replace("/\.txt$/"," ",$file)));
-
-			if($page == $whatsnew || $file == "." || $file == "..") continue;
-			if(preg_match("/$non_list/",$page)) continue;
-
-			if(file_exists(get_filename(encode($page))))
-			{
-				$page_url = rawurlencode($page);
-				$lastmodtime = filemtime(get_filename(encode($page)));
-				$lastmod = date($date_format,$lastmodtime)
-					 . " (" . $weeklabels[date("w",$lastmodtime)] . ") "
-					 . date($time_format,$lastmodtime);
-				$putval[$lastmodtime][] = "-$lastmod - $page";
-			}
-		}
-		closedir($dir);
-	}
-	
-	$cnt = 1;
-	krsort($putval);
-	$fp = fopen(get_filename(encode($whatsnew)),"w");
-	flock($fp,LOCK_EX);
-	foreach($putval as $pages)
-	{
-		foreach($pages as $page)
-		{
-			fputs($fp,$page."\n");
-			$cnt++;
-			if($cnt > $maxshow) break;
-		}
-		if($cnt > $maxshow) break;
-	}
-	flock($fp,LOCK_EX);
-	fclose($fp);
-}
-
-// 検索
-function do_search($word,$type="AND",$non_format=0)
-{
-	global $script,$whatsnew,$vars;
-	global $_msg_andresult,$_msg_orresult,$_msg_notfoundresult;
-	
-	$database = array();
-	$retval = array();
-	$cnt = 0;
-
-	if ($dir = @opendir(DATA_DIR))
-	{
-		while($file = readdir($dir))
-		{
-			if($file == ".." || $file == ".") continue;
-			$cnt++;
-			$page = decode(trim(preg_replace("/\.txt$/"," ",$file)));
-			if($page == $whatsnew) continue;
-			if($page == $vars["page"] && $non_format) continue;
-			$data[$page] = file(DATA_DIR.$file);
-		}
-		closedir($dir);
-	}
-	
-	$arywords = explode(" ",$word);
-	$result_word = $word;
-	
-	foreach($data as $name => $lines)
-	{
-		$line = join("\n",$lines);
-		
-		$hit = 0;
-		if(strpos($result_word," ") !== FALSE)
-		{
-			foreach($arywords as $word)
-			{
-				if($type=="AND")
-				{
-					if(strpos($line,$word) === FALSE)
-					{
-						$hit = 0;
-						break;
-					}
-					else
-					{
-						$hit = 1;
-					}
-				}
-				else if($type=="OR")
-				{
-					if(strpos($line,$word) !== FALSE)
-						$hit = 1;
-				}
-			}
-			if($hit==1 || strpos($name,$word)!==FALSE)
-			{
-				$page_url = rawurlencode($name);
-				$word_url = rawurlencode($word);
-				$name2 = strip_bracket($name);
-				$str = get_pg_passage($name);
-				$retval[$name2] = "<li><a href=\"$script?$page_url\">$name2</a>$str</li>";
-			}
-		}
-		else
-		{
-			if(stristr($line,$word) || stristr($name,$word))
-			{
-				$page_url = rawurlencode($name);
-				$word_url = rawurlencode($word);
-				$name2 = strip_bracket($name);
-				$link_tag = "<a href=\"$script?$page_url\">$name2</a>";
-				$link_tag .= get_pg_passage($name,false);
-				if($non_format)
-				{
-					$tm = @filemtime(get_filename(encode($name)));
-					$retval[$tm] = $link_tag;
-				}
-				else
-				{
-					$retval[$name2] = "<li>$link_tag</li>";
-				}
-			}
-		}
-	}
-
-	if($non_format)
-		return $retval;
-
-	$retval = list_sort($retval);
-
-	if(count($retval) && !$non_format)
-	{
-		$retvals = "<ul>\n" . join("\n",$retval) . "</ul>\n<br>\n";
-		
-		if($type=="AND")
-			$retvals.= str_replace('$1',$result_word,str_replace('$2',count($retval),str_replace('$3',$cnt,$_msg_andresult)));
-		else
-			$retvals.= str_replace('$1',$result_word,str_replace('$2',count($retval),str_replace('$3',$cnt,$_msg_orresult)));
-
-	}
-	else
-		$retvals .= str_replace('$1',$result_word,$_msg_notfoundresult);
-	return $retvals;
-}
-
-// 差分の作成
-function do_diff($strlines1,$strlines2)
-{
-	$lines1 = split("\n",$strlines1);
-	$lines2 = split("\n",$strlines2);
-	
-	$same_lines = $diff_lines = $del_lines = $add_lines = $retdiff = array();
-	
-	if(count($lines1) > count($lines2)) { $max_line = count($lines1)+2; }
-	else                                { $max_line = count($lines2)+2; }
-
-	//$same_lines = array_intersect($lines1,$lines2);
-
-	$diff_lines = array_diff($lines1,$lines2);
-	$diff_lines = array_merge($diff_lines,array_diff($lines2,$lines1));
-
-	foreach($diff_lines as $line)
-	{
-		$index = array_search($line,$lines1);
-		if($index > -1)
-		{
-			$del_lines[$index] = $line;
-		}
-		
-		//$index = array_search($line,$lines2);
-		//if($index > -1)
-		//{
-		//	$add_lines[$index] = $line;
-		//}
-	}
-
-	$cnt=0;
-	foreach($lines2 as $line)
-	{
-		$line = rtrim($line);
-		
-		while($del_lines[$cnt])
-		{
-			$retdiff[] = "- ".$del_lines[$cnt];
-			$del_lines[$cnt] = "";
-			$cnt++;
-		}
-		
-		if(in_array($line,$diff_lines))
-		{
-			$retdiff[] = "+ $line";
-		}
-		else
-		{
-			$retdiff[] = "  $line";
-		}
-
-		$cnt++;
-	}
-	
-	foreach($del_lines as $line)
-	{
-		if(trim($line))
-			$retdiff[] = "- $line";
-	}
-
-	return join("\n",$retdiff);
-}
-
-// 一覧の取得
-function get_list($withfilename)
-{
-	global $script,$list_index,$top,$non_list,$whatsnew;
-	global $_msg_symbol,$_msg_other;
-	
-	$retval = array();
-	if ($dir = @opendir(DATA_DIR))
-	{
-		while($file = readdir($dir))
-		{
-			$page = decode(trim(preg_replace("/\.txt$/"," ",$file)));
-			if($file == ".." || $file == ".") continue;
-			if(preg_match("/$non_list/",$page) && !$withfilename) continue;
-			if($page == $whatsnew) continue;
-			$page_url = rawurlencode($page);
-			$page2 = strip_bracket($page);
-			$pg_passage = get_pg_passage($page);
-			$retval[$page2] .= "<li><a href=\"$script?$page_url\">$page2</a>$pg_passage</li>\n";
-			if($withfilename)
-			{
-				$retval[$page2] .= "<ul><li>$file</li></ul>\n";
-			}
-		}
-		closedir($dir);
-	}
-	
-	$retval = list_sort($retval);
-	
-	if($list_index)
-	{
-		$head_str = "";
-		$etc_sw = 0;
-		$symbol_sw = 0;
-		$top_link = "";
-		foreach($retval as $page => $link)
-		{
-			$head = substr($page,0,1);
-			if($head_str != $head && !$etc_sw)
-			{
-				$retval2[$page] = "";
-				
-				if(preg_match("/([A-Z])|([a-z])/",$head,$match))
-				{
-					if($match[1])
-						$head_nm = "High:$head";
-					else
-						$head_nm = "Low:$head";
-					
-					if($head_str) $retval2[$page] = "</ul>\n";
-					$retval2[$page] .= "<li><a href=\"#top:$head_nm\" name=\"$head_nm\"><b>$head</b></a></li>\n<ul>\n";
-					$head_str = $head;
-					if($top_link) $top_link .= "|";
-					$top_link .= "<a href=\"#$head_nm\" name=\"top:$head_nm\"><b>&nbsp;".$head."&nbsp;</b></a>";
-				}
-				else if(preg_match("/[ -~]/",$head))
-				{
-					if(!$symbol_sw)
-					{
-						if($head_str) $retval2[$page] = "</ul>\n";
-						$retval2[$page] .= "<li><a href=\"#top:symbol\" name=\"symbol\"><b>$_msg_symbol</b></a></li>\n<ul>\n";
-						$head_str = $head;
-						if($top_link) $top_link .= "|";
-						$top_link .= "<a href=\"#symbol\" name=\"top:symbol\"><b>$_msg_symbol</b></a>";
-						$symbol_sw = 1;
-					}
-				}
-				else
-				{
-					if($head_str) $retval2[$page] = "</ul>\n";
-					$retval2[$page] .= "<li><a href=\"#top:etc\" name=\"etc\"><b>$_msg_other</b></a></li>\n<ul>\n";
-					$etc_sw = 1;
-					if($top_link) $top_link .= "|";
-					$top_link .= "<a href=\"#etc\" name=\"top:etc\"><b>$_msg_other</b></a>";
-				}
-			}
-			$retval2[$page] .= $link;
-		}
-		$retval2[] = "</ul>\n";
-		
-		$top_link = "<div align=\"center\"><a name=\"top\">$top_link</a></div><br>\n";
-		
-		array_unshift($retval2,$top_link);
-	}
-	else
-	{
-		$retval2 = $retval;
-	}
-	
-	return join("",$retval2);
-}
-
-// 編集フォームの表示
-function edit_form($postdata,$page,$add=0)
-{
-	global $script,$rows,$cols,$hr,$vars,$function_freeze;
-	global $_btn_addtop,$_btn_preview,$_btn_update,$_btn_freeze,$_msg_help,$_btn_notchangetimestamp;
-	global $whatsnew,$_btn_template,$_btn_load,$non_list,$load_template_func;
-
-	$digest = md5(@join("",@file(get_filename(encode($page)))));
-
-	if($add)
-	{
-		$addtag = '<input type="hidden" name="add" value="true">';
-		$add_top = '<input type="checkbox" name="add_top" value="true"><small>'.$_btn_addtop.'</small>';
-	}
-
-	if($vars["help"] == "true")
-		$help = $hr.catrule();
-	else
-		$help = "<br>\n<ul><li><a href=\"$script?cmd=edit&help=true&page=".rawurlencode($page)."\">$_msg_help</a></ul></li>\n";
-
-	if($function_freeze)
-		$str_freeze = '<input type="submit" name="freeze" value="'.$_btn_freeze.'" accesskey="f">';
-
-	if($load_template_func)
-	{
-		$vals = array();
-		if ($dir = @opendir(DATA_DIR))
-		{
-			while($file = readdir($dir))
-			{
-				$pg_org = decode(trim(preg_replace("/\.txt$/"," ",$file)));
-				if($file == ".." || $file == "." || $pg_org == $whatsnew) continue;
-				if(preg_match("/$non_list/",$pg_org)) continue;
-				$name = strip_bracket($pg_org);
-				$vals[$name] = "    <option value=\"$pg_org\">$name</option>";
-			}
-			closedir($dir);
-		}
-		@ksort($vals);
-		
-		$template = "   <select name=\"template_page\">\n"
-			   ."    <option value=\"\">-- $_btn_template --</option>\n"
-			   .join("\n",$vals)
-			   ."   </select>\n"
-			   ."   <input type=\"submit\" name=\"template\" value=\"$_btn_load\" accesskey=\"r\"><br>\n";
-
-		if($vars["refer"]) $refer = $vars["refer"]."\n\n";
-	}
-
-return '
-<form action="'.$script.'" method="post">
-<input type="hidden" name="page" value="'.$page.'">
-<input type="hidden" name="digest" value="'.$digest.'">
-'.$addtag.'
-<table cellspacing="3" cellpadding="0" border="0">
- <tr>
-  <td colspan="2" align="right">
-'.$template.'
-  </td>
- </tr>
- <tr>
-  <td colspan="2" align="right">
-   <textarea name="msg" rows="'.$rows.'" cols="'.$cols.'" wrap="virtual">
-'.$refer.$postdata.'</textarea>
-  </td>
- </tr>
- <tr>
-  <td>
-   <input type="submit" name="preview" value="'.$_btn_preview.'" accesskey="p">
-   <input type="submit" name="write" value="'.$_btn_update.'" accesskey="s">
-   '.$add_top.'
-   <input type="checkbox" name="notimestamp" value="true"><small>'.$_btn_notchangetimestamp.'</small>
-  </td>
-  </form>
-  <form action="'.$script.'?cmd=freeze" method="post">
-   <input type="hidden" name="page" value="'.$vars["page"].'">
-  <td align="right">
-   '.$str_freeze.'
-  </td>
-  </form>
- </tr>
-</table>
-' . $help;
-}
-
-// ファイル名を得る(エンコードされている必要有り)
-function get_filename($pagename)
-{
-	return DATA_DIR.$pagename.".txt";
-}
-
-// ページが存在するかしないか
-function is_page($page,$reload=false)
-{
-	global $InterWikiName,$_ispage;
-
-	if(($_ispage[$page] === true || $_ispage[$page] === false) && !$reload) return $_ispage[$page];
-
-	if(preg_match("/($InterWikiName)/",$page))
-		$_ispage[$page] = false;
-	else if(!file_exists(get_filename(encode($page))))
-		$_ispage[$page] = false;
-	else
-		$_ispage[$page] = true;
-	
-	return $_ispage[$page];
-}
-
-// ページが編集可能か
-function is_editable($page)
-{
-	global $BracketName,$WikiName,$InterWikiName,$cantedit,$_editable;
-
-	if($_editable === true || $_editable === false) return $_editable;
-
-	if(preg_match("/^$InterWikiName$/",$page))
-		$_editable = false;
-	elseif(!preg_match("/^$BracketName$/",$page) && !preg_match("/^$WikiName$/",$page))
-		$_editable = false;
-	else if(in_array($page,$cantedit))
-		$_editable = false;
-	else
-		$_editable = true;
-	
-	return $_editable;
-}
-
-// ページが凍結されているか
-function is_freeze($page)
-{
-	global $_freeze;
-
-	if(!is_page($page)) return false;
-	if($_freeze === true || $_freeze === false) return $_freeze;
-
-	$lines = file(get_filename(encode($page)));
-	
-	if($lines[0] == "#freeze\n")
-		$_freeze = true;
-	else
-		$_freeze = false;
-	
-	return $_freeze;
-}
-
-// プログラムへの引数のチェック
-function arg_check($str)
-{
-	global $arg,$vars;
-
-	return preg_match("/^".$str."/",$vars["cmd"]);
-}
-
-// ページリストのソート
-function list_sort($values)
-{
-	if(!is_array($values)) return array();
-	
-	// ksortのみだと、[[日本語]]、[[英文字]]、英文字のみ、に順に並べ替えられる
-	ksort($values);
-
-	$vals1 = array();
-	$vals2 = array();
-	$vals3 = array();
-
-	// 英文字のみ、[[英文字]]、[[日本語]]、の順に並べ替える
-	foreach($values as $key => $val)
-	{
-		if(preg_match("/\[\[[^\w]+\]\]/",$key))
-			$vals3[$key] = $val;
-		else if(preg_match("/\[\[[\W]+\]\]/",$key))
-			$vals2[$key] = $val;
-		else
-			$vals1[$key] = $val;
-	}
-	return array_merge($vals1,$vals2,$vals3);
-}
-
-// ページ名のエンコード
-function encode($key)
-{
-	$enkey = '';
-	$arych = preg_split("//", $key, -1, PREG_SPLIT_NO_EMPTY);
-	
-	foreach($arych as $ch)
-	{
-		$enkey .= sprintf("%02X", ord($ch));
-	}
-
-	return $enkey;
-}
-
-// ファイル名のデコード
-function decode($key)
-{
-	$dekey = '';
-	
-	for($i=0;$i<strlen($key);$i+=2)
-	{
-		$ch = substr($key,$i,2);
-		$dekey .= chr(intval("0x".$ch,16));
-	}
-	return urldecode($dekey);
-}
-
-// テキスト本体をHTMLに変換する
-function convert_html($string)
-{
-	global $result,$saved,$hr,$script,$page,$vars,$top;
-	global $note_id,$foot_explain,$digest,$note_hr;
-	global $user_rules,$str_rules,$line_rules,$strip_link_wall;
-
-	global $longtaketime;
-
-	$string = rtrim($string);
-	$string = preg_replace("/(\x0D\x0A)/","\n",$string);
-	$string = preg_replace("/(\x0D)/","\n",$string);
-	$string = preg_replace("/(\x0A)/","\n",$string);
-
-	$start_mtime = getmicrotime();
-
-	$digest = md5(@join("",@file(get_filename(encode($vars["page"])))));
-
-	$content_id = 0;
-	$user_rules = array_merge($str_rules,$line_rules);
-
-	$result = array();
-	$saved = array();
-	$arycontents = array();
-
-	$string = preg_replace("/^#freeze\n/","",$string);
-
-	$lines = split("\n", $string);
-	$note_id = 1;
-	$foot_explain = array();
-
-	$table = 0;
-
-	if(preg_match("/#contents/",$string))
-		$top_link = "<a href=\"#contents\">$top</a>";
-
-	foreach ($lines as $line)
-	{
-		if(!preg_match("/^\/\/(.*)/",$line,$comment_out) && $table != 0)
-		{
-			if(!preg_match("/^\|(.+)\|$/",$line,$out))
-				array_push($result, "</table>");
-			if(!$out[1] || $table != count(explode("|",$out[1])))
-				$table = 0;
-		}
-
-		$comment_out = $comment_out[1];
-
-		if(preg_match("/^(\*{1,3})(.*)/",$line,$out))
-		{
-			$result = array_merge($result,$saved); $saved = array();
-			$str = inline($out[2]);
-			
-			$level = strlen($out[1]) + 1;
-			
-			array_push($result, "<h$level><a name=\"content:$content_id\">$str</a> $top_link</h$level>");
-			$arycontents[] = str_repeat("-",$level-1)."<a href=\"#content:$content_id\">".strip_htmltag($str)."</a>\n";
-			$content_id++;
-		}
-		else if(preg_match("/^(-{1,4})(.*)/",$line,$out))
-		{
-			if(strlen($out[1]) == 4)
-			{
-				$result = array_merge($result,$saved); $saved = array();
-				array_push($result, $hr);
-			}
-			else
-			{
-				back_push('ul', strlen($out[1]));
-				array_push($result, '<li>' . inline($out[2]) . '</li>');
-			}
-		}
-		else if (preg_match("/^:([^:]+):(.*)/",$line,$out))
-		{
-			back_push('dl', 1);
-			array_push($result, '<dt>' . inline($out[1]) . '</dt>', '<dd>' . inline($out[2]) . '</dd>');
-		}
-		else if(preg_match("/^(>{1,3})(.*)/",$line,$out))
-		{
-			back_push('blockquote', strlen($out[1]));
-			array_push($result, ltrim(inline($out[2])));
-		}
-		else if (preg_match("/^\s*$/",$line,$out))
-		{
-			$result = array_merge($result,$saved); $saved = array();
-			//array_unshift($saved, "</p>");
-			array_push($result, "<p>");
-		}
-		else if(preg_match("/^(\s+.*)/",$line,$out))
-		{
-			back_push('pre', 1);
-			array_push($result, htmlspecialchars($out[1],ENT_NOQUOTES));
-		}
-		else if(preg_match("/^\|(.+)\|$/",$line,$out))
-		{
-			$arytable = explode("|",$out[1]);
-
-			if(!$table)
-			{
-				$result = array_merge($result,$saved); $saved = array();
-				array_push($result,"<table class=\"style_table\" cellspacing=\"1\" border=\"0\">");
-				$table = count($arytable);
-			}
-
-			array_push($result,"<tr>");
-			foreach($arytable as $td)
-			{
-				array_push($result,"<td class=\"style_td\">");
-				array_push($result,ltrim(inline($td)));
-				array_push($result,"</td>");
-			}
-			array_push($result,"</tr>");
-
-		}
-		else if(strlen($comment_out) != 0)
-		{
-			array_push($result," <!-- ".htmlspecialchars($comment_out)." -->");
-		}
-		else
-		{
-			array_push($result, inline($line));
-		}
-	}
-	if($table) array_push($result, "</table>");
-
-	$result_last = $result = array_merge($result,$saved); $saved = array();
-
-	if($content_id != 0)
-	{
-		$result = array();
-		$saved = array();
-
-		foreach($arycontents as $line)
-		{
-			if(preg_match("/^(-{1,3})(.*)/",$line,$out))
-			{
-				back_push('ul', strlen($out[1]));
-				array_push($result, '<li>'.$out[2].'</li>');
-			}
-		}
-		$result = array_merge($result,$saved); $saved = array();
-		
-		$contents = "<a name=\"contents\"></a>\n";
-		$contents .= join("\n",$result);
-		if($strip_link_wall)
-		{
-			$contents = preg_replace("/\[\[([^\]]+)\]\]/","$1",$contents);
-		}
-	}
-
-	$result_last = inline2($result_last);
-	
-	$result_last = preg_replace("/^#contents/",$contents,$result_last);
-
-	$str = join("\n", $result_last);
-
-	if($foot_explain)
-	{
-		$str .= "\n";
-		$str .= "$note_hr\n";
-		//$str .= "<p>\n";
-		$str .= join("\n",inline2($foot_explain));
-		//$str .= "</p>\n";
-	}
-
-	$longtaketime = getmicrotime() - $start_mtime;
-
-	$str = preg_replace("/&amp;((lt;)|(gt;))/","&$1",$str);
-
-	return $str;
-}
-
-// $tagのタグを$levelレベルまで詰める。
-function back_push($tag, $level)
-{
-	global $result,$saved;
-	
-	while (count($saved) > $level) {
-		array_push($result, array_shift($saved));
-	}
-	if ($saved[0] != "</$tag>") {
-		$result = array_merge($result,$saved); $saved = array();
-	}
-	while (count($saved) < $level) {
-		array_unshift($saved, "</$tag>");
-		array_push($result, "<$tag>");
-	}
-}
-
-// リンクの付加その他
-function inline($line)
-{
-	$line = htmlspecialchars($line);
-
-	$line = preg_replace("/(
-
-					(\(\(([^\(\)]+)\)\))
-					|
-					(\(\((.+)\)\))
-
-				)/ex","make_note(\"$1\")",$line);
-
-	return $line;
-}
-
-// リンクの付加その他2
-function inline2($str)
-{
-	global $WikiName,$BracketName,$InterWikiName,$vars,$related,$related_link,$script;
-	$cnts_plain = array();
-	$cnts_plugin = array();
-	$arykeep = array();
-
-	for($cnt=0;$cnt<count($str);$cnt++)
-	{
-		if(preg_match("/^(\s)/",$str[$cnt]))
-		{
-			$arykeep[$cnt] = $str[$cnt];
-			$str[$cnt] = "";
-			$cnts_plain[] = $cnt;
-		}
-		else if(preg_match("/^\#([^\(]+)\(?(.*)\)?$/",$str[$cnt],$match))
-		{
-			if(file_exists(PLUGIN_DIR.$match[1].".inc.php"))
-			{
-				require_once(PLUGIN_DIR.$match[1].".inc.php");
-				if(function_exists("plugin_".$match[1]."_convert"))
-				{
-					$aryplugins[$cnt] = $str[$cnt];
-					$str[$cnt] = "";
-					$cnts_plugin[] = $cnt;
-				}
-			}
-		}
-	}
-
-	$str = preg_replace("/'''([^']+?)'''/s","<i>$1</i>",$str);	// Italic
-
-	$str = preg_replace("/''([^']+?)''/s","<b>$1</b>",$str);	// Bold
-
-	$str = preg_replace("/
-		(
-			(\[\[([^\]]+)\:(https?|ftp|news)(:\/\/[-_.!~*'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)\]\])
-			|
-			(\[(https?|ftp|news)(:\/\/[-_.!~*'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)\s([^\]]+)\])
-			|
-			(https?|ftp|news)(:\/\/[-_.!~*'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)
-			|
-			([[:alnum:]\-_.]+@[[:alnum:]\-_]+\.[[:alnum:]\-_\.]+)
-			|
-			(\[\[([^\]]+)\:([[:alnum:]\-_.]+@[[:alnum:]\-_]+\.[[:alnum:]\-_\.]+)\]\])
-			|
-			($InterWikiName)
-			|
-			($BracketName)
-			|
-			($WikiName)
-		)/ex","make_link('$1')",$str);
-
-	$str = preg_replace("/#related/",make_related($vars["page"],true),$str);
-
-	$str = make_user_rules($str);
-
-	$aryplugins = preg_replace("/^\#([^\(]+)$/ex","plugin_convert('$1','$2')",$aryplugins);
-	$aryplugins = preg_replace("/^\#([^\(]+)\((.*)\)$/ex","plugin_convert('$1','$2')",$aryplugins);
-
-	$tmp = $str;
-	$str = preg_replace("/^#norelated$/","",$str);
-	if($tmp != $str)
-		$related_link = 0;
-
-	foreach($cnts_plain as $cnt)
-		$str[$cnt] = $arykeep[$cnt];
-
-	foreach($cnts_plugin as $cnt)
-		$str[$cnt] = $aryplugins[$cnt];
-
-	return $str;
-}
-
-// Plug-in
-function plugin_convert($plugin_name,$plugin_args)
-{
-	$invalid_return = "#${plugin_name}(${plugin_args})";
-	
-	if($plugin_args !== "")
-		$aryargs = explode(",",$plugin_args);
-	else
-		$aryargs = array();
-	$retvar = call_user_func_array("plugin_${plugin_name}_convert",$aryargs);
-
-	if($retvar === FALSE) return $invalid_return;
-	else                  return $retvar;
-}
-
-// 関連するページ
-function make_related($page,$_isrule)
-{
-	global $related_str,$rule_related_str,$related,$_make_related,$vars;
-
-	$page_name = strip_bracket($vars["page"]);
-
-	if(!is_array($_make_related))
-	{
-		$aryrelated = do_search($page,"OR",1);
-
-		if(is_array($aryrelated))
-		{
-			foreach($aryrelated as $key => $val)
-			{
-				$new_arylerated[$key.md5($val)] = $val;
-			}
-		}
-
-		if(is_array($related))
-		{
-			foreach($related as $key => $val)
-			{
-				$new_arylerated[$key.md5($val)] = $val;
-			}
-		}
-
-		@krsort($new_arylerated);
-		$_make_related = @array_unique($new_arylerated);
-	}
-
-	if($_isrule)
-	{
-		if(is_array($_make_related))
-		{
-			foreach($_make_related as $str)
-			{
-				preg_match("/<a\shref=\"([^\"]+)\">([^<]+)<\/a>(.*)/",$str,$out);
-				
-				if($out[3]) $title = " title=\"$out[2] $out[3]\"";
-				
-				$aryret[$out[2]] = "<a href=\"$out[1]\"$title>$out[2]</a>";
-			}
-			@ksort($aryret);
-		}
-	}
-	else
-	{
-		$aryret = $_make_related;
-	}
-
-	if($_isrule) $str = $rule_related_str;
-	else         $str = $related_str;
-
-	return @join($str,$aryret);
-}
-
-// 注釈処理
-function make_note($str)
-{
-	global $note_id,$foot_explain;
-
-	$str = preg_replace("/^\(\(/","",$str);
-	$str = preg_replace("/\)\)$/","",$str);
-
-	$str= str_replace("\\'","'",$str);
-
-	$str = make_user_rules($str);
-
-	$foot_explain[] = "<a name=\"notefoot:$note_id\" href=\"#notetext:$note_id\"><sup><small>*$note_id</small></sup></a> <small>$str</small><br />\n";
-	$note =  "<a name=\"notetext:$note_id\" href=\"#notefoot:$note_id\"><sup><small>*$note_id</small></sup></a>";
-	$note_id++;
-
-	return $note;
-}
-
-// リンクを付加する
-function make_link($name)
-{
-	global $BracketName,$WikiName,$InterWikiName,$script,$link_target,$interwiki_target;
-	global $related,$show_passage,$vars,$defaultpage;
-
-	$aryconv_htmlspecial = array("&amp;","&lt;","&gt;");
-	$aryconv_html = array("&","<",">");
-
-	$page = $name;
-
-	if(preg_match("/^\[\[([^\]]+)\:((https?|ftp|news)([^\]]+))\]\]$/",$name,$match))
-	{
-		$match[2] = str_replace($aryconv_htmlspecial,$aryconv_html,$match[2]);
-		return "<a href=\"$match[2]\" target=\"$link_target\">$match[1]</a>";
-	}
-	else if(preg_match("/^\[((https?|ftp|news)([^\]\s]+))\s([^\]]+)\]$/",$name,$match))
-	{
-		$match[1] = str_replace($aryconv_htmlspecial,$aryconv_html,$match[1]);
-		return "<a href=\"$match[1]\" target=\"$link_target\">$match[4]</a>";
-	}
-	else if(preg_match("/^(https?|ftp|news).*?(\.gif|\.png|\.jpeg|\.jpg)?$/",$name,$match))
-	{
-		$name = str_replace($aryconv_htmlspecial,$aryconv_html,$name);
-		if($match[2])
-			return "<a href=\"$name\" target=\"$link_target\"><img src=\"$name\" border=\"0\"></a>";
-		else
-			return "<a href=\"$name\" target=\"$link_target\">$page</a>";
-	}
-	else if(preg_match("/^\[\[([^\]]+)\:([[:alnum:]\-_.]+@[[:alnum:]\-_]+\.[[:alnum:]\-_\.]+)\]\]/",$name,$match))
-	{
-		$match[1] = str_replace($aryconv_htmlspecial,$aryconv_html,$match[1]);
-		$match[2] = str_replace($aryconv_htmlspecial,$aryconv_html,$match[2]);
-
-		return "<a href=\"mailto:$match[2]\">$match[1]</a>";
-	}
-	else if(preg_match("/^([[:alnum:]\-_]+@[[:alnum:]\-_]+\.[[:alnum:]\-_\.]+)/",$name))
-	{
-		$name = str_replace($aryconv_htmlspecial,$aryconv_html,$name);
-		return "<a href=\"mailto:$name\">$page</a>";
-	}
-	else if(preg_match("/^($InterWikiName)$/",str_replace($aryconv_htmlspecial,$aryconv_html,$name)))
-	{
-		$page = strip_bracket($page);
-		$percent_name = str_replace($aryconv_htmlspecial,$aryconv_html,$name);
-		$percent_name = rawurlencode($percent_name);
-
-		return "<a href=\"$script?$percent_name\" target=\"$interwiki_target\">$page</a>";
-	}
-	else if(preg_match("/^($BracketName)|($WikiName)$/",str_replace($aryconv_htmlspecial,$aryconv_html,$name)))
-	{
-		if(preg_match("/^([^>]+)>([^>]+)$/",strip_bracket(str_replace($aryconv_htmlspecial,$aryconv_html,$name)),$match))
-		{
-			$page = $match[1];
-			$name = $match[2];
-			if(!preg_match("/^($BracketName)|($WikiName)$/",$page))
-				$page = "[[$page]]";
-			if(!preg_match("/^($BracketName)|($WikiName)$/",$name))
-				$name = "[[$name]]";
-		}
-		
-		if(preg_match("/^\[\[\.\/([^\]]*)\]\]/",str_replace($aryconv_htmlspecial,$aryconv_html,$name),$match))
-		{
-			if(!$match[1])
-				$name = $vars["page"];
-			else
-				$name = "[[".strip_bracket($vars[page])."/$match[1]]]";
-		}
-		else if(preg_match("/^\[\[\..\/([^\]]+)\]\]/",str_replace($aryconv_htmlspecial,$aryconv_html,$name),$match))
-		{
-			for($i=0;$i<substr_count($name,"../");$i++)
-				$name = preg_replace("/(.+)\/([^\/]+)$/","$1",strip_bracket($vars["page"]));
-
-			if(!preg_match("/^($BracketName)|($WikiName)$/",$name))
-				$name = "[[$name]]";
-			
-			if($vars["page"]==$name)
-				$name = "[[$match[1]]]";
-			else
-				$name = "[[".strip_bracket($name)."/$match[1]]]";
-		}
-		else if($name == "[[../]]")
-		{
-			$name = preg_replace("/(.+)\/([^\/]+)$/","$1",strip_bracket($vars["page"]));
-			
-			if(!preg_match("/^($BracketName)|($WikiName)$/",$name))
-				$name = "[[$name]]";
-			if($vars["page"]==$name)
-				$name = $defaultpage;
-		}
-		
-		$page = strip_bracket($page);
-		$pagename = strip_bracket($name);
-		$percent_name = str_replace($aryconv_htmlspecial,$aryconv_html,$name);
-		$percent_name = rawurlencode($percent_name);
-
-		$refer = rawurlencode($vars["page"]);
-		if(is_page($name))
-		{
-			$str = get_pg_passage($name,false);
-			$tm = @filemtime(get_filename(encode($name)));
-			if($vars["page"] != $name)
-				$related[$tm] = "<a href=\"$script?$percent_name\">$pagename</a>$str";
-			if($show_passage)
-			{
-				$str_title = "title=\"$pagename $str\"";
-			}
-			return "<a href=\"$script?$percent_name\" $str_title>$page</a>";
-		}
-		else
-			return "<span class=\"noexists\">$page<a href=\"$script?cmd=edit&page=$percent_name&refer=$refer\">?</a></span>";
-	}
-	else
-	{
-		return $page;
-	}
-}
-
-// ユーザ定義ルール(ソースを置換する)
-function user_rules_str($str)
-{
-	global $str_rules;
-
-	$arystr = split("\n",$str);
-
-	// 日付・時刻置換処理
-	foreach($arystr as $str)
-	{
-		if(substr($str,0,1) != " ")
-		{
-			foreach($str_rules as $rule => $replace)
-			{
-				$str = preg_replace("/$rule/",$replace,$str);
-			}
-		}
-		$retvars[] = $str;
-	}
-
-	return join("\n",$retvars);
-}
-
-// ユーザ定義ルール(ソースは置換せずコンバート)
-function make_user_rules($str)
-{
-	global $user_rules;
-
-	foreach($user_rules as $rule => $replace)
-	{
-		$str = preg_replace("/$rule/",$replace,$str);
-	}
-
-	return $str;
-}
-
-// InterWikiName List の解釈(返値:２次元配列)
-function open_interwikiname_list()
-{
-	global $interwiki;
-	
-	$retval = array();
-	$aryinterwikiname = file(get_filename(encode($interwiki)));
-
-	$cnt = 0;
-	foreach($aryinterwikiname as $line)
-	{
-		if(preg_match("/\[((https?|ftp|news)(\:\/\/[[:alnum:]\+\$\;\?\.%,!#~\*\/\:@&=_\-]+))\s([^\]]+)\]\s?([^\s]*)/",$line,$match))
-		{
-			$retval[$match[4]]["url"] = $match[1];
-			$retval[$match[4]]["opt"] = $match[5];
-		}
-	}
-
-	return $retval;
-}
-
-// zlib関数が使用できれば、圧縮して使用するためのファイルシステム関数
-function backup_fopen($filename,$mode)
-{
-	if(function_exists(gzopen))
-		return gzopen(str_replace(".txt",".gz",$filename),$mode);
-	else
-		return fopen($filename,$mode);
-}
-function backup_fputs($zp,$str)
-{
-	if(function_exists(gzputs))
-		return gzputs($zp,$str);
-	else
-		return fputs($zp,$str);
-}
-function backup_fclose($zp)
-{
-	if(function_exists(gzclose))
-		return gzclose($zp);
-	else
-		return fclose($zp);
-}
-function backup_file($filename)
-{
-	if(function_exists(gzfile))
-		return @gzfile(str_replace(".txt",".gz",$filename));
-	else
-		return @file($filename);
-}
-function backup_delete($filename)
-{
-	if(function_exists(gzopen))
-		return @unlink(str_replace(".txt",".gz",$filename));
-	else
-		return @unlink($filename);
-}
-
-// バックアップデータを作成する
-function make_backup($filename,$body,$oldtime)
-{
-	global $splitter,$cycle,$maxage;
-	$aryages = array();
-	$arystrout = array();
-
-	if(function_exists(gzfile))
-		$filename = str_replace(".txt",".gz",$filename);
-
-	$realfilename = BACKUP_DIR.$filename;
-
-	if(time() - @filemtime($realfilename) > (60 * 60 * $cycle))
-	{
-		$aryages = read_backup($filename);
-		if(count($aryages) >= $maxage)
-		{
-			array_shift($aryages);
-		}
-		
-		foreach($aryages as $lines)
-		{
-			foreach($lines as $key => $line)
-			{
-				if($key && $key == "timestamp")
-				{
-					$arystrout[] = "$splitter " . rtrim($line);
-				}
-				else
-				{
-					$arystrout[] = rtrim($line);
-				}
-			}
-		}
-
-		$strout = join("\n",$arystrout);
-		if(!preg_match("/\n$/",$strout) && trim($strout)) $strout .= "\n";
-
-		$body = "$splitter " . $oldtime . "\n" . $body;
-		if(!preg_match("/\n$/",$body)) $body .= "\n";
-
-		$fp = backup_fopen($realfilename,"w");
-		backup_fputs($fp,$strout);
-		backup_fputs($fp,$body);
-		backup_fclose($fp);
-	}
-	
-	return true;
-}
-
-// 特定の世代のバックアップデータを取得
-function get_backup($age,$filename)
-{
-	$aryages = read_backup($filename);
-	
-	foreach($aryages as $key => $lines)
-	{
-		if($key != $age) continue;
-		foreach($lines as $key => $line)
-		{
-			if($key && $key == "timestamp") continue;
-			$retvars[] = $line;
-		}
-	}
-
-	return $retvars;
-}
-
-// バックアップ情報を返す
-function get_backup_info($filename)
-{
-	global $splitter;
-	$lines = array();
-	$retvars = array();
-	$lines = backup_file(BACKUP_DIR.$filename);
-
-	if(!is_array($lines)) return array();
-
-	$age = 0;
-	foreach($lines as $line)
-	{
-		preg_match("/^$splitter\s(\d+)$/",trim($line),$match);
-		if($match[1])
-		{
-			$age++;
-			$retvars[$age] = $match[1];
-		}
-	}
-	
-	return $retvars;
-}
-
-// バックアップデータ全体を取得
-function read_backup($filename)
-{
-	global $splitter;
-	$lines = array();
-	$lines = backup_file(BACKUP_DIR.$filename);
-
-	if(!is_array($lines)) return array();
-
-	$age = 0;
-	foreach($lines as $line)
-	{
-		preg_match("/^$splitter\s(\d+)$/",trim($line),$match);
-		if($match[1])
-		{
-			$age++;
-			$retvars[$age]["timestamp"] = $match[1] . "\n";
-		}
-		else
-		{
-			$retvars[$age][] = $line;
-		}
-	}
-
-	return $retvars;
-}
-
-// [[ ]] を取り除く
-function strip_bracket($str)
-{
-	global $strip_link_wall;
-	
-	if($strip_link_wall)
-	{
-		preg_match("/^\[\[(.*)\]\]$/",$str,$match);
-		if($match[1])
-			$str = $match[1];
-	}
-	return $str;
-}
-
-// HTMLタグを取り除く
-function strip_htmltag($str)
-{
-	//$str = preg_replace("/<a[^>]+>\?<\/a>/","",$str);
-	return preg_replace("/<[^>]+>/","",$str);
-}
-
-// テキスト整形ルールを表示する
-function catrule()
-{
-	global $rule_body;
-	return $rule_body;
-}
-
-// エラーメッセージを表示する
-function die_message($msg)
-{
-	$title = $page = "Runtime error";
-
-	$body = "<h3>Runtime error</h3>\n";
-	$body .= "<b>Error message : $msg</b>\n";
-
-	catbody($title,$page,$body);
-
-	die();
-}
-
-// 指定されたページの経過時刻
-function get_pg_passage($page,$sw=true)
-{
-	global $_pg_passage,$show_passage;
-
-	if(!$show_passage) return "";
-
-	if(isset($_pg_passage[$page]))
-	{
-		if($sw)
-			return $_pg_passage[$page]["str"];
-		else
-			return $_pg_passage[$page]["label"];
-	}
-	if($pgdt = @filemtime(get_filename(encode($page))))
-	{
-		$pgdt = UTIME - $pgdt;
-		if(ceil($pgdt / 60) < 60)
-			$_pg_passage[$page]["label"] = "(".ceil($pgdt / 60)."m)";
-		else if(ceil($pgdt / 60 / 60) < 24)
-			$_pg_passage[$page]["label"] = "(".ceil($pgdt / 60 / 60)."h)";
-		else
-			$_pg_passage[$page]["label"] = "(".ceil($pgdt / 60 / 60 / 24)."d)";
-		
-		$_pg_passage[$page]["str"] = "<small>".$_pg_passage[$page]["label"]."</small>";
-	}
-	else
-	{
-		$_pg_passage[$page]["label"] = "";
-		$_pg_passage[$page]["str"] = "";
-	}
-
-	if($sw)
-		return $_pg_passage[$page]["str"];
-	else
-		return $_pg_passage[$page]["label"];
-}
-
-// 現在時刻をマイクロ秒で取得
-function getmicrotime()
-{
-	list($usec, $sec) = explode(" ",microtime());
-	return ((float)$sec + (float)$usec);
-}
-
-// ページ名からページ名を検索するリンクを作成
-function make_search($page)
-{
-	global $script,$WikiName;
-
-	$page = htmlspecialchars($page);
-	$name = strip_bracket($page);
-	$url = rawurlencode($page);
-
-	//WikiWikiWeb like...
-	//if(preg_match("/^$WikiName$/",$page))
-	//	$name = preg_replace("/([A-Z][a-z]+)/","$1 ",$name);
-
-	return "<a href=\"$script?cmd=search&word=$url\">$name</a> ";
-}
-
-// Last-Modified ヘッダ
-function header_lastmod($page)
-{
-	global $lastmod;
-	
-	if($lastmod && is_page($page))
-	{
-		header("Last-Modified: ".gmdate("D, d M Y H:i:s", filemtime(get_filename(encode($page))))." GMT");
-	}
-}
-
-// RecentChanges の RSS を出力
-function catrss($rss)
-{
-	global $rss_max,$page_title,$WikiName,$BracketName,$script,$whatsnew;
-
-	$lines = file(get_filename(encode($whatsnew)));
-	header("Content-type: application/xml");
-
-	$item = "";
-	$rdf_li = "";
-	$cnt = 0;
-	foreach($lines as $line)
-	{
-		if($cnt > $rss_max - 1) break;
-
-		if(preg_match("/(($WikiName)|($BracketName))/",$line,$match))
-		{
-			if($match[2])
-			{
-				$title = $url = $match[1];
-			}
-			else
-			{
-				if(function_exists("mb_convert_encoding"))
-					$title = mb_convert_encoding(strip_bracket($match[1]),"UTF-8","auto");
-				else
-					$title = strip_bracket($match[1]);
-
-				$url = $match[1];
-			}
-			
-			$desc = date("D, d M Y H:i:s T",filemtime(get_filename(encode($match[1]))));
-			
-			if($rss==2)
-				$items.= "<item rdf:about=\"http://".SERVER_NAME.PHP_SELF."?".rawurlencode($url)."\">\n";
-			else
-				$items.= "<item>\n";
-			$items.= " <title>$title</title>\n";
-			$items.= " <link>http://".SERVER_NAME.PHP_SELF."?".rawurlencode($url)."</link>\n";
-			$items.= " <description>$desc</description>\n";
-			$items.= "</item>\n\n";
-			$rdf_li.= "    <rdf:li rdf:resource=\"http://".SERVER_NAME.PHP_SELF."?".rawurlencode($url)."\"/>\n";
-
-		}
-
-		$cnt++;
-	}
-
-	if($rss==1)
-	{
-?>
-<?='<?xml version="1.0" encoding="UTF-8"?>'?>
-
-
-<!DOCTYPE rss PUBLIC "-//Netscape Communications//DTD RSS 0.91//EN"
-            "http://my.netscape.com/publish/formats/rss-0.91.dtd">
-
-<rss version="0.91">
-
-<channel>
-<title><?=$page_title?></title>
-<link><?="http://".SERVER_NAME.PHP_SELF."?$whatsnew"?></link>
-<description>PukiWiki RecentChanges</description>
-<language>ja</language>
-
-<?=$items?>
-</channel>
-</rss>
-<?
-	}
-	else if($rss==2)
-	{
-?>
-<?='<?xml version="1.0" encoding="utf-8"?>'?>
-
-
-<rdf:RDF 
-  xmlns="http://purl.org/rss/1.0/"
-  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?></title>
-  <link><?="http://".SERVER_NAME.PHP_SELF."?$whatsnew"?></link>
-  <description>PukiWiki RecentChanges</description>
-  <items>
-   <rdf:Seq>
-<?=$rdf_li?>
-   </rdf:Seq>
-  </items>
- </channel>
-
-<?=$items?>
-</rdf:RDF>
-<?
-	}
-}
-?>
+<?
+// pukiwiki.php - Yet another WikiWikiWeb clone.
+//
+// PukiWiki 1.3.* MASUI'z Edition
+//  Copyright (C) 2002 by sng, MASUI.
+//  Yuichiro MASUI <[e-mail]>
+//  http://masui.net/pukiwiki/
+//
+// PukiWiki 1.3 (Base)
+//  Copyright (C) 2001,2002 by sng.
+//  <[e-mail]>
+//  http://factage.com/sng/pukiwiki/
+//
+// Special thanks
+//  YukiWiki by Hiroshi Yuki
+//  <[e-mail]>
+//  http://www.hyuki.com/yukiwiki/
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// $Id: pukiwiki.php,v 1.2 2002/06/21 05:21:46 masui Exp $
+/////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////
+// プログラムファイル読み込み
+require("func.php");
+require("file.php");
+require("plugin.php");
+require("template.php");
+require("html.php");
+require("backup.php");
+require("rss.php");
+
+
+/////////////////////////////////////////////////
+// プログラムファイル読み込み
+require("init.php");
+
+
+/////////////////////////////////////////////////
+// メイン処理
+
+// Plug-in action
+if(!empty($vars["plugin"]) && exist_plugin_action($vars["plugin"]))
+{
+	$retvars = do_plugin_action($vars["plugin"]);
+	
+	$title = strip_bracket($vars["refer"]);
+	$page = make_search($vars["refer"]);
+	
+	if($retvars["msg"])
+	{
+		$title =  str_replace("$1",$title,$retvars["msg"]);
+		$page =  str_replace("$1",$page,$retvars["msg"]);
+	}
+	
+	if(!empty($retvars["body"]))
+	{
+		$body = $retvars["body"];
+	}
+	else
+	{
+		$cmd = "read";
+		$vars["page"] = $vars["refer"];
+		$body = @join("",get_source($vars["refer"]));
+		$body = convert_html($body);
+	}
+}
+// 一覧の表示
+else if(arg_check("list"))
+{
+	header_lastmod($whatsnew);
+	
+	$page = $title = $_title_list;
+	$body = "<ul>\n" . get_list(false) . "</ul>\n";
+}
+// ファイル名一覧の表示
+else if(arg_check("filelist"))
+{
+	header_lastmod($whatsnew);
+
+	$page = $title = $_title_filelist;
+	$body = "<ul>\n" . get_list(true) . "</ul>\n";
+}
+// 編集不可能なページを編集しようとしたとき
+else if(((arg_check("add") || arg_check("edit") || arg_check("preview")) && (is_freeze($vars["page"]) || !is_editable($vars["page"]) || $vars["page"] == "")))
+{
+	$body = $title = str_replace('$1',strip_bracket($vars["page"]),$_title_cannotedit);
+	$page = str_replace('$1',make_search($vars["page"]),$_title_cannotedit);
+
+	if(is_freeze($vars["page"]))
+		$body .= "(<a href=\"$script?cmd=unfreeze&page=".rawurlencode($vars["page"])."\">$_msg_unfreeze</a>)";
+}
+// 追加
+else if(arg_check("add"))
+{
+	$title = str_replace('$1',strip_bracket($get["page"]),$_title_add);
+	$page = str_replace('$1',make_search($get["page"]),$_title_add);
+	$body = "<ul>\n";
+	$body .= "<li>$_msg_add</li>\n";
+	$body .= "</ul>\n";
+	$body .= edit_form("",$get["page"],true);
+}
+// 編集
+else if(arg_check("edit"))
+{
+        $postdata = @join("",get_source($get["page"]));
+	if($postdata == '') {
+		$postdata = auto_template($get["page"]);
+	}  
+	$title = str_replace('$1',strip_bracket($get["page"]),$_title_edit);
+	$page = str_replace('$1',make_search($get["page"]),$_title_edit);
+	$body = edit_form($postdata,$get["page"]);
+}
+// プレビュー
+else if(arg_check("preview") || $post["preview"] || $post["template"])
+{
+        if($post["template"] && page_exists($post["template_page"]))
+	{
+		$post["msg"] = @join("",get_source($post["template_page"]));
+	}
+	
+	$post["msg"] = preg_replace("/^#freeze\n/","",$post["msg"]);
+	$postdata_input = $post["msg"];
+
+	if($post["add"])
+	{
+		if($post["add_top"])
+		{
+			$postdata  = $post["msg"];
+			$postdata .= "\n\n";
+			$postdata .= @join("",get_source($post["page"]));
+		}
+		else
+		{
+			$postdata  = @join("",get_source($post["page"]));
+			$postdata .= "\n\n";
+			$postdata .= $post["msg"];
+		}
+	}
+	else
+	{
+		$postdata = $post["msg"];
+	}
+
+	$title = str_replace('$1',strip_bracket($post["page"]),$_title_preview);
+	$page = str_replace('$1',make_search($post["page"]),$_title_preview);
+
+	$body = "$_msg_preview<br>\n";
+	if($postdata == "") $body .= "<b>$_msg_preview_delete</b><br>\n";
+	else                $body .= "<br>\n";
+
+	if($postdata != "")
+	{
+		$postdata = convert_html($postdata);
+		
+		$body .= "<table width=\"100%\" bgcolor=\"$preview_color\">\n"
+			."<tr><td>\n"
+			.$postdata
+			."\n</td></tr>\n"
+			."</table>\n";
+	}
+
+	if($post["add"])
+	{
+		if($post["add_top"]) $checked_top = " checked";
+		$addtag = '<input type="hidden" name="add" value="true">';
+		$add_top = '<input type="checkbox" name="add_top" value="true"'.$checked_top.'><small>ページの上に追加</small>';
+	}
+	if($post["notimestamp"]) $checked_time = "checked";
+
+	$body .= "<form action=\"$script\" method=\"post\">\n"
+		."<input type=\"hidden\" name=\"help\" value=\"$post[add]\">\n"
+		."<input type=\"hidden\" name=\"page\" value=\"".$post["page"]."\">\n"
+		."<input type=\"hidden\" name=\"digest\" value=\"".$post["digest"]."\">\n"
+		."$addtag\n"
+		."<textarea name=\"msg\" rows=\"$rows\" cols=\"$cols\" wrap=\"virtual\">\n".htmlspecialchars($postdata_input)."</textarea><br>\n"
+		."<input type=\"submit\" name=\"preview\" value=\"$_btn_repreview\" accesskey=\"p\">\n"
+		."<input type=\"submit\" name=\"write\" value=\"$_btn_update\" accesskey=\"s\">\n"
+		."$add_top\n"
+		."<input type=\"checkbox\" name=\"notimestamp\" value=\"true\" $checked_time><small>$_btn_notchangetimestamp</small>\n"
+		."</form>\n";
+}
+// 書き込みもしくは追加もしくはコメントの挿入
+else if($post["write"])
+{
+	$post["msg"] = preg_replace("/^#freeze\n/","",$post["msg"]);
+	$postdata_input = $post["msg"];
+
+	if($post["add"])
+	{
+		if($post["add_top"])
+		{
+			$postdata  = $post["msg"];
+			$postdata .= "\n\n";
+			$postdata .= @join("",get_source($post["page"]));
+		}
+		else
+		{
+			$postdata  = @join("",get_source($post["page"]));
+			$postdata .= "\n\n";
+			$postdata .= $post["msg"];
+		}
+	}
+	else
+	{
+		$postdata = $post["msg"];
+	}
+
+        $oldpagesrc = get_source($post["page"]);
+	if(md5(join("",$oldpagesrc)) != $post["digest"])
+	{
+		$title = str_replace('$1',strip_bracket($post["page"]),$_title_collided);
+		$page = str_replace('$1',make_search($post["page"]),$_title_collided);
+		$post["digest"] = md5(join("",($oldpagesrc)));
+		list($postdata_input,$auto) = do_update_diff(join("",$oldpagesrc),$postdata_input);
+		
+		if($auto) {
+		  $body = $_msg_collided_auto."\n";
+		}
+		else {
+		  $body = $_msg_collided."\n";
+		}
+		$body .= "<form action=\"$script\" method=\"post\">\n"
+			."<input type=\"hidden\" name=\"page\" value=\"".$post["page"]."\">\n"
+			."<input type=\"hidden\" name=\"digest\" value=\"".$post["digest"]."\">\n"
+			."<textarea name=\"msg\" rows=\"$rows\" cols=\"$cols\" wrap=\"virtual\" id=\"textarea\">$postdata_input</textarea><br>\n"
+			."<input type=\"submit\" name=\"preview\" value=\"$_btn_repreview\" accesskey=\"p\">\n"
+			."<input type=\"submit\" name=\"write\" value=\"$_btn_update\" accesskey=\"s\">\n"
+			."$add_top\n"
+			."<input type=\"checkbox\" name=\"notimestamp\" value=\"true\" $checked_time><small>$_btn_notchangetimestamp</small>\n"
+			."</form>\n";
+	}
+	else
+	{
+		$postdata = user_rules_str($postdata);
+
+		// 差分ファイルの作成
+		if(is_page($post["page"]))
+			$oldpostdata = join("",get_source($post["page"]));
+		else
+			$oldpostdata = "\n";
+		if($postdata)
+			$diffdata = do_diff($oldpostdata,$postdata);
+		file_write(DIFF_DIR,$post["page"],$diffdata);
+
+		// バックアップの作成
+		if(is_page($post["page"]))
+			$oldposttime = filemtime(get_filename(encode($post["page"])));
+		else
+			$oldposttime = time();
+
+		// 編集内容が何も書かれていないとバックアップも削除する?しないですよね。
+		if(!$postdata && $del_backup)
+			backup_delete(BACKUP_DIR.encode($post["page"]).".txt");
+		else if($do_backup && is_page($post["page"]))
+			make_backup(encode($post["page"]).".txt",$oldpostdata,$oldposttime);
+
+		// ファイルの書き込み
+		file_write(DATA_DIR,$post["page"],$postdata);
+
+		// is_pageのキャッシュをクリアする。
+		is_page($post["page"],true);
+
+		if($postdata)
+		{
+			$title = str_replace('$1',strip_bracket($post["page"]),$_title_updated);
+			$page = str_replace('$1',make_search($post["page"]),$_title_updated);
+			$body = convert_html($postdata);
+			header("Location: $script?".rawurlencode($post["page"]));
+		}
+		else
+		{
+			$title = str_replace('$1',strip_bracket($post["page"]),$_title_deleted);
+			$page = str_replace('$1',make_search($post["page"]),$_title_deleted);
+			$body = str_replace('$1',strip_bracket($post["page"]),$_title_deleted);
+		}
+	}
+}
+// 凍結
+else if(arg_check("freeze") && $vars["page"] && $function_freeze)
+{
+	if(is_freeze($vars["page"]))
+	{
+		$title = str_replace('$1',strip_bracket($vars["page"]),$_title_isfreezed);
+		$page = str_replace('$1',make_search($vars["page"]),$_title_isfreezed);
+		$body = str_replace('$1',strip_bracket($vars["page"]),$_title_isfreezed);
+	}
+	else if(md5($post["pass"]) == $adminpass)
+	{
+		$postdata = get_source($post["page"]);
+		$postdata = join("",$postdata);
+		$postdata = "#freeze\n".$postdata;
+
+		file_write(DATA_DIR,$vars["page"],$postdata);
+
+		$title = str_replace('$1',strip_bracket($vars["page"]),$_title_freezed);
+		$page = str_replace('$1',make_search($vars["page"]),$_title_freezed);
+		$postdata = join("",get_source($vars["page"]));
+		$postdata = convert_html($postdata);
+
+		$body = $postdata;
+	}
+	else
+	{
+		$title = str_replace('$1',strip_bracket($vars["page"]),$_title_freeze);
+		$page = str_replace('$1',make_search($vars["page"]),$_title_freeze);
+
+		$body.= "<br>\n";
+		
+		if($post["pass"])
+			$body .= "<b>$_msg_invalidpass</b><br>\n";
+		else
+			$body.= "$_msg_freezing<br>\n";
+		
+		$body.= "<form action=\"$script?cmd=freeze\" method=\"post\">\n";
+		$body.= "<input type=\"hidden\" name=\"page\" value=\"$vars[page]\">\n";
+		$body.= "<input type=\"password\" name=\"pass\" size=\"12\">\n";
+		$body.= "<input type=\"submit\" name=\"ok\" value=\"$_btn_freeze\">\n";
+		$body.= "</form>\n";
+	}
+}
+//凍結の解除
+else if(arg_check("unfreeze") && $vars["page"] && $function_freeze)
+{
+	if(!is_freeze($vars["page"]))
+	{
+		$title = str_replace('$1',strip_bracket($vars["page"]),$_title_isunfreezed);
+		$page = str_replace('$1',make_search($vars["page"]),$_title_isunfreezed);
+		$body = str_replace('$1',strip_bracket($vars["page"]),$_title_isunfreezed);
+	}
+	else if(md5($post["pass"]) == $adminpass)
+	{
+		$postdata = get_source($post["page"]);
+		array_shift($postdata);
+		$postdata = join("",$postdata);
+
+		file_write(DATA_DIR,$vars["page"],$postdata);
+
+		$title = str_replace('$1',strip_bracket($vars["page"]),$_title_unfreezed);
+		$page = str_replace('$1',make_search($vars["page"]),$_title_unfreezed);
+		
+		$postdata = join("",get_source($vars["page"]));
+		$postdata = convert_html($postdata);
+		
+		$body = $postdata;
+	}
+	else
+	{
+		$title = str_replace('$1',strip_bracket($vars["page"]),$_title_unfreeze);
+		$page = str_replace('$1',make_search($vars["page"]),$_title_unfreeze);
+
+		$body.= "<br>\n";
+
+		if($post["pass"])
+			$body .= "<b>$_msg_invalidpass</b><br>\n";
+		else
+			$body.= "$_msg_unfreezing<br>\n";
+
+		$body.= "<form action=\"$script?cmd=unfreeze\" method=\"post\">\n";
+		$body.= "<input type=\"hidden\" name=\"page\" value=\"$vars[page]\">\n";
+		$body.= "<input type=\"password\" name=\"pass\" size=\"12\">\n";
+		$body.= "<input type=\"submit\" name=\"ok\" value=\"$_btn_unfreeze\">\n";
+		$body.= "</form>\n";
+	}
+}
+// 差分の表示
+else if(arg_check("diff"))
+{
+	$pagename = strip_bracket($get["page"]);
+	if(!is_page($get["page"]))
+	{
+		$title = $pagename;
+		$page = make_search($vars["page"]);
+		$body = "指定されたページは見つかりませんでした。";
+	}
+	else
+	{
+		$link = str_replace('$1',"<a href=\"$script?".rawurlencode($get["page"])."\">$pagename</a>",$_msg_goto);
+		
+		$body =  "<ul>\n"
+			."<li>$_msg_addline</li>\n"
+			."<li>$_msg_delline</li>\n"
+			."<li>$link</li>\n"
+			."</ul>\n"
+			."$hr\n";
+	}
+
+	if(!file_exists(DIFF_DIR.encode($get["page"]).".txt") && is_page($get["page"]))
+	{
+		$title = str_replace('$1',strip_bracket($get["page"]),$_title_diff);
+		$page = str_replace('$1',make_search($get["page"]),$_title_diff);
+
+		$diffdata = get_source($get["page"]);
+		$body .= "<font color=\"blue\">\n"
+			."<pre>\n"
+			.join("",$diffdata)
+			."\n"
+			."</pre>\n"
+			."</font>\n";
+	}
+	else if(file_exists(DIFF_DIR.encode($get["page"]).".txt"))
+	{
+		$title = str_replace('$1',strip_bracket($get["page"]),$_title_diff);
+		$page = str_replace('$1',make_search($get["page"]),$_title_diff);
+
+		$diffdata = file(DIFF_DIR.encode($get["page"]).".txt");
+		$diffdata = preg_replace("/</","&lt;",$diffdata);
+		$diffdata = preg_replace("/>/","&gt;",$diffdata);
+		$diffdata = preg_replace("/^(\-)(.*)/","<font color=\"red\"> $2</font>",$diffdata);
+		$diffdata = preg_replace("/^(\+)(.*)/","<font color=\"blue\"> $2</font>",$diffdata);
+		
+		$body .= "<pre>\n"
+			.join("",$diffdata)
+			."\n"
+			."</pre>\n";
+	}
+}
+// 検索
+else if(arg_check("search"))
+{
+	if($vars["word"])
+	{
+		$title = $page = str_replace('$1',$vars["word"],$_title_result);
+	}
+	else
+	{
+		$page = $title = $_title_search;
+	}
+
+	if($vars["word"])
+		$body = do_search($vars["word"],$vars["type"]);
+	else
+		$body = "<br>\n$_msg_searching";
+
+	if($vars["type"]=="AND" || !$vars["type"]) $and_check = "checked";
+	else if($vars["type"]=="OR")               $or_check = "checked";
+
+	$body .= "<form action=\"$script?cmd=search\" method=\"post\">\n"
+		."<input type=\"text\" name=\"word\" size=\"20\" value=\"".$vars["word"]."\">\n"
+		."<input type=\"radio\" name=\"type\" value=\"AND\" $and_check>$_btn_and\n"
+		."<input type=\"radio\" name=\"type\" value=\"OR\" $or_check>$_btn_or\n"
+		."&nbsp;<input type=\"submit\" value=\"$_btn_search\">\n"
+		."</form>\n";
+}
+// バックアップ
+else if($do_backup && arg_check("backup"))
+{
+	if($get["page"] && $get["age"] && (file_exists(BACKUP_DIR.encode($get["page"]).".txt") || file_exists(BACKUP_DIR.encode($get["page"]).".gz")))
+	{
+		$pagename = strip_bracket($get["page"]);
+		$body =  "<ul>\n";
+
+		$body .= "<li><a href=\"$script?cmd=backup\">$_msg_backuplist</a></li>\n";
+
+		if(!arg_check("backup_diff") && is_page($get["page"]))
+		{
+			$link = str_replace('$1',"<a href=\"$script?cmd=backup_diff&page=".rawurlencode($get["page"])."&age=$get[age]\">$_msg_diff</a>",$_msg_view);
+			$body .= "<li>$link</li>\n";
+		}
+		if(!arg_check("backup_nowdiff") && is_page($get["page"]))
+		{
+			$link = str_replace('$1',"<a href=\"$script?cmd=backup_nowdiff&page=".rawurlencode($get["page"])."&age=$get[age]\">$_msg_nowdiff</a>",$_msg_view);
+			$body .= "<li>$link</li>\n";
+		}
+		if(!arg_check("backup_source"))
+		{
+			$link = str_replace('$1',"<a href=\"$script?cmd=backup_source&page=".rawurlencode($get["page"])."&age=$get[age]\">$_msg_source</a>",$_msg_view);
+			$body .= "<li>$link</li>\n";
+		}
+		if(arg_check("backup_diff") || arg_check("backup_source") || arg_check("backup_nowdiff"))
+		{
+			$link = str_replace('$1',"<a href=\"$script?cmd=backup&page=".rawurlencode($get["page"])."&age=$get[age]\">$_msg_backup</a>",$_msg_view);
+			$body .= "<li>$link</li>\n";
+		}
+		
+		if(is_page($get["page"]))
+		{
+			$link = str_replace('$1',"<a href=\"$script?".rawurlencode($get["page"])."\">$pagename</a>",$_msg_goto);
+			$body .=  "<li>$link</li>\n";
+		}
+		else
+		{
+			$link = str_replace('$1',$pagename,$_msg_deleleted);
+			$body .=  "<li>$link</li>\n";
+		}
+
+		$backups = array();
+		$backups = get_backup_info(encode($get["page"]).".txt");
+		if(count($backups)) $body .= "<ul>\n";
+		foreach($backups as $key => $val)
+		{
+			$ins_date = date($date_format,$val);
+			$ins_time = date($time_format,$val);
+			$ins_week = "(".$weeklabels[date("w",$val)].")";
+			$backupdate = "($ins_date $ins_week $ins_time)";
+			if($key != $get["age"])
+				$body .= "<li><a href=\"$script?cmd=$get[cmd]&page=".rawurlencode($get["page"])."&age=$key\">$key $backupdate</a></li>\n";
+			else
+				$body .= "<li><i>$key $backupdate</i></li>\n";
+		}
+		if(count($backups)) $body .= "</ul>\n";
+		
+		if(arg_check("backup_diff"))
+		{
+			$title = str_replace('$1',$pagename,$_title_backupdiff)."(No.$get[age])";
+			$page = str_replace('$1',make_search($get["page"]),$_title_backupdiff)."(No.$get[age])";
+			
+			$backupdata = @join("",get_backup($get[age]-1,encode($get["page"]).".txt"));
+			$postdata = @join("",get_backup($get[age],encode($get["page"]).".txt"));
+			$diffdata = split("\n",do_diff($backupdata,$postdata));
+		}
+		else if(arg_check("backup_nowdiff"))
+		{
+			$title = str_replace('$1',$pagename,$_title_backupnowdiff)."(No.$get[age])";
+			$page = str_replace('$1',make_search($get["page"]),$_title_backupnowdiff)."(No.$get[age])";
+			
+			$backupdata = @join("",get_backup($get[age],encode($get["page"]).".txt"));
+			$postdata = @join("",get_source($get["page"]));
+			$diffdata = split("\n",do_diff($backupdata,$postdata));
+		}
+		else if(arg_check("backup_source"))
+		{
+			$title = str_replace('$1',$pagename,$_title_backupsource)."(No.$get[age])";
+			$page = str_replace('$1',make_search($get["page"]),$_title_backupsource)."(No.$get[age])";
+			$backupdata = join("",get_backup($get[age],encode($get["page"]).".txt"));
+			
+			$body.="</ul>\n<pre>\n$backupdata</pre>\n";
+		}
+		else
+		{
+			$pagename = strip_bracket($get["page"]);
+			$title = str_replace('$1',$pagename,$_title_backup)."(No.$get[age])";
+			$page = str_replace('$1',make_search($get["page"]),$_title_backup)."(No.$get[age])";
+			$backupdata = join("",get_backup($get[age],encode($get["page"]).".txt"));
+			$backupdata = convert_html($backupdata);
+			$body .= "</ul>\n"
+				."$hr\n";
+			$body .= $backupdata;
+		}
+		
+		if(arg_check("backup_diff") || arg_check("backup_nowdiff"))
+		{
+			$diffdata = preg_replace("/</","&lt;",$diffdata);
+			$diffdata = preg_replace("/>/","&gt;",$diffdata);
+			$diffdata = preg_replace("/^(\-)(.*)/","<font color=\"red\"> $2</font>",$diffdata);
+			$diffdata = preg_replace("/^(\+)(.*)/","<font color=\"blue\"> $2</font>",$diffdata);
+
+			$body .= "<br>\n"
+				."<li>$_msg_addline</li>\n"
+				."<li>$_msg_delline</li>\n"
+				."</ul>\n"
+				."$hr\n"
+				."<pre>\n".join("\n",$diffdata)."</pre>\n";
+		}
+	}
+	else if($get["page"] && (file_exists(BACKUP_DIR.encode($get["page"]).".txt") || file_exists(BACKUP_DIR.encode($get["page"]).".gz")))
+	{
+		$title = str_replace('$1',strip_bracket($get["page"]),$_title_pagebackuplist);
+		$page = str_replace('$1',make_search($get["page"]),$_title_pagebackuplist);
+		$body = get_backup_list($get["page"]);
+	}
+	else
+	{
+		$page = $title = $_title_backuplist;
+		$body = get_backup_list();
+	}
+}
+// ヘルプの表示
+else if(arg_check("help"))
+{
+	$title = $page = "ヘルプ";
+	$body = catrule();
+}
+// MD5パスワードへの変換
+else if($vars["md5"])
+{
+	$title = $page = "Make password of MD5";
+	$body = "$vars[md5] : ".md5($vars["md5"]);
+}
+else if(arg_check("rss"))
+{
+	if(!arg_check("rss10"))
+		catrss(1);
+	else
+		catrss(2);
+	die();
+}
+// ページの表示とInterWikiNameの解釈
+else if((arg_check("read") && $vars["page"] != "") || (!arg_check("read") && $arg != "" && $vars["page"] == ""))
+{
+	// アクションを明示的に指定していない場合ページ名として解釈
+	if($arg != "" && $vars["page"] == "" && $vars["cmd"] == "")
+	{
+		$post["page"] = $arg;
+		$get["page"] = $arg;
+		$vars["page"] = $arg;
+	}
+	
+	// ページ名がWikiNameでなく、BracketNameでなければBracketNameとして解釈
+	if(!preg_match("/^(($WikiName)|($BracketName)|($InterWikiName))$/",$get["page"]))
+	{
+		$vars["page"] = "[[$vars[page]]]";
+		$get["page"] = $vars["page"];
+	}
+
+	// WikiName、BracketNameが示すページを表示
+	if(is_page($get["page"]))
+	{
+		$postdata = join("",get_source($get["page"]));
+		$postdata = convert_html($postdata);
+
+		$title = strip_bracket($get["page"]);
+		$page = make_search($get["page"]);
+		$body = $postdata;
+
+		header_lastmod($vars["page"]);
+	}
+	else if(preg_match("/($InterWikiName)/",$get["page"],$match))
+	{
+	// InterWikiNameの判別とページの表示
+		$interwikis = open_interwikiname_list();
+		
+		if(!$interwikis[$match[2]]["url"])
+		{
+			$title = $page = $_title_invalidiwn;
+			$body = str_replace('$1',strip_bracket($get[page]),str_replace('$2',"<a href=\"$script?InterWikiName\">InterWikiName</a>",$_msg_invalidiwn));
+		}
+		else
+		{
+			// 文字エンコーディング
+			if($interwikis[$match[2]]["opt"] == "yw")
+			{
+				// YukiWiki系
+				if(!preg_match("/$WikiName/",$match[3]))
+					$match[3] = "[[".mb_convert_encoding($match[3],"SJIS","auto")."]]";
+			}
+			else if($interwikis[$match[2]]["opt"] == "moin")
+			{
+				// moin系
+				if(function_exists("mb_convert_encoding"))
+				{
+					$match[3] = rawurlencode(mb_convert_encoding($match[3],"EUC-JP","auto"));
+					$match[3] = str_replace("%","_",$match[3]);
+				}
+				else
+					$not_mb = 1;
+			}
+			else if($interwikis[$match[2]]["opt"] == "" || $interwikis[$match[2]]["opt"] == "std")
+			{
+				// 内部文字エンコーディングのままURLエンコード
+				$match[3] = rawurlencode($match[3]);
+			}
+			else if($interwikis[$match[2]]["opt"] == "asis" || $interwikis[$match[2]]["opt"] == "raw")
+			{
+				// URLエンコードしない
+				$match[3] = $match[3];
+			}
+			else if($interwikis[$match[2]]["opt"] != "")
+			{
+				// エイリアスの変換
+				if($interwikis[$match[2]]["opt"] == "sjis")
+					$interwikis[$match[2]]["opt"] = "SJIS";
+				else if($interwikis[$match[2]]["opt"] == "euc")
+					$interwikis[$match[2]]["opt"] = "EUC-JP";
+				else if($interwikis[$match[2]]["opt"] == "utf8")
+					$interwikis[$match[2]]["opt"] = "UTF-8";
+
+				// その他、指定された文字コードへエンコードしてURLエンコード
+				if(function_exists("mb_convert_encoding"))
+					$match[3] = rawurlencode(mb_convert_encoding($match[3],$interwikis[$match[2]]["opt"],"auto"));
+				else
+					$not_mb = 1;
+			}
+
+			if(strpos($interwikis[$match[2]]["url"],'$1') !== FALSE)
+				$url = str_replace('$1',$match[3],$interwikis[$match[2]]["url"]);
+			else
+				$url = $interwikis[$match[2]]["url"] . $match[3];
+
+			if($not_mb)
+			{
+				$title = $page = "Not support mb_jstring.";
+				$body = "This server's PHP does not have \"mb_jstring\" module.Cannot convert encoding.";
+			}
+			else
+			{
+				header("Location: $url");
+				die();
+			}
+		}
+	}
+	// WikiName、BracketNameが見つからず、InterWikiNameでもない場合
+	else
+	{
+		//$title = strip_bracket($get["page"]);
+		//$page = make_search($get["page"]);
+		//$body = "指定されたページは見つかりませんでした。";
+
+		$title = str_replace('$1',strip_bracket($get["page"]),$_title_edit);
+		$page = str_replace('$1',make_search($get["page"]),$_title_edit);
+		$template = auto_template($get["page"]);
+		$body = edit_form($template,$get["page"]);
+	}
+}
+// 何も指定されない場合、トップページを表示
+else
+{
+	$postdata = join("",get_source($defaultpage));
+
+	$vars["page"] = $defaultpage;
+	$title = strip_bracket($defaultpage);
+	$page = make_search($vars["page"]);
+	$body = convert_html($postdata);
+
+	header_lastmod($vars["page"]);
+}
+
+// ** 出力処理 **
+catbody($title,$page,$body);
+
+// ** 終了 **
+?>

--- a/readme.txt
+++ b/readme.txt
@@ -1,12 +1,18 @@
 NAME
     PukiWiki - 自由にページを追加・削除・編集できるWebページ構築PHPスクリプト
 
+       PukiWiki 1.3.1beta MASUI'z Edition
+        Copyright (C) 2001,2002 by sng, MASUI.
+        Yuichiro MASUI <[e-mail]>
+        http://masui.net/pukiwiki/
+
+       PukiWiki 1.3 (based)
         Copyright (C) 2001,2002 by sng.
         sng <[e-mail]>
         http://factage.com/sng/
 
 SYNOPSIS
-        http://factage.com/sng/pukiwiki/pukiwiki.php
+        http://masui.net/pukiwiki/
 
 DESCRIPTION
     PukiWikiは参加者が自由にページを追加・削除・編集できる
@@ -16,6 +22,8 @@ DESCRIPTION
     PukiWikiは、Webページ全体を自由に変更することができます。
 
     PukiWikiは、結城浩さんのYukiWikiの仕様を参考にして独自に作られました。
+    PukiWiki(MASUI'z Edition)は、sngさんのPukiWiki 1.3を元にプラグインなどを
+    まとめたものです。
 
     PukiWikiはPHPで書かれたPHPスクリプトとして実現されていますので、
     PHPが動作するWebサーバならば比較的容易に設置できます。
@@ -25,7 +33,7 @@ DESCRIPTION
 設置方法
   入手
 
-    PukiWikiの最新版は、 http://factage.com/sng/php/ から入手できます。
+    PukiWiki(MASUI'z Edition)の最新版は、 http://masui.net/pukiwiki/ から入手できます。
 
   ファイル一覧
 
@@ -42,21 +50,28 @@ DESCRIPTION
     2.  必要に応じてpukiwiki.ini.phpの設定を確認します。
         1.11 から設定ファイルが別ファイルのpukiwiki.ini.phpになりました。
 
-    3.  pukiwiki.phpとpukiwiki.gifを同じところに設置します。
+    3.  *.phpとpukiwiki.gifを同じところに設置します。
 
-    4.  さらにpukiwiki.phpと同じところにpukiwiki.ini.phpとpukiwiki.skin.ja.php、        もしくはpukiwiki.skin.en.phpを同じところに設置します。
+    4.  さらに*.phpと同じところにpukiwiki.ini.phpとpukiwiki.skin.ja.php、
+        もしくはpukiwiki.skin.en.phpを同じところに設置します。
 
-    5.  pukiwiki.php内で指定したデータファイルディレクトリを
+    5.  pukiwiki.ini.php内で指定したデータファイルディレクトリを
         属性 777 で作成する。(ディフォルトは wiki )
 
-    6.  pukiwiki.php内で指定した差分ファイルディレクトリを
+    6.  pukiwiki.ini.php内で指定した差分ファイルディレクトリを
         属性 777 で作成する。(ディフォルトは diff )
 
     7.  自動バックアップ機能(ディフォルトでは off)を使う場合、
-        pukiwiki.php内で指定した差分ファイルディレクトリを
-        属性 777 で作成する。(ディフォルトは diff )
+        pukiwiki.ini.php内で指定した差分ファイルディレクトリを
+        属性 777 で作成する。(ディフォルトは backup )
+
+    8.  attach.inc.php内で指定した添付ファイルディレクトリを
+        属性 777 で作成する。(ディフォルトは attach )
 
-    8.  pukiwiki.phpにブラウザからアクセスします。
+    9.  counter.inc.php内で指定したカウンターファイルディレクトリを
+        属性 777 で作成する。(ディフォルトは counter )
+
+    10. pukiwiki.phpにブラウザからアクセスします。
 
   パーミッション
 
@@ -67,13 +82,24 @@ DESCRIPTION
             pukiwiki.skin.ja.php 644                 ASCII
             en.lng               644                 ASCII
             ja.lng               644                 ASCII
+	    func.php             644                 ASCII
+	    file.php             644                 ASCII
+	    html.php             644                 ASCII
+	    init.php             644                 ASCII
+	    plugin.php           644                 ASCII
+	    template.php         644                 ASCII
+	    rss.php              644                 ASCII
+	    backup.php           644                 ASCII
             pukiwiki.gif         644                 BINARY
 
             ディレクトリ         パーミッション
             wiki                 777
             diff                 777
             backup               777
-            plug-in              777
+            attach               777
+            counter              777
+            skin                 755
+            plug-in              755
 
    データのバックアップ方法
 
@@ -157,14 +183,14 @@ DESCRIPTION
             大かっこの中にはスペースを含めてはいけません。
             日本語も使えます。
 
-        *   また、[[factage:http://factage.com/]] のようにすると factage の文字に
-            http://factage.com/ へのリンクが貼れます。
+        *   また、[[pukiwiki:http://masui.net/pukiwiki/]] のようにすると factage の文字に
+            http://masui.net/pukiwiki/ へのリンクが貼れます。
 
         *   [[サーバ名:WikiName]] のようにすると InterWikiName になります。
 
-        *   http://factage.com/sng/ のようなURLは自動的にリンクになります。
+        *   http://masui.net/pukiwiki/ のようなURLは自動的にリンクになります。
 
-        *   [e-mail] のようなメールアドレスも自動的にリンクになります。
+        *   [e-mail] のようなメールアドレスも自動的にリンクになります。
 
     *   行頭がスペースやタブで始まっていると、
         それは整形済みの段落`<pre>'として扱われます。
@@ -204,27 +230,27 @@ InterWiki
     InterWikiName のページに以下のようにサーバの定義をする。 
 
     *   [URL サーバ名] タイプ
-    *   [http://factage.com/sng/pukiwiki/pukiwiki.php?read&page= sng] pw
+    *   [http://masui.net/pukiwiki/pukiwiki.php?read&page= pukiwiki] pw
 
 
   InterWikiNameの追加 
     サーバ名:WikiNameをBracketNameで作ればInterWikiNameの完成 
 
     *   [[サーバ名:WikiName]]
-    *   [[sng:FrontPage]]
+    *   [[pukiwiki:FrontPage]]
 
   WikiNameの挿入位置 
     要求しようとするURLへのWikiNameの挿入位置を $1 で指定することができます。
     省略するとお尻にくっつきます。 
 
-    *   [http://factage.com/sng/pukiwiki/pukiwiki.php?backup&page=$1&age=1 sng] pw
+    *   [http://masui.net/pukiwiki/pukiwiki.php?backup&page=$1&age=1 pukiwiki] pw
 
 
   文字コード変換タイプ 
     PukiWikiページ以外にも飛ばせます。日本語をURLに含む可能性もあるのでその場合の
     エンコーディングの指定をタイプとして指定できます。 
 
-    *   [http://factage.com/sng/pukiwiki/pukiwiki.php?read&page=$1 sng] pw
+    *   [http://masui.net/pukiwiki/pukiwiki.php?read&page=$1 pukiwiki] pw
 
 
     *   std 省略時
@@ -264,14 +290,26 @@ RDF/RSS
 
   RSS 0.91 の出力方法の例
 
-    *   http://factage.com/sng/pukiwiki/pukiwiki.php?rss
+    *   http://masui.net/pukiwiki/pukiwiki.php?rss
 
   RSS 1.0 の出力方法の例
 
-    *   http://factage.com/sng/pukiwiki/pukiwiki.php?rss10
+    *   http://masui.net/pukiwiki/pukiwiki.php?rss10
 
 更新履歴
-    *   2002-03-18 1.3
+    *   2002-06-10 1.3.1beta MASUI'z Edition
+
+        PukiWiki 1.3をベースに、MASUIが勝手にプラグインとかまとめてみました。
+        ソースファイルを分割。
+        calendar2, include, article, memo, aname, anchor, counter, vote, ls, yetlist, recent, source, imgプラグインを添付。
+        attach, commentプラグインバージョンアップ。
+        本文に、タグが入っていた場合、編集がうまくできなかった不具合を修正。
+        更新衝突時にdiffアルゴリズムで差分をとり、マージを行う様に変更。
+	&amp; &lt;などを含んだ文章を編集すると、それが消えてしまう場合がある不具合を修正。
+	自動テンプレート機能を追加。[[SandBox/template]]
+        ソースファイルを分割。
+
+    *   2002-03-18 1.3 by sng.
 
         ある文字列へWikiName/BracketNameへのリンクを貼る。(エイリアス機能)
         疑似ディレクトリ構想。./ や ../ などをBracketNameとして使用することで実現。 
@@ -282,7 +320,7 @@ RDF/RSS
         一部の整形ルールをプラグイン化する。
         Win32でも正常に動作するように修正
 
-    *   2002-02-15 1.2.12
+    *   2002-02-15 1.2.12 by sng.
 
         バックアップの挙動の変更 
         現在表示しているページのみのバックアップ一覧を表示する 
@@ -298,46 +336,51 @@ RDF/RSS
         #norelated を行頭に書くと関連ページを表示しないルールを追加 
         関連ページの区切り文字を整形ルール用と分けた 
 
-    *   2002-02-09 1.2.11 関連リンク常時表示機能、経過時間表示機能、セキュリティ対策、コマンドを cmd= に修正。その他バグ修正。 
+    *   2002-02-09 1.2.11 by sng. 関連リンク常時表示機能、経過時間表示機能、セキュリティ対策、コマンドを cmd= に修正。その他バグ修正。 
 
-    *   2002-02-09 1.2.1 バグ修正、高速化、RDF/RSS(1.0,0.91)の実装。
+    *   2002-02-09 1.2.1 by sng. バグ修正、高速化、RDF/RSS(1.0,0.91)の実装。
 
-    *   2002-02-07 1.2.0 設定ファイルを外部へ、InterWiki搭載、関連ページルール、注釈ルール、httpリンクルール、バグ修正。
+    *   2002-02-07 1.2.0 by sng. 設定ファイルを外部へ、InterWiki搭載、関連ページルール、注釈ルール、httpリンクルール、バグ修正。
 
-    *   2002-02-05 1.10 スキン機能、コメント挿入、見出し目次作成、その他バグ修正。
+    *   2002-02-05 1.10 by sng. スキン機能、コメント挿入、見出し目次作成、その他バグ修正。
 
-    *   2002-02-01 1.07 追加機能、ユーザ定義ルール、単語AND/OR検索の実装。
+    *   2002-02-01 1.07 by sng. 追加機能、ユーザ定義ルール、単語AND/OR検索の実装。
 
-    *   2001-01-22 1.06 ページ編集時エラーの修正。ページタイトルの[[]]も取り除くように。
+    *   2001-01-22 1.06 by sng. ページ編集時エラーの修正。ページタイトルの[[]]も取り除くように。
 
-    *   2001-12-12 1.05 差分アルゴリズムの修正、自動バックアップ機能追加。
+    *   2001-12-12 1.05 by sng. 差分アルゴリズムの修正、自動バックアップ機能追加。
 
-    *   2001-12-10 1.01 メールアドレスリンクの不備の修正(thanks to s.sawada)
+    *   2001-12-10 1.01 by sng. メールアドレスリンクの不備の修正(thanks to s.sawada)
 
-    *   2001-12-05 1.00 正式公開。検索結果からのハイライト表示機能の削除。
+    *   2001-12-05 1.00 by sng. 正式公開。検索結果からのハイライト表示機能の削除。
 
-    *   2001-11-29 0.96 またまたいくつかのバグの修正。差分の追加。まだまだ未完、とりあえず。 
+    *   2001-11-29 0.96 by sng. またまたいくつかのバグの修正。差分の追加。まだまだ未完、とりあえず。 
 
-    *   2001-11-28 0.94 いくつかのバグの修正。日付・時刻挿入ルールの追加。 
+    *   2001-11-28 0.94 by sng. いくつかのバグの修正。日付・時刻挿入ルールの追加。 
 
-    *   2001-11-27 0.93 コードの清書。検索結果からのページ表示時ハイライト表示。 
+    *   2001-11-27 0.93 by sng. コードの清書。検索結果からのページ表示時ハイライト表示。 
 
-    *   2001-11-26 0.92 データファイル名を YukiWiki と共通の変換方法にした。 
+    *   2001-11-26 0.92 by sng. データファイル名を YukiWiki と共通の変換方法にした。 
 
-    *   2001-11-25 0.91 即日にして単語検索機能が追加。差分は結構かかりそう。 
+    *   2001-11-25 0.91 by sng. 即日にして単語検索機能が追加。差分は結構かかりそう。 
 
-    *   2001-11-25 0.90 一応公開。YukiWiki の検索と差分はまだ。
+    *   2001-11-25 0.90 by sng. 一応公開。YukiWiki の検索と差分はまだ。
 
 TODO
-        - 予定なし、これから実装される YukiWiki の機能を移植
+        - 予定なし、これから実装される YukiWiki の機能を移植 by sng.
 
 作者
-        Copyright (C) 2001,2002 by sng.
-        sng <[e-mail]>
-        http://factage.com/sng/
-        http://factage.com/sng/pukiwiki/
+        PukiWiki 1.3.1 MASUI'z Edition by
+         Copyright (C) 2002 by sng & MASUI.
+         Yuichiro MASUI <[e-mail]>
+         http://masui.net/pukiwiki/
 
-    質問、意見、バグ報告は [e-mail] にメールしてください。
+        PukiWiki 1.3 by
+         Copyright (C) 2001,2002 by sng.
+         sng <[e-mail]>
+         http://factage.com/sng/
+
+    質問、意見、バグ報告は [e-mail] にメールしてください。
 
 配布条件
     PukiWikiは、 GNU General Public Licenseにて公開します。
@@ -345,6 +388,8 @@ TODO
     PukiWikiはフリーソフトです。 ご自由にお使いください。
 
 謝辞
+    PukiWiki を開発した、sngさんに感謝します。
+
     YukiWiki のクローン化を許可していただいた結城浩さんに感謝します。
 
     本家のWikiWikiを作ったCunningham & Cunningham, Inc.に 感謝します。

--- /dev/null
+++ b/rss.php
@@ -0,0 +1,103 @@
+<?
+// PukiWiki - Yet another WikiWikiWeb clone.
+// $Id: rss.php,v 1.1 2002/06/21 05:21:46 masui Exp $
+/////////////////////////////////////////////////
+
+// RecentChanges の RSS を出力
+function catrss($rss)
+{
+	global $rss_max,$page_title,$WikiName,$BracketName,$script,$whatsnew;
+
+	$lines = get_source($whatsnew);
+	header("Content-type: application/xml");
+
+	$item = "";
+	$rdf_li = "";
+	$cnt = 0;
+	foreach($lines as $line)
+	{
+		if($cnt > $rss_max - 1) break;
+
+		if(preg_match("/(($WikiName)|($BracketName))/",$line,$match))
+		{
+			if($match[2])
+			{
+				$title = $url = $match[1];
+			}
+			else
+			{
+				if(function_exists("mb_convert_encoding"))
+					$title = mb_convert_encoding(strip_bracket($match[1]),"UTF-8","auto");
+				else
+					$title = strip_bracket($match[1]);
+
+				$url = $match[1];
+			}
+			
+			$desc = date("D, d M Y H:i:s T",filemtime(get_filename(encode($match[1]))));
+			
+			if($rss==2)
+				$items.= "<item rdf:about=\"http://".SERVER_NAME.PHP_SELF."?".rawurlencode($url)."\">\n";
+			else
+				$items.= "<item>\n";
+			$items.= " <title>$title</title>\n";
+			$items.= " <link>http://".SERVER_NAME.PHP_SELF."?".rawurlencode($url)."</link>\n";
+			$items.= " <description>$desc</description>\n";
+			$items.= "</item>\n\n";
+			$rdf_li.= "    <rdf:li rdf:resource=\"http://".SERVER_NAME.PHP_SELF."?".rawurlencode($url)."\"/>\n";
+
+		}
+
+		$cnt++;
+	}
+
+	if($rss==1)
+	{
+?>
+<?='<?xml version="1.0" encoding="UTF-8"?>'?>
+
+
+<!DOCTYPE rss PUBLIC "-//Netscape Communications//DTD RSS 0.91//EN"
+            "http://my.netscape.com/publish/formats/rss-0.91.dtd">
+
+<rss version="0.91">
+
+<channel>
+<title><?=$page_title?></title>
+<link><?="http://".SERVER_NAME.PHP_SELF."?$whatsnew"?></link>
+<description>PukiWiki RecentChanges</description>
+<language>ja</language>
+
+<?=$items?>
+</channel>
+</rss>
+<?
+	}
+	else if($rss==2)
+	{
+?>
+<?='<?xml version="1.0" encoding="utf-8"?>'?>
+
+
+<rdf:RDF 
+  xmlns="http://purl.org/rss/1.0/"
+  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?></title>
+  <link><?="http://".SERVER_NAME.PHP_SELF."?$whatsnew"?></link>
+  <description>PukiWiki RecentChanges</description>
+  <items>
+   <rdf:Seq>
+<?=$rdf_li?>
+   </rdf:Seq>
+  </items>
+ </channel>
+
+<?=$items?>
+</rdf:RDF>
+<?
+	}
+}
+?>

--- a/pukiwiki.skin.ja.php
+++ b/skin/pukiwiki.skin.ja.php
@@ -1,7 +1,9 @@
+<? header("Content-Type: text/html; charset=EUC_JP") ?>
 <!-- default skin by sng -->
+<!-- little changed by masui -->
 <html>
 <head>
-<meta http-equiv="content-type" content="text/html; charset=euc-jp">
+<meta http-equiv="content-type" content="text/html; charset=EUC_JP">
 <title>sng's PukiWiki - <?=$title?></title>
 <style>
 <!--
@@ -187,7 +189,8 @@ ul {
 <? if($is_page) { ?>
 [ <a href="<?=$script?>?<?=rawurlencode($vars[page])?>">リロード</a> ]
 &nbsp;
-[ <a href="<?=$link_add?>">追加</a>
+[ <a href="<?=$script?>?plugin=newpage">新規</a>
+<!--| <a href="<?=$link_add?>">追加</a-->
 | <a href="<?=$link_edit?>">編集</a>
 | <a href="<?=$link_diff?>">差分</a>
 | <a href="<?=$script?>?plugin=attach&pcmd=upload&page=<?=rawurlencode($vars[page])?>">添付</a>
@@ -209,9 +212,22 @@ ul {
  ]<br>
 
 <?=$hr?>
-
-<?=$body?>
-
+<?if($is_page){ ?>
+<table cellspacing="1" cellpadding="0" border="0" width="100%">
+ <tr>
+  <td width="120" valign="top" style="word-break:break-all;">
+   <? echo convert_html(@join("",@file(get_filename(encode("MenuBar"))))); ?> 
+  </td>
+ <td width="10">
+ </td>
+  <td valign="top">
+<? } ?>
+   <?=$body?>
+<?if($is_page){ ?>
+  </td>
+ </tr>
+</table>
+<? } ?>
 <?=$hr?>
 
 <?
@@ -234,7 +250,8 @@ if(file_exists(PLUGIN_DIR."attach.inc.php") && $is_read)
 
 &nbsp;
 
-<a href="<?=$link_add?>"><img src="./image/add.gif" width="20" height="20" border="0" alt="追加"></a>
+<a href="<?=$script?>?plugin=newpage"><img src="./image/new.gif" width="20" height="20" border="0" alt="新規"></a>
+<!--a href="<?=$link_add?>"><img src="./image/add.gif" width="20" height="20" border="0" alt="追加"></a-->
 <a href="<?=$link_edit?>"><img src="./image/edit.gif" width="20" height="20" border="0" alt="編集"></a>
 <a href="<?=$link_diff?>"><img src="./image/diff.gif" width="20" height="20" border="0" alt="差分"></a>
 &nbsp;
@@ -268,8 +285,7 @@ if(file_exists(PLUGIN_DIR."attach.inc.php") && $is_read)
 <font face="Verdana" size="1">
 Modified by <a href="<?=$modifierlink?>"><?=$modifier?></a><br>
 <br>
-<b>"PukiWiki" <?=S_VERSION?></b> Copyright &copy; 2001,2002 <a href="mailto:[e-mail]">sng</a>.<br>
-This is Free Software released under the <a href="http://www.gnu.org/">GNU/GPL license</a>.<br>
+<?=S_COPYRIGHT?><br>
 Powered by PHP <?=PHP_VERSION?><br>
 <br>
 HTML convert time to <?=$taketime?> sec.

--- a/pukiwiki.skin.php
+++ b/skin/pukiwiki.skin.php
@@ -1,4 +1,5 @@
 <!-- default skin by sng -->
+<!-- little changed by masui -->
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=euc-jp">
@@ -243,8 +244,7 @@ ul {
 <font face="Verdana" size="1">
 Modified by <a href="<?=$modifierlink?>"><?=$modifier?></a><br>
 <br>
-<b>"PukiWiki" <?=S_VERSION?></b> Copyright &copy; 2001,2002 <a href="mailto:[e-mail]">sng</a>.<br>
-This is Free Software released under the <a href="http://www.gnu.org/">GNU/GPL license</a>.<br>
+<?=S_COPYRIGHT?><br>
 Powered by PHP <?=PHP_VERSION?><br>
 <br>
 HTML convert time to <?=$taketime?> sec.

--- /dev/null
+++ b/template.php
@@ -0,0 +1,25 @@
+<?
+// PukiWiki - Yet another WikiWikiWeb clone.
+// $Id: template.php,v 1.1 2002/06/21 05:21:46 masui Exp $
+/////////////////////////////////////////////////
+
+function auto_template($page)
+{
+  global $auto_template_rules,$auto_template_func;
+  if(!$auto_template_func) return '';
+
+  $body = '';
+  foreach($auto_template_rules as $rule => $template)
+    {
+      if(preg_match("/$rule/",$page,$matches)) {
+	$template_page = preg_replace("/$rule/",$template,$page);
+	$body = join('',get_source($template_page));
+	for($i=0; $i<count($matches); ++$i) {
+	  $body = str_replace("\$$i",$matches[$i],$body);
+	}
+	break;
+      }
+    }
+  return $body;
+}
+?>
\ No newline at end of file