/[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.35 by wakaba, Thu Dec 5 04:32:27 2002 UTC revision 1.38 by wakaba, Sun Dec 15 06:08:33 2002 UTC
# Line 217  sub do_read { Line 217  sub do_read {
217  }  }
218    
219  sub do_output_css {  sub do_output_css {
220      wiki::referer::add ($form{mypage}, $ENV{HTTP_REFERER});
221      wiki::useragent::add ($ENV{HTTP_USER_AGENT});
222    my $content = $database{$form{mypage}};    my $content = $database{$form{mypage}};
223    if ($content =~ m#^\s*/\*\s*W3C-CSS#) {    if ($content =~ m#^\s*/\*\s*W3C-CSS#) {
224      my $lm = &get_info($form{mypage}, $info_LastModified);      my $lm = &get_info($form{mypage}, $info_LastModified);
225          print scalar make_navigate_links ($form{mypage});
226      print "Content-Type: text/css; charset=$charset\n";      print "Content-Type: text/css; charset=$charset\n";
227      print "Last-Modified: $lm\n";      print "Last-Modified: $lm\n";
228      print "\n";      print "\n";
# Line 234  sub do_output_css { Line 237  sub do_output_css {
237    
238  sub id_and_name ($) {  sub id_and_name ($) {
239      my $name = shift;      my $name = shift;
240      if ($UA =~ m#Mozilla/[12]\.#) {      if ($UA =~ m#Mozilla/[12]\.|Microsoft Internet Explorer#) {
241        qq{id="$name"><a name="$name"></a};        qq{id="$name"><a name="$name"></a};
242      } else {      } else {
243          qq{id="$name"};          qq{id="$name"};
# Line 311  EOD Line 314  EOD
314  }  }
315    
316  sub do_index {  sub do_index {
317      wiki::referer::add ($form{mypage}, $ENV{HTTP_REFERER});
318      wiki::useragent::add ($ENV{HTTP_USER_AGENT});
319      &print_header($IndexPage);      &print_header($IndexPage);
320      print qq(<ul>);      print qq(<ul>);
321      foreach my $page (sort keys %database) {      foreach my $page (sort keys %database) {
# Line 321  sub do_index { Line 326  sub do_index {
326          }          }
327      }      }
328      print qq(</ul>);      print qq(</ul>);
329        my ($r, $c) = get_search_result ($form{mypage});
330        if ($c) {
331          print qq{<h2 @{[&id_and_name('wikipage-see-also')]}>See also</h2>};
332          print $r;
333        }
334        my $rl = wiki::referer::list_html ($form{mypage});
335        if ($rl) {
336            print qq(<div @{[&id_and_name('wikipage-referer')]}><h2>??????</h2>\n$rl</div>\n);
337        }
338      &print_footer($IndexPage);      &print_footer($IndexPage);
339  }  }
340    
# Line 357  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          my $fragment;          my $fragment = '';
375            $fragment .= qq(;after_edit_cmd=@{[&encode($form{after_edit_cmd})]}) if $form{after_edit_cmd};
376          if ($form{__comment_anchor_index}) {          if ($form{__comment_anchor_index}) {
377              $fragment = qq(anchor-$form{__comment_anchor_index});              $fragment .= qq(#anchor-$form{__comment_anchor_index});
378          } elsif ($form{__wikiform_anchor_index}) {          } elsif ($form{__wikiform_anchor_index}) {
379              $fragment = qq(wikiform-$form{__wikiform_anchor_index});              $fragment .= qq(#wikiform-$form{__wikiform_anchor_index});
380          }          }
381          &print_header($CompletedSuccessfully, -noindex => 1, -goto => $url_cgi.'?mycmd=read;mypage='.&encode($form{mypage}).qq(;x-param=@{[time.[0..9]->[rand 10]]}).($fragment?'#'.$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));
382          &print_message($resource{saved});          &print_message($resource{saved});
383          &print_content("$resource{continuereading} @{[&armor_name($form{mypage})]}");          &print_content("$resource{continuereading} @{[&armor_name($form{mypage})]}");
384          &print_footer($CompletedSuccessfully);          &print_footer($CompletedSuccessfully);
# Line 469  sub print_header ($;%) { Line 484  sub print_header ($;%) {
484      }      }
485      $bodyclass .= " wiki-page-obsoleted" if $option{-content_format} =~ /obsoleted="yes"/;      $bodyclass .= " wiki-page-obsoleted" if $option{-content_format} =~ /obsoleted="yes"/;
486      if ($option{-goto}) {      if ($option{-goto}) {
487        if ($UA =~ m#Mozilla/[12]\.|Opera#) {        if ($UA =~ m#Opera|MSIE 2\.#) {
488            $option{-goto} =~ tr/;/&/;            $option{-goto} =~ tr/;/&/ if $UA =~ m#Opera#;
489            print qq{Refresh: 0; url=$option{-goto}\n};            print qq{Refresh: 0; url=$option{-goto}\n};
490            $option{-goto} = qq(<meta http-equiv="refresh" content="0; url=$option{-goto}">);            $option{-goto} = qq(<meta http-equiv="refresh" content="0; url=$option{-goto}">);
491        } else {        } else {
492              $option{-goto} =~ tr/;/&/ if $UA =~ m#Mozilla/[1-4]\.#;
493            print qq{Refresh: 0; url="$option{-goto}"\n};            print qq{Refresh: 0; url="$option{-goto}"\n};
494            $option{-goto} = qq(<meta http-equiv="refresh" content="0; url=&quot;@{[&escape($option{-goto})]}&quot;">);            $option{-goto} = qq(<meta http-equiv="refresh" content="0; url=&quot;@{[&escape($option{-goto})]}&quot;">);
495        }        }
# Line 484  sub print_header ($;%) { Line 500  sub print_header ($;%) {
500          $meta_ct = qq{text/html; charset=@{[&x_charset($charset)]}};          $meta_ct = qq{text/html; charset=@{[&x_charset($charset)]}};
501          print qq{Content-Type: $meta_ct\n};          print qq{Content-Type: $meta_ct\n};
502          $meta_ct = qq{<meta http-equiv="content-type" content="$meta_ct">};          $meta_ct = qq{<meta http-equiv="content-type" content="$meta_ct">};
503        } elsif ($UA =~ m#Infomosaic#) {
504            print qq{Content-Type: text/html\n};
505      } else {      } else {
506          print qq{Content-Type: text/html; charset=$charset\n};          print qq{Content-Type: text/html; charset=$charset\n};
507      }      }
508      my $cookedpage = &encode($page);      my $cookedpage = &encode($page);
509      my $escapedpage = &escape($page);      my $escapedpage = &escape($page);
510        my ($Links, $links) = &make_navigate_links ($page);
511        print $Links;
512      print <<"EOD";      print <<"EOD";
513  Content-Language: $lang  Content-Language: $lang
514  Content-Style-Type: text/css  Content-Style-Type: text/css
# Line 498  Content-Style-Type: text/css Line 518  Content-Style-Type: text/css
518      PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"      PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
519      "http://www.w3.org/TR/html4/loose.dtd"> + RUBY -->      "http://www.w3.org/TR/html4/loose.dtd"> + RUBY -->
520  <html lang="$lang">  <html lang="$lang">
521  <head>  <head profile="http://suika.fam.cx/~wakaba/-temp/wiki/wiki?WikiHTMLMetaProfile">
522      $meta_ct$option{-goto}      $meta_ct$option{-goto}
523      <title>$escapedpage</title>      <title>$escapedpage</title>
524      <link rel="index" href="$url_cgi?$IndexPage">      @{[($UA !~ m#Mozilla/[1-4]\.# || $UA =~ m#MSIE (?:[4-9]\.|\d\d)#) ? qq(<link rel="stylesheet" type="text/css" href="@{[&escape($url_stylesheet)]}">) : '']}
     <link rel="help" href="$url_cgi?WikiHelp">  
     <link rel="copyright" href="$url_cgi?$NAME_OF_WikiPageLicense">  
     <link rel="stylesheet" type="text/css" href="@{[&escape($url_stylesheet)]}">  
525      @{[$option{-noindex} ? q(<meta name="ROBOTS" content="NOINDEX">) : '']}      @{[$option{-noindex} ? q(<meta name="ROBOTS" content="NOINDEX">) : '']}
526    $links
527  </head>  </head>
528  <body class="$bodyclass">  <body class="$bodyclass">
529  EOD  EOD
# Line 542  sub print_navigate_links (@) { Line 560  sub print_navigate_links (@) {
560    print <<EOH;    print <<EOH;
561  <div class="tools">  <div class="tools">
562      @{[ $admineditable      @{[ $admineditable
563          ? qq(<a title="$resource{admineditthispage}" href="$url_cgi?mycmd=adminedit;mypage=$cookedpage">$resource{admineditbutton}</a> | )          ? qq(<a title="$resource{admineditthispage}" href="$url_cgi?mycmd=adminedit;mypage=$cookedpage" class="wiki-cmd">$resource{admineditbutton}</a> | )
564          : qq()          : qq()
565      ]}      ]}
566      @{[ $editable      @{[ $editable
567          ? #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> | )
568          qq(<a title="$resource{editthispage}" href="$url_cgi?mycmd=edit;mypage=$cookedpage" accesskey="E">編集</a> | )          qq(<a title="$resource{editthispage}" href="$url_cgi?mycmd=edit;mypage=$cookedpage" accesskey="E" class="wiki-cmd">編集</a> | )
569          : qq()          : qq()
570      ]}      ]}
571      <a href="$url_cgi?mycmd=read;mypage=$cookedpage;x-param=@{[time.[0..9]->[rand 10]]}">表示</a> |      <a href="$url_cgi?mycmd=read;mypage=$cookedpage;x-param=@{[time.[0..9]->[rand 10]]}" class="wiki-cmd">表示</a> |
572      @{[ $admineditable      @{[ $admineditable
573          ? qq(<a href="$url_cgi?mycmd=diff;mypage=$cookedpage">$resource{diffbutton}</a> | )          ? qq(<a href="$url_cgi?mycmd=diff;mypage=$cookedpage" class="wiki-cmd">$resource{diffbutton}</a> | )
574          : qq()          : qq()
575      ]}      ]}
576      <a href="$url_cgi?$CreatePage" class="wiki">新規</a> |      <a href="$url_cgi?$CreatePage" class="wiki">新規</a> |
# Line 563  sub print_navigate_links (@) { Line 581  sub print_navigate_links (@) {
581      <a href="$url_cgi?$RecentChanges" class="wiki">最新</a>      <a href="$url_cgi?$RecentChanges" class="wiki">最新</a>
582  </div>  </div>
583  EOH  EOH
584  <<EOH;  ## temp  }
585      <a href="$url_cgi?$CreatePage" class="wiki">$resource{createbutton}</a> |  
586      <a href="$url_cgi?$IndexPage" class="wiki">$resource{indexbutton}</a> |  sub make_navigate_links ($) {
587  <!--    <a href="$url_cgi?$RssPage" class="wiki">$resource{rssbutton}</a> | -->      my $page = shift;
588      <a href="$url_cgi?$FrontPage" class="wiki">$FrontPage</a> |      my @link;
589      <a href="$url_cgi?$SearchPage" class="wiki">$resource{searchbutton}</a> |      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);
590      <a href="$url_cgi?mycmd=RandomJump;x-param=@{[time.[0..9]->[rand 10]]}" class="wiki randomlink">どこか</a> |      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);
591      <a href="$url_cgi?$RecentChanges" class="wiki">$resource{recentchangesbutton}</a>      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'};
592  </div>      push @link, {rel=>'myself', href=>"$url_cgi?@{[&encode($page)]}", class=>'wiki'};
593  EOH      push @link, {rel=>'index', href=>"$url_cgi?$IndexPage", class=>'wiki', title=>$resource{indexbutton}};
594        push @link, {rel=>'home', href=>"$url_cgi?$FrontPage", class=>'wiki', title=>$FrontPage};
595        push @link, {rel=>'News', href=>"$url_cgi?WikiNews", class=>'wiki', title=>'News on this wiki'};
596        push @link, {rel=>'News', href=>"$url_cgi?$RecentChanges", class=>"wiki", title=>$resource{recentchangesbutton}};
597        push @link, {rel=>'News', href=>"$url_cgi?$RssPage", class=>"wiki", title=>$resource{rssbutton}, type=>'application/xml'};
598        push @link, {rel=>'search', href=>"$url_cgi?$SearchPage", class=>'wiki', title=>$resource{searchbutton}};
599        push @link, {rel=>'help', href=>"$url_cgi?WikiHelp", class=>'wiki'};
600        push @link, {rel=>'copyright', href=>"$url_cgi?WikiPageLicense", class=>'wiki'};
601        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...'};
602        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)...'};
603        push @link, {rel=>'lucky', href=>"$url_cgi?mycmd=RandomJump;x-param=@{[time.[0..9]->[rand 10]]}", class=>'wiki randomlink', title=>'Somewhere'};
604        my ($Links, $links) = ('', '');
605        for my $e (@link) {
606            $links .= qq(<link);
607            $Links .= qq(Link: <$e->{href}>);
608            for my $attr (qw/rel rev href title class type hreflang charset/) {
609                $links .= qq( $attr="@{[&escape($e->{$attr})]}") if $e->{$attr};
610            }
611            for my $attr (qw/rel rev title/) {
612                $Links .= qq(; $attr="@{[do{$e->{$attr} =~ s/([\\\"])/\\$1/g; $e->{$attr}}]}") if $e->{$attr};
613            }
614            $links .= qq(>\n);
615            $Links .= qq(\n);
616        }
617        wantarray ? ($Links, $links) : $Links;
618  }  }
619    
620  sub print_footer {  sub print_footer {
# Line 641  sub text_to_html { Line 683  sub text_to_html {
683          chomp;          chomp;
684          if (/^\*\*\*\*\*([^\x0D\x0A]*)/) {          if (/^\*\*\*\*\*([^\x0D\x0A]*)/) {
685              push(@toc, qq(----- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));              push(@toc, qq(----- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));
686              push(@result, splice(@saved), qq(<h6 id="i$tocnum">) . &inline($1) . '</h6>');              push(@result, splice(@saved), qq(<h6 @{[&id_and_name("i$tocnum")]}>) . &inline($1) . '</h6>');
687              $tocnum++;              $tocnum++;
688          } elsif (/^\*\*\*\*([^\x0D\x0A]*)/) {          } elsif (/^\*\*\*\*([^\x0D\x0A]*)/) {
689              push(@toc, qq(---- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));              push(@toc, qq(---- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));
690              push(@result, splice(@saved), qq(<h5 id="i$tocnum">) . &inline($1) . '</h5>');              push(@result, splice(@saved), qq(<h5 @{[&id_and_name("i$tocnum")]}>) . &inline($1) . '</h5>');
691              $tocnum++;              $tocnum++;
692          } elsif (/^\*\*\*([^\x0D\x0A]*)/) {          } elsif (/^\*\*\*([^\x0D\x0A]*)/) {
693              push(@toc, qq(--- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));              push(@toc, qq(--- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));
694              push(@result, splice(@saved), qq(<h4 id="i$tocnum">) . &inline($1) . '</h4>');              push(@result, splice(@saved), qq(<h4 @{[&id_and_name("i$tocnum")]}>) . &inline($1) . '</h4>');
695              $tocnum++;              $tocnum++;
696          } elsif (/^\*\*([^\x0D\x0A]*)/) {          } elsif (/^\*\*([^\x0D\x0A]*)/) {
697          # if (/^\*\*(.*)/) {          # if (/^\*\*(.*)/) {
698          # Walrus mod (6) end          # Walrus mod (6) end
699              push(@toc, qq(-- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));              push(@toc, qq(-- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));
700              push(@result, splice(@saved), qq(<h3><a name="i$tocnum"> </a>) . &inline($1) . '</h3>');              push(@result, splice(@saved), qq(<h3 @{[&id_and_name("i$tocnum")]}>) . &inline($1) . '</h3>');
701              $tocnum++;              $tocnum++;
702          } elsif (/^\*([^\x0D\x0A]*)/) {          } elsif (/^\*([^\x0D\x0A]*)/) {
703              push(@toc, qq(- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));              push(@toc, qq(- <a href="#i$tocnum">@{[&escape($1)||$tocnum]}</a>\n));
704              push(@result, splice(@saved), qq(<h2><a name="i$tocnum"> </a>) . &inline($1) . '</h2>');              push(@result, splice(@saved), qq(<h2 @{[&id_and_name("i$tocnum")]}>) . &inline($1) . '</h2>');
705              $tocnum++;              $tocnum++;
706          } elsif (/^(={1,6})(.*)/) {          } elsif (/^(={1,6})(.*)/) {
707              &back_push('ol', length($1), \@saved, \@result);              &back_push('ol', length($1), \@saved, \@result);
# Line 1116  sub print_editform { Line 1158  sub print_editform {
1158      } else {      } else {
1159          $mymsg = &escape($mymsg || $database{NewPageTemplate});          $mymsg = &escape($mymsg || $database{NewPageTemplate});
1160      }      }
1161        my $magic = '';
1162        $magic = $1 if $mymsg =~ m/^([^\x0A\x0D]+)/s;
1163    
1164      my $edit = $mode{admin} ? 'adminedit' : 'edit';      my $edit = $mode{admin} ? 'adminedit' : 'edit';
1165      my $escapedmypage = &escape($form{mypage});      my $escapedmypage = &escape($form{mypage});
1166      my $escapedmypassword = &escape($form{mypassword});      my $escapedmypassword = &escape($form{mypassword});
1167        my $selected = 'read';
1168        if ($form{after_edit_cmd}) {
1169            $selected = $form{after_edit_cmd};
1170        } elsif ($magic =~ /Config/ || $magic =~ /CSS/) {
1171            $selected = 'edit';
1172        }
1173        my $afteredit = <<EOH;
1174    <select name="after_edit_cmd">
1175    <option value="read" label="View changed page"@{[$selected eq 'read' ? ' selected="selected"':'']}>read</option>
1176    <option value="edit" label="Edit changed page"@{[$selected eq 'edit' ? ' selected="selected"':'']}>edit</option>
1177    </select>
1178    EOH
1179    
1180      print <<"EOD";      print <<"EOD";
1181  <form action="$url_cgi" method="post">  <form action="$url_cgi" method="post">
1182  <h2>$escapedmypageの編集</h2>  <h2>$escapedmypageの編集</h2>
1183      @{[ $mode{admin} ? qq($resource{frozenpassword} <input type="password" name="mypassword" value="$escapedmypassword" size="10"><br>) : "" ]}      @{[ $mode{conflict} ? '' : qq(<input type="submit" name="mypreview_write" value="$resource{savebutton}"><kbd>S</kbd>) ]}
1184        @{[ $mode{admin} ? qq($resource{frozenpassword} <input type="password" name="mypassword" value="$escapedmypassword" size="10">) : "" ]} [@{[do {my $n = 0;
1185                   $mymsg =~ s/(?:-+\s)?\[([0-9]+)\]/$n = $1 if $1 > $n; $&/mge;
1186                   ++$n}]}]<br>
1187      <input type="hidden" name="myLastModified" value="$lastmodified">      <input type="hidden" name="myLastModified" value="$lastmodified">
1188      <input type="hidden" name="mypage" value="$escapedmypage">      <input type="hidden" name="mypage" value="$escapedmypage">
1189      <textarea cols="$cols" rows="$rows" name="mymsg" tabindex="1">$mymsg</textarea><br>      <textarea cols="$cols" rows="$rows" name="mymsg" tabindex="1">$mymsg</textarea><br>
# Line 1141  sub print_editform { Line 1200  sub print_editform {
1200          <input type="checkbox" name="mytouch" value="on" checked="checked">$resource{touch}<br>          <input type="checkbox" name="mytouch" value="on" checked="checked">$resource{touch}<br>
1201          <input type="submit" name="mypreview_$edit" value="$resource{previewbutton}">          <input type="submit" name="mypreview_$edit" value="$resource{previewbutton}">
1202          <input type="submit" name="mypreview_write" value="$resource{savebutton}" accesskey="S"><kbd>S</kbd>          <input type="submit" name="mypreview_write" value="$resource{savebutton}" accesskey="S"><kbd>S</kbd>
1203          [@{[do {my $n = 0;         $afteredit
1204                 $mymsg =~ s/(?:-+\s)?\[([0-9]+)\]/$n = $1 if $1 > $n; $&/mge;         <br>
                ++$n}]}]<br>  
1205      )      )
1206  ]}  ]}
1207  </form>  </form>
# Line 1222  sub encode { Line 1280  sub encode {
1280  sub init_resource {  sub init_resource {
1281      open(FILE, $file_resource) or &print_error("(resource)");      open(FILE, $file_resource) or &print_error("(resource)");
1282      while (<FILE>) {      while (<FILE>) {
1283          chomp;          s/[\x0A\x0D]+$//g;
1284          next if /^#/;          next if /^#/;
1285          my ($key, $value) = split(/=/, $_, 2);          my ($key, $value) = split(/=/, $_, 2);
1286          $resource{$key} = &code_convert(\$value, $kanjicode);          $resource{$key} = &code_convert(\$value, $kanjicode);
# Line 1273  sub init_InterWikiName { Line 1331  sub init_InterWikiName {
1331    $fmt{interwiki}->{encoded} = sub {    $fmt{interwiki}->{encoded} = sub {
1332      my ($o, $p) = @_;      my ($o, $p) = @_;
1333      if ($o->{except}) {      if ($o->{except}) {
1334        $o->{except} =~ tr/\x00-\x20\x22\x23%\x2D<>^[\x5C]`{|}\x7F-\xFF//d;        $o->{except} =~ tr/\x00-\x20\x22%\x2D<>^[\x5C]`{|}\x7F-\xFF//d;
1335      }      }
1336      my $s = &code_convert (\$p->{name}, $o->{charset} || 'iso-2022-7bit');      my $s = &code_convert (\$p->{name}, $o->{charset} || 'iso-2022-7bit');
1337      $s =~ s/([^$o->{except}A-Za-z0-9_-])/sprintf '%%%02X', unpack 'C', $1/ge;      $s =~ s/([^$o->{except}A-Za-z0-9_-])/sprintf '%%%02X', unpack 'C', $1/ge;
# Line 1484  sub do_wikiform { Line 1542  sub do_wikiform {
1542              $fmt{form_option}->replace ($option, $param);              $fmt{form_option}->replace ($option, $param);
1543              my $t = 1;              my $t = 1;
1544              for (@{$param->{require}||[]}) {              for (@{$param->{require}||[]}) {
1545                (undef $t, last) unless length $param->{argv}->{'wikiform__'.$_};                  (undef $t, last) unless length $param->{argv}->{'wikiform__'.$_};
1546              }              }
1547              $t = $fmt{form_template}->replace ($template, $param) if $t;              $t = $fmt{form_template}->replace ($template, $param) if $t;
1548              if (length $t) {              if (length $t) {
# Line 1685  sub do_rss { Line 1743  sub do_rss {
1743          $count++;          $count++;
1744      }      }
1745      # print RSS information (as XML).      # print RSS information (as XML).
1746    print scalar &make_navigate_links ('RssPage');
1747      print <<"EOD"      print <<"EOD"
1748  Content-type: text/xml  Content-type: application/xml
1749    
1750  @{[$rss->as_string]}  @{[$rss->as_string]}
1751  EOD  EOD
# Line 1775  sub list_html ($) { Line 1834  sub list_html ($) {
1834      }      }
1835      my $euri = main::escape ($uri);      my $euri = main::escape ($uri);
1836      if ($title) {      if ($title) {
1837        $r .= qq(<li>[$list{$uri}] <a href="$euri" title="URI: &lt;$euri>">@{[main::escape ($title)]}</a></li>\n);        $r .= qq(<li>[$list{$uri}] <a href="$euri" title="URI: &lt;$euri&gt;">@{[main::escape ($title)]}</a></li>\n);
1838      } else {      } else {
1839        $r .= qq(<li>[$list{$uri}] &lt;<a href="$euri">$euri</a>&gt;</li>\n);        $r .= qq(<li>[$list{$uri}] &lt;<a href="$euri">$euri</a>&gt;</li>\n);
1840      }      }
Legend:
Removed from v.1.35  
changed lines
  Added in v.1.38
admin@suikawiki.org
 ViewVC Help
Powered by ViewVC 1.1.24