/[pub]/suikawiki/script/wiki.cgi

Diff of /suikawiki/script/wiki.cgi

Parent Directory | Revision Log | View Patch Patch

-revision 1.38 by wakaba,
Sun Dec 15 06:08:33 2002 UTC
+revision 1.48 by w,
Fri Jan  3 08:25:31 2003 UTC
 Line 1
  #!/usr/bin/perl
- #
  # wiki.cgi - This is YukiWiki, yet another Wiki clone.
  #
- # Copyright (C) 2000-2002 by Hiroshi Yuki.
- # <hyuki@hyuki.com>
- # http://www.hyuki.com/yukiwiki/
- #
  # This program is free software; you can redistribute it and/or
  # modify it under the same terms as Perl itself.
- #
- # walwiki.cgi based on yukiwiki.cgi - Yet another WikiWikiWeb clone.
- # Walrus add (debug) start
- my $walrus_log;
- my $walrus_debugging = 0;
- # Walrus add (debug) end
- # Libraries.
  use strict;
- use lib qw(./WalWiki/lib);
+ use lib qw(./lib);
- use CGI qw(:standard);
  use CGI::Carp qw(fatalsToBrowser);
- use Yuki::RSS;
+ our $VERSION = do{my @r=(q$Revision$=~/\d+/g);sprintf "%d."."%02d" x $#r,@r};
- use Yuki::DiffText qw(difftext);
- use Yuki::YukiWikiDB;
+ require 'wikidata/suikawiki-config.ph';
- use AnyDBM_File;
- require 'jcode.pl';
- require Jcode;
  use Fcntl;
- my $version = '2.0.beta1.2002-05-29';
- my $walversion;
- ##############################
- #
- # You MUST modify following '$modifier_...' variables.
- #
- my $modifier_mail = 'w@suika.fam.cx';   # Your mail address, like 'walrus@digit.que.ne.jp'.
- my $modifier_url  = 'http://suika.fam.cx/~wakaba/';     # Your web page, like 'http://digit.que.ne.jp/work/'.
- my $modifier_name = 'ĻĀ';       # Your name, like 'Makio Tsukamoto'.
- # my $modifier_dbtype = 'AnyDBM_File';  # Fast, not available on some server, page size limited.
- # my $modifier_dbtype = 'dbmopen';      # Fast, not available on some server, page size limited.
- my $modifier_dbtype = 'YukiWikiDB';     # Slow, available on all environment.
- # my $modifier_sendmail = '/usr/sbin/sendmail -t -n'; # Your sendmail.
- my $modifier_sendmail = ''; # If you don't need mail notification.
- my $modifier_dir_data = './wikidata'; # Your data directory.
- my $modifier_rss_title = "SuikaWiki $walversion";
- my $modifier_rss_link = 'http://suika.fam.cx/~wakaba/-temp/wiki2/wiki'; # Blank is not allowed.
- my $modifier_rss_description = 'This is SuikaWiki';
- ##############################
- #
- # You MAY modify following variables.
- #
- $SuikaWiki::Plugin::plugin_directory = q(./SuikaWiki/Plugin/);
- my $file_touch = "$modifier_dir_data/touched.txt";
- my $file_resource = "$modifier_dir_data/resource.txt";
- my $file_FrontPage = "$modifier_dir_data/frontpage.txt";
- my $file_conflict = "$modifier_dir_data/conflict.txt";
- my $file_format = "$modifier_dir_data/format.txt";
- my $url_cgi = '/~wakaba/-temp/wiki/wiki';       ## MUST be started from '/'
- my $url_stylesheet = $url_cgi.'?mycmd=TEXT_CSS;mypage=WikiHTMLStyle';
- my $icontag = '<img src="/icons/folder" alt="*" width="40" height="40" />';
- my $maxrecent = 50;
- my $cols = 80;
- my $rows = 20;
- ##############################
- #
- # You MAY, but do NOT NEED modify following variables.
- #
- my $dataname = "$modifier_dir_data/wiki";
- my $infoname = "$modifier_dir_data/info";
- my $diffname = "$modifier_dir_data/diff";
- my $editchar = '?';
- my $subject_delimiter = ' - ';
- my $use_autoimg = 1; # automatically convert image URL into <img> tag.
- my $use_exists = 0; # If you can use 'exists' method for your DB.
- ##############################
- my $InterWikiName = 'InterWikiName';
- my $RecentChanges = 'RecentChanges';
- my $AdminChangePassword = 'AdminChangePassword';
- my $CompletedSuccessfully = 'CompletedSuccessfully';
- my $FrontPage = 'HomePage';
- my $IndexPage = 'IndexPage';
- my $SearchPage = 'SearchPage';
- my $CreatePage = 'CreatePage';
- my $ErrorPage = 'ErrorPage';
- my $RssPage = 'RssPage';
- my $NAME_OF_WikiPageLicense = 'WikiPageLicense';
- my $AdminSpecialPage = 'Admin Special Page'; # must include spaces.
  ##############################
- my $bracket_name = '\[\[(\S+?)\]\]';
- my $embedded_name = '\[\[(#\S+?)\]\]';
  my %fmt;        ## formatter objects
- ##############################
- my $embed_comment = '[[#comment]]';
- my $embed_rcomment = '[[#rcomment]]';
- my $embed_comment_Name_Prompt = 'Ģ¾Į°:';
- my $DEFAULT_embed_comment_name = 'Ģ¾Ģµ¤·¤µ¤ó';
- my $embed_interwiki = '^\[\[#(box|text|password):(\S+)\]\]$';    # Walrus add (5)
  my %embed_command = (
          searched        => '^\[\[#searched:([^\]]+)\]\]$',
-     form => qw/\[\[\#form(?:\(([A-Za-z0-9-]+)\))?:'((?:[^'\\]|\\.)*)':'((?:[^'\\]|\\.)*)'(?::'((?:[^'\\]|\\.)*)')?\]\]/,
+         form    => qr/\[\[\#form(?:\(([A-Za-z0-9-]+)\))?:'((?:[^'\\]|\\.)*)':'((?:[^'\\]|\\.)*)'(?::'((?:[^'\\]|\\.)*)')?\]\]/,
  );
+ our ($modifier_dbtype,$url_cgi,%uri,%PathTo,$use_exists);
+ our (%PageName,$kanjicode,$lang,%ViewDefinition);
  ##############################
- my $info_LastModified = 'LastModified';
- my $info_IsFrozen = 'IsFrozen';
- my $info_AdminPassword = 'AdminPassword';
- ##############################
- my $kanjicode = 'euc';
- my $charset = 'EUC-JP';
- my $lang = 'ja';
- my %fixedpage = (
-     $IndexPage => 1,
-     $CreatePage => 1,
-     $ErrorPage => 1,
-     $RssPage => 1,
-     $RecentChanges => 1,
-     $SearchPage => 1,
-     $AdminChangePassword => 1,
-     $CompletedSuccessfully => 1,
-     #$FrontPage => 1,
-     WikiUserAgentList => 1,
-     WikiPluginInfo    => 1,
- );
  my %form;
- my %database;
+ our %database;
- my %infobase;
+ our $database = bless {}, 'wiki::dummy';
- my %diffbase;
- my %resource;
  my %interwiki;
  ##############################
  my %page_command = (
-     $IndexPage => 'index',
+     $PageName{RssPage} => 'rss',
-     $SearchPage => 'searchform',
-     $CreatePage => 'create',
-     $RssPage => 'rss',
-     $AdminChangePassword => 'adminchangepasswordform',
-     #$FrontPage => 'FrontPage',
-     WikiPluginInfo       => 'x_WikiPluginInfo',
  );
  my %command_do = (
      read => \&do_read,
      TEXT_CSS => \&do_output_css,
-     edit => \&do_edit,
+     edit => \&do_view,
-     adminedit => \&do_adminedit,
-     adminchangepasswordform => \&do_adminchangepasswordform,
      adminchangepassword => \&do_adminchangepassword,
      write => \&do_write,
-     index => \&do_index,
      searchform => \&do_searchform,
-     search => \&do_search,
-     create => \&do_create,
-     createresult => \&do_createresult,
-     FrontPage => \&do_FrontPage,
      comment => \&do_comment,
      RandomJump  => \&do_random_jump,
      rss => \&do_rss,
      diff => \&do_diff,
-     interwikibox => \&do_interwiki_box, # Walrus add (5)
+     wikiform    => \&do_wikiform,
-     wikiform => \&do_wikiform,
+     map => \&do_view,
-     x_WikiPluginInfo  => \&do_wikiplugininfo,
  );
- ##############################
- my $walversion = '2.0.beta1.wal.1';          # Walrus add (1)
- ##############################
- # &test_convert;
  my $UA = '';  ## User agent name
+ $| = 1;
  ##############################
  sub main {
      $UA = $main::ENV{HTTP_USER_AGENT};
-     &init_resource;
      &open_db;
      &init_form;
-     &init_InterWikiName;
      if ($command_do{$form{mycmd}}) {
          &{$command_do{$form{mycmd}}};
      } else {
-         &do_FrontPage;
+         &{$command_do{read}};
      }
      &close_db;
  }
  sub do_read {
    my $content = $database{$form{mypage}};
-   my $lm = &get_info($form{mypage}, $info_LastModified);
+   my $lm = $database->mtime ($form{mypage});
    wiki::referer::add ($form{mypage}, $ENV{HTTP_REFERER});
    wiki::useragent::add ($ENV{HTTP_USER_AGENT});
-   my ($r, $c) = get_search_result ($form{mypage});
-   my $rl = wiki::referer::list_html ($form{mypage});
    my @toc;
-   push @toc, qq(-<a href="#wikipage-see-also">See Also</a>) if $c;
-   push @toc, qq(-<a href="#wikipage-referer">»²¾Čøµ</a>) if $rl;
      my $cf = 'SuikaWiki/0.9';
      ## Should be support at least:
      ## - 'SuikaWiki/0.9' CRLF
-Line 197 
 sub do_read {
+Line 72 
 sub do_read {
      ## - "/*" WSP* 'W3C-CSS/' ("1.0" / "2.0") "*/" CRLF
      $cf = $1 if $content =~ s#^(?:/\*\s*|[\#<]\?)?([A-Z][A-Za-z0-9-]+/[0-9.]+(?:[^0-9.\x0D\x0A][^\x0D\x0A]*)?)[\x0D\x0A]+##s;
      if ($cf =~ m!^(?:\#\?)?SuikaWiki/0.9(?:$|\s)!) {
-       &print_header ($form{mypage}, -last_modified => $lm,
+       my $expires = time;
-         -content_format => $cf, -noindex => $cf =~ /obsoleted="yes"/);
+       if ($cf =~ /interactive="yes"/) {
+         $lm = $expires;
+       } else {
+         $expires += 120;
+       }
+       &print_header ($form{mypage}, -last_modified => $lm, -expires => $expires,
+         -content_format => $cf, -noindex => ($cf =~ /obsoleted="yes"/ ? 1 : 0));
        &print_content ($content, content_format => $cf, last_modified => $lm,
          -toc => \@toc);
-       print &text_to_html (q([[#comment]])) if $cf !~ /obsoleted="yes"/ && !$fixedpage{$form{mypage}};
+       print &text_to_html (q([[#comment]])) if $cf !~ /obsoleted="yes"/ && !$database->meta (IsFrozen => $form{mypage});
      } else {
-       &print_header($form{mypage}, -last_modified => $lm);
+       &print_header($form{mypage}, -expires => time + 120, -last_modified => $lm);
        print "<pre>@{[&escape($content)]}</pre>";
      }
-     if ($c) {
+     &load_formatter ('view');
-       print qq{<h2 @{[&id_and_name('wikipage-see-also')]}>See also</h2>};
+     print $fmt{view}->replace ($ViewDefinition{read} => bless {param => \%form, page => $form{mypage}, toc => \@toc, formatter => $fmt{view}, &_compatible_options ()}, 'SuikaWiki::Plugin');
-       print $r;
+     &print_footer ($form{mypage}, $lm);
-     }
-     if ($rl) {
-       print qq(<div @{[&id_and_name('wikipage-referer')]}><h2>»²¾Čøµ</h2>\n$rl</div>\n);
-     }
-   &print_footer($form{mypage}, $lm);
  }
  sub do_output_css {
-Line 221 
 sub do_output_css {
+Line 97 
 sub do_output_css {
    wiki::useragent::add ($ENV{HTTP_USER_AGENT});
    my $content = $database{$form{mypage}};
    if ($content =~ m#^\s*/\*\s*W3C-CSS#) {
-     my $lm = &get_info($form{mypage}, $info_LastModified);
+     my $lm = gmtime $database->mtime ($form{mypage});
-       print scalar make_navigate_links ($form{mypage});
+     print "Content-Type: text/css; charset=@{[&get_charset_name($kanjicode)]}\n";
-     print "Content-Type: text/css; charset=$charset\n";
      print "Last-Modified: $lm\n";
+     print "Expires: @{[scalar gmtime time+3600]}\n";    ## TODO: don't use asctime
      print "\n";
      print $content;
    } else {
-Line 244 
 sub id_and_name ($) {
+Line 120 
 sub id_and_name ($) {
      }
  }
- sub do_edit {
+ sub do_view {
-     my ($page) = &unarmor_name(&armor_name($form{mypage}));
-     &print_header($page, -noindex => 1);
-     if (not &is_editable($page)) {
-         &print_message($resource{cantchange});
-     } elsif (&is_frozen($page)) {
-         &print_message($resource{cantchange});
-     } else {
-         &print_editform($database{$page}, &get_info($page, $info_LastModified), admin=>0);
-     }
      wiki::referer::add ($form{mypage}, $ENV{HTTP_REFERER});
      wiki::useragent::add ($ENV{HTTP_USER_AGENT});
-     my ($r, $c) = get_search_result ($form{mypage});
+     &print_header($form{mypage}, -noindex => 1, -expires => time+60);
-     my $rl = wiki::referer::list_html ($form{mypage});
+     &load_formatter ('view');
-     if ($c) {
+     my $view = $form{mycmd};
-       print q{<h2 id="wikipage-see-also">See also</h2>};
+     if ($view eq 'edit') {
-       print $r;
+       $view = 'adminedit' if $form{admin};
-     }
+     } elsif ($view =~ /[^0-9A-Za-z]/) {
-     if ($rl) {
+       $view = 'view'
-       print qq(<div id="wikipage-referer"><h2>»²¾Čøµ</h2>\n$rl</div>\n);
-     }
-     &print_footer($page);
- }
- sub do_adminedit {
-     my ($page) = &unarmor_name(&armor_name($form{mypage}));
-     &print_header($page, -noindex => 1);
-     if (not &is_editable($page)) {
-         &print_message($resource{cantchange});
-     } else {
-         &print_message($resource{passwordneeded});
-         &print_editform($database{$page}, &get_info($page, $info_LastModified), admin=>1);
      }
-     &print_footer($page);
+     print $fmt{view}->replace ($ViewDefinition{$view} => bless {param => \%form, page => $form{mypage}, toc => [], formatter => $fmt{view}, &_compatible_options ()}, 'SuikaWiki::Plugin');
- }
+     &print_footer($form{mypage});
- sub do_adminchangepasswordform {
-     &print_header($AdminChangePassword, -noindex => 1);
-     &print_passwordform;
-     &print_footer($AdminChangePassword);
  }
  sub do_adminchangepassword {
      if ($form{mynewpassword} ne $form{mynewpassword2}) {
-         &print_error($resource{passwordmismatcherror});
+         &print_error(&Resource('Error:PasswordMismatch'));
      }
-     my ($validpassword_crypt) = &get_info($AdminSpecialPage, $info_AdminPassword);
+     my ($validpassword_crypt) = $database->meta (AdminPassword => $PageName{AdminSpecialPage});
      if ($validpassword_crypt) {
          if (not &valid_password($form{myoldpassword})) {
-             &send_mail_to_admin(<<"EOD", "AdminChangePassword");
+             &print_error(&Resource('Error:PasswordIsIncorrect'));
- myoldpassword=$form{myoldpassword}
- mynewpassword=$form{mynewpassword}
- mynewpassword2=$form{mynewpassword2}
- EOD
-             &print_error($resource{passworderror});
          }
      }
      my ($sec, $min, $hour, $day, $mon, $year, $weekday) = localtime(time);
-Line 306 
 EOD
+Line 150 
 EOD
      my $salt1 = $token[(time | $$) % scalar(@token)];
      my $salt2 = $token[($sec + $min*60 + $hour*60*60) % scalar(@token)];
      my $crypted = crypt($form{mynewpassword}, "$salt1$salt2");
-     &set_info($AdminSpecialPage, $info_AdminPassword, $crypted);
+     $database->meta (AdminPassword => $PageName{AdminSpecialPage} => $crypted);
-     &print_header($CompletedSuccessfully, -noindex => 1);
+     &print_header('CompletedSuccessfully', -noindex => 1);
-     &print_message($resource{passwordchanged});
+     &print_message(&Resource('Error:PasswordIsChanged'));
-     &print_footer($CompletedSuccessfully);
+     &print_footer('CompletedSuccessfully');
  }
- sub do_index {
+ sub valid_password ($) {
-   wiki::referer::add ($form{mypage}, $ENV{HTTP_REFERER});
+     my ($validpassword_crypt) = $database->meta (AdminPassword => $PageName{AdminSpecialPage});
-   wiki::useragent::add ($ENV{HTTP_USER_AGENT});
+     return crypt (shift, $validpassword_crypt) eq $validpassword_crypt ? 1 : 0;
-     &print_header($IndexPage);
-     print qq(<ul>);
-     foreach my $page (sort keys %database) {
-         if (&is_editable($page)) {
-             print qq(<li><a href="$url_cgi?@{[&encode($page)]}">@{[&escape($page)]}</a>@{[&escape(&get_subjectline($page))]}</li>);
-             # print qq(<li>@{[&get_info($page, $info_IsFrozen)]}</li>);
-             # print qq(<li>@{[0 + &is_frozen($page)]}</li>);
-         }
-     }
-     print qq(</ul>);
-     my ($r, $c) = get_search_result ($form{mypage});
-     if ($c) {
-       print qq{<h2 @{[&id_and_name('wikipage-see-also')]}>See also</h2>};
-       print $r;
-     }
-     my $rl = wiki::referer::list_html ($form{mypage});
-     if ($rl) {
-         print qq(<div @{[&id_and_name('wikipage-referer')]}><h2>??????</h2>\n$rl</div>\n);
-     }
-     &print_footer($IndexPage);
  }
  sub do_write {
-Line 345 
 sub do_write {
+Line 169 
 sub do_write {
      if (not &is_editable($form{mypage})) {
          &print_header($form{mypage}, -noindex => 1);
-         &print_message($resource{cantchange});
+         &print_message(&Resource('Error:ThisPageIsUneditable'));
          &print_footer($form{mypage});
          return;
      }
-     if (&conflict($form{mypage}, $form{mymsg})) {
+     ## Check confliction
-         return;
+     if ($form{myLastModified} ne $database->mtime ($page)) {
-     }
+       &print_header($page, -noindex => 1);
+       &load_formatter ('view');
-     # Making diff
+       print $fmt{view}->replace ($ViewDefinition{-conflict} => bless {param => \%form, page => $form{mypage}, toc => [], formatter => $fmt{view}, &_compatible_options ()}, 'SuikaWiki::Plugin');
-     {
+       &print_footer($page);
-         &open_diff;
+       return;
-         my @msg1 = split(/\n/, $database{$form{mypage}});
-         my @msg2 = split(/\n/, $form{mymsg});
-         $diffbase{$form{mypage}} = &difftext(\@msg1, \@msg2);
-         &close_diff;
      }
      if ($form{mymsg}) {
-         $database{$form{mypage}} = $form{mymsg};
+         if ($form{mytouch} || !ref $database) {
-         &send_mail_to_admin($form{mypage}, "Modify");
+           $database{$form{mypage}} = $form{mymsg};
-         if ($form{mytouch}) {
+         } else {
-             &set_info($form{mypage}, $info_LastModified, '' . localtime);
+           $database->STORE ($form{mypage} => $form{mymsg}, -touch => 0);
-             &update_recent_changes;
          }
-         &set_info($form{mypage}, $info_IsFrozen, 0 + $form{myfrozen});
+         $database->meta (IsFrozen => $form{mypage} => 0 + $form{myfrozen});
          my $fragment = '';
          $fragment .= qq(;after_edit_cmd=@{[&encode($form{after_edit_cmd})]}) if $form{after_edit_cmd};
          if ($form{__comment_anchor_index}) {
-Line 378 
 sub do_write {
+Line 197 
 sub do_write {
          } elsif ($form{__wikiform_anchor_index}) {
              $fragment .= qq(#wikiform-$form{__wikiform_anchor_index});
          }
-         &print_header($CompletedSuccessfully, -noindex => 1, -goto => $url_cgi.'?mycmd='.&encode($form{after_edit_cmd}||'read').';mypage='.&encode($form{mypage}).qq(;x-param=@{[time.[0..9]->[rand 10]]}$fragment));
+         &print_header('CompletedSuccessfully', -noindex => 1, -goto => $url_cgi.'?mycmd='.&encode($form{after_edit_cmd}||'read').';mypage='.&encode($form{mypage}).qq(;x-param=@{[time.[0..9]->[rand 10]]}$fragment));
-         &print_message($resource{saved});
+         &print_message(&Resource('Error:SavedSuccessfully'));
-         &print_content("$resource{continuereading} @{[&armor_name($form{mypage})]}");
+         &print_content(&Resource('Error:ContinueReading')." @{[&armor_name($form{mypage})]}");
-         &print_footer($CompletedSuccessfully);
+         &print_footer('CompletedSuccessfully');
      } else {
-         &send_mail_to_admin($form{mypage}, "Delete");
          delete $database{$form{mypage}};
-         delete $infobase{$form{mypage}};
-         if ($form{mytouch}) {
-             &update_recent_changes;
-         }
          &print_header($form{mypage}, -noindex => 1);
-         &print_message($resource{deleted});
+         &print_message(&Resource('Error:PageIsDeletedSuccessfully'));
          &print_footer($form{mypage});
      }
  }
- sub do_searchform {
+ sub _compatible_options () {
-     &print_header($SearchPage);
+   (use_anchor_name => ($UA =~ m#Mozilla/[12]\.|Microsoft Internet Explorer# ? 1 : 0));
-     &print_searchform("");
-     &print_footer($SearchPage);
- }
- sub do_search {
-     my $word = $form{mymsg};
-     &print_header($SearchPage);
-     &print_searchform(&escape($word));
-     print scalar get_search_result ($word, -output_not_found => 1, -match_myself => 1);
-     &print_footer($SearchPage);
  }
  sub get_search_result ($;%) {
-Line 414 
 sub get_search_result ($;%) {
+Line 218 
 sub get_search_result ($;%) {
    my %option = @_;
    my @r;
    foreach my $page (keys %database) {
-     next if $page eq $RecentChanges || ($page eq $word && !$option{-match_myself});
+     next if !$option{-match_myself} && ($page eq $word);
-     my $content = $database{$page};
+     my $content = lc $database{$page};
-     my $cf = 'SuikaWiki/0.9';
-     $cf = $1 if $content =~ s/^\#\?([^\x0A\x0D]+)//s;
-     next if $cf =~ /obsoleted="yes"/;
      if (index (lc $page, $word) > -1) {
-       my $c = $content =~ s/\Q$word\E//gi;
+       my $c = $content =~ s/\Q$word\E//g;
        push @r, [$page, $c+20];
      } elsif (index ($word, lc $page) > -1) {
-       my $c = $content =~ s/\Q$word\E//gi;
+       my $c = $content =~ s/\Q$word\E//g;
        push @r, [$page, $c+10];
-     } elsif (my $c = $content =~ s/\Q$word\E//gi) {
+     } elsif (my $c = $content =~ s/\Q$word\E//g) {
        push @r, [$page, $c];
      }
    }
-   my $em = sub { my $s = shift; $s =~ s#(\Q$word\E)#<em>$1</em>#gi; $s };
+   #my $em = sub { my $s = shift; $s =~ s#(\Q$word\E)#<em>$1</em>#gi; $s };
-   my $r = join "\n", map {qq(<li>[$_->[1]] <a href ="$url_cgi?@{[&encode($_->[0])]}" class="wiki">@{[&$em(&escape($_->[0]))]}</a> <span class="wikipage-summary">@{[&$em(&escape(&get_subjectline($_->[0])))]}</span></li>)} sort {$b->[1] <=> $a->[1] || $a->[0] cmp $b->[0]} @r;
+   my $r = join "\n", map {qq(<li>[$_->[1]] <a href ="$url_cgi?@{[&encode($_->[0])]}" class="wiki">@{[&escape($_->[0])]}</a> <span class="wikipage-summary">@{[&escape(&get_subjectline($_->[0]))]}</span></li>)} sort {$b->[1] <=> $a->[1] || $a->[0] cmp $b->[0]} @r;
    $r = qq|<ul class="search-result">$r</ul>| if $r;
-   get_message ($resource{notfound}) if @r == 0 && $option{-output_not_found};
    wantarray? ($r, scalar @r): $r;
  }
- sub do_create {
-     &print_header($CreatePage);
-     print <<"EOD";
- <form action="$url_cgi" method="post">
-     <input type="hidden" name="mycmd" value="edit">
-     <strong>$resource{newpagename}</strong><br>
-     <input type="text" name="mypage" value="" size="20">
-     <input type="submit" value="$resource{createbutton}"><br>
- </form>
- EOD
-     &print_footer($CreatePage);
- }
  sub do_random_jump {
    my @list = keys %database;
    my $name = &encode ($list[rand @list]);
-   my ($scheme) = 'http';
+   my $scheme = 'http';
-   $scheme = $1 if $main::ENV{SERVER_PROTOCOL} =~ m#([A-Za-z0-9+.%-]+)#;
+   $scheme = lc $1 if $main::ENV{SERVER_PROTOCOL} =~ m#([A-Za-z0-9+.%-]+)#;
    print "Location: $scheme://$main::ENV{SERVER_NAME}:$main::ENV{SERVER_PORT}$url_cgi?$name\n";
    print "\n";
  }
- sub do_FrontPage {
-     open(FILE, $file_FrontPage) or &print_error("($file_FrontPage)");
-     my $content = join('', <FILE>);
-     &code_convert(\$content, $kanjicode);
-     close(FILE);
-     &print_header($FrontPage);
-     &print_content($content);
-     &print_footer($FrontPage);
- }
  sub print_error {
      my ($msg) = @_;
-     &print_header($ErrorPage, -noindex => 1);
+     &print_header($PageName{ErrorPage}, -noindex => 1);
      print qq(<p><strong class="error">$msg</strong></p>);
-     &print_footer($ErrorPage);
+     &print_footer($PageName{ErrorPage});
      exit(0);
  }
  sub print_header ($;%) {
      my ($page, %option) = @_;
-     my $bodyclass = "normal";
+     my @head;
-     if (&is_frozen($page) and $form{mycmd} =~ /^(read|write)$/) {
+     $option{body_class} = &is_frozen($page) ? 'frozen' : 'normal';
-         $bodyclass = "frozen";
+     $option{body_class} .= " wiki-page-obsoleted" if $option{-content_format} =~ /obsoleted="yes"/;
-     }
-     $bodyclass .= " wiki-page-obsoleted" if $option{-content_format} =~ /obsoleted="yes"/;
      if ($option{-goto}) {
        if ($UA =~ m#Opera|MSIE 2\.#) {
+           ## WARNING: This code may output unsafe HTML document if
+           ##          $option{-goto} is not clean.
            $option{-goto} =~ tr/;/&/ if $UA =~ m#Opera#;
            print qq{Refresh: 0; url=$option{-goto}\n};
-           $option{-goto} = qq(<meta http-equiv="refresh" content="0; url=$option{-goto}">);
+           push @head, qq(<meta http-equiv="refresh" content="0; url=$option{-goto}">);
        } else {
            $option{-goto} =~ tr/;/&/ if $UA =~ m#Mozilla/[1-4]\.#;
            print qq{Refresh: 0; url="$option{-goto}"\n};
-           $option{-goto} = qq(<meta http-equiv="refresh" content="0; url=&quot;@{[&escape($option{-goto})]}&quot;">);
+           push @head, qq(<meta http-equiv="refresh" content="0; url=&quot;@{[&escape($option{-goto})]}&quot;">);
        }
      }
-     print qq{Last-Modified: $option{-last_modified}\n} if $option{-last_modified};
+     print qq{Last-Modified: @{[scalar gmtime $option{-last_modified}]}\n} if $option{-last_modified};
-     my $meta_ct = '';
+     if ($option{-expires}) {
+       print qq{Expires: @{[scalar gmtime $option{-expires}]}\n};
+     }
      if ($UA =~ m#Mozilla/2#) {
-         $meta_ct = qq{text/html; charset=@{[&x_charset($charset)]}};
+         my $ct = qq{text/html; charset=@{[&get_charset_name($kanjicode,compatible=>1)]}};
-         print qq{Content-Type: $meta_ct\n};
+         print qq{Content-Type: $ct\n};
-         $meta_ct = qq{<meta http-equiv="content-type" content="$meta_ct">};
+         push @head, qq{<meta http-equiv="content-type" content="$ct">};
      } elsif ($UA =~ m#Infomosaic#) {
          print qq{Content-Type: text/html\n};
      } else {
-         print qq{Content-Type: text/html; charset=$charset\n};
+         print qq{Content-Type: text/html; charset=@{[&get_charset_name($kanjicode)]}\n};
      }
-     my $cookedpage = &encode($page);
+     push @head, qq(<title>@{[&escape($page)]}</title>);
-     my $escapedpage = &escape($page);
+     if ($UA !~ m#Mozilla/[1-4]\.# || $UA =~ m#MSIE (?:[4-9]\.|\d\d)#) {
+       push @head, qq(<link rel="stylesheet" type="text/css").
+                   qq( href="@{[&escape($uri{wiki}.'?mycmd=TEXT_CSS;mypage='.&encode($PageName{DefaultStyleForHTML}).';x-lm='.$database->mtime ($PageName{DefaultStyleForHTML}))]}");
+     }
+     push @head, q(<meta name="ROBOTS" content="NOINDEX">) if $option{-noindex};
      my ($Links, $links) = &make_navigate_links ($page);
-     print $Links;
+     #print $Links;      ## Link: fields
+     $links = join "\n", (@head, $links);
      print <<"EOD";
  Content-Language: $lang
  Content-Style-Type: text/css
- <!--
+ <!-- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- <!DOCTYPE html
+ "http://www.w3.org/TR/html4/loose.dtd"> + RUBY -->
-     PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ <html lang="$lang" class="$option{body_class}">
-     "http://www.w3.org/TR/html4/loose.dtd"> + RUBY -->
- <html lang="$lang">
  <head profile="http://suika.fam.cx/~wakaba/-temp/wiki/wiki?WikiHTMLMetaProfile">
-     $meta_ct$option{-goto}
-     <title>$escapedpage</title>
-     @{[($UA !~ m#Mozilla/[1-4]\.# || $UA =~ m#MSIE (?:[4-9]\.|\d\d)#) ? qq(<link rel="stylesheet" type="text/css" href="@{[&escape($url_stylesheet)]}">) : '']}
-     @{[$option{-noindex} ? q(<meta name="ROBOTS" content="NOINDEX">) : '']}
  $links
  </head>
- <body class="$bodyclass">
+ <body class="$option{body_class}">
  EOD
-   &print_navigate_links ($page);
+     &print_navigate_links ($page);
-   print <<EOD;
+     print <<EOD;
  <h1 class="header">@{[&escape($page)]}</h1>
  EOD
  }
- sub x_charset ($) {
+ sub get_charset_name ($;%) {
-     my $charset = lc shift;
+     my ($charset, %option) = (lc shift, @_);
-     if ($charset eq 'euc-jp') {
+     if ($charset =~ 'euc') {
-         $charset = 'x-euc-jp';
+         $charset = $option{compatible} ? 'x-euc-jp' : 'euc-jp';
-     } elsif ($charset eq 'shift_jis') {
+     } elsif ($charset =~ 'sjis' || $charset =~ 'shift') {
-         $charset = 'x-sjis';
+         $charset = $option{compatible} ? 'x-sjis' : 'shift_jis';
+     } elsif ($charset =~ 'jis') {
+         $charset = 'iso-2022-jp';
      }
      $charset;
  }
  sub print_navigate_links (@) {
    my ($page) = @_;
-     my $editable = 0;
+   my $editable = (&is_editable($page) && !&is_frozen($page)) ? 1 : 0;
-     my $admineditable = 0;
+   my $cookedpage = &encode($page);
-     if (&is_frozen($page) and $form{mycmd} =~ /^(read|write)$/) {
-         $editable = 0;
-         #$admineditable = 1;
-     } elsif (&is_editable($page) and $form{mycmd} =~ /^(read|write)$/) {
-         #$admineditable = 1;
-         $editable = 1;
-     } else {
-         $editable = 0;
-     }
-     my $cookedpage = &encode($page);
    print <<EOH;
  <div class="tools">
-     @{[ $admineditable
-         ? qq(<a title="$resource{admineditthispage}" href="$url_cgi?mycmd=adminedit;mypage=$cookedpage" class="wiki-cmd">$resource{admineditbutton}</a> | )
-         : qq()
-     ]}
      @{[ $editable
-         ? #qq(<a title="$resource{editthispage}" href="$url_cgi?mycmd=edit;mypage=$cookedpage" accesskey="E">$resource{editbutton} <kbd>E</kbd></a> | )
+         ? qq(<a title="@{[&Resource('EditThisPageLong',escape=>1)]}" href="$url_cgi?mycmd=edit;mypage=$cookedpage" accesskey="E" class="wiki-cmd">@{[&Resource('EditThisPage',escape=>1)]}</a> | )
-         qq(<a title="$resource{editthispage}" href="$url_cgi?mycmd=edit;mypage=$cookedpage" accesskey="E" class="wiki-cmd">ŹŌ½ø</a> | )
-         : qq()
-     ]}
-     <a href="$url_cgi?mycmd=read;mypage=$cookedpage;x-param=@{[time.[0..9]->[rand 10]]}" class="wiki-cmd">É½¼Ø</a> |
-     @{[ $admineditable
-         ? qq(<a href="$url_cgi?mycmd=diff;mypage=$cookedpage" class="wiki-cmd">$resource{diffbutton}</a> | )
          : qq()
      ]}
-     <a href="$url_cgi?$CreatePage" class="wiki">æ·µ¬</a> |
+     <a href="$url_cgi?mycmd=read;mypage=$cookedpage;x-param=@{[time.[0..9]->[rand 10]]}" class="wiki-cmd" title="@{[&Resource('ViewThisPageLong',escape=>1)]}">@{[&Resource('ViewThisPage',escape=>1)]}</a> |
-     <a href="$url_cgi?$IndexPage" class="wiki">$resource{indexbutton}</a> |
+     <a href="$url_cgi?mycmd=map;mypage=$cookedpage" class="wiki-cmd" title="@{[&Resource('ShowMapOfThisPageLong',escape=>1)]}">@{[&Resource('ShowMapOfThisPage',escape=>1)]}</a> |
-     <a href="$url_cgi?$FrontPage" class="wiki">¼óŹĒ</a> |
+     <a href="$url_cgi?$PageName{CreatePage}" class="wiki" title="@{[&Resource('GoToCreatePageLong',escape=>1)]}">@{[&Resource('GoToCreatePage',escape=>1)]}</a> |
-     <a href="$url_cgi?$SearchPage" class="wiki">$resource{searchbutton}</a> |
+     <a href="$url_cgi?$PageName{IndexPage}" class="wiki" title="@{[&Resource('GoToIndexPageLong',escape=>1)]}">@{[&Resource('GoToIndexPage',escape=>1)]}</a> |
-     <a href="$url_cgi?mycmd=RandomJump;x-param=@{[time.[0..9]->[rand 10]]}" class="wiki randomlink">¤É¤³¤«</a> |
+     <a href="$url_cgi?$PageName{FrontPage}" class="wiki" title="@{[&Resource('GoToHomePageLong',escape=>1)]}">@{[&Resource('GoToHomePage',escape=>1)]}</a> |
-     <a href="$url_cgi?$RecentChanges" class="wiki">ŗĒæ·</a>
+     <a href="$url_cgi?$PageName{SearchPage}" class="wiki" title="@{[&Resource('GoToSearchPageLong',escape=>1)]}">@{[&Resource('GoToSearchPage',escape=>1)]}</a> |
+     <a href="$url_cgi?mycmd=RandomJump;x-param=@{[time.[0..9]->[rand 10]]}" class="wiki randomlink" title="@{[&Resource('GoSomewhereLong',escape=>1)]}">@{[&Resource('GoSomewhere',escape=>1)]}</a> |
+     <a href="$url_cgi?$PageName{RecentChanges}" class="wiki" title="@{[&Resource('GoToRecentChangesLong',escape=>1)]}">@{[&Resource('GoToRecentChanges',escape=>1)]}</a>
  </div>
  EOH
  }
-Line 586 
 EOH
+Line 348 
 EOH
  sub make_navigate_links ($) {
      my $page = shift;
      my @link;
-     push @link, {rel=>'edit', href=>"$url_cgi?mycmd=edit;mypage=@{[&encode($page)]}", class=>"wiki-command", title=>$resource{editbutton}} if &is_editable ($page) && !&is_frozen ($page);
+     push @link, {rel=>'edit', href=>"$url_cgi?mycmd=edit;mypage=@{[&encode($page)]}", class=>"wiki-command", title=>&Resource('EditThisPageLink')} if &is_editable ($page) && !&is_frozen ($page);
-     push @link, {rel=>'edit', href=>"$url_cgi?mycmd=adminedit;mypage=@{[&encode($page)]}", class=>"wiki-command", title=>$resource{admineditbutton}} if &is_editable ($page) || &is_frozen ($page);
+     push @link, {rel=>'edit', href=>"$url_cgi?mycmd=edit;admin=1;mypage=@{[&encode($page)]}", class=>"wiki-command", title=>&Resource('AdminEditThisPageLink')} if &is_editable ($page) || &is_frozen ($page);
-     push @link, {rel=>'view', href=>"$url_cgi?mycmd=read;mypage=@{[&encode($page)]};x-p=@{[time.[0..9]->[rand 10]]}", class=>'wiki-command', title=>'View latest version of this page'};
+     push @link, {rel=>'view', href=>"$url_cgi?mycmd=read;mypage=@{[&encode($page)]};x-p=@{[time.[0..9]->[rand 10]]}", class=>'wiki-command', title=>&Resource('ViewThisPageLink')};
-     push @link, {rel=>'myself', href=>"$url_cgi?@{[&encode($page)]}", class=>'wiki'};
+     push @link, {rel=>'myself', href=>"$url_cgi?@{[&encode($page)]}", class=>'wiki', title=>&Resource('GoToMyselfLink')};
-     push @link, {rel=>'index', href=>"$url_cgi?$IndexPage", class=>'wiki', title=>$resource{indexbutton}};
+     push @link, {rel=>'index', href=>"$url_cgi?$PageName{IndexPage}", class=>'wiki', title=>&Resource('GoToIndexPageLink')};
-     push @link, {rel=>'home', href=>"$url_cgi?$FrontPage", class=>'wiki', title=>$FrontPage};
+     push @link, {rel=>'home', href=>"$url_cgi?$PageName{FrontPage}", class=>'wiki', title=>&Resource('GoToHomePageLink')};
-     push @link, {rel=>'News', href=>"$url_cgi?WikiNews", class=>'wiki', title=>'News on this wiki'};
+     push @link, {rel=>'News', href=>"$url_cgi?WikiNews", class=>'wiki', title=>&Resource('GoToWikiNewsLink')};
-     push @link, {rel=>'News', href=>"$url_cgi?$RecentChanges", class=>"wiki", title=>$resource{recentchangesbutton}};
+     push @link, {rel=>'News', href=>"$url_cgi?$PageName{RecentChanges}", class=>"wiki", title=>&Resource('GoToRecentChangesLink')};
-     push @link, {rel=>'News', href=>"$url_cgi?$RssPage", class=>"wiki", title=>$resource{rssbutton}, type=>'application/xml'};
+     push @link, {rel=>'News', href=>"$url_cgi?$PageName{RssPage}", class=>"wiki", title=>&Resource('GoToRssPageLink'), type=>'application/xml'};
-     push @link, {rel=>'search', href=>"$url_cgi?$SearchPage", class=>'wiki', title=>$resource{searchbutton}};
+     push @link, {rel=>'search', href=>"$url_cgi?$PageName{SearchPage}", class=>'wiki', title=>&Resource('GoToSearchPageLink')};
-     push @link, {rel=>'help', href=>"$url_cgi?WikiHelp", class=>'wiki'};
+     push @link, {rel=>'help', href=>"$url_cgi?WikiHelp", class=>'wiki', title=>&Resource('GoToWikiHelpLink')};
-     push @link, {rel=>'copyright', href=>"$url_cgi?WikiPageLicense", class=>'wiki'};
+     push @link, {rel=>'copyright', href=>"$url_cgi?WikiPageLicense", class=>'wiki', title=>&Resource('GoToWikiPageLicenseLink')};
-     push @link, {rel=>'jump', href=>q(javascript:var%20WikiName=prompt('Please%20input%20the%20WikiName:','','Jump%20to%20SuikaWiki');if(WikiName)%7B_content.location.href='http://suika.fam.cx/%7Ewakaba/-temp/wiki/wiki%3F'+encodeURIComponent(WikiName)%7D), class=>'wiki-cmd', title=>'Jump to...'};
+     push @link, {rel=>'jump', href=>qq(javascript:var%20WikiName=prompt('Please%20input%20the%20WikiName:','','Jump%20to%20SuikaWiki');if(WikiName)%7B_content.location.href='$url_cgi%3F'+encodeURIComponent(WikiName)%7D), class=>'wiki-cmd', title=>&Resource('JumpToLink')};
-     push @link, {rel=>'jump', href=>q(javascript:var%20WikiName=prompt('Please%20input%20the%20WikiName:','','Jump%20to%20SuikaWiki');if(WikiName)%7B_content.location.href='http://suika.fam.cx/%7Ewakaba/-temp/wiki/wiki%3Fmycmd=edit;mypage='+encodeURIComponent(WikiName)%7D), class=>'wiki-cmd', title=>'Jump to (edit)...'};
+     push @link, {rel=>'jump', href=>qq(javascript:var%20WikiName=prompt('Please%20input%20the%20WikiName:','','Jump%20to%20SuikaWiki');if(WikiName)%7B_content.location.href='$url_cgi%3Fmycmd=edit;mypage='+encodeURIComponent(WikiName)%7D), class=>'wiki-cmd', title=>&Resource('JumpToEditLink')};
-     push @link, {rel=>'lucky', href=>"$url_cgi?mycmd=RandomJump;x-param=@{[time.[0..9]->[rand 10]]}", class=>'wiki randomlink', title=>'Somewhere'};
+     push @link, {rel=>'lucky', href=>"$url_cgi?mycmd=RandomJump;x-param=@{[time.[0..9]->[rand 10]]}", class=>'wiki randomlink', title=>&Resource('GoSomewhereLink')};
+     push @link, {rel=>'history', href=>$uri{cvs_wikipage}.do{my $s=$page;$s=~s/(.)/sprintf '%02X', ord $1/ges;$s}.'.txt', title=>&Resource('ViewHistoryOfThisPageLink'),hreflang=>'en'} if $uri{cvs_wikipage};
+     push @link, {rel=>'history', href=>"$url_cgi?mycmd=diff;mypage=@{[&encode($page)]}", title=>&Resource('ViewDiffOfThisPageLink'), class=>'wiki-command'} if $wiki::diff::UseDiff;
+     push @link, {rel=>'contents', href=>"$url_cgi?mycmd=map;mypage=@{[&encode($page)]}", title=>&Resource('ShowMapOfThisPageLink'), class=>'wiki-command'};
      my ($Links, $links) = ('', '');
      for my $e (@link) {
          $links .= qq(<link);
-Line 620 
 sub make_navigate_links ($) {
+Line 385 
 sub make_navigate_links ($) {
  sub print_footer {
      my ($page, $lm) = @_;
      my $epage = &encode ($page);
-     $walrus_log = ($walrus_debugging) ? &text_to_html("----\n$walrus_log") : '';    # Walrus add (debug)
-     # Walrus mod (1) start
    my $cvslog1 = q$Revision$;
    my $cvslog2 = q$Date$;
    print_navigate_links ($page);
    print <<"EOD";
- @{[ $lm ? qq(<div id="wikipage-last-modified">Last modified: $lm</div>) : '' ]}
+ @{[ $lm ? qq(<div id="wikipage-last-modified">@{[&Resource('LastModified=',escape=>1)]}@{[&_rfc3339_date ($lm)]}</div>) : '' ]}
  <div class="footer">
- <a href="http://www.hyuki.com/yukiwiki/" title="$version &copy; 2000-2002 by Hiroshi Yuki">YukiWiki</a> <a href="http://digit.que.ne.jp/work/" title="$walversion &copy; 2000-2002 by Makio Tsukamoto">WalWiki</a>
+ <a href="http://www.hyuki.com/yukiwiki/" title="YukiWiki 2.0.beta1.2002-05-29 &copy; 2000-2002 by Hiroshi Yuki">@{[&Resource('About:Name:YukiWiki',escape=>1)]}</a> <a href="http://digit.que.ne.jp/work/" title="WalWiki 2.0.beta1.wal.1 &copy; 2000-2002 by Makio Tsukamoto">@{[&Resource('About:Name:WalWiki',escape=>1)]}</a>
- <a href="/gate/cvs/wakaba/wiki/" title="CVS Repository of this script ($cvslog2)">SuikaWiki $cvslog1</a>
+ <a href="/gate/cvs/wakaba/wiki/" title="@{[&Resource('About:SuikaWiki:JumpToCVS',escape=>1)]} ($cvslog2)">@{[&Resource('About:Name:SuikaWiki',escape=>1)]} $cvslog1</a>
- <div class="navigation">
- [<a href="/" title="¤³¤Ī�µ�¼�Š�¼¤Ī¼óŹĒ">/</a>
- <a href="/map" title="¤³¤Ī�µ�¼�Š�¼¤Ī°ĘĘā">ĆĻæŽ</a>
- <a href="/search/" title="¤³¤Ī�µ�¼�Š�¼¤Īø�ŗ÷">ø�ŗ÷</a>]
  </div>
- <div class="myuri">
-     &lt;<a href="$url_cgi?$epage">$url_cgi?$epage</a>&gt;
- </div>
- </div>
- $walrus_log
  </body>
  </html>
  EOD
-Line 647 
 EOD
+Line 401 
 EOD
  sub escape {
      my $s = shift;
-     $s =~ s|\r\n|\n|g;
+     $s =~ s|\x0D\x0A|\x0A|g;
      $s =~ s|&|&amp;|g;
      $s =~ s|<|&lt;|g;
      $s =~ s|>|&gt;|g;
-Line 672 
 sub print_content ($;$) {
+Line 426 
 sub print_content ($;$) {
  sub text_to_html {
      my ($txt, %option) = @_;
-     my (@txt) = split(/\n/, $txt);
+     my $toc = $option{-toc} || [];
-     my @toc;
-     my @toc2 = @{$option{-toc}||[]};
      my $tocnum = 0;
+     ## Load constants
+     my %const;
+     if ($option{content_format} =~ /import="([^"]+)"/) {
+       for (split /\s*,\s*/, $1) {
+         my $wp = $database{$_};
+         if ($wp =~ m!^\#\?SuikaWikiConst/1.0!) {
+           wiki::suikawikiconst::to_hash ($wp => \%const);
+         }
+       }
+     }
+     $txt =~ s{__&&([^&]+)&&__}{defined $const{$1}?$const{$1}:qq(__&&$1&&__)}ge;
+     my (@txt) = split(/\n/, $txt);
      my (@saved, @result);
      unshift(@saved, "</p>");
      push(@result, "<p>");
      foreach (@txt) {
          chomp;
          if (/^\*\*\*\*\*([^\x0D\x0A]*)/) {
-             push(@toc, qq(----- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));
+             push @$toc, [5, "i$tocnum" => ($1 || $tocnum)];
-             push(@result, splice(@saved), qq(<h6 @{[&id_and_name("i$tocnum")]}>) . &inline($1) . '</h6>');
+             push(@result, splice(@saved), qq(<h6 @{[&id_and_name("i$tocnum")]}>) . &inline($1, const => \%const) . '</h6>');
              $tocnum++;
          } elsif (/^\*\*\*\*([^\x0D\x0A]*)/) {
-             push(@toc, qq(---- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));
+             push @$toc, [4, "i$tocnum" => ($1 || $tocnum)];
-             push(@result, splice(@saved), qq(<h5 @{[&id_and_name("i$tocnum")]}>) . &inline($1) . '</h5>');
+             push(@result, splice(@saved), qq(<h5 @{[&id_and_name("i$tocnum")]}>) . &inline($1, const => \%const) . '</h5>');
              $tocnum++;
          } elsif (/^\*\*\*([^\x0D\x0A]*)/) {
-             push(@toc, qq(--- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));
+             push @$toc, [3, "i$tocnum" => ($1 || $tocnum)];
-             push(@result, splice(@saved), qq(<h4 @{[&id_and_name("i$tocnum")]}>) . &inline($1) . '</h4>');
+             push(@result, splice(@saved), qq(<h4 @{[&id_and_name("i$tocnum")]}>) . &inline($1, const => \%const) . '</h4>');
              $tocnum++;
          } elsif (/^\*\*([^\x0D\x0A]*)/) {
          # if (/^\*\*(.*)/) {
          # Walrus mod (6) end
-             push(@toc, qq(-- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));
+             push @$toc, [2, "i$tocnum" => ($1 || $tocnum)];
-             push(@result, splice(@saved), qq(<h3 @{[&id_and_name("i$tocnum")]}>) . &inline($1) . '</h3>');
+             push(@result, splice(@saved), qq(<h3 @{[&id_and_name("i$tocnum")]}>) . &inline($1, const => \%const) . '</h3>');
              $tocnum++;
          } elsif (/^\*([^\x0D\x0A]*)/) {
-             push(@toc, qq(- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));
+             push @$toc, [1, "i$tocnum" => ($1 || $tocnum)];
-             push(@result, splice(@saved), qq(<h2 @{[&id_and_name("i$tocnum")]}>) . &inline($1) . '</h2>');
+             push(@result, splice(@saved), qq(<h2 @{[&id_and_name("i$tocnum")]}>) . &inline($1, const => \%const) . '</h2>');
              $tocnum++;
          } elsif (/^(={1,6})(.*)/) {
              &back_push('ol', length($1), \@saved, \@result);
-             push(@result, '<li>' . &inline($2) . '</li>');
+             push(@result, '<li>' . &inline($2, const => \%const) . '</li>');
          } elsif (/^(-{1,6})(.*)/) {
            &back_push('ul', length($1), \@saved, \@result);
            my ($pf, $l) = ('', $2);
-Line 713 
 sub text_to_html {
+Line 479 
 sub text_to_html {
              my $num = 0+$1;
              $pf = qq(<a name="anchor-$num" id="anchor-$num" class="anchor">[$num]</a>);
            }
-           push(@result, '<li>' . $pf . &inline ($l) . '</li>');
+           push(@result, '<li>' . $pf . &inline ($l, const => \%const) . '</li>');
          } elsif (/^:([^:]+):(.*)/) {
              &back_push('dl', 1, \@saved, \@result);
-             push(@result, '<dt>' . &inline($1) . '</dt>', '<dd>' . &inline($2) . '</dd>');
+             push(@result, '<dt>' . &inline($1, const => \%const) . '</dt>', '<dd>' . &inline($2, const => \%const) . '</dd>');
          } elsif (/^(?!>>\d)(>{1,5})(.*)/) {
              &back_push('blockquote', length($1), \@saved, \@result);
              push @result, "<p>";
-             push(@result, &inline($2));
+             push(@result, &inline($2, const => \%const));
              unshift @saved, "</p>";
          } elsif (/^\s*$/) {
              push(@result, splice(@saved));
-Line 728 
 sub text_to_html {
+Line 494 
 sub text_to_html {
              unshift(@saved, "</p>");
          } elsif (/^(\s+.*)$/) {
              &back_push('pre', 1, \@saved, \@result);
-             #push(@result, &escape($1)); # Not &inline, but &escape
+             push(@result, &inline($1, const => \%const));
-             push(@result, &inline($1));
+         } elsif (/^\,(.*?)[\x0D\x0A]*$/) {
- #       } elsif (/^\,(.*)$/) {             # Walrus del (BF)
+             &back_push('table', 1, \@saved, \@result);
-         } elsif (/^\,(.*?)[\x0D\x0A]*$/) { # Walrus add (BF)
-             &back_push('table', 1, \@saved, \@result, ' border="1"');
              #######
              # This part is taken from Mr. Ohzaki's Perl Memo and Makio Tsukamoto's WalWiki.
              # XXXXX
-Line 746 
 sub text_to_html {
+Line 510 
 sub text_to_html {
                          $colspan[$i]++;
                      }
                      $colspan[$i] = ($colspan[$i] > 1) ? sprintf(' colspan="%d"', $colspan[$i]) : '';
-                     $value[$i] = sprintf('<td%s%s>%s</td>', $align[$i], $colspan[$i], &inline($value[$i]));
+                     $value[$i] = sprintf('<td%s%s>%s</td>', $align[$i], $colspan[$i], &inline($value[$i], const => \%const));
                  } else {
                      $value[$i] = '';
                  }
-Line 763 
 sub text_to_html {
+Line 527 
 sub text_to_html {
          } elsif (/^\[([0-9]+)\](.*)$/ && !$main::_EMBEDED) {
            my $num = 0+$1;
            push @result, qq(<a name="anchor-$num" id="anchor-$num" class="anchor">[$num]</a>);
-           push @result, &inline ($2);
+           push @result, &inline ($2, const => \%const);
          } else {
-             push(@result, &inline($_));
+             push(@result, &inline($_, const => \%const));
          }
      }
      push(@result, splice(@saved));
-     my $toc = '';
+     my $r = join("\n", @result);
-     if ($option{toc}) {
+     $r =~ s#<p>\x0D?\x0A</p>##g;
-         # Convert @toc (table of contents) to HTML.
+     $r =~ s#[\x0D\x0A]+</#</#g;
-         # This part is taken from Makio Tsukamoto's WalWiki.
+     $r =~ s#<pre>\x0D?\x0A#<pre>#g;
-         my (@tocsaved, @tocresult);
+     $r;
-         foreach (@toc,@toc2) {
-             if (/^(-{1,6})(.*)$/) {
-                 &back_push('ul', length($1), \@tocsaved, \@tocresult);
-                 push(@tocresult, '<li>' . $2 . '</li>');
-             }
-         }
-         push(@tocresult, splice(@tocsaved));
-         $toc = join("\n", @tocresult);
-         $toc = $toc ? qq(<div id="wikipage-toc">$toc</div>) : '';
-     }
-     $toc .= join("\n", @result);
-     $toc =~ s#<p>\n</p>##g;
-     $toc =~ s#[\x0D\x0A]+</#</#g;
-     $toc =~ s#<pre>\n#<pre>#g;
-     $toc;
  }
  sub back_push {
-Line 806 
 sub back_push {
+Line 555 
 sub back_push {
      }
  }
- sub inline {
+ sub inline ($;%) {
-     my ($line) = @_;
+     my ($line, %option) = @_;
      $line = &escape($line);
      $line =~ s{$embed_command{form}}{&make_custom_form ($1, $2, $3, $4)}ge;
      $line =~ s{\[(INS|DEL|SUP|SUB|VAR|CODE|KBD|SAMP|DFN)(?:\(([A-Za-z0-9\x20-]+)\))?\[(.+?)\]\]}{<@{[lc $1]}@{[$2 ? qq( class="$2") : '']}>$3</@{[lc $1]}>}g;
-Line 816 
 sub inline {
+Line 565 
 sub inline {
      $line =~ s:\[RUBYB\[([^]]+)\] \[([^]]+)\] \[([^]]+)\]\]:<span class="ruby"><ruby class="rb"><rb>$1</rb><rp>(</rp><rt>$2</rt><rp>)</rp></ruby><span class="rp"> (</span><span class="rt-below">$3</span><span class="rp">) </span></span>:g;
      $line =~ s:\[RUBY\[([^]]+)\] \[([^]]+)\]\]:<ruby><rb>$1</rb><rp>(</rp><rt>$2</rt><rp>)</rp></ruby>:g;
      $line =~ s:\[RUBYB\[([^]]+)\] \[([^]]+)\]\]:<span class="ruby"><span class="rb">$1</span><span class="rp"> (</span><span class="rt-below">$2</span><span class="rp">) </span></span>:g;
-     $line =~ s%\[Q\[([^]]+)\](?: \[&lt;([\x21-\x5A\x5E-\x7E]+)&gt;\])?\]%�Ö<q@{[$2?qq( cite="$2"):'']}>$1</q>�×%g;
      $line =~ s|'''([^']+)'''|<strong>$1</strong>|g;
      $line =~ s|''([^']+)''|<em>$1</em>|g;
      $line =~ s{
-       ((?:$bracket_name))       # [[likethis]], [[#comment]], [[Friend:remotelink]]
+       (\[\[(\#\S+?)\]\])
-       |\[\[([^[]+?)]&gt;&gt;([0-9]+)]   # [[WikiName]>>1]
+       |\[\[([^[]+?)](?:&gt;&gt;([0-9]+))?]
        |&gt;&gt;([0-9]+)
        |&lt;([A-Za-z0-9%]+:(?:(?!&gt;).)+)&gt;
      }{
        my ($l, $page,$anchor, $anum, $uri) = ($1, $3,$4, 0+$5, $6);
        if ($l) {
-         &make_link($l)
+         &embedded_to_html($1);
        } elsif (defined $page) {
          &make_wikilink ($page, anchor => 0+$anchor);
        } elsif ($anum) {
-Line 850 
 sub make_wikilink ($%) {
+Line 598 
 sub make_wikilink ($%) {
        return qq(<a title="$subject" href="$url_cgi?@{[&encode($name)]}" class="wiki">$ename</a>);
      }
    } else {
-     return qq(<a title="$resource{editthispage}" href="$url_cgi?mycmd=edit;mypage=@{[&escape($name)]}" class="wiki not-exist">$ename<span class="mark">$editchar</span></a>);
+     return qq(<a title="@{[&Resource('JumpAndEditWikiPage',escape=>1)]}" href="$url_cgi?@{[&escape($name)]}" class="wiki not-exist">$ename<span class="mark">@{[&Resource('JumpAndEditWikiPageMark',escape=>1)]}</span></a>);
    }
  }
-Line 864 
 sub make_urilink ($;%) {
+Line 612 
 sub make_urilink ($;%) {
        for ($site, $name) {
          if (s/^"//) { s/"$//; s/\\(.)/$1/g }
        }
+       &init_InterWikiName () unless $interwiki{'[[]]'};
        if ($interwiki{$site}) {
+         &load_formatter ('interwiki');
          my $uri = &escape ($fmt{interwiki}->replace ($interwiki{$site} => {site => $site, name => $name}));
          $site = &escape ($site); $name = &escape ($name);
          qq(&lt;<a href="$uri" class="out-of-wiki interwiki" title="$name ($site); URI: &lt;$uri&gt;"><span class="interwiki-site">$site:</span><span class="interwiki-name">$name</span></a>&gt;);
        } else {
-         qq(&lt;Ģ¤ÅŠĻæ¤Ī <a href="$url_cgi?InterWikiName" class="wiki">InterWikiName</a>: @{[&escape ($site)]}>);
+         qq(&lt;@{[&Resource('Error:UnknownInterWikiName=',escape=>1)]}@{[&escape ($site)]}&gt;);
        }
      } else {
-       qq(&lt;ÉŌĄµ¤Ź <a href="$url_cgi?InterWikiName" class="wiki">InterWikiName</a>: @{[&escape($uri)]}>);
+       qq(&lt;@{[&Resource('Error:InvalidInterWiki=',escape=>1)]}@{[&escape($uri)]}&gt;);
      }
    } elsif ($uri =~ /^urn:/) {   ## URN
      my $uri2 = &escape (URI->new ('/uri-res/N2L?'.&unescape ($uri), 'http')->canonical);
-Line 891 
 sub make_urilink ($;%) {
+Line 641 
 sub make_urilink ($;%) {
    }
  }
- my $FormIndex = 0;
+ {my $FormIndex = 0;
  sub make_custom_form ($$$$) {
      my ($wfname, $definition, $template, $option) = @_;
      ## $template and $option is currently not used in this procedure.
-Line 899 
 sub make_custom_form ($$$$) {
+Line 649 
 sub make_custom_form ($$$$) {
          $FormIndex++;
          if (length $definition) {
              my $param = bless {}, 'SuikaWiki::Plugin';
-             my $lastmodified = &get_info($form{mypage}, $info_LastModified);
+             my $lastmodified = $database->mtime ($form{mypage});
              &load_formatter (qw/form_input form_option/);
              $definition = &unescape ($definition);
              $definition =~ s/\\(.)/$1/g;
-             $definition .= ' %submit;' if $definition !~ /%submit/;
              $option = &unescape ($option);
              $option =~ s/\\(.)/$1/g;
              $fmt{form_option}->replace ($option, $param);
+             $param->{output}->{form} = 1 unless defined $param->{output}->{form};
+             $definition .= ' %submit;' if $definition !~ /%submit/ && !$param->{output}->{nosubmit} && $param->{output}->{form};
              my $target_page = $param->{output}->{page} || $form{mypage};
-             $param->{form_disabled} = 1 if $fixedpage{$target_page};
+             $param->{form_disabled} = 1 if $database->meta (IsFrozen => $form{mypage});
              my $target_form = $param->{output}->{id};
-             my $r = <<EOH;
+             my $r = '';
+             $r = <<EOH if $param->{output}->{form};
  <form method="post" action="$url_cgi" id="wikiform-$FormIndex" class="wikiform">
    <input type="hidden" name="mycmd" value="@{[$param->{form_disabled}?'read':'wikiform']}">
    <input type="hidden" name="mypage" value="@{[&escape($target_page)]}">
-Line 920 
 sub make_custom_form ($$$$) {
+Line 672 
 sub make_custom_form ($$$$) {
  EOH
              $r .= qq(<a name="wikiform-$FormIndex"></a>) if $UA =~ m#Mozilla/[12]\.#;
              $r .= $fmt{form_input}->replace ($definition, $param);
-             $r .= <<EOH;
+             $r .= "</form>\n" if $param->{output}->{form};
- </form>
- EOH
              $r;
         } else {  ## No input-interface WikiForm
             qq(<a id="wikiform-$FormIndex" name="wikiform-$FormIndex"><!-- #form --></a>);
         }
      } else {
-         q(<ins class="wiki-error"><strong>Warning</strong>: form in embeded page is currently not supported.</ins>);
+         qq(<ins class="wiki-error">@{[&Resource('Error:WikiForm:EmbedIsNotSupported',escape=>1)]}</ins>);
      }
- }
+ }}
- ## to be obsoleted
- sub make_link {
-     my $chunk = shift;
-     # Walrus add (3) start
-     $chunk =~ s/^&lt;(.*)&gt;$/$1/;
-     my $name  = $chunk;
-     $name = &unarmor_name($name);
-     # Walrus add (3) end
-     if ($chunk =~ /^$embedded_name$/) {
-         return &embedded_to_html($chunk);
-     } else {
-         $chunk = &unarmor_name($chunk);
-         $chunk = &unescape($chunk); # To treat '&' or '>' or '<' correctly.
-         my $cookedchunk = &encode($chunk);
-         if ($database{$chunk}) {
-             my $subject = &escape(&get_subjectline($chunk, delimiter => ''));
- #           return qq(<a title="$subject" href="$url_cgi?$cookedchunk">$chunk</a>);  # Walrus del (3)
-             return qq(<a title="$subject" href="$url_cgi?$cookedchunk" class="wiki">@{[&escape($name)]}</a>);   # Walrus add (3)
-         } elsif ($page_command{$chunk}) {
- #           return qq(<a title="$chunk" href="$url_cgi?$cookedchunk">$chunk</a>);    # Walrus del (3)
-             return qq(<a title="$chunk" href="$url_cgi?$cookedchunk" class="wiki">@{[&escape($name)]}</a>);     # Walrus add (3)
-         } else {
-             return qq(<a title="$resource{editthispage}" href="$url_cgi?mycmd=edit;mypage=$cookedchunk" class="wiki">@{[&escape($name)]}<span class="mark">$editchar</span></a>);
-         }
-     }
- }
  sub print_message {
      my ($msg) = @_;
-     print qq(<p><strong>$msg</strong></p>);
+     print qq(<p><strong>@{[&escape($msg)]}</strong></p>);
- }
- sub get_message {
-     my ($msg) = @_;
-     qq(<p><strong>$msg</strong></p>);
  }
  sub init_form {
-     if (param()) {
+     ## TODO: Support multipart/form-data
-         foreach my $var (param()) {
+     my $query = '';
-             $form{$var} = param($var);
+     if (uc $main::ENV{REQUEST_METHOD} eq 'POST') {
-       }
+       read STDIN, $query, $main::ENV{CONTENT_LENGTH};
      }
-     $form{mypage} = &code_convert(\$form{mypage}, $kanjicode);
+     $query .= ($query ? ';' : '') . $main::ENV{QUERY_STRING};
-     if ($main::ENV{QUERY_STRING} && $main::ENV{QUERY_STRING} !~ /[&;=]/) {
+     if ($main::ENV{REQUEST_METHOD} ne 'POST' && $main::ENV{QUERY_STRING} && $main::ENV{QUERY_STRING} !~ /[&;=]/) {
        my $query = &decode($main::ENV{QUERY_STRING});
        $query = &code_convert(\$query, $kanjicode);
        if ($page_command{$query}) {
-Line 986 
 sub init_form {
+Line 704 
 sub init_form {
          $form{mypage} = $query;
          $form{mycmd} = $database{$form{mypage}} ? 'read' : 'edit';
        }
+     } else {
+       for (split /[;&]/, $query) {
+         if (my ($n, $v) = split /=/, $_, 2) {
+           for ($n, $v) {tr/+/ /; s/%([0-9A-Fa-f][0-9A-Fa-f])/pack 'C', hex $1/ge};
+           $form{$n} = $v;
+         }
+       }
+       unless (defined $form{mypage}) {
+         $form{mypage} = $form{epage};
+         $form{mypage} =~ s/([0-9A-F]{2})/ord hex $1/g;
+       }
+       if ($page_command{$form{mypage}} && $form{mycmd} eq 'read') {
+         $form{mypage} = &code_convert(\$form{mypage}, $kanjicode);
+         $form{mycmd} = $page_command{$form{mypage}};
+       }
      }
      $form{mypage} ||= 'HomePage';
+     $form{mypage} =~ tr/\x00-\x1F\x7F//d;
      $form{mycmd} ||= 'read';
      # mypreview_edit        -> do_edit, with preview.
-Line 1011 
 sub init_form {
+Line 745 
 sub init_form {
      $form{myname} = &code_convert(\$form{myname}, $kanjicode);
  }
- sub update_recent_changes {
+ {my %SubjectLine;
-     my $update = "- @{[&get_now]} [[@{[&escape($form{mypage})]}]] @{[&get_subjectline($form{mypage})]}";
-     my @oldupdates = split(/\r?\n/, $database{$RecentChanges});
-     shift (@oldupdates); ## '#?' magic line
-     my @updates;
-     foreach (@oldupdates) {
-         /^\- \d\d\d\d\-\d\d\-\d\d \([^)]+\) \d\d:\d\d \[\[(\S+?)\]\]/;
-         my $name = $1;
-         if ($name ne $form{mypage}) {
-             push @updates, $_;
-         }
-     }
-     if (&is_exist_page($form{mypage})) {
-       unshift @updates, $update;
-     }
-     splice(@updates, $maxrecent + 1);
-     $database{$RecentChanges} = "#?SuikaWiki/0.9\n" . join("\n", @updates);
-     if ($file_touch) {
-         open(FILE, "> $file_touch");
-         print FILE localtime() . "\n";
-         close(FILE);
-     }
- }
  sub get_subjectline {
      my ($page, %option) = @_;
-     if (not &is_editable($page)) {
+     unless (defined $SubjectLine{$page}) {
-         return "";
+       if (not &is_editable($page)) {
+         $SubjectLine{$page} = "";
+       } else {
+         $SubjectLine{$page} = $database{$page};
+         $SubjectLine{$page} =~ s!^\#\?[^\x0A\x0D]+[\x0A\x0D]*!!s;
+         $SubjectLine{$page} =~ s/\x0D?\x0A.*//s;
+       }
+     }
+     if (length $SubjectLine{$page}) {
+       $option{delimiter} = defined $option{delimiter} ? $option{delimiter} : &Resource('Title-Summary Delimiter');
+       $option{delimiter}.$SubjectLine{$page}.$option{tail};
      } else {
-         # Delimiter check.
+       '';
-         my $delim = $subject_delimiter;
-         if (defined($option{delimiter})) {
-             $delim = $option{delimiter};
-         }
-         # Get the subject of the page.
-         my $subject = $database{$page};
-         $subject =~ s#^(?:\#\?)?SuikaWiki/0.9[^\x0D\x0A]*[\x0D\x0A]+##s;
-         $subject =~ s/\r?\n.*//s;
-         return "$delim$subject".$option{tail};
      }
- }
+ }}
- sub send_mail_to_admin {
-     my ($page, $mode) = @_;
-     return unless $modifier_sendmail;
-     my $message = <<"EOD";
- To: $modifier_mail
- From: $modifier_mail
- Subject: [Wiki]
- MIME-Version: 1.0
- Content-Type: text/plain; charset=ISO-2022-JP
- Content-Transfer-Encoding: 7bit
- --------
- MODE = $mode
- REMOTE_ADDR = $ENV{REMOTE_ADDR}
- REMOTE_HOST = $ENV{REMOTE_HOST}
- --------
- $page
- --------
- $database{$page}
- --------
- EOD
-     &code_convert(\$message, 'jis');
-     open(MAIL, "| $modifier_sendmail");
-     print MAIL $message;
-     close(MAIL);
- }
  sub open_db {
      if ($modifier_dbtype eq 'dbmopen') {
-         dbmopen(%database, $dataname, 0666) or &print_error("(dbmopen) $dataname");
+         dbmopen(%database, $PathTo{WikiDataBase}, 0666) or &print_error("(dbmopen) $PathTo{WikiDataBase}");
-         dbmopen(%infobase, $infoname, 0666) or &print_error("(dbmopen) $infoname");
      } elsif ($modifier_dbtype eq 'AnyDBM_File') {
-         tie(%database, "AnyDBM_File", $dataname, O_RDWR|O_CREAT, 0666) or &print_error("(tie AnyDBM_File) $dataname");
+         eval q{use AnyDBM_File};
-         tie(%infobase, "AnyDBM_File", $infoname, O_RDWR|O_CREAT, 0666) or &print_error("(tie AnyDBM_File) $infoname");
+         tie(%database, "AnyDBM_File", $PathTo{WikiDataBase}, O_RDWR|O_CREAT, 0666) or &print_error("(tie AnyDBM_File) $PathTo{WikiDataBase}");
-     } else {
+     } elsif ($modifier_dbtype eq 'Yuki::YukiWikiDB') {
-         tie(%database, "Yuki::YukiWikiDB", $dataname) or &print_error("(tie Yuki::YukiWikiDB) $dataname");
+         eval q{use Yuki::YukiWikiDB};
-         tie(%infobase, "Yuki::YukiWikiDB", $infoname) or &print_error("(tie Yuki::YukiWikiDB) $infoname");
+         tie(%database, "Yuki::YukiWikiDB", $PathTo{WikiDataBase}) or &print_error("(tie Yuki::YukiWikiDB) $PathTo{WikiDataBase}");
+     } else {    ## Yuki::YukiWikiDB || Yuki::YukiWikiDBMeta
+         eval qq{use $modifier_dbtype};
+         $database = tie(%database, $modifier_dbtype => $PathTo{WikiDataBase}, -lock => 2, -backup => $wiki::diff::UseDiff) or &print_error("(tie $modifier_dbtype) $PathTo{WikiDataBase}");
      }
  }
  sub close_db {
      if ($modifier_dbtype eq 'dbmopen') {
          dbmclose(%database);
-         dbmclose(%infobase);
-     } elsif ($modifier_dbtype eq 'AnyDBM_File') {
-         untie(%database);
-         untie(%infobase);
      } else {
          untie(%database);
-         untie(%infobase);
-     }
- }
- sub open_diff {
-     if ($modifier_dbtype eq 'dbmopen') {
-         dbmopen(%diffbase, $diffname, 0666) or &print_error("(dbmopen) $diffname");
-     } elsif ($modifier_dbtype eq 'AnyDBM_File') {
-         tie(%diffbase, "AnyDBM_File", $diffname, O_RDWR|O_CREAT, 0666) or &print_error("(tie AnyDBM_File) $diffname");
-     } else {
-         tie(%diffbase, "Yuki::YukiWikiDB", $diffname) or &print_error("(tie Yuki::YukiWikiDB) $diffname");
-     }
- }
- sub close_diff {
-     if ($modifier_dbtype eq 'dbmopen') {
-         dbmclose(%diffbase);
-     } elsif ($modifier_dbtype eq 'AnyDBM_File') {
-         untie(%diffbase);
-     } else {
-         untie(%diffbase);
      }
  }
- sub print_searchform {
+ sub editform (@) {
-     my ($word) = @_;
+   my %option = @_;
-     print <<"EOD";
+   my $frozen = &is_frozen ($option{page});
- <form action="$url_cgi" method="get">
+   $option{content} = $database{$option{page}} unless defined $option{content};
-     <input type="hidden" name="mycmd" value="read">
+   $option{content} = $database{NewPageTemplate} unless length $option{content};
-     <input type="text" name="mypage" value="$word" size="20">
+   $option{last_modified} = $database->mtime ($option{page}) unless defined $option{last_modified};
-     <input type="submit" value="$resource{searchbutton}">
+   my $f = '';
- </form>
+   my $magic = '';
- EOD
+   $magic = $1 if $option{content} =~ m/^([^\x0A\x0D]+)/s;
- }
+   my $selected = 'read';
- sub print_editform {
+   if ($form{after_edit_cmd}) {
-     my ($mymsg, $lastmodified, %mode) = @_;
+     $selected = $form{after_edit_cmd};
-     my $frozen = &is_frozen($form{mypage});
+   } elsif ($magic =~ /Const|Config|CSS/) {
+     $selected = 'edit';
-     if ($form{mypreview}) {
+   }
-         if ($form{mymsg}) {
+   my $afteredit = <<EOH;
-             unless ($mode{conflict}) {
-                 print qq(<h3>$resource{previewtitle}</h3>\n);
-                 print qq($resource{previewnotice}\n);
-                 print qq(<div class="preview">\n);
-                 &print_content($form{mymsg});
-                 print qq(</div>\n);
-             }
-         } else {
-             print qq($resource{previewempty});
-         }
-         $mymsg = &escape($form{mymsg});
-     } else {
-         $mymsg = &escape($mymsg || $database{NewPageTemplate});
-     }
-     my $magic = '';
-     $magic = $1 if $mymsg =~ m/^([^\x0A\x0D]+)/s;
-     my $edit = $mode{admin} ? 'adminedit' : 'edit';
-     my $escapedmypage = &escape($form{mypage});
-     my $escapedmypassword = &escape($form{mypassword});
-     my $selected = 'read';
-     if ($form{after_edit_cmd}) {
-         $selected = $form{after_edit_cmd};
-     } elsif ($magic =~ /Config/ || $magic =~ /CSS/) {
-         $selected = 'edit';
-     }
-     my $afteredit = <<EOH;
  <select name="after_edit_cmd">
- <option value="read" label="View changed page"@{[$selected eq 'read' ? ' selected="selected"':'']}>read</option>
+ <option value="read" label="@{[&Resource('Edit:SaveAndView',escape=>1)]}"@{[$selected eq 'read' ? ' selected="selected"':'']}>@{[&Resource('Edit:SaveAndView',escape=>1)]}</option>
- <option value="edit" label="Edit changed page"@{[$selected eq 'edit' ? ' selected="selected"':'']}>edit</option>
+ <option value="edit" label="@{[&Resource('Edit:SaveAndEdit',escape=>1)]}"@{[$selected eq 'edit' ? ' selected="selected"':'']}>@{[&Resource('Edit:SaveAndEdit',escape=>1)]}</option>
  </select>
  EOH
+   $f .= <<"EOD";
-     print <<"EOD";
+ <form action="$uri{wiki}" method="post">
- <form action="$url_cgi" method="post">
+     @{[ $option{conflict} ? '' : qq(<label><input type="submit" name="mypreview_write" value="@{[&Resource('Edit:Save',escape=>1)]}"><kbd>S</kbd></label>) ]}
- <h2>$escapedmypage¤ĪŹŌ½ø</h2>
+     @{[ $option{admin} ? qq(<label>@{[&Resource('Edit:Password=',escape=>1)]}<input type="password" name="mypassword" value="" size="10"></label>) : "" ]} [@{[&get_new_anchor_index($option{content})]}]<br>
-     @{[ $mode{conflict} ? '' : qq(<input type="submit" name="mypreview_write" value="$resource{savebutton}"><kbd>S</kbd>) ]}
+     <input type="hidden" name="myLastModified" value="$option{last_modified}">
-     @{[ $mode{admin} ? qq($resource{frozenpassword} <input type="password" name="mypassword" value="$escapedmypassword" size="10">) : "" ]} [@{[do {my $n = 0;
+     <input type="hidden" name="mypage" value="@{[&escape($form{mypage})]}">
-                $mymsg =~ s/(?:-+\s)?\[([0-9]+)\]/$n = $1 if $1 > $n; $&/mge;
+     <textarea cols="@{[&Resource('Edit:Form:Cols')+0||80]}" rows="@{[&Resource('Edit:Form:Rows')+0||20]}" name="mymsg" tabindex="1">@{[&escape($option{content})]}</textarea><br>
-                ++$n}]}]<br>
-     <input type="hidden" name="myLastModified" value="$lastmodified">
-     <input type="hidden" name="mypage" value="$escapedmypage">
-     <textarea cols="$cols" rows="$rows" name="mymsg" tabindex="1">$mymsg</textarea><br>
  @{[
-     $mode{admin} ?
+     $option{admin} ?
      qq(
-     <input type="radio" name="myfrozen" value="1" @{[$frozen ? qq(checked="checked") : ""]}>$resource{frozenbutton}
+     <label><input type="radio" name="myfrozen" value="1" @{[$frozen ? qq(checked="checked") : ""]}>@{[&Resource('Edit:Freeze',escape=>1)]}</label>
-     <input type="radio" name="myfrozen" value="0" @{[$frozen ? "" : qq(checked="checked")]}>$resource{notfrozenbutton}<br>)
+     <label><input type="radio" name="myfrozen" value="0" @{[$frozen ? "" : qq(checked="checked")]}>@{[&Resource('Edit:DontFreeze',escape=>1)]}</label><br>)
      : ""
  ]}
  @{[
-     $mode{conflict} ? "" :
+     $option{conflict} ? "" :
      qq(
-         <input type="checkbox" name="mytouch" value="on" checked="checked">$resource{touch}<br>
+         <label><input type="checkbox" name="mytouch" value="on" checked="checked">@{[&Resource('Edit:UpdateTimeStamp',escape=>1)]}</label><br>
-         <input type="submit" name="mypreview_$edit" value="$resource{previewbutton}">
+         <label><input type="submit" name="mypreview_write" value="@{[&Resource('Edit:Save',escape=>1)]}" accesskey="S"><kbd>S</kbd></label>
-         <input type="submit" name="mypreview_write" value="$resource{savebutton}" accesskey="S"><kbd>S</kbd>
         $afteredit
-        <br>
      )
  ]}
  </form>
  EOD
-     unless ($mode{conflict}) {
+     unless ($option{conflict}) {
-         # Show the format rule.
+         ## Show help text
-         my $help = $database{'WikiEditHelp'};
+         my $help = $database{WikiEditHelp};
          $help =~ s!^\#\?([A-Z][A-Za-z0-9-]+/[0-9.]+(?:[^0-9.\x0D\x0A][^\x0D\x0A]*)?)[\x0D\x0A]+!!s;
-         print &text_to_html ($help, toc => 0);
+         $f .= &text_to_html ($help, toc => 0);
-     #    open(FILE, $file_format) or &print_error("($file_format)");
-     #    my $content = join('', <FILE>);
-     #    &code_convert(\$content, $kanjicode);
-     #    close(FILE);
-     #    print &text_to_html($content, toc=>0);
      }
- }
+     $f;
- sub print_passwordform {
-         print <<"EOD";
- <form action="$url_cgi" method="post">
-     <input type="hidden" name="mycmd" value="adminchangepassword">
-     $resource{oldpassword} <input type="password" name="myoldpassword" size="10"><br>
-     $resource{newpassword} <input type="password" name="mynewpassword" size="10"><br>
-     $resource{newpassword2} <input type="password" name="mynewpassword2" size="10"><br>
-     <input type="submit" value="$resource{changepasswordbutton}"><br>
- </form>
- EOD
  }
  sub is_editable {
      my ($page) = @_;
-     if ($fixedpage{$page} || $page =~ /\s/ || $page =~ /^\#/) {
+     $page =~ /[\x00-\x1F\x7F]/ ? 0 : 1;
-         return 0;
-     } else {
-         return 1;
-     }
  }
  # armor_name:
-Line 1250 
 sub armor_name { qq([[$_[0]]]) }
+Line 858 
 sub armor_name { qq([[$_[0]]]) }
  #   WikiName -> WikiName
  sub unarmor_name {
      my ($name) = @_;
-     if ($name =~ /^$bracket_name$/) {
+     if ($name =~ /^\[\[(\S+?)\]\]$/) {
          return $1;
      } else {
          return $name;
-Line 1277 
 sub encode {
+Line 885 
 sub encode {
      return $encoded;
  }
- sub init_resource {
-     open(FILE, $file_resource) or &print_error("(resource)");
-     while (<FILE>) {
-         s/[\x0A\x0D]+$//g;
-         next if /^#/;
-         my ($key, $value) = split(/=/, $_, 2);
-         $resource{$key} = &code_convert(\$value, $kanjicode);
-     }
-     close(FILE);
- }
- sub conflict {
-     my ($page, $rawmsg) = @_;
-     if ($form{myLastModified} eq &get_info($page, $info_LastModified)) {
-         return 0;
-     }
-     open(FILE, $file_conflict) or &print_error("(conflict)");
-     my $content = join('', <FILE>);
-     &code_convert(\$content, $kanjicode);
-     close(FILE);
-     &print_header($page, -noindex => 1);
-     &print_content($content);
-     &print_editform($rawmsg, $form{myLastModified}, frozen=>0, conflict=>1);
-     &print_footer($page);
-     return 1;
- }
  sub get_now {
-     my (@week) = qw(Sun Mon Tue Wed Thu Fri Sat);
+     my ($sec, $min, $hour, $day, $mon, $year) = localtime(time);
-     my (@week) = qw(Ęü ·ī ²Š æå ĢŚ ¶ā ÅŚ);
-     my ($sec, $min, $hour, $day, $mon, $year, $weekday) = localtime(time);
      $year += 1900;
      $mon++;
      $mon = "0$mon" if $mon < 10;
-Line 1315 
 sub get_now {
+Line 894 
 sub get_now {
      $hour = "0$hour" if $hour < 10;
      $min = "0$min" if $min < 10;
      #$sec = "0$sec" if $sec < 10;
-     $weekday = $week[$weekday];
+     return "$year-$mon-$day $hour:$min";
-     return "$year-$mon-$day ($weekday) $hour:$min";
  }
  sub init_InterWikiName {
-   my @content = split /\n/, $database{$InterWikiName};
+   my @content = split /\n/, $database{InterWikiName};
    for (@content) {
      if (/^([^#]\S*)\s+(\S[^\x0A\x0D]+)/) {
        $interwiki{$1} = $2;
      }
    }
-   require Message::Util::Formatter;
+   $interwiki{'[[]]'} = 1;       ## dummy
-   $fmt{interwiki} = Message::Util::Formatter->new;
-   $fmt{interwiki}->{encoded} = sub {
-     my ($o, $p) = @_;
-     if ($o->{except}) {
-       $o->{except} =~ tr/\x00-\x20\x22%\x2D<>^[\x5C]`{|}\x7F-\xFF//d;
-     }
-     my $s = &code_convert (\$p->{name}, $o->{charset} || 'iso-2022-7bit');
-     $s =~ s/([^$o->{except}A-Za-z0-9_-])/sprintf '%%%02X', unpack 'C', $1/ge;
-     $s;
-   };
-   $fmt{interwiki}->{ykwk} = sub {       ## YukiWiki1
-     my ($o, $p) = @_;
-     my $s = $p->{name};
-     $s = qq([[$s]]) if $s !~ /^[A-Z][a-z]+(?:[A-Z][a-z]+)+$/;
-     &encode (&code_convert (\$p->{name}, $o->{charset} || 'shift_jis'));
-   };
- }
- sub get_info {
-     my ($page, $key) = @_;
-     my %info = map { split(/=/, $_, 2) } split(/\n/, $infobase{$page});
-     return $info{$key};
- }
- sub set_info {
-     my ($page, $key, $value) = @_;
-     my %info = map { split(/=/, $_, 2) } split(/\n/, $infobase{$page});
-     $info{$key} = $value;
-     my $s = '';
-     for (keys %info) {
-         $s .= "$_=$info{$_}\n";
-     }
-     $infobase{$page} = $s;
  }
  sub frozen_reject {
-     my ($isfrozen) = &get_info($form{mypage}, $info_IsFrozen);
+     my ($isfrozen) = $database->meta (IsFrozen => $form{mypage});
      my ($willbefrozen) = $form{myfrozen};
      if (not $isfrozen and not $willbefrozen) {
          # You need no check.
-Line 1373 
 sub frozen_reject {
+Line 917 
 sub frozen_reject {
          # You are admin.
          return 0;
      } else {
-         &print_error($resource{passworderror});
+         &print_error(&Resource('Error:PasswordIsIncorrect'));
          return 1;
      }
  }
- sub valid_password {
+ sub is_frozen ($) { $database->meta (IsFrozen => $_[0]) ? 1 : 0 }
-     my ($givenpassword) = @_;
-     my ($validpassword_crypt) = &get_info($AdminSpecialPage, $info_AdminPassword);
-     if (crypt($givenpassword, $validpassword_crypt) eq $validpassword_crypt) {
-         return 1;
-     } else {
-         return 0;
-     }
- }
- sub is_frozen {
-     my ($page) = @_;
-     if (&get_info($page, $info_IsFrozen)) {
-         return 1;
-     } else {
-         return 0;
-     }
- }
  sub do_comment {
      my ($content) = $database{$form{mypage}};
      my $default_name;   ## this code does not strict.
      $default_name = $1 if $content =~ /default-name="([^"]+)"/;
      my $datestr = '[WEAK['.&get_now.']]';
-     my $namestr = $form{myname} || $default_name || $DEFAULT_embed_comment_name;
+     my $namestr = $form{myname} || $default_name || &Resource('WikiForm:WikiComment:DefaultName');
      ($namestr = '', $datestr = '') if $form{myname} eq 'nodate';
      if ($namestr =~ /^(?:>>)?[0-9]/) {
        $namestr = qq( ''$namestr'': );
-Line 1411 
 sub do_comment {
+Line 938 
 sub do_comment {
      }
      my $anchor = &get_new_anchor_index ($content);
      my $i = 1;  my $o = 0;
-     $content =~ s{(\Q$embed_comment\E|\Q$embed_rcomment\E)}{
+     $content =~ s{(\[\[\#r?comment\]\])}{
        my $embed = $1;
        if ($i == $form{comment_index}) {
-         if ($embed eq $embed_comment) {
+         if ($embed ne '[[#rcomment]]') {
            $embed = "- [$anchor] $datestr$namestr$form{mymsg}\n$embed";  $o = 1;
          } else {
            $embed .= "\n- [$anchor] $datestr$namestr$form{mymsg}";  $o = 1;
-Line 1448 
 sub get_new_anchor_index ($) {
+Line 975 
 sub get_new_anchor_index ($) {
  my $CommentIndex = 0;
  sub embedded_to_html {
      my ($embedded) = @_;
-     if ($embedded eq $embed_comment or $embedded eq $embed_rcomment) {
+     if ($embedded eq '[[#comment]]' or $embedded eq '[[#rcomment]]') {
        unless ($main::_EMBEDED) {
-         my $lastmodified = &get_info($form{mypage}, $info_LastModified);
+         my $lastmodified = $database->mtime ($form{mypage});
          return <<"EOD";
  <form action="$url_cgi" method="post" id="x-comment-@{[++$CommentIndex]}" class="comment"><p>
      <input type="hidden" name="mycmd" value="comment">
-Line 1458 
 sub embedded_to_html {
+Line 985 
 sub embedded_to_html {
      <input type="hidden" name="myLastModified" value="$lastmodified">
      <input type="hidden" name="mytouch" value="on">
      <input type="hidden" name="comment_index" value="$CommentIndex">
-     $embed_comment_Name_Prompt
+     @{[&Resource('WikiForm:WikiComment:Name=',escape=>1)]}
      <input type="text" name="myname" value="" size="10" class="comment-name">
      <input type="text" name="mymsg" value="" size="60" class="comment-msg">
-     <input type="submit" value="$resource{commentbutton}" class="comment-submit">
+     <input type="submit" value="@{[&Resource('WikiForm:Add',escape=>1)]}" title="@{[&Resource('WikiForm:AddLong',escape=>1)]}" class="comment-submit">
  </p></form>
  EOD
       } else {
-Line 1469 
 EOD
+Line 996 
 EOD
  <del><form action="$url_cgi" method="get">
      <input type="hidden" name="mycmd" value="read">
      <input type="hidden" name="mypage" value="$form{mypage}">
-     $embed_comment_Name_Prompt
+     @{[&Resource('WikiForm:WikiComment:Name=',escape=>1)]}
      <input type="text" name="myname" value="" size="10" disabled="disabled">
      <input type="text" name="mymsg" value="" size="60" disabled="disabled">
-     <input type="submit" value="$resource{commentbutton}" disabled="disabled">
  </form></del>
  EOD
      }
    } elsif ($embedded =~ /$embed_command{searched}/) {
      return get_search_result ($1, -match_myself => 1);
-     # Walrus add (5) start
-     } elsif ($embedded =~ /$embed_interwiki/ and my $remoteurl = $interwiki{$2}) {
-         $_ = &make_interwiki_box($1, $2);
-         return ($_) ? $_ : $embedded;
-     # Walrus add (5) end
    } elsif ($embedded =~ /^\[\[\#embed:(.+)\]\]$/) {
      my ($name, $r) = ($1, '');
      if ($main::_EMBEDED != 1) {
-Line 1495 
 EOD
+Line 1016 
 EOD
        } elsif (length $content) {
          $r = "<pre>@{[&escape ($content)]}</pre>";
        } else {
-         $r = &text_to_html ("[INS[\nĖä¤į¹ž¤Ž¤ģ¤Ę¤¤¤ė [[$name]] ¤Ļ¤Ž¤Ą½ń¤«¤ģ¤Ę¤¤¤Ž¤»¤ó�£\n]INS]\n", content_format => 'SuikaWiki/0.9');
+         $r = &text_to_html ("[INS[\n[[$name]]: @{[&Resource('Embed:PageNotFound')]}\n]INS]\n", content_format => 'SuikaWiki/0.9');
        }
      } else {    ## nested #EMBED
-       $r = &text_to_html ("[INS[\n[[$name]] ¤ĪĖä¤į¹ž¤ß¤Ļ (Ęž¤źĮČ¤ó¤Ē¤¤¤ė¤Ī¤Ē) ²ņ·č¤µ¤ģ¤Ž¤»¤ó¤Ē¤·¤æ�£\n]INS]\n", content_format => 'SuikaWiki/0.9');
+       $r = &text_to_html ("[INS[\n[[$name]]: @{[&Resource('Embed:Nested',escape=>1)]}\n]INS]\n", content_format => 'SuikaWiki/0.9');
      }
      return qq(<blockquote title="@{[&escape($name)]}" class="wiki-embed">$r<div class="cite-note">�Ų<cite><a href="$url_cgi?@{[&encode($name)]}" class="wiki">@{[&escape($name)]}</a></cite>�Ł</div></blockquote>);
    } elsif ($embedded =~ /^\[\[\#randomlink:(.+)\]\]$/) {
-Line 1511 
 EOD
+Line 1032 
 EOD
  sub load_formatter (@) {
      for my $t (@_) {
          unless ($fmt{$t}) {
+             require Message::Util::Formatter;
              $fmt{$t} = Message::Util::Formatter->new;
              for (@{$SuikaWiki::Plugin::List{'wiki'.$t}||[]}) {
                  $_->load_formatter ($fmt{$t}, type => 'wiki'.$t);
-Line 1538 
 sub do_wikiform {
+Line 1060 
 sub do_wikiform {
              $param->{anchor_index} = $anchor;
              $param->{argv} = \%form;
              $param->{default_name} = $1 if $content =~ /default-name="([^"]+)"/;
-             $param->{default_name} ||= $DEFAULT_embed_comment_name;
+             $param->{default_name} ||= &Resource('WikiForm:WikiComment:DefaultName');
              $fmt{form_option}->replace ($option, $param);
              my $t = 1;
              for (@{$param->{require}||[]}) {
-Line 1576 
 sub do_wikiform {
+Line 1098 
 sub do_wikiform {
      }
  }
- # Walrus add (5) start
- sub do_interwiki_box {
-     my $remoteurl = $interwiki{$form{'myintername'}};
-     if ($remoteurl) {
-         $remoteurl =~ s/\b(euc|sjis|ykwk|asis|isbn)\(\$1\)/&interwiki_convert($1, $form{'mylocalname'})/e;
-         print "Location: $remoteurl\n\n";
-         exit(1);
-     } else {
-         &do_read;
-     }
- }
- # Walrus add (5) end
- # Walrus add (5) start
- sub make_interwiki_box {
-     my ($localname, $intername) = @_;
-     my %ignoretype = (
-         'box'      => 'text',
-         'text'     => 'text',
-         'pass'     => 'password',
-         'password' => 'password'
-     );
-     my $converted = ($ignoretype{$localname}) ? <<EOD : undef;
- <form action="$url_cgi" method="post">
-     <input type="hidden" name="mycmd" value="interwikibox">
-     <input type="hidden" name="mypage" value="$form{mypage}">
-     <input type="hidden" name="myintername" value="$intername">
-     $intername:
-     <input type="$ignoretype{$localname}" name="mylocalname" value="" size="10">
-     <input type="submit" value="Submit">
- </form>
- EOD
- }
- # Walrus add (5) end
  sub code_convert {
+   require Jcode;
      my ($contentref, $code) = (shift, shift || $kanjicode);
      $code = 'jis' if $code =~ /iso/;
      $code = 'euc' if $code =~ /euc/;
      $code = 'sjis' if $code =~ /shift/;
      $code = 'utf8' if $code =~ /utf/;
-     &Jcode::convert($contentref, $code);       # for Jcode.pm
+     $$contentref = Jcode->new ($contentref)->tr ("\xA3\xB0-\xA3\xB9\xA3\xC1-\xA3\xDA\xA3\xE1-\xA3\xFA\xA1\xF5\xA1\xA4\xA1\xA5\xA1\xA7\xA1\xA8\xA1\xA9\xA1\xAA\xA1\xAE\xA1\xB0\xA1\xB2\xA1\xBF\xA1\xC3\xA1\xCA\xA1\xCB\xA1\xCE\xA1\xCF\xA1\xD0\xA1\xD1\xA1\xDC\xA1\xF0\xA1\xF3\xA1\xF4\xA1\xF6\xA1\xF7\xA1\xE1\xA2\xAF\xA2\xB0\xA2\xB2\xA2\xB1\xA1\xE4\xA1\xE3\xA1\xC0\xA1\xA1" => q(0-9A-Za-z&,.:;?!`^_/|()[]{}+$%#*@='"~-><\ ))->$code;
- #    &jcode::convert($contentref, $code);       # for jcode.pl
-     &jcode::tr ($contentref, "\xA3\xB0-\xA3\xB9\xA3\xC1-\xA3\xDA\xA3\xE1-\xA3\xFA\xA1\xF5\xA1\xA4\xA1\xA5\xA1\xA7\xA1\xA8\xA1\xA9\xA1\xAA\xA1\xAE\xA1\xB0\xA1\xB2\xA1\xBF\xA1\xC3\xA1\xCA\xA1\xCB\xA1\xCE\xA1\xCF\xA1\xD0\xA1\xD1\xA1\xDC\xA1\xF0\xA1\xF3\xA1\xF4\xA1\xF6\xA1\xF7\xA1\xE1\xA2\xAF\xA2\xB0\xA2\xB2\xA2\xB1\xA1\xE4\xA1\xE3\xA1\xC0\xA1\xA1" => q(0-9A-Za-z&,.:;?!`^_/|()[]{}+$%#*@='"~-><\ )) if $code eq 'euc';
      return $$contentref;
  }
- sub test_convert {
-     my $txt = &text_to_html(<<"EOD", toc=>1);
- *HEADER1
- **HEADER1-1
- -ITEM1
- -ITEM2
- -ITEM3
- PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1
- PAR1PAR1PAR1PAR1PAR1PAR1''BOLD''PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1
- PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1
- PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2
- PAR2PAR2PAR2PAR2PAR2PAR2'''ITALIC'''PAR2PAR2PAR2PAR2PAR2PAR2PAR2
- PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2
- **HEADER1-2
- :TERM1:DESCRIPTION1 AND ''BOLD''
- PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1
- PAR1PAR1PAR1PAR1PAR1PAR1''BOLD''PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1
- PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1
- :TERM2:DESCRIPTION2
- :TERM3:DESCRIPTION3
- ----
- *HEADER2
- **HEADER2-1
- http://www.hyuki.com/
- **HEADER2-2
- [[YukiWiki2]]
- PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1
- PAR1PAR1PAR1PAR1PAR1PAR1'''''BOLD ITALIC'''''PAR1PAR1PAR1PAR1PAR1
- PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1PAR1
- >PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2
- >PAR2PAR2PAR2PAR2PAR2PAR2'''ITALIC'''PAR2PAR2PAR2PAR2PAR2PAR2PAR2
- >PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2PAR2
- LEVEL0LEVEL0LEVEL0LEVEL0LEVEL0LEVEL0LEVEL0
- >LEVEL1
- >LEVEL1
- >LEVEL1
- >>LEVEL2
- >>LEVEL2
- >>LEVEL2
- >>>LEVEL3
- -HELLO-1
- --HELLO-2
- (HELLO-2, HELLO-2, HELLO-2)
- ---HELLO-3
- (HELLO-3, HELLO-3, HELLO-3)
- --HELLO-2
- ---HELLO-3
- --HELLO-2
- ---HELLO-3
- >>>LEVEL3
- >>>LEVEL3
- >>>LEVEL3
- >>>LEVEL3
- EOD
-     print $txt;
-     exit;
- }
  sub do_diff {
-     if (not &is_editable($form{mypage})) {
-         &do_read;
-         return;
-     }
-     &open_diff;
      my $title = $form{mypage};
      &print_header($title, -noindex => 1);
-     $_ = &escape($diffbase{$form{mypage}});
+     print qq(<h2>@{[&Resource('Diff:Title',escape=>1)]}</h2>);
-     &close_diff;
+     print qq(<p>@{[&Resource('Diff:Notice',escape=>1)]}</p>);
-     print qq(<h3>$resource{difftitle}</h3>);
-     print qq($resource{diffnotice});
      print qq(<pre class="diff">);
-     foreach (split(/\n/, $_)) {
+     for (split(/\n/, &escape ($database->traverse_diff ($form{mypage})))) {
          if (/^\+(.*)/) {
-             print qq(<b class="added">$1</b>\n);
+             print qq(<ins class="added">$1</ins>\n);
          } elsif (/^\-(.*)/) {
-             print qq(<s class="deleted">$1</s>\n);
+             print qq(<del class="deleted">$1</del>\n);
          } elsif (/^\=(.*)/) {
              print qq(<span class="same">$1</span>\n);
          } else {
-Line 1712 
 sub do_diff {
+Line 1127 
 sub do_diff {
          }
      }
      print qq(</pre>);
-     print qq(<hr>);
      &print_footer($title);
  }
  sub do_rss {
+     eval q{use Yuki::RSS};
      my $rss = new Yuki::RSS(
          version => '1.0',
-         encoding => $charset,
+         encoding => &get_charset_name ($kanjicode),
+     );
+     my $scheme = 'http';
+     $scheme = lc $1 if $main::ENV{SERVER_PROTOCOL} =~ m#([A-Za-z0-9+.%-]+)#;
+     my $myuri = "$scheme://$main::ENV{SERVER_NAME}:$main::ENV{SERVER_PORT}$url_cgi";
+     $rss->stylesheet (
+       href      => $myuri . "?mycmd=TEXT_CSS;mypage=WikiStyle:RSS",
+       type      => 'text/css',
      );
      $rss->channel(
-         title => $modifier_rss_title,
+         title   => &Resource ('RSS:WikiTitle'),
-         link  => $modifier_rss_link,
+         link    => $myuri,
-         description => $modifier_rss_description,
+         description     => &Resource ('RSS:WikiDescription'),
+         'dc:language'   => $lang,
      );
-     my $recentchanges = $database{$RecentChanges};
+     my $recentchanges = $database{RecentChanges};
      my $count = 0;
      foreach (split(/\n/, $recentchanges)) {
          last if ($count >= 15);
-         /^\- \d\d\d\d\-\d\d\-\d\d \([^)]+\) \d\d:\d\d:\d\d (\S+)/;    # date format.
+         if (/\[\[([^]]+)\]\]/) {
-         my $title = &unarmor_name($1);
+           my $title = $1;
-         my $escaped_title = &escape($title);
+           $rss->add_item (
-         my $link = $modifier_rss_link . '?' . &encode($title);
+             title       => &escape($title),
-         my $description = $escaped_title . &escape(&get_subjectline($title));
+             link        => $myuri . '?' . &encode($title),
-         $rss->add_item(
+             description => &escape(&get_subjectline($title,delimiter=>'')),
-             title => $escaped_title,
+             'dc:date'   => $database->mtime ($title),
-             link  => $link,
+           );
-             description => $description,
+           $count++;
-         );
+         }
-         $count++;
      }
      # print RSS information (as XML).
- print scalar &make_navigate_links ('RssPage');
      print <<"EOD"
- Content-type: application/xml
+ Content-type: application/xml; charset=@{[&get_charset_name ($kanjicode)]}
  @{[$rss->as_string]}
  EOD
  }
+ sub _rfc3339_date ($) {
+   my @time = gmtime (shift);
+   sprintf '%04d-%02d-%02dT%02d:%02d:%02d+00:00', $time[5]+1900,$time[4]+1,@time[3,2,1,0];
+ }
  sub is_exist_page {
      my ($name) = @_;
      if ($use_exists) {
-Line 1761 
 sub is_exist_page {
+Line 1187 
 sub is_exist_page {
  }
  sub __get_database ($) { $database{ $_[0] } }
- sub __set_database ($$) { $database{ $_[0] } = $_[1] }
- sub do_wikiplugininfo {
+ my %_Resource;
-     &print_header (q(WikiPluginInfo));
+ sub Resource ($;%) {
-     print text_to_html (&SuikaWiki::Plugin::make_info_page);
+   my ($s, %o) = @_;
-     &print_footer (q(WikiPluginInfo));
+   unless (defined $_Resource{$s}) {
+     $_Resource{$_[0]} = &wiki::resource::get ($s, $_Resource{__option});
+   }
+   $o{escape} ? &escape ($_Resource{$s}) : $_Resource{$s};
  }
  package wiki::referer;
-Line 1789 
 sub add ($$) {
+Line 1217 
 sub add ($$) {
    $list{ $uri }++;
    set ($page, \%list);
  }
- sub get ($) {
+ sub get ($) { split /"/, $main::database->meta (Referer => $_[0]) }
-   my $page = shift;
-   split /"/, main::get_info ($page, 'Referer');
- }
  sub set ($%) {
    my $page = shift;
    my $list = shift;
-   main::set_info ($page, Referer => join '"', %$list);
+   $main::database->meta (Referer => $page => join '"', %$list);
  }
  sub get_dont_record () {
-Line 1850 
 sub __decode ($) {
+Line 1275 
 sub __decode ($) {
  }
  package wiki::useragent;
+ our $UseLog;
  sub add ($) {
    my $s = shift;
    return unless length $s;
-   $s =~ s/([\x00-\x08\x0A-\x1F\x25\x7F-\xFF])/sprintf '%%%02X', unpack 'C', $1/g;
+   return unless $UseLog;
+   $s =~ s/([\x00-\x08\x0A-\x1F\x25\x7F-\xFF])/sprintf '%%%02X', unpack 'C', $1/ge;
    my %ua;
-   for (split /\n/, &main::__get_database('WikiUserAgentList')) {
+   for (split /\n/, &main::__get_database($main::PageName{UserAgentList})) {
      if (/^-\[(\d+)\] (.+)$/) {
        my ($t, $n) = ($1, $2);
        $n =~ tr/\x0A\x0D//d;
-Line 1868 
 sub add ($) {
+Line 1295 
 sub add ($) {
    for (sort {$ua{$a} <=> $ua{$b}} keys %ua) {
      $s .= sprintf qq(-[%d] %s\n), $ua{$_}, $_;
    }
-   &main::__set_database ('WikiUserAgentList' => $s);
+   $main::database->STORE ($main::PageName{UserAgentList} => $s, -touch => 0);
+ }
+ package wiki::suikawikiconst;
+ sub to_hash ($;$) {
+   my $page = shift;
+   my $h = shift || {};
+   my $val;
+   for my $line (split /\n/, $page) {
+     $line =~ tr/\x0A\x0D//d;
+     if ($val && $line =~ s/^\s+//) {
+       $h->{$val} .= length $h->{$val} ? "\n" . $line : $line;
+     } elsif ($line =~ /^(.+):/) {
+       $val = $1; $h->{$val} = '';
+     }
+   }
+   $h;
  }
+ package wiki::dummy;
+ sub mtime (@) {undef}
+ sub meta (@) {undef}
+ sub Yuki::YukiWikiDB2::meta (@) {undef}
  package SuikaWiki::Plugin;
    our $plugin_directory;  # defined in top of this file.
    our %List;
+   our %Index;
  sub escape ($$) { main::escape ($_[1]) }
  sub unescape ($$) { main::unescape ($_[1]) }
  sub encode ($$) { main::encode ($_[1]) }
  sub decode ($$) { main::decode ($_[1]) }
  sub __get_datetime ($) { main::get_now () }
+ sub resource ($$;%) { shift; &main::Resource (@_) }
+ sub uri ($$) { $main::uri{$_[1]} }
+ sub new_index ($$) { ++$Index{$_[1]} }
  sub regist ($@) {
      my $pack = shift;
-Line 1898 
 sub import_plugins () {
+Line 1351 
 sub import_plugins () {
      }
  }
- sub make_info_page () {
+ &import_plugins ();
-     my $r = <<EOH;
- EOH
-     unless ($List{_all}) {
-         $r .= qq('''No plugin is installed!'''\n);
-     } else {
-         my $index = 0;
-         for my $package (sort @{$List{_all}}) {
-             $index++;
-             my $prop = $package->property ();
-             $r .= <<EOH;
- *$package
- [$index] '''$prop->{name}''' (Version $prop->{version})
- <$prop->{uri}>
- Provide:
- @{[do{my $t = ''; for my $f (@{$prop->{provide}||[]}) {
-     $t .= qq(-''$f''\n);
-     for (sort grep m#^\Q$f\E/#, keys %{$prop->{partinfo}}) {
-          $t .= qq(--''$_'' -- $prop->{partinfo}->{$_}\n);
-     }
- }$t}]}
- EOH
+ package wiki::conneg;
-         }
+ ## BUG: this parser isn't strict.
+ sub get_accept_lang (;$) {
+   my $alang = shift || $main::ENV{HTTP_ACCEPT_LANGUAGE};
+   my %alang = (ja => 0.0002, en => 0.0001);
+   my $i = 0.1;
+   for (split /\s*,\s*/, $alang) {
+     tr/\x09\x0A\x0D\x20//d;
+     if (/((?:(?!;q=).)+)(?:;q="?([0-9.]+)"?)?/) {
+       my $l = lc $1; $l =~ tr/\x22\x5C//d;
+       $alang{$l} = (defined $2 ? $2 : 1.000)*1000;
+       $alang{$l} += $i unless $alang{$l} == 0;
+       $i -= 0.001;
      }
-     $r;
+   }
+   \%alang;
  }
- &import_plugins ();
+ package wiki::resource;
+ sub get ($;\%) {
+   my ($resname, $option) = @_;
+   $option->{accept_language} ||= &wiki::conneg::get_accept_lang ();
+   $option->{resource} ||= {};
+   my $v;
+   for my $lang (sort {$option->{accept_language}->{$b} <=> $option->{accept_language}->{$a}} grep {$option->{accept_language}->{$_}!=0} keys %{$option->{accept_language}}) {
+     while (length $lang) {
+       unless ($option->{accept_language}->{defined $option->{accept_language}->{$lang} ? $lang : '*'} == 0) {
+         $option->{resource}->{$lang} ||= &wiki::suikawikiconst::to_hash (&main::__get_database('WikiResource:'.$lang));
+         $v = $option->{resource}->{$lang}->{$resname};
+         last if defined $v;
+       }
+       $lang =~ s/[^+-]*$//; $lang =~ s/[+-]$//;
+     }
+     last if defined $v;
+   }
+   defined $v ? $v : $resname;
+ }
  package main;
  &main;
-Line 1938 
 exit 0;
+Line 1401 
 exit 0;
  __END__
  =head1 NAME
- wiki.cgi - This is YukiWiki, yet another Wiki clone.
+ wiki.cgi --- SuikaWiki: Yet yet another Wiki engine
- =head1 DESCRIPTION
- YukiWiki is yet another Wiki clone.
- YukiWiki can treat Japanese WikiNames (enclosed with [[ and ]]).
+ =head1 AUTHORS
- YukiWiki provides 'InterWiki' feature, RDF Site Summary (RSS),
- and some embedded commands (such as [[#comment]] to add comments).
- Read F<readme_en.txt> (English) or F<readme_ja.txt> (Japanese) in more detail.
+ Hiroshi Yuki <hyuki@hyuki.com> <http://www.hyuki.com/yukiwiki/>
- =head1 AUTHOR
+ Makio Tsukamoto <http://digit.que.ne.jp/>
- Hiroshi Yuki <hyuki@hyuki.com> http://www.hyuki.com/yukiwiki/
+ Wakaba <w@suika.fam.cx>
  =head1 LICENSE
- Copyright (C) 2000-2002 by Hiroshi Yuki.
+ Copyright (C) 2000-2003 AUTHORS
  This program is free software; you can redistribute it and/or
  modify it under the same terms as Perl itself.

 Legend:



Removed from v.1.38
 


changed lines


 
Added in v.1.48
 Legend:



Removed from v.1.38
 


changed lines


 
Added in v.1.48
-Removed from v.1.38
+Added in v.1.48

admin@suikawiki.org	ViewVC Help
Powered by ViewVC 1.1.24