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

Diff of /suikawiki/script/wiki.cgi

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.28 by wakaba, Thu Oct 17 07:56:58 2002 UTC revision 1.30 by wakaba, Wed Nov 13 08:28:15 2002 UTC
# Line 208  sub main { Line 208  sub main {
208  sub do_read {  sub do_read {
209    my $content = $database{$form{mypage}};    my $content = $database{$form{mypage}};
210    my $lm = &get_info($form{mypage}, $info_LastModified);    my $lm = &get_info($form{mypage}, $info_LastModified);
   &print_header($form{mypage}, -last_modified => $lm);  
211    wiki::referer::add ($form{mypage}, $ENV{HTTP_REFERER});    wiki::referer::add ($form{mypage}, $ENV{HTTP_REFERER});
212      my ($r, $c) = get_search_result ($form{mypage});
213      my $rl = wiki::referer::list_html ($form{mypage});
214      my @toc;
215      push @toc, qq(-<a href="#wikipage-see-also">See Also</a>) if $c;
216      push @toc, qq(-<a href="#wikipage-referer">参照元</a>) if $rl;
217      my $cf = 'SuikaWiki/0.9';      my $cf = 'SuikaWiki/0.9';
218      ## Should be support at least:      ## Should be support at least:
219      ## - 'SuikaWiki/0.9' CRLF      ## - 'SuikaWiki/0.9' CRLF
# Line 217  sub do_read { Line 221  sub do_read {
221      ## - "/*" WSP* 'W3C-CSS/' ("1.0" / "2.0") "*/" CRLF      ## - "/*" WSP* 'W3C-CSS/' ("1.0" / "2.0") "*/" CRLF
222      $cf = $1 if $content =~ s#^(?:/\*\s*|[\#<]\?)?([A-Z][A-Za-z0-9-]+/[0-9.]+(?:[^0-9.][^\x0D\x0A]*)?)[\x0D\x0A]+##s;      $cf = $1 if $content =~ s#^(?:/\*\s*|[\#<]\?)?([A-Z][A-Za-z0-9-]+/[0-9.]+(?:[^0-9.][^\x0D\x0A]*)?)[\x0D\x0A]+##s;
223      if ($cf =~ m!^(?:\#\?)?SuikaWiki/0.9(?:$|\s)!) {      if ($cf =~ m!^(?:\#\?)?SuikaWiki/0.9(?:$|\s)!) {
224        &print_content($content, content_format => $cf, last_modified => $lm);        &print_header ($form{mypage}, -last_modified => $lm,
225        print &text_to_html (q([[#comment]]));          -content_format => $cf, -noindex => $cf =~ /obsoleted="yes"/);
226          &print_content ($content, content_format => $cf, last_modified => $lm,
227            -toc => \@toc);
228          print &text_to_html (q([[#comment]])) unless $cf =~ /obsoleted="yes"/;
229      } else {      } else {
230          &print_header($form{mypage}, -last_modified => $lm);
231        print "<pre>@{[&escape($content)]}</pre>";        print "<pre>@{[&escape($content)]}</pre>";
232      }      }
   my ($r, $c) = get_search_result ($form{mypage});  
233      if ($c) {      if ($c) {
234        print q{<h2 id="SEE-ALSO">See also</h2>};        print q{<h2 id="wikipage-see-also">See also</h2>};
235        print $r;        print $r;
236      }      }
237    my $r = wiki::referer::list_html ($form{mypage});      if ($rl) {
238      if ($r) {        print qq(<div id="wikipage-referer"><h2>参照元</h2>\n$rl</div>\n);
       print qq(<div id="wikipage-referer"><h2>参照元</h2>\n$r</div>\n);  
239      }      }
240    &print_footer($form{mypage}, $lm);    &print_footer($form{mypage}, $lm);
241  }  }
# Line 237  sub do_read { Line 243  sub do_read {
243  sub do_output_css {  sub do_output_css {
244    my $content = $database{$form{mypage}};    my $content = $database{$form{mypage}};
245    if ($content =~ m#^\s*/\*\s*W3C-CSS#) {    if ($content =~ m#^\s*/\*\s*W3C-CSS#) {
246        my $lm = &get_info($form{mypage}, $info_LastModified);
247      print "Content-Type: text/css; charset=$charset\n";      print "Content-Type: text/css; charset=$charset\n";
248        print "Last-Modified: $lm\n";
249      print "\n";      print "\n";
250      print $content;      print $content;
251    } else {    } else {
252      print "Status: 406 Unsupported Media Type\n";      print "Status: 406 Unsupported Media Type\n";
253      &print_header('WikiPageIsNotCSS');      &print_header('WikiPageIsNotCSS', -noindex => 1);
254      &print_content($database{WikiPageIsNotCSS});      &print_content($database{WikiPageIsNotCSS});
255      &print_footer('WikiPageIsNotCSS');      &print_footer('WikiPageIsNotCSS');
256    }    }
# Line 250  sub do_output_css { Line 258  sub do_output_css {
258    
259  sub do_edit {  sub do_edit {
260      my ($page) = &unarmor_name(&armor_name($form{mypage}));      my ($page) = &unarmor_name(&armor_name($form{mypage}));
261      &print_header($page);      &print_header($page, -noindex => 1);
262      if (not &is_editable($page)) {      if (not &is_editable($page)) {
263          &print_message($resource{cantchange});          &print_message($resource{cantchange});
264      } elsif (&is_frozen($page)) {      } elsif (&is_frozen($page)) {
# Line 258  sub do_edit { Line 266  sub do_edit {
266      } else {      } else {
267          &print_editform($database{$page}, &get_info($page, $info_LastModified), admin=>0);          &print_editform($database{$page}, &get_info($page, $info_LastModified), admin=>0);
268      }      }
269        wiki::referer::add ($form{mypage}, $ENV{HTTP_REFERER});
270        my ($r, $c) = get_search_result ($form{mypage});
271        my $rl = wiki::referer::list_html ($form{mypage});
272        if ($c) {
273          print q{<h2 id="wikipage-see-also">See also</h2>};
274          print $r;
275        }
276        if ($rl) {
277          print qq(<div id="wikipage-referer"><h2>参照元</h2>\n$rl</div>\n);
278        }
279      &print_footer($page);      &print_footer($page);
280  }  }
281    
282  sub do_adminedit {  sub do_adminedit {
283      my ($page) = &unarmor_name(&armor_name($form{mypage}));      my ($page) = &unarmor_name(&armor_name($form{mypage}));
284      &print_header($page);      &print_header($page, -noindex => 1);
285      if (not &is_editable($page)) {      if (not &is_editable($page)) {
286          &print_message($resource{cantchange});          &print_message($resource{cantchange});
287      } else {      } else {
# Line 274  sub do_adminedit { Line 292  sub do_adminedit {
292  }  }
293    
294  sub do_adminchangepasswordform {  sub do_adminchangepasswordform {
295      &print_header($AdminChangePassword);      &print_header($AdminChangePassword, -noindex => 1);
296      &print_passwordform;      &print_passwordform;
297      &print_footer($AdminChangePassword);      &print_footer($AdminChangePassword);
298  }  }
# Line 301  EOD Line 319  EOD
319      my $crypted = crypt($form{mynewpassword}, "$salt1$salt2");      my $crypted = crypt($form{mynewpassword}, "$salt1$salt2");
320      &set_info($AdminSpecialPage, $info_AdminPassword, $crypted);      &set_info($AdminSpecialPage, $info_AdminPassword, $crypted);
321    
322      &print_header($CompletedSuccessfully);      &print_header($CompletedSuccessfully, -noindex => 1);
323      &print_message($resource{passwordchanged});      &print_message($resource{passwordchanged});
324      &print_footer($CompletedSuccessfully);      &print_footer($CompletedSuccessfully);
325  }  }
# Line 326  sub do_write { Line 344  sub do_write {
344      }      }
345    
346      if (not &is_editable($form{mypage})) {      if (not &is_editable($form{mypage})) {
347          &print_header($form{mypage});          &print_header($form{mypage}, -noindex => 1);
348          &print_message($resource{cantchange});          &print_message($resource{cantchange});
349          &print_footer($form{mypage});          &print_footer($form{mypage});
350          return;          return;
# Line 353  sub do_write { Line 371  sub do_write {
371              &update_recent_changes;              &update_recent_changes;
372          }          }
373          &set_info($form{mypage}, $info_IsFrozen, 0 + $form{myfrozen});          &set_info($form{mypage}, $info_IsFrozen, 0 + $form{myfrozen});
374          &print_header($CompletedSuccessfully, -goto => $url_cgi.'?'.&encode($form{mypage}).($form{comment_index}?"#x-comment-$form{comment_index}":''));          &print_header($CompletedSuccessfully, -noindex => 1, -goto => $url_cgi.'?'.&encode($form{mypage}).($form{__comment_anchor_index}?"#anchor-$form{__comment_anchor_index}":''));
375          &print_message($resource{saved});          &print_message($resource{saved});
376          &print_content("$resource{continuereading} @{[&armor_name($form{mypage})]}");          &print_content("$resource{continuereading} @{[&armor_name($form{mypage})]}");
377          &print_footer($CompletedSuccessfully);          &print_footer($CompletedSuccessfully);
# Line 364  sub do_write { Line 382  sub do_write {
382          if ($form{mytouch}) {          if ($form{mytouch}) {
383              &update_recent_changes;              &update_recent_changes;
384          }          }
385          &print_header($form{mypage});          &print_header($form{mypage}, -noindex => 1);
386          &print_message($resource{deleted});          &print_message($resource{deleted});
387          &print_footer($form{mypage});          &print_footer($form{mypage});
388      }      }
# Line 380  sub do_search { Line 398  sub do_search {
398      my $word = $form{mymsg};      my $word = $form{mymsg};
399      &print_header($SearchPage);      &print_header($SearchPage);
400      &print_searchform(&escape($word));      &print_searchform(&escape($word));
401      print scalar get_search_result ($word, -output_not_found => 1);      print scalar get_search_result ($word, -output_not_found => 1, -match_myself => 1);
402      &print_footer($SearchPage);      &print_footer($SearchPage);
403  }  }
404    
405  sub get_search_result ($;%) {  sub get_search_result ($;%) {
406    my $word = shift;    my $word = shift;
407    my %option = @_;    my %option = @_;
408    my $counter = 0;    my @r;
409    my $r = '';    foreach my $page (keys %database) {
410    foreach my $page (sort keys %database) {      next if $page eq $RecentChanges || ($page eq $word && !$option{-match_myself});
     next if $page eq $RecentChanges;  
411      my $content = $database{$page};      my $content = $database{$page};
412      $content =~ s/^\#\?[^\x0A\x0D]+//s;      my $cf = 'SuikaWiki/0.9';
413      if (   index ($content, $word) > 0      $cf = $1 if $content =~ s/^\#\?([^\x0A\x0D]+)//s;
414          || index ($page, $word) > 0      next if $cf =~ /obsoleted="yes"/;
415          || index ($word, $page) > 0      if (index ($page, $word) > -1) {
416         ) {        my $c = $content =~ s/\Q$word\E/$word/g;
417        $r .= qq(<li><a href ="$url_cgi?@{[&encode($page)]}" class="wiki">@{[&escape($page)]}</a> <span class="wikipage-summary">@{[&escape(&get_subjectline($page))]}</span></li>);        push @r, [$page, $c+20];
418        $counter++;      } elsif (index ($word, $page) > -1) {
419          my $c = $content =~ s/\Q$word\E/$word/g;
420          push @r, [$page, $c+10];
421        } elsif (my $c = $content =~ s/\Q$word\E/$word/g) {
422          push @r, [$page, $c];
423      }      }
424    }    }
425    $r = qq|<ul>$r</ul>| if $r;    my $em = sub { my $s = shift; $s =~ s#(\Q$word\E)#<em>$1</em>#g; $s };
426    get_message ($resource{notfound})    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;
427      if $counter == 0 && $option{-output_not_found};    $r = qq|<ul class="search-result">$r</ul>| if $r;
428    wantarray? ($r, $counter): $r;    get_message ($resource{notfound}) if @r == 0 && $option{-output_not_found};
429      wantarray? ($r, scalar @r): $r;
430  }  }
431    
432  sub do_create {  sub do_create {
# Line 423  EOD Line 445  EOD
445  sub do_random_jump {  sub do_random_jump {
446    my @list = keys %database;    my @list = keys %database;
447    my $name = &encode ($list[rand @list]);    my $name = &encode ($list[rand @list]);
448    print "Location: $url_cgi?$name\n";    my ($scheme) = 'http';
449      $scheme = $1 if $main::ENV{SERVER_PROTOCOL} =~ m#([A-Za-z0-9+.%-]+)#;
450      print "Location: $scheme://$main::ENV{SERVER_NAME}:$main::ENV{SERVER_PORT}$url_cgi?$name\n";
451    print "\n";    print "\n";
452  }  }
453    
# Line 439  sub do_FrontPage { Line 463  sub do_FrontPage {
463    
464  sub print_error {  sub print_error {
465      my ($msg) = @_;      my ($msg) = @_;
466      &print_header($ErrorPage);      &print_header($ErrorPage, -noindex => 1);
467      print qq(<p><strong class="error">$msg</strong></p>);      print qq(<p><strong class="error">$msg</strong></p>);
468      &print_footer($ErrorPage);      &print_footer($ErrorPage);
469      exit(0);      exit(0);
# Line 451  sub print_header ($;%) { Line 475  sub print_header ($;%) {
475      if (&is_frozen($page) and $form{mycmd} =~ /^(read|write)$/) {      if (&is_frozen($page) and $form{mycmd} =~ /^(read|write)$/) {
476          $bodyclass = "frozen";          $bodyclass = "frozen";
477      }      }
478        $bodyclass .= " wiki-page-obsoleted" if $option{-content_format} =~ /obsoleted="yes"/;
479      print qq{Refresh: 0; url="$option{-goto}"\n} if $option{-goto};      print qq{Refresh: 0; url="$option{-goto}"\n} if $option{-goto};
480      print qq{Last-Modified: $option{-last_modified}\n} if $option{-last_modified};      print qq{Last-Modified: $option{-last_modified}\n} if $option{-last_modified};
481      my $cookedpage = &encode($page);      my $cookedpage = &encode($page);
# Line 466  Content-Style-Type: text/css Line 491  Content-Style-Type: text/css
491      "http://www.w3.org/TR/html4/loose.dtd"> + RUBY -->      "http://www.w3.org/TR/html4/loose.dtd"> + RUBY -->
492  <html lang="$lang">  <html lang="$lang">
493  <head>  <head>
494      <title>$escapedpage @{[&escape(&get_subjectline($page))]}</title>      <title>$escapedpage</title>
495      <link rel="index" href="$url_cgi?$IndexPage">      <link rel="index" href="$url_cgi?$IndexPage">
496        <link rel="help" href="$url_cgi?WikiHelp">
497      <link rel="copyright" href="$url_cgi?$NAME_OF_WikiPageLicense">      <link rel="copyright" href="$url_cgi?$NAME_OF_WikiPageLicense">
     <link rev="made" href="mailto:@{[&escape($modifier_mail)]}">  
498      <link rel="stylesheet" type="text/css" href="@{[&escape($url_stylesheet)]}">      <link rel="stylesheet" type="text/css" href="@{[&escape($url_stylesheet)]}">
499        @{[$option{-noindex} ? q(<meta name="ROBOTS" content="NOINDEX">) : '']}
500  </head>  </head>
501  <body class="$bodyclass">  <body class="$bodyclass">
502  EOD  EOD
503    &print_navigate_links ($page);    &print_navigate_links ($page);
504    print <<EOD;    print <<EOD;
505  <h1 class="header">@{[&escape($page)]}  <h1 class="header">@{[&escape($page)]}</h1>
   <span class="wikipage-summary">@{[&escape(&get_subjectline($page))]}</span></h1>  
506  EOD  EOD
507  }  }
508    
# Line 487  sub print_navigate_links (@) { Line 512  sub print_navigate_links (@) {
512      my $admineditable = 0;      my $admineditable = 0;
513      if (&is_frozen($page) and $form{mycmd} =~ /^(read|write)$/) {      if (&is_frozen($page) and $form{mycmd} =~ /^(read|write)$/) {
514          $editable = 0;          $editable = 0;
515          $admineditable = 1;          #$admineditable = 1;
516      } elsif (&is_editable($page) and $form{mycmd} =~ /^(read|write)$/) {      } elsif (&is_editable($page) and $form{mycmd} =~ /^(read|write)$/) {
517          $admineditable = 1;          #$admineditable = 1;
518          $editable = 1;          $editable = 1;
519      } else {      } else {
520          $editable = 0;          $editable = 0;
# Line 502  sub print_navigate_links (@) { Line 527  sub print_navigate_links (@) {
527          : qq()          : qq()
528      ]}      ]}
529      @{[ $editable      @{[ $editable
530          ? qq(<a title="$resource{editthispage}" href="$url_cgi?mycmd=edit;mypage=$cookedpage" accesskey="E">$resource{editbutton} <kbd>E</kbd></a> | )          ? #qq(<a title="$resource{editthispage}" href="$url_cgi?mycmd=edit;mypage=$cookedpage" accesskey="E">$resource{editbutton} <kbd>E</kbd></a> | )
531            qq(<a title="$resource{editthispage}" href="$url_cgi?mycmd=edit;mypage=$cookedpage" accesskey="E">編集</a> | )
532          : qq()          : qq()
533      ]}      ]}
534      @{[ $admineditable      @{[ $admineditable
535          ? qq(<a href="$url_cgi?mycmd=diff;mypage=$cookedpage">$resource{diffbutton}</a> | )          ? qq(<a href="$url_cgi?mycmd=diff;mypage=$cookedpage">$resource{diffbutton}</a> | )
536          : qq()          : qq()
537      ]}      ]}
538      <a href="$url_cgi?$CreatePage">$resource{createbutton}</a> |      <a href="$url_cgi?$CreatePage" class="wiki">新規</a> |
539      <a href="$url_cgi?$IndexPage">$resource{indexbutton}</a> |      <a href="$url_cgi?$IndexPage" class="wiki">$resource{indexbutton}</a> |
540      <a href="$url_cgi?$RssPage">$resource{rssbutton}</a> |      <a href="$url_cgi?$FrontPage" class="wiki">首頁</a> |
541      <a href="$url_cgi?$FrontPage">$FrontPage</a> |      <a href="$url_cgi?$SearchPage" class="wiki">$resource{searchbutton}</a> |
542      <a href="$url_cgi?$SearchPage">$resource{searchbutton}</a> |      <a href="$url_cgi?mycmd=RandomJump;x-param=@{[time.[0..9]->[rand 10]]}" class="wiki randomlink">どこか</a> |
543      <a href="$url_cgi?$RecentChanges">$resource{recentchangesbutton}</a>      <a href="$url_cgi?$RecentChanges" class="wiki">最新</a>
544    </div>
545    EOH
546    <<EOH;  ## temp
547        <a href="$url_cgi?$CreatePage" class="wiki">$resource{createbutton}</a> |
548        <a href="$url_cgi?$IndexPage" class="wiki">$resource{indexbutton}</a> |
549    <!--    <a href="$url_cgi?$RssPage" class="wiki">$resource{rssbutton}</a> | -->
550        <a href="$url_cgi?$FrontPage" class="wiki">$FrontPage</a> |
551        <a href="$url_cgi?$SearchPage" class="wiki">$resource{searchbutton}</a> |
552        <a href="$url_cgi?mycmd=RandomJump;x-param=@{[time.[0..9]->[rand 10]]}" class="wiki randomlink">どこか</a> |
553        <a href="$url_cgi?$RecentChanges" class="wiki">$resource{recentchangesbutton}</a>
554  </div>  </div>
555  EOH  EOH
556  }  }
# Line 523  sub print_footer { Line 559  sub print_footer {
559      my ($page, $lm) = @_;      my ($page, $lm) = @_;
560      $walrus_log = ($walrus_debugging) ? &text_to_html("----\n$walrus_log") : '';    # Walrus add (debug)      $walrus_log = ($walrus_debugging) ? &text_to_html("----\n$walrus_log") : '';    # Walrus add (debug)
561      # Walrus mod (1) start      # Walrus mod (1) start
562    my $cvslog = '$Revision$ $Date$';    my $cvslog1 = q$Revision$;
563      my $cvslog2 = q$Date$;
564    print_navigate_links ($page);    print_navigate_links ($page);
565    print <<"EOD";    print <<"EOD";
566  @{[ $lm ? qq(<div id="wikipage-last-modified">Last modified: $lm</div>) : '' ]}  @{[ $lm ? qq(<div id="wikipage-last-modified">Last modified: $lm</div>) : '' ]}
567  <div class="footer">  <div class="footer">
568  <p>  <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>
569  <a href="http://digit.que.ne.jp/work/">WalWiki</a> $walversion &copy; 2000-2002 by <a href="http://digit.que.ne.jp/">Makio Tsukamoto</a>.<br />  <a href="/gate/cvs/wakaba/wiki/" title="CVS Repository of this script ($cvslog2)">SuikaWiki $cvslog1</a>
 based on <a href="http://www.hyuki.com/yukiwiki/">YukiWiki</a> $version &copy; 2000-2002 by <a href="http://www.hyuki.com/">Hiroshi Yuki</a>.<br />  
 <a href="/gate/cvs/wakaba/wiki/" title="CVS Repository">  
 $cvslog  
 </a>  
 </p>  
570  <div class="navigation">  <div class="navigation">
571  [<a href="/" title="このサーバーの首頁">/</a>  [<a href="/" title="このサーバーの首頁">/</a>
572  <a href="/map" title="このサーバーの案内">地図</a>  <a href="/map" title="このサーバーの案内">地図</a>
# Line 583  sub unescape { Line 615  sub unescape {
615    
616  sub print_content ($;$) {  sub print_content ($;$) {
617      my ($rawcontent, %option) = @_;      my ($rawcontent, %option) = @_;
618      print &text_to_html($rawcontent, toc=>1);      print &text_to_html($rawcontent, toc=>1, %option);
619  }  }
620    
621  sub text_to_html {  sub text_to_html {
622      my ($txt, %option) = @_;      my ($txt, %option) = @_;
623      my (@txt) = split(/\n/, $txt);      my (@txt) = split(/\n/, $txt);
624      my (@toc);      my @toc;
625        my @toc2 = @{$option{-toc}||[]};
626      my $tocnum = 0;      my $tocnum = 0;
627      my (@saved, @result);      my (@saved, @result);
628      unshift(@saved, "</p>");      unshift(@saved, "</p>");
# Line 632  sub text_to_html { Line 665  sub text_to_html {
665          } elsif (/^:([^:]+):(.*)/) {          } elsif (/^:([^:]+):(.*)/) {
666              &back_push('dl', 1, \@saved, \@result);              &back_push('dl', 1, \@saved, \@result);
667              push(@result, '<dt>' . &inline($1) . '</dt>', '<dd>' . &inline($2) . '</dd>');              push(@result, '<dt>' . &inline($1) . '</dt>', '<dd>' . &inline($2) . '</dd>');
668          } elsif (/^(>{1,5})(.*)/) {          } elsif (/^(?!>>\d)(>{1,5})(.*)/) {
669              &back_push('blockquote', length($1), \@saved, \@result);              &back_push('blockquote', length($1), \@saved, \@result);
670                push @result, "<p>";
671              push(@result, &inline($2));              push(@result, &inline($2));
672                unshift @saved, "</p>";
673          } elsif (/^\s*$/) {          } elsif (/^\s*$/) {
674              push(@result, splice(@saved));              push(@result, splice(@saved));
             unshift(@saved, "</p>");  
675              push(@result, "<p>");              push(@result, "<p>");
676                unshift(@saved, "</p>");
677          } elsif (/^(\s+.*)$/) {          } elsif (/^(\s+.*)$/) {
678              &back_push('pre', 1, \@saved, \@result);              &back_push('pre', 1, \@saved, \@result);
679              #push(@result, &escape($1)); # Not &inline, but &escape              #push(@result, &escape($1)); # Not &inline, but &escape
# Line 667  sub text_to_html { Line 702  sub text_to_html {
702              push(@result, join('', '<tr>', @value, '</tr>'));              push(@result, join('', '<tr>', @value, '</tr>'));
703              # XXXXX              # XXXXX
704              #######              #######
705          } elsif (/^\[(INS|DEL|PRE)\[/) {          } elsif (/^\[(INS|DEL|PRE)\[\s*$/) {
706              push @result, splice (@saved), '<'.lc($1).'>';              push @result, splice (@saved), '<'.lc($1).'>';
707              unshift @saved, "</p>";              unshift @saved, "</p>";
708              push @result, "<p>";              push @result, "<p>";
709          } elsif (/^\](INS|DEL|PRE)\]/) {          } elsif (/^\](INS|DEL|PRE)\]\s*$/) {
710              push @result, splice (@saved), '</'.lc($1).'>';              push @result, splice (@saved), '</'.lc($1).'>';
711          } elsif (/^\[([0-9]+)\](.*)$/ && !$main::_EMBEDED) {          } elsif (/^\[([0-9]+)\](.*)$/ && !$main::_EMBEDED) {
712            my $num = 0+$1;            my $num = 0+$1;
# Line 688  sub text_to_html { Line 723  sub text_to_html {
723          # Convert @toc (table of contents) to HTML.          # Convert @toc (table of contents) to HTML.
724          # This part is taken from Makio Tsukamoto's WalWiki.          # This part is taken from Makio Tsukamoto's WalWiki.
725          my (@tocsaved, @tocresult);          my (@tocsaved, @tocresult);
726          foreach (@toc) {          foreach (@toc,@toc2) {
727              if (/^(-{1,6})(.*)$/) {              if (/^(-{1,6})(.*)$/) {
728                  &back_push('ul', length($1), \@tocsaved, \@tocresult);                  &back_push('ul', length($1), \@tocsaved, \@tocresult);
729                  push(@tocresult, '<li>' . $2 . '</li>');                  push(@tocresult, '<li>' . $2 . '</li>');
# Line 698  sub text_to_html { Line 733  sub text_to_html {
733          $toc = join("\n", @tocresult);          $toc = join("\n", @tocresult);
734          $toc = $toc ? qq(<div id="wikipage-toc">$toc</div>) : '';          $toc = $toc ? qq(<div id="wikipage-toc">$toc</div>) : '';
735      }      }
736      return $toc . join("\n", @result);      $toc .= join("\n", @result);
737        $toc =~ s#<p>\n</p>##g;
738        $toc =~ s#[\x0D\x0A]+</#</#g;
739        $toc =~ s#<pre>\n#<pre>#g;
740        $toc;
741  }  }
742    
743  sub back_push {  sub back_push {
# Line 718  sub back_push { Line 757  sub back_push {
757  sub inline {  sub inline {
758      my ($line) = @_;      my ($line) = @_;
759      $line = &escape($line);      $line = &escape($line);
760      $line =~ s:\[(INS|DEL|SUP|SUB)\[(.+?)\]\]:<@{[lc $1]}>$2</@{[lc $1]}>:g;      $line =~ s{\[(INS|DEL|SUP|SUB|VAR|CODE|KBD)(?:\(([A-Za-z0-9\x20-]+)\))?\[(.+?)\]\]}{<@{[lc $1]}@{[$2 ? qq( class="$2") : '']}>$3</@{[lc $1]}>}g;
761      $line =~ s:\[ABBR\[(.+?)\] \[(.+?)\]\]:<acronym title="$2">$1</acronym>:g;      $line =~ s:\[(WEAK)\[(.+?)\]\]:<span class="@{[lc $1]}">$2</span>:g;
762      $line =~ s:\[RUBY\[(.+?)\] \[(.+?)\]\]:<ruby><rb>$1</rb><rp>(</rp><rt>$2</rt><rp>)</rp></ruby>:g;      $line =~ s:\[ABBR\[([^]]+)\] \[([^]]+)\]\]:<acronym title="$2">$1</acronym>:g;
763      $line =~ s%\[Q\[(.+?)\](?: \[&lt;([\x21-\x5A\x5E-\x7E]+)&gt;\])?\]%「<q@{[$2?qq( cite="$2"):'']}>$1</q>」%g;      $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;
764      $line =~ s|'''([^']+?)'''|<strong>$1</strong>|g;      $line =~ s:\[RUBY\[([^]]+)\] \[([^]]+)\]\]:<ruby><rb>$1</rb><rp>(</rp><rt>$2</rt><rp>)</rp></ruby>:g;
765      $line =~ s|''([^']+?)''|<em>$1</em>|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;
766      $line =~ s|(\d\d\d\d-\d\d-\d\d \(\w\w\w\) \d\d:\d\d:\d\d)|<span class="date">$1</span>|g;   # Date      $line =~ s%\[Q\[([^]]+)\](?: \[&lt;([\x21-\x5A\x5E-\x7E]+)&gt;\])?\]%「<q@{[$2?qq( cite="$2"):'']}>$1</q>」%g;
767        $line =~ s|'''([^']+)'''|<strong>$1</strong>|g;
768        $line =~ s|''([^']+)''|<em>$1</em>|g;
769      $line =~ s!      $line =~ s!
770        (        (
771          (?:&lt;(?:mailto|http|https|ftp|urn|news):[\x21-\x7E]*)&gt;          (?:&lt;(?:mailto|http|https|ftp|urn|news):[\x21-\x7E]*)&gt;
772        |        |
773          (?:$bracket_name))      # [[likethis]], [[#comment]], [[Friend:remotelink]]          (?:$bracket_name))      # [[likethis]], [[#comment]], [[Friend:remotelink]]
774        |\[\[([^[]+?)]&gt;&gt;([0-9]+)]        |\[\[([^[]+?)]&gt;&gt;([0-9]+)]   # [[WikiName]>>1]
775        |&gt;&gt;([0-9]+)        |&gt;&gt;([0-9]+)
776      !      !
777        my ($l, $page,$anchor, $anum) = ($1, $3,$4, 0+$5);        my ($l, $page,$anchor, $anum) = ($1, $3,$4, 0+$5);
# Line 837  sub init_form { Line 878  sub init_form {
878      if (param()) {      if (param()) {
879          foreach my $var (param()) {          foreach my $var (param()) {
880              $form{$var} = param($var);              $form{$var} = param($var);
881          }        }
     } else {  
         $ENV{QUERY_STRING} = $FrontPage;  
882      }      }
883        if ($main::ENV{QUERY_STRING} && $main::ENV{QUERY_STRING} !~ /[&;]/) {
884      my $query = &decode($ENV{QUERY_STRING});        my $query = &decode($main::ENV{QUERY_STRING});
885      if ($page_command{$query}) {        if ($page_command{$query}) {
886          $form{mycmd} = $page_command{$query};          $form{mycmd} = $page_command{$query};
887          $form{mypage} = $query;          $form{mypage} = $query;
888      } elsif ($query =~ /^($wiki_name)$/) {        } else {
         $form{mycmd} = 'read';  
         $form{mypage} = $1;  
     } elsif ($database{$query}) {  
         $form{mycmd} = 'read';  
889          $form{mypage} = $query;          $form{mypage} = $query;
890            $form{mycmd} = $database{$form{mypage}} ? 'read' : 'edit';
891          }
892      }      }
893        $form{mypage} ||= 'HomePage';
894    
895      # mypreview_edit        -> do_edit, with preview.      # mypreview_edit        -> do_edit, with preview.
896      # mypreview_adminedit   -> do_adminedit, with preview.      # mypreview_adminedit   -> do_adminedit, with preview.
# Line 864  sub init_form { Line 902  sub init_form {
902          }          }
903      }      }
904    
905      #      #
906      # $form{mycmd} is frozen here.      # $form{mycmd} is frozen here.
907      #      #
908    
909      $form{mymsg} = &code_convert(\$form{mymsg}, $kanjicode);      $form{mymsg} = &code_convert(\$form{mymsg}, $kanjicode);
910      $form{myname} = &code_convert(\$form{myname}, $kanjicode);      $form{myname} = &code_convert(\$form{myname}, $kanjicode);
# Line 1025  sub print_editform { Line 1063  sub print_editform {
1063    
1064      print <<"EOD";      print <<"EOD";
1065  <form action="$url_cgi" method="post">  <form action="$url_cgi" method="post">
1066    <h2>$escapedmypageの編集</h2>
1067      @{[ $mode{admin} ? qq($resource{frozenpassword} <input type="password" name="mypassword" value="$escapedmypassword" size="10"><br>) : "" ]}      @{[ $mode{admin} ? qq($resource{frozenpassword} <input type="password" name="mypassword" value="$escapedmypassword" size="10"><br>) : "" ]}
1068      <input type="hidden" name="myLastModified" value="$lastmodified">      <input type="hidden" name="myLastModified" value="$lastmodified">
1069      <input type="hidden" name="mypage" value="$escapedmypage">      <input type="hidden" name="mypage" value="$escapedmypage">
# Line 1041  sub print_editform { Line 1080  sub print_editform {
1080      qq(      qq(
1081          <input type="checkbox" name="mytouch" value="on" checked="checked">$resource{touch}<br>          <input type="checkbox" name="mytouch" value="on" checked="checked">$resource{touch}<br>
1082          <input type="submit" name="mypreview_$edit" value="$resource{previewbutton}">          <input type="submit" name="mypreview_$edit" value="$resource{previewbutton}">
1083          <input type="submit" name="mypreview_write" value="$resource{savebutton}" accesskey="S"><kbd>S</kbd><br>          <input type="submit" name="mypreview_write" value="$resource{savebutton}" accesskey="S"><kbd>S</kbd>
1084            [@{[do {my $n = 0;
1085                   $mymsg =~ s/(?:-+\s)?\[([0-9]+)\]/$n = $1 if $1 > $n; $&/mge;
1086                   ++$n}]}]<br>
1087      )      )
1088  ]}  ]}
1089  </form>  </form>
1090  EOD  EOD
1091      unless ($mode{conflict}) {      unless ($mode{conflict}) {
1092          # Show the format rule.          # Show the format rule.
1093          open(FILE, $file_format) or &print_error("($file_format)");          my $help = $database{'WikiEditHelp'};
1094          my $content = join('', <FILE>);          $help =~ s!^\#\?([A-Z][A-Za-z0-9-]+/[0-9.]+(?:[^0-9.\x0D\x0A][^\x0D\x0A]*)?)[\x0D\x0A]+!!s;
1095          &code_convert(\$content, $kanjicode);          print &text_to_html ($help, toc => 0);
1096          close(FILE);      #    open(FILE, $file_format) or &print_error("($file_format)");
1097          print &text_to_html($content, toc=>0);      #    my $content = join('', <FILE>);
1098        #    &code_convert(\$content, $kanjicode);
1099        #    close(FILE);
1100        #    print &text_to_html($content, toc=>0);
1101      }      }
1102  }  }
1103    
# Line 1158  sub conflict { Line 1203  sub conflict {
1203      my $content = join('', <FILE>);      my $content = join('', <FILE>);
1204      &code_convert(\$content, $kanjicode);      &code_convert(\$content, $kanjicode);
1205      close(FILE);      close(FILE);
1206      &print_header($page);      &print_header($page, -noindex => 1);
1207      &print_content($content);      &print_content($content);
1208      &print_editform($rawmsg, $form{myLastModified}, frozen=>0, conflict=>1);      &print_editform($rawmsg, $form{myLastModified}, frozen=>0, conflict=>1);
1209      &print_footer($page);      &print_footer($page);
# Line 1267  sub is_frozen { Line 1312  sub is_frozen {
1312    
1313  sub do_comment {  sub do_comment {
1314      my ($content) = $database{$form{mypage}};      my ($content) = $database{$form{mypage}};
1315      my $datestr = &get_now;      my $default_name;   ## this code does not strict.
1316      my $namestr = " ''[[@{[$form{myname}||$DEFAULT_embed_comment_name]}]]'': ";      $default_name = $1 if $content =~ /default-name="([^"]+)"/;
1317        my $datestr = '[WEAK['.&get_now.']]';
1318        my $namestr = $form{myname} || $default_name || $DEFAULT_embed_comment_name;
1319        ($namestr = '', $datestr = '') if $form{myname} eq 'nodate';
1320        if ($namestr =~ /^(?:>>)?[0-9]/) {
1321          $namestr = qq( ''$namestr'': );
1322        } elsif (length $namestr) {
1323          $namestr = qq( ''[[$namestr]]'': );
1324        }
1325      my $anchor = 0;      my $anchor = 0;
1326      $content =~ s/(?:-+\s)?\[([0-9]+)\]/$anchor = $1 if $1 > $anchor; $&/mge;      $content =~ s/(?:-+\s)?\[([0-9]+)\]/$anchor = $1 if $1 > $anchor; $&/mge;
1327      $anchor++;      $anchor++;
# Line 1285  sub do_comment { Line 1338  sub do_comment {
1338        $i++; $embed;        $i++; $embed;
1339      }ge;      }ge;
1340      unless ($o) {      unless ($o) {
1341          $content = "#?SuikaWiki/0.9\n\n" unless $content;
1342          $content .= "\n" unless $content =~ /\n$/s;
1343        $content .= "- [$anchor] $datestr$namestr$form{mymsg}\n";        $content .= "- [$anchor] $datestr$namestr$form{mymsg}\n";
1344      }      }
1345      if ($form{mymsg}) {      $form{__comment_anchor_index} = $anchor;
1346        if ($form{mymsg} || $form{myname}) {
1347          $form{mymsg} = $content;          $form{mymsg} = $content;
1348          $form{mytouch} = 'on';          $form{mytouch} = 'on';
1349          &do_write;          &do_write;
# Line 1304  sub embedded_to_html { Line 1360  sub embedded_to_html {
1360        unless ($main::_EMBEDED) {        unless ($main::_EMBEDED) {
1361          my $lastmodified = &get_info($form{mypage}, $info_LastModified);          my $lastmodified = &get_info($form{mypage}, $info_LastModified);
1362          return <<"EOD";          return <<"EOD";
1363  <form action="$url_cgi" method="post" id="x-comment-@{[++$CommentIndex]}">  <form action="$url_cgi" method="post" id="x-comment-@{[++$CommentIndex]}" class="comment"><p>
1364      <input type="hidden" name="mycmd" value="comment">      <input type="hidden" name="mycmd" value="comment">
1365      <input type="hidden" name="mypage" value="$form{mypage}">      <input type="hidden" name="mypage" value="$form{mypage}">
1366      <input type="hidden" name="myLastModified" value="$lastmodified">      <input type="hidden" name="myLastModified" value="$lastmodified">
1367      <input type="hidden" name="mytouch" value="on">      <input type="hidden" name="mytouch" value="on">
1368      <input type="hidden" name="comment_index" value="$CommentIndex">      <input type="hidden" name="comment_index" value="$CommentIndex">
1369      $embed_comment_Name_Prompt      $embed_comment_Name_Prompt
1370      <input type="text" name="myname" value="" size="10">      <input type="text" name="myname" value="" size="10" class="comment-name">
1371      <input type="text" name="mymsg" value="" size="60">      <input type="text" name="mymsg" value="" size="60" class="comment-msg">
1372      <input type="submit" value="$resource{commentbutton}">      <input type="submit" value="$resource{commentbutton}" class="comment-submit">
1373  </form>  </p></form>
1374  EOD  EOD
1375       } else {       } else {
1376          return <<"EOD";          return <<"EOD";
# Line 1329  EOD Line 1385  EOD
1385  EOD  EOD
1386      }      }
1387    } elsif ($embedded =~ /$embed_command{searched}/) {    } elsif ($embedded =~ /$embed_command{searched}/) {
1388      return get_search_result ($1);      return get_search_result ($1, -match_myself => 1);
1389      # Walrus add (5) start      # Walrus add (5) start
1390      } elsif ($embedded =~ /$embed_interwiki/ and my $remoteurl = $interwiki{$2}) {      } elsif ($embedded =~ /$embed_interwiki/ and my $remoteurl = $interwiki{$2}) {
1391          $_ = &make_interwiki_box($1, $2);          $_ = &make_interwiki_box($1, $2);
# Line 1347  EOD Line 1403  EOD
1403        } elsif (length $content) {        } elsif (length $content) {
1404          $r = "<pre>@{[&escape ($content)]}</pre>";          $r = "<pre>@{[&escape ($content)]}</pre>";
1405        } else {        } else {
1406          $r = &text_to_html ("[[$name]]", content_format => 'SuikaWiki/0.9');          $r = &text_to_html ("[INS[\n埋め込まれている [[$name]] はまだ書かれていません。\n]INS]\n", content_format => 'SuikaWiki/0.9');
1407        }        }
1408      } else {    ## nested #EMBED      } else {    ## nested #EMBED
1409        $r = &text_to_html ("[INS[\n[[$name]] の埋め込みは (入り組んでいるので) 解決されませんでした。\n]INS]\n", content_format => 'SuikaWiki/0.9');        $r = &text_to_html ("[INS[\n[[$name]] の埋め込みは (入り組んでいるので) 解決されませんでした。\n]INS]\n", content_format => 'SuikaWiki/0.9');
1410      }      }
1411      return qq(<blockquote title="@{[&escape($name)]}">$r</blockquote>);      return qq(<blockquote title="@{[&escape($name)]}">$r<div class="cite-note">『<cite><a href="$url_cgi?@{[&encode($name)]}" class="wiki">@{[&escape($name)]}</a></cite>』</div></blockquote>);
1412    } elsif ($embedded =~ /^\[\[\#randomlink:(.+)\]\]$/) {    } elsif ($embedded =~ /^\[\[\#randomlink:(.+)\]\]$/) {
1413      return qq(<a href="$url_cgi?mycmd=RandomJump;x-param=@{[time.[0..9]->[rand 10]]}" class="wiki randomlink">$1</a>);      return qq(<a href="$url_cgi?mycmd=RandomJump;x-param=@{[time.[0..9]->[rand 10]]}" class="wiki randomlink">$1</a>);
1414    } else {    } else {
# Line 1472  sub do_diff { Line 1528  sub do_diff {
1528      }      }
1529      &open_diff;      &open_diff;
1530      my $title = $form{mypage};      my $title = $form{mypage};
1531      &print_header($title);      &print_header($title, -noindex => 1);
1532      $_ = &escape($diffbase{$form{mypage}});      $_ = &escape($diffbase{$form{mypage}});
1533      &close_diff;      &close_diff;
1534      print qq(<h3>$resource{difftitle}</h3>);      print qq(<h3>$resource{difftitle}</h3>);
Legend:
Removed from v.1.28  
changed lines
  Added in v.1.30
admin@suikawiki.org
 ViewVC Help
Powered by ViewVC 1.1.24