@{[&escape($page.' '.&get_subjectline($page))]}

--- suikawiki/script/wiki.cgi 2002/08/18 04:14:35 1.23 +++ suikawiki/script/wiki.cgi 2002/08/30 04:31:11 1.24 @@ -274,7 +274,7 @@ print qq(

$page@{[&escape(&get_subjectline($page))]}
@{[&escape($page)]}@{[&escape(&get_subjectline($page))]}
@{[&get_info($page, $info_IsFrozen)]}
@{[0 + &is_frozen($page)]}
@{[&escape($page)]}@{[&escape(&get_subjectline($page))]}
@{[&escape($page)]}@{[&escape(&get_subjectline($page))]}

$escapedpage @{[&escape(&get_subjectline($page))]}

@@ -549,14 +549,6 @@ push(@result, "

"); foreach (@txt) { chomp; - # Walrus mod (6) start - #if ($saved[0] eq '') { - # if (/<\/html>/i) { splice(@saved); } - # else { push (@result, &html_to_ignored_html($_)); } - #} elsif (/^/i and &is_ignore_html($form{mypage})) { - # push(@result, splice(@saved)); - # push(@saved, ''); - #} els if (/^\*\*\*\*\*(.*)/) { push(@toc, qq(-- @{[&escape($1)]}\n)); push(@result, splice(@saved), qq(

) . &inline($1) . '

'); @@ -729,57 +721,24 @@ # $remoteurl =~ s/\b(euc|sjis|ykwk|asis)$\$1$/&interwiki_convert($1, $localname)/e; # Walrus del (4) $remoteurl =~ s/\b(euc|sjis|ykwk|asis|isbn)$\$1$/&interwiki_convert($1, $localname)/e; # Walrus add (4) # return qq($chunk); # Walrus del (3) - return qq($name); # Walrus add (3) + return qq(@{[&escape($name)]}); # Walrus add (3) } else { # return $chunk; # Walrus del (3) - return $name; # Walrus add (3) + return &escape($name); # Walrus add (3) } } elsif ($database{$chunk}) { my $subject = &escape(&get_subjectline($chunk, delimiter => '')); # return qq($chunk); # Walrus del (3) - return qq($name); # Walrus add (3) + return qq(@{[&escape($name)]}); # Walrus add (3) } elsif ($page_command{$chunk}) { # return qq($chunk); # Walrus del (3) - return qq($name); # Walrus add (3) + return qq(@{[&escape($name)]}); # Walrus add (3) } else { - return qq($name$editchar); + return qq(@{[&escape($name)]}$editchar); } } } -# Walrus add (6) start -sub is_ignore_html { - my ($pagename) = @_; - foreach (@ignore_html_page) { - return 1 if ($pagename eq $_); - } - return 0; -} -# Walrus add (6) end - -# Walrus add (6) start -sub html_to_ignored_html { - my $str = shift(@_); - my $text_regex = q{[^<]*}; - my $tag_regex_ = q{[^"'<>]*(?:"[^"]*"[^"'<>]*|'[^']*'[^"'<>]*)*(?:>|(?=<)|$(?!\n))}; #'}}}} - my $comment_tag_regex = '-]*(?:-[^>-]+)*?)??)*(?:>|$(?!\n)|--.*$)'; - my $tag_regex = qq{$comment_tag_regex|<$tag_regex_}; - my $ignored = join('|', @ignore_html_tags); - my $result = ''; - while ($str =~ /($text_regex)($tag_regex)?/gso) { - last if $1 eq '' and $2 eq ''; - $result .= $1; - my $tag_tmp = $2; - $result .= ($tag_tmp =~ /^<\/?($ignored)(?![0-9A-Za-z])/i) ? $tag_tmp : &escape($tag_tmp); - if ($tag_tmp =~ /^<(XMP|PLAINTEXT|SCRIPT)(?![0-9A-Za-z])/i) { - $str =~ /(.*?)(?:<\/$1(?![0-9A-Za-z])$tag_regex_|$)/gsi; - $result .= &escape($1); - } - } - return $result; -} -# Walrus add (6) end - sub print_message { my ($msg) = @_; print qq(

$msg

); @@ -976,12 +935,14 @@ } my $edit = $mode{admin} ? 'adminedit' : 'edit'; + my $escapedmypage = &escape($form{mypage}); + my $escapedmypassword = &escape($form{mypassword}); print <<"EOD";