--- suikawiki/script/wiki.cgi 2002/08/30 04:31:11 1.24 +++ suikawiki/script/wiki.cgi 2002/09/28 09:43:07 1.25 @@ -83,7 +83,7 @@ my $file_conflict = "$modifier_dir_data/conflict.txt"; my $file_format = "$modifier_dir_data/format.txt"; my $url_cgi = 'wiki'; -my $url_stylesheet = 'wiki-style.css'; +my $url_stylesheet = $url_cgi.'?mycmd=TEXT_CSS;mypage=WikiHTMLStyle'; my $icontag = '*'; my $maxrecent = 50; my $cols = 80; @@ -117,10 +117,12 @@ my $bracket_name = '\[\[(\S+?)\]\]'; my $embedded_name = '\[\[(#\S+?)\]\]'; my $interwiki_definition = '\[\[(\S+?)\ (\S+?)\]\]'; -my $interwiki_name = '([^:]+):i:([^:].*)'; +my $interwiki_name = 'i:([^:]+):([^:].*)'; ############################## 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:([^\]]+)\]\]$', @@ -161,6 +163,7 @@ ); my %command_do = ( read => \&do_read, + TEXT_CSS => \&do_output_css, edit => \&do_edit, adminedit => \&do_adminedit, adminchangepasswordform => \&do_adminchangepasswordform, @@ -203,6 +206,7 @@ sub do_read { &print_header($form{mypage}); &print_content($database{$form{mypage}}); + print &text_to_html (q([[#comment]])); my ($r, $c) = get_search_result ($form{mypage}); if ($c) { print q{

See also

}; @@ -211,6 +215,20 @@ &print_footer($form{mypage}); } +sub do_output_css { + my $content = $database{$form{mypage}}; + if ($content =~ m#^\s*/\*\s*W3C-CSS#) { + print "Content-Type: text/css; charset=$charset\n"; + print "\n"; + print $content; + } else { + print "Status: 406 Unsupported Media Type\n"; + &print_header('WikiPageIsNotCSS'); + &print_content($database{WikiPageIsNotCSS}); + &print_footer('WikiPageIsNotCSS'); + } +} + sub do_edit { my ($page) = &unarmor_name(&armor_name($form{mypage})); &print_header($page); @@ -477,7 +495,7 @@ my ($page) = @_; $walrus_log = ($walrus_debugging) ? &text_to_html("----\n$walrus_log") : ''; # Walrus add (debug) # Walrus mod (1) start - my $cvslog = '$Revision: 1.24 $ $Date: 2002/08/30 04:31:11 $'; + my $cvslog = '$Revision: 1.25 $ $Date: 2002/09/28 09:43:07 $'; print_navigate_links ($page); print <<"EOD";
@@ -536,6 +554,7 @@ sub print_content { my ($rawcontent) = @_; + $rawcontent =~ s#^SuikaWiki/0.9[^\x0D\x0A]*[\x0D\x0A]+##s; print &text_to_html($rawcontent, toc=>1); } @@ -549,34 +568,32 @@ push(@result, "

"); foreach (@txt) { chomp; - if (/^\*\*\*\*\*(.*)/) { - push(@toc, qq(-- @{[&escape($1)]}\n)); + if (/^\*\*\*\*\*([^\x0D\x0A]*)/) { + push(@toc, qq(----- @{[&escape($1)||$tocnum]}\n)); push(@result, splice(@saved), qq(

) . &inline($1) . '
'); $tocnum++; - } elsif (/^\*\*\*\*(.*)/) { - push(@toc, qq(-- @{[&escape($1)]}\n)); + } elsif (/^\*\*\*\*([^\x0D\x0A]*)/) { + push(@toc, qq(---- @{[&escape($1)||$tocnum]}\n)); push(@result, splice(@saved), qq(
) . &inline($1) . '
'); $tocnum++; - } elsif (/^\*\*\*(.*)/) { - push(@toc, qq(-- @{[&escape($1)]}\n)); + } elsif (/^\*\*\*([^\x0D\x0A]*)/) { + push(@toc, qq(--- @{[&escape($1)||$tocnum]}\n)); push(@result, splice(@saved), qq(

) . &inline($1) . '

'); $tocnum++; - } elsif (/^\*\*(.*)/) { + } elsif (/^\*\*([^\x0D\x0A]*)/) { # if (/^\*\*(.*)/) { # Walrus mod (6) end - push(@toc, qq(-- @{[&escape($1)]}\n)); + push(@toc, qq(-- @{[&escape($1)||$tocnum]}\n)); push(@result, splice(@saved), qq(

) . &inline($1) . '

'); $tocnum++; - } elsif (/^\*(.*)/) { - push(@toc, qq(- @{[&escape($1)]}\n)); + } elsif (/^\*([^\x0D\x0A]*)/) { + push(@toc, qq(- @{[&escape($1)||$tocnum]}\n)); push(@result, splice(@saved), qq(

) . &inline($1) . '

'); $tocnum++; - #} elsif (/^----/) { - # push(@result, splice(@saved), '
'); - } elsif (/^(={1,5})(.*)/) { + } elsif (/^(={1,6})(.*)/) { &back_push('ol', length($1), \@saved, \@result); push(@result, '
  • ' . &inline($2) . '
    • '); - } elsif (/^(-{1,5})(.*)/) { + } elsif (/^(-{1,6})(.*)/) { &back_push('ul', length($1), \@saved, \@result); push(@result, '
  • ' . &inline($2) . '
    • '); } elsif (/^:([^:]+):(.*)/) { @@ -628,7 +645,7 @@ # This part is taken from Makio Tsukamoto's WalWiki. my (@tocsaved, @tocresult); foreach (@toc) { - if (/^(-{1,3})(.*)/) { + if (/^(-{1,6})(.*)$/) { &back_push('ul', length($1), \@tocsaved, \@tocresult); push(@tocresult, '
  • ' . $2 . '
    • '); } @@ -662,7 +679,7 @@ $line =~ s|(\d\d\d\d-\d\d-\d\d \(\w\w\w\) \d\d:\d\d:\d\d)|$1|g; # Date $line =~ s! ( - (?:<(?:mailto|http|https|ftp|urn):[\x21-\x7E]*)> + (?:<(?:mailto|http|https|ftp|urn|news):[\x21-\x7E]*)> | ($bracket_name) # [[likethis]], [[#comment]], [[Friend:remotelink]] | @@ -686,12 +703,12 @@ } elsif ($chunk =~ /^mailto:(.*)$/) { $name = $1; } - if ($use_autoimg and $name =~ /^(http|https|ftp|):.+\.(png|gif|jpe?g)/) { + if ($use_autoimg and $name =~ /^(http|https|ftp):.+\.(png|gif|jpe?g)/) { $name = qq() ; } $name = &unarmor_name($name); # Walrus add (3) end - if ($chunk =~ /^(http|https|ftp):/) { + if ($chunk =~ /^(http|https|ftp|news):/) { # Walrus mod (3) start # if ($use_autoimg and $chunk =~ /\.(gif|png|jpeg|jpg)$/) { # return qq(); @@ -824,6 +841,7 @@ # 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"; } @@ -931,7 +949,7 @@ } $mymsg = &escape($form{mymsg}); } else { - $mymsg = &escape($mymsg); + $mymsg = &escape($mymsg || $database{NewPageTemplate}); } my $edit = $mode{admin} ? 'adminedit' : 'edit'; @@ -943,7 +961,7 @@ @{[ $mode{admin} ? qq($resource{frozenpassword}
    ) : "" ]} -
    +
    @{[ $mode{admin} ? qq( @@ -1005,11 +1023,11 @@ # not_wiki_name -> [[not_wiki_name]] sub armor_name { my ($name) = @_; - if ($name =~ /^$wiki_name$/) { - return $name; - } else { + #if ($name =~ /^$wiki_name$/) { + # return $name; + #} else { return "[[$name]]"; - } + #} } # unarmor_name: @@ -1182,11 +1200,26 @@ sub do_comment { my ($content) = $database{$form{mypage}}; my $datestr = &get_now; - my $namestr = $form{myname} ? " ''[[$form{myname}]]'' : " : " "; - if ($content =~ s/(\Q$embed_comment\E)/- $datestr$namestr$form{mymsg}\n$1/) { - ; - } else { - $content =~ s/(\Q$embed_rcomment\E)/$1\n- $datestr$namestr$form{mymsg}/; + my $namestr = " ''[[@{[$form{myname}||$DEFAULT_embed_comment_name]}]]'' : "; + #if ($content =~ s/(\Q$embed_comment\E)/- $datestr$namestr$form{mymsg}\n$1/) { + # ; + #} else { + # $content =~ s/(\Q$embed_rcomment\E)/$1\n- $datestr$namestr$form{mymsg}/; + #} + my $i = 0; my $o = 0; + $content =~ s{(\Q$embed_comment\E|\Q$embed_rcomment\E)}{ + my $embed = $1; + if ($i == $form{comment_index}) { + if ($embed eq $embed_comment) { + $embed = "- $datestr$namestr$form{mymsg}\n$embed"; $o = 1; + } else { + $embed .= "\n- $datestr$namestr$form{mymsg}"; $o = 1; + } + } + $i++; $embed; + }ge; + unless ($o) { + $content .= "- $datestr$namestr$form{mymsg}\n"; } if ($form{mymsg}) { $form{mymsg} = $content; @@ -1198,6 +1231,7 @@ } } +my $_O_COMMENT_INDEX = 0; sub embedded_to_html { my ($embedded) = @_; if ($embedded eq $embed_comment or $embedded eq $embed_rcomment) { @@ -1208,7 +1242,8 @@ - $resource{yourname} + + $embed_comment_Name_Prompt