and back in sync again

[squirrelmail.git] / src / search.php

diff --git a/src/search.php b/src/search.php
index 448e85998fa454dc1ee4bf501a60b4b353240e77..4fca3ea9c9db800895d03dd96d5dad7896eb6404 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -254,7 +254,7 @@ if ($mailbox == 'All Folders') {
 if (isset($composenew) && $composenew) {
     $comp_uri = "../src/compose.php?mailbox=". urlencode($mailbox).
                "&session=$composesession&attachedmessages=true&amp";
-    displayPageHeader($color, $mailbox, "comp_in_new(false,'$comp_uri');", false);
+    displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false);
 } else {
     displayPageHeader($color, $mailbox);
 }
@@ -309,14 +309,14 @@ if ($saved_count > 0) {
         } else {
             echo html_tag( 'tr', '', '', $color[4] );
         }
-        echo html_tag( 'td', $saved_attributes['saved_folder'][$i], 'left', '', 'width="35%"' )
+        echo html_tag( 'td', imap_utf7_decode_local($saved_attributes['saved_folder'][$i]), 'left', '', 'width="35%"' )
         . html_tag( 'td', $saved_attributes['saved_what'][$i], 'left' )
         . html_tag( 'td', $saved_attributes['saved_where'][$i], 'center' )
         . html_tag( 'td', '', 'right' )
         .   '<a href=search.php'
-        .     '?mailbox=' . htmlentities($saved_attributes['saved_folder'][$i])
-        .     '&amp;what=' . htmlentities($saved_attributes['saved_what'][$i])
-        .     '&amp;where=' . htmlentities($saved_attributes['saved_where'][$i])
+        .     '?mailbox=' . htmlspecialchars($saved_attributes['saved_folder'][$i])
+        .     '&amp;what=' . htmlspecialchars($saved_attributes['saved_what'][$i])
+        .     '&amp;where=' . htmlspecialchars($saved_attributes['saved_where'][$i])
         .   '>' . _("edit") . '</a>'
         .   '&nbsp;|&nbsp;'
         .   '<a href=search.php'
@@ -356,8 +356,8 @@ if ($recent_count > 0) {
             }
             if (isset($attributes['search_what'][$i]) &&
                 !empty($attributes['search_what'][$i])) {
-            echo html_tag( 'td', $attributes['search_folder'][$i], 'left', '', 'width="35%"' )
-               . html_tag( 'td', htmlentities($attributes['search_what'][$i]), 'left' )
+            echo html_tag( 'td', imap_utf7_decode_local($attributes['search_folder'][$i]), 'left', '', 'width="35%"' )
+               . html_tag( 'td', htmlspecialchars($attributes['search_what'][$i]), 'left' )
                . html_tag( 'td', $attributes['search_where'][$i], 'center' )
                . html_tag( 'td', '', 'right' )
                .   "<a href=search.php?count=$i&amp;submit=save>"