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

Diff of /suikawiki/script/wiki.cgi

Parent Directory | Revision Log | View Patch Patch

-revision 1.28 by wakaba,
Thu Oct 17 07:56:58 2002 UTC
+revision 1.29 by wakaba,
Mon Oct 21 06:28:02 2002 UTC
 Line 208 
 sub main {
  sub do_read {
    my $content = $database{$form{mypage}};
    my $lm = &get_info($form{mypage}, $info_LastModified);
-   &print_header($form{mypage}, -last_modified => $lm);
    wiki::referer::add ($form{mypage}, $ENV{HTTP_REFERER});
+   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 217 
 sub do_read {
+Line 221 
 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]+##s;
      if ($cf =~ m!^(?:\#\?)?SuikaWiki/0.9(?:$|\s)!) {
-       &print_content($content, content_format => $cf, last_modified => $lm);
+       &print_header ($form{mypage}, -last_modified => $lm,
+         -content_format => $cf, -noindex => $cf =~ /obsoleted="yes"/);
+       &print_content ($content, content_format => $cf, last_modified => $lm,
+         -toc => \@toc);
        print &text_to_html (q([[#comment]]));
      } else {
+       &print_header($form{mypage}, -last_modified => $lm);
        print "<pre>@{[&escape($content)]}</pre>";
      }
-   my ($r, $c) = get_search_result ($form{mypage});
      if ($c) {
-       print q{<h2 id="SEE-ALSO">See also</h2>};
+       print q{<h2 id="wikipage-see-also">See also</h2>};
        print $r;
      }
-   my $r = wiki::referer::list_html ($form{mypage});
+     if ($rl) {
-     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);
      }
    &print_footer($form{mypage}, $lm);
  }
-Line 237 
 sub do_read {
+Line 243 
 sub do_read {
  sub do_output_css {
    my $content = $database{$form{mypage}};
    if ($content =~ m#^\s*/\*\s*W3C-CSS#) {
+     my $lm = &get_info($form{mypage}, $info_LastModified);
      print "Content-Type: text/css; charset=$charset\n";
+     print "Last-Modified: $lm\n";
      print "\n";
      print $content;
    } else {
      print "Status: 406 Unsupported Media Type\n";
-     &print_header('WikiPageIsNotCSS');
+     &print_header('WikiPageIsNotCSS', -noindex => 1);
      &print_content($database{WikiPageIsNotCSS});
      &print_footer('WikiPageIsNotCSS');
    }
-Line 250 
 sub do_output_css {
+Line 258 
 sub do_output_css {
  sub do_edit {
      my ($page) = &unarmor_name(&armor_name($form{mypage}));
-     &print_header($page);
+     &print_header($page, -noindex => 1);
      if (not &is_editable($page)) {
          &print_message($resource{cantchange});
      } elsif (&is_frozen($page)) {
-Line 263 
 sub do_edit {
+Line 271 
 sub do_edit {
  sub do_adminedit {
      my ($page) = &unarmor_name(&armor_name($form{mypage}));
-     &print_header($page);
+     &print_header($page, -noindex => 1);
      if (not &is_editable($page)) {
          &print_message($resource{cantchange});
      } else {
-Line 274 
 sub do_adminedit {
+Line 282 
 sub do_adminedit {
  }
  sub do_adminchangepasswordform {
-     &print_header($AdminChangePassword);
+     &print_header($AdminChangePassword, -noindex => 1);
      &print_passwordform;
      &print_footer($AdminChangePassword);
  }
-Line 301 
 EOD
+Line 309 
 EOD
      my $crypted = crypt($form{mynewpassword}, "$salt1$salt2");
      &set_info($AdminSpecialPage, $info_AdminPassword, $crypted);
-     &print_header($CompletedSuccessfully);
+     &print_header($CompletedSuccessfully, -noindex => 1);
      &print_message($resource{passwordchanged});
      &print_footer($CompletedSuccessfully);
  }
-Line 326 
 sub do_write {
+Line 334 
 sub do_write {
      }
      if (not &is_editable($form{mypage})) {
-         &print_header($form{mypage});
+         &print_header($form{mypage}, -noindex => 1);
          &print_message($resource{cantchange});
          &print_footer($form{mypage});
          return;
-Line 353 
 sub do_write {
+Line 361 
 sub do_write {
              &update_recent_changes;
          }
          &set_info($form{mypage}, $info_IsFrozen, 0 + $form{myfrozen});
-         &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}":''));
          &print_message($resource{saved});
          &print_content("$resource{continuereading} @{[&armor_name($form{mypage})]}");
          &print_footer($CompletedSuccessfully);
-Line 364 
 sub do_write {
+Line 372 
 sub do_write {
          if ($form{mytouch}) {
              &update_recent_changes;
          }
-         &print_header($form{mypage});
+         &print_header($form{mypage}, -noindex => 1);
          &print_message($resource{deleted});
          &print_footer($form{mypage});
      }
-Line 423 
 EOD
+Line 431 
 EOD
  sub do_random_jump {
    my @list = keys %database;
    my $name = &encode ($list[rand @list]);
-   print "Location: $url_cgi?$name\n";
+   my ($scheme) = 'http';
+   $scheme = $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";
  }
-Line 439 
 sub do_FrontPage {
+Line 449 
 sub do_FrontPage {
  sub print_error {
      my ($msg) = @_;
-     &print_header($ErrorPage);
+     &print_header($ErrorPage, -noindex => 1);
      print qq(<p><strong class="error">$msg</strong></p>);
      &print_footer($ErrorPage);
      exit(0);
-Line 451 
 sub print_header ($;%) {
+Line 461 
 sub print_header ($;%) {
      if (&is_frozen($page) and $form{mycmd} =~ /^(read|write)$/) {
          $bodyclass = "frozen";
      }
+     $bodyclass .= " wiki-page-obsoleted" if $option{-content_format} =~ /obsoleted="yes"/;
      print qq{Refresh: 0; url="$option{-goto}"\n} if $option{-goto};
      print qq{Last-Modified: $option{-last_modified}\n} if $option{-last_modified};
      my $cookedpage = &encode($page);
-Line 466 
 Content-Style-Type: text/css
+Line 477 
 Content-Style-Type: text/css
      "http://www.w3.org/TR/html4/loose.dtd"> + RUBY -->
  <html lang="$lang">
  <head>
-     <title>$escapedpage @{[&escape(&get_subjectline($page))]}</title>
+     <title>$escapedpage</title>
      <link rel="index" href="$url_cgi?$IndexPage">
      <link rel="copyright" href="$url_cgi?$NAME_OF_WikiPageLicense">
      <link rev="made" href="mailto:@{[&escape($modifier_mail)]}">
      <link rel="stylesheet" type="text/css" href="@{[&escape($url_stylesheet)]}">
+     @{[$option{-noindex} ? q(<meta name="ROBOTS" content="NOINDEX">) : '']}
  </head>
  <body class="$bodyclass">
  EOD
    &print_navigate_links ($page);
    print <<EOD;
- <h1 class="header">@{[&escape($page)]}
+ <h1 class="header">@{[&escape($page)]}</h1>
-   <span class="wikipage-summary">@{[&escape(&get_subjectline($page))]}</span></h1>
  EOD
  }
-Line 487 
 sub print_navigate_links (@) {
+Line 498 
 sub print_navigate_links (@) {
      my $admineditable = 0;
      if (&is_frozen($page) and $form{mycmd} =~ /^(read|write)$/) {
          $editable = 0;
-         $admineditable = 1;
+         #$admineditable = 1;
      } elsif (&is_editable($page) and $form{mycmd} =~ /^(read|write)$/) {
-         $admineditable = 1;
+         #$admineditable = 1;
          $editable = 1;
      } else {
          $editable = 0;
-Line 502 
 sub print_navigate_links (@) {
+Line 513 
 sub print_navigate_links (@) {
          : 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{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">ЪдНИ</a> | )
          : qq()
      ]}
      @{[ $admineditable
          ? qq(<a href="$url_cgi?mycmd=diff;mypage=$cookedpage">$resource{diffbutton}</a> | )
          : qq()
      ]}
-     <a href="$url_cgi?$CreatePage">$resource{createbutton}</a> |
+     <a href="$url_cgi?$CreatePage" class="wiki">ПЗЕЌ</a> |
-     <a href="$url_cgi?$IndexPage">$resource{indexbutton}</a> |
+     <a href="$url_cgi?$IndexPage" class="wiki">$resource{indexbutton}</a> |
-     <a href="$url_cgi?$RssPage">$resource{rssbutton}</a> |
+     <a href="$url_cgi?$FrontPage" class="wiki">МѓЪЧ</a> |
-     <a href="$url_cgi?$FrontPage">$FrontPage</a> |
+     <a href="$url_cgi?$SearchPage" class="wiki">$resource{searchbutton}</a> |
-     <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> |
-     <a href="$url_cgi?$RecentChanges">$resource{recentchangesbutton}</a>
+     <a href="$url_cgi?$RecentChanges" class="wiki">КЧПЗ</a>
+ </div>
+ EOH
+ <<EOH;  ## temp
+     <a href="$url_cgi?$CreatePage" class="wiki">$resource{createbutton}</a> |
+     <a href="$url_cgi?$IndexPage" class="wiki">$resource{indexbutton}</a> |
+ <!--    <a href="$url_cgi?$RssPage" class="wiki">$resource{rssbutton}</a> | -->
+     <a href="$url_cgi?$FrontPage" class="wiki">$FrontPage</a> |
+     <a href="$url_cgi?$SearchPage" class="wiki">$resource{searchbutton}</a> |
+     <a href="$url_cgi?mycmd=RandomJump;x-param=@{[time.[0..9]->[rand 10]]}" class="wiki randomlink">ЄЩЄГЄЋ</a> |
+     <a href="$url_cgi?$RecentChanges" class="wiki">$resource{recentchangesbutton}</a>
  </div>
  EOH
  }
-Line 523 
 sub print_footer {
+Line 545 
 sub print_footer {
      my ($page, $lm) = @_;
      $walrus_log = ($walrus_debugging) ? &text_to_html("----\n$walrus_log") : '';    # Walrus add (debug)
      # Walrus mod (1) start
-   my $cvslog = '$Revision$ $Date$';
+   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>) : '' ]}
  <div class="footer">
- <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>
- <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>
  <div class="navigation">
  [<a href="/" title="ЄГЄЮЅЕЁМЅаЁМЄЮМѓЪЧ">/</a>
  <a href="/map" title="ЄГЄЮЅЕЁМЅаЁМЄЮАЦЦт">УЯПо</a>
-Line 583 
 sub unescape {
+Line 601 
 sub unescape {
  sub print_content ($;$) {
      my ($rawcontent, %option) = @_;
-     print &text_to_html($rawcontent, toc=>1);
+     print &text_to_html($rawcontent, toc=>1, %option);
  }
  sub text_to_html {
      my ($txt, %option) = @_;
      my (@txt) = split(/\n/, $txt);
-     my (@toc);
+     my @toc;
+     my @toc2 = @{$option{-toc}||[]};
      my $tocnum = 0;
      my (@saved, @result);
      unshift(@saved, "</p>");
-Line 667 
 sub text_to_html {
+Line 686 
 sub text_to_html {
              push(@result, join('', '<tr>', @value, '</tr>'));
              # XXXXX
              #######
-         } elsif (/^\[(INS|DEL|PRE)\[/) {
+         } elsif (/^\[(INS|DEL|PRE)\[\s*$/) {
              push @result, splice (@saved), '<'.lc($1).'>';
              unshift @saved, "</p>";
              push @result, "<p>";
-         } elsif (/^\](INS|DEL|PRE)\]/) {
+         } elsif (/^\](INS|DEL|PRE)\]\s*$/) {
              push @result, splice (@saved), '</'.lc($1).'>';
          } elsif (/^\[([0-9]+)\](.*)$/ && !$main::_EMBEDED) {
            my $num = 0+$1;
-Line 688 
 sub text_to_html {
+Line 707 
 sub text_to_html {
          # Convert @toc (table of contents) to HTML.
          # This part is taken from Makio Tsukamoto's WalWiki.
          my (@tocsaved, @tocresult);
-         foreach (@toc) {
+         foreach (@toc,@toc2) {
              if (/^(-{1,6})(.*)$/) {
                  &back_push('ul', length($1), \@tocsaved, \@tocresult);
                  push(@tocresult, '<li>' . $2 . '</li>');
-Line 1158 
 sub conflict {
+Line 1177 
 sub conflict {
      my $content = join('', <FILE>);
      &code_convert(\$content, $kanjicode);
      close(FILE);
-     &print_header($page);
+     &print_header($page, -noindex => 1);
      &print_content($content);
      &print_editform($rawmsg, $form{myLastModified}, frozen=>0, conflict=>1);
      &print_footer($page);
-Line 1268 
 sub is_frozen {
+Line 1287 
 sub is_frozen {
  sub do_comment {
      my ($content) = $database{$form{mypage}};
      my $datestr = &get_now;
-     my $namestr = " ''[[@{[$form{myname}||$DEFAULT_embed_comment_name]}]]'': ";
+     my $namestr = $form{myname} || $DEFAULT_embed_comment_name;
+     if ($namestr =~ /^(?:>>)?[0-9]/) {
+       $namestr = qq( ''$namestr'': );
+     } else {
+       $namestr = qq( ''[[$namestr]]'': );
+     }
      my $anchor = 0;
      $content =~ s/(?:-+\s)?\[([0-9]+)\]/$anchor = $1 if $1 > $anchor; $&/mge;
      $anchor++;
-Line 1287 
 sub do_comment {
+Line 1311 
 sub do_comment {
      unless ($o) {
        $content .= "- [$anchor] $datestr$namestr$form{mymsg}\n";
      }
+     $form{__comment_anchor_index} = $anchor;
      if ($form{mymsg}) {
          $form{mymsg} = $content;
          $form{mytouch} = 'on';
-Line 1472 
 sub do_diff {
+Line 1497 
 sub do_diff {
      }
      &open_diff;
      my $title = $form{mypage};
-     &print_header($title);
+     &print_header($title, -noindex => 1);
      $_ = &escape($diffbase{$form{mypage}});
      &close_diff;
      print qq(<h3>$resource{difftitle}</h3>);

 Legend:



Removed from v.1.28
 


changed lines


 
Added in v.1.29
 Legend:



Removed from v.1.28
 


changed lines


 
Added in v.1.29
-Removed from v.1.28
+Added in v.1.29

admin@suikawiki.org	ViewVC Help
Powered by ViewVC 1.1.24