Removed, now a plugin, no idea if this will be included with the source tree.

[squirrelmail.git] / src / search.php

diff --git a/src/search.php b/src/search.php
index 18ba2e519a3a317b8c83551ddb7c7442885faec9..9c33400e32c00443dafb085faec41c2177af8921 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -28,6 +28,7 @@
    displayPageHeader($color, $mailbox);
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
+   do_hook("search_before_form");
    echo "<br>
       <table width=95% align=center cellpadding=2 cellspacing=0 border=0>
       <tr><td bgcolor=\"$color[0]\">
@@ -35,7 +36,7 @@
       </td></tr>
       <tr><td align=center>";
 
-   echo "<FORM ACTION=\"search.php\">\n";
+   echo "<FORM ACTION=\"search.php\" NAME=s>\n";
    echo "   <TABLE WIDTH=75%>\n";
    echo "     <TR>\n";
    echo "       <TD WIDTH=33%>\n";
@@ -55,11 +56,18 @@
    echo "         </SELECT></SMALL></TT>";
    echo "       </TD>\n";
    echo "        <TD ALIGN=\"CENTER\" WIDTH=33%>\n";
-   echo "          <INPUT TYPE=\"TEXT\" SIZE=\"20\" NAME=\"what\" VALUE=\"$what\">\n";
+   $what_disp = ereg_replace(",", " ", $what);
+   $what_disp = str_replace("\\\\", "\\", $what_disp);
+   $what_disp = str_replace("\\\"", "\"", $what_disp);
+   $what_disp = str_replace("\"", "&quot;", $what_disp);
+   echo "          <INPUT TYPE=\"TEXT\" SIZE=\"20\" NAME=\"what\" VALUE=\"$what_disp\">\n";
    echo "        </TD>";
    echo "       <TD ALIGN=\"RIGHT\" WIDTH=33%>\n";
    echo "         <SELECT NAME=\"where\">";
    
+   if ($where == "BODY") echo "           <OPTION VALUE=\"BODY\" SELECTED>"._("Body")."\n";
+   else echo "           <OPTION VALUE=\"BODY\">"._("Body")."\n";
+   
    if ($where == "TEXT") echo "           <OPTION VALUE=\"TEXT\" SELECTED>"._("Everywhere")."\n";
    else echo "           <OPTION VALUE=\"TEXT\">"._("Everywhere")."\n";
    
@@ -69,6 +77,9 @@
    if ($where == "FROM") echo "           <OPTION VALUE=\"FROM\" SELECTED>"._("From")."\n";
    else echo "           <OPTION VALUE=\"FROM\">"._("From")."\n";
    
+   if ($where == "CC") echo "           <OPTION VALUE=\"Cc\" SELECTED>"._("Cc")."\n";
+   else echo "           <OPTION VALUE=\"CC\">"._("Cc")."\n";
+   
    if ($where == "TO") echo "           <OPTION VALUE=\"TO\" SELECTED>"._("To")."\n";
    else echo "           <OPTION VALUE=\"TO\">"._("To")."\n";
    
@@ -81,10 +92,12 @@
    echo "   </TABLE>\n"; 
    echo "</FORM>";
    echo "</td></tr></table>";
+   do_hook("search_after_form");
    if ($where && $what) {   
       sqimap_mailbox_select($imapConnection, $mailbox);
       sqimap_search($imapConnection, $where, $what, $mailbox, $color);
    }
+   do_hook("search_bottom");
    sqimap_logout ($imapConnection);
 ?>
 </body></html>