--- suikawiki/script/wiki.cgi	2002/06/30 07:52:46	1.22
+++ suikawiki/script/wiki.cgi	2002/08/18 04:14:35	1.23
@@ -344,6 +344,7 @@
     &print_header($SearchPage);
     &print_searchform(&escape($word));
     print get_search_result ($word, -output_not_found => 1);
+    print "foo";
     &print_footer($SearchPage);
 }
 
@@ -358,7 +359,7 @@
         || index ($page, $word) > 0
         || index ($word, $page) > 0
        ) {
-      $r .= qq(<li><a href ="$url_cgi?@{[&encode($page)]}">$page</a>@{[&escape(&get_subjectline($page))]}</li>);
+      $r .= qq(<li><a href ="$url_cgi?@{[&escape(&encode($page))]}">@{[&escape($page)]}</a>@{[&escape(&get_subjectline($page))]}</li>);
       $counter++;
     }
   }
@@ -419,7 +420,7 @@
     "http://www.w3.org/TR/html4/loose.dtd">
 <html lang="$lang">
 <head>
-    <title>$page @{[&escape(&get_subjectline($page))]}</title>
+    <title>@{[&escape($page.' '.&get_subjectline($page))]}</title>
     <link rel="index" href="$url_cgi?$IndexPage">
     <link rev="made" href="mailto:$modifier_mail">
     <link rel="stylesheet" type="text/css" href="$url_stylesheet">
@@ -430,7 +431,7 @@
   print <<EOD;
 <h1 class="header"><a
     title="$resource{searchthispage}"
-    href="$url_cgi?mycmd=search;mymsg=$cookedpage">$page</a>@{[&escape(&get_subjectline($page))]}</h1>
+    href="$url_cgi?mycmd=search;mymsg=$cookedpage">@{[&escape($page)]}</a>@{[&escape(&get_subjectline($page))]}</h1>
 EOD
 }
 
@@ -476,7 +477,7 @@
     my ($page) = @_;
     $walrus_log = ($walrus_debugging) ? &text_to_html("----\n$walrus_log") : '';    # Walrus add (debug)
     # Walrus mod (1) start
-  my $cvslog = '$Revision: 1.22 $ $Date: 2002/06/30 07:52:46 $';
+  my $cvslog = '$Revision: 1.23 $ $Date: 2002/08/18 04:14:35 $';
   print_navigate_links ($page);
   print <<"EOD";
 <div class="footer">
@@ -516,7 +517,7 @@
 sub escape {
     my $s = shift;
     $s =~ s|\r\n|\n|g;
-    $s =~ s|\&|&amp;|g;
+    $s =~ s|&|&amp;|g;
     $s =~ s|<|&lt;|g;
     $s =~ s|>|&gt;|g;
     $s =~ s|"|&quot;|g;
@@ -526,10 +527,10 @@
 sub unescape {
     my $s = shift;
     # $s =~ s|\n|\r\n|g;
-    $s =~ s|\&amp;|\&|g;
-    $s =~ s|\&lt;|\<|g;
-    $s =~ s|\&gt;|\>|g;
-    $s =~ s|\&quot;|\"|g;
+    $s =~ s|&lt;|<|g;
+    $s =~ s|&gt;|>|g;
+    $s =~ s|&quot;|"|g;
+    $s =~ s|&amp;|&|g;
     return $s;
 }
 
@@ -980,7 +981,7 @@
 <form action="$url_cgi" method="post">
     @{[ $mode{admin} ? qq($resource{frozenpassword} <input type="password" name="mypassword" value="$form{mypassword}" size="10"><br>) : "" ]}
     <input type="hidden" name="myLastModified" value="$lastmodified">
-    <input type="hidden" name="mypage" value="$form{mypage}">
+    <input type="hidden" name="mypage" value="@{[&escape($form{mypage})]}">
     <textarea cols="$cols" rows="$rows" name="mymsg" wrap="off" tabindex="1">$mymsg</textarea><br>
 @{[
     $mode{admin} ?
