X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsearch.php;h=de5471bbd36a76433970d2d3accd0b1fe4f0e6c2;hb=907aba419237fba0317f7abb2f27bb224592a5b7;hp=ed92be5e85d7a2173d7d65f9e43b07483764882e;hpb=441f2d33bad826a0278aafe63e58d0b3c81b6e0c;p=squirrelmail.git

diff --git a/src/search.php b/src/search.php
index ed92be5e..de5471bb 100644
--- a/src/search.php
+++ b/src/search.php
@@ -1,91 +1,71 @@
 <?php
-   session_start();
 
-   if(!isset($logged_in)) {
-      set_up_language($squirrelmail_language, true);
-      echo _("You must login first.");
-      exit;
-   }
-   if(!isset($username) || !isset($key)) {
-      set_up_language($squirrelmail_language, true);
-      echo _("You need a valid user and password to access this page!");
-      exit;
-   }
-
-   if (!isset($i18n_php))
-      include("../functions/i18n.php");
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
-   if (!isset($imap_search_php))
-      include("../functions/imap_search.php");
-   if (!isset($array_php))
-      include("../functions/array.php");
+   /* $Id$ */
 
-   include("../src/load_prefs.php");
+   include('../src/validate.php');
+   include('../functions/imap.php');
+   include('../functions/imap_search.php');
+   include('../functions/array.php');
 
    displayPageHeader($color, $mailbox);
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
-   do_hook("search_before_form");
+   do_hook('search_before_form');
    echo "<br>\n";
    echo "      <table width=95% align=center cellpadding=2 cellspacing=0 border=0>\n";
    echo "      <tr><td bgcolor=\"$color[0]\">\n";
    echo "          <center><b>"._("Search")."</b></center>\n";
    echo "      </td></tr>\n";
-   echo "      <tr><td align=center>";
+   echo '      <tr><td align=center>';
 
    echo "<FORM ACTION=\"search.php\" NAME=s>\n";
    echo "   <TABLE WIDTH=75%>\n";
    echo "     <TR>\n";
    echo "       <TD WIDTH=33%>\n";
-   echo "         <TT><SMALL><SELECT NAME=\"mailbox\">";
+   echo '         <TT><SMALL><SELECT NAME="mailbox">';
 
    $boxes = sqimap_mailbox_list($imapConnection);
    for ($i = 0; $i < count($boxes); $i++) {
-      if ($boxes[$i]["flags"][0] != "noselect" && $boxes[$i]["flags"][1] != "noselect" && $boxes[$i]["flags"][2] != "noselect") {
-         $box = $boxes[$i]["unformatted"];
-         $box2 = replace_spaces($boxes[$i]["formatted"]);
+	  if (!in_array('noselect', $boxes[$i]['flags'])) {
+         $box = $boxes[$i]['unformatted'];
+	 $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']);
          if ($mailbox == $box)
             echo "         <OPTION VALUE=\"$box\" SELECTED>$box2\n";
          else
             echo "         <OPTION VALUE=\"$box\">$box2\n";
       }
    }
-   echo "         </SELECT></SMALL></TT>";
+   echo '         </SELECT></SMALL></TT>';
    echo "       </TD>\n";
    echo "        <TD ALIGN=\"CENTER\" WIDTH=33%>\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);
+   if (!isset($what))
+       $what = '';
+   $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>';
    echo "       <TD ALIGN=\"RIGHT\" WIDTH=33%>\n";
-   echo "         <SELECT NAME=\"where\">";
+   echo '         <SELECT NAME="where">';
    
-   if ($where == "BODY") echo "           <OPTION VALUE=\"BODY\" SELECTED>"._("Body")."\n";
-   else echo "           <OPTION VALUE=\"BODY\">"._("Body")."\n";
+   if (isset($where) && $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";
+   if (isset($where) && $where == 'TEXT') echo '           <OPTION VALUE="TEXT" SELECTED>'._("Everywhere")."\n";
+   else echo '           <OPTION VALUE="TEXT">'._("Everywhere")."\n";
    
-   if ($where == "SUBJECT") echo "           <OPTION VALUE=\"SUBJECT\" SELECTED>"._("Subject")."\n";
-   else echo "           <OPTION VALUE=\"SUBJECT\">"._("Subject")."\n";
+   if (isset($where) && $where == 'SUBJECT') echo '           <OPTION VALUE="SUBJECT" SELECTED>'._("Subject")."\n";
+   else echo '           <OPTION VALUE="SUBJECT">'._("Subject")."\n";
    
-   if ($where == "FROM") echo "           <OPTION VALUE=\"FROM\" SELECTED>"._("From")."\n";
-   else echo "           <OPTION VALUE=\"FROM\">"._("From")."\n";
+   if (isset($where) && $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 (isset($where) && $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";
+   if (isset($where) && $where == 'TO') echo '           <OPTION VALUE="TO" SELECTED>'._("To")."\n";
+   else echo '           <OPTION VALUE="TO">'._("To")."\n";
    
    echo "         </SELECT>\n";
    echo "        </TD>\n";
@@ -97,10 +77,9 @@
    echo "</FORM>";
    echo "</td></tr></table>";
    do_hook("search_after_form");
-   if ($where && $what) {   
+   if (isset($where) && $where && isset($what) && $what) {   
       sqimap_mailbox_select($imapConnection, $mailbox);
       sqimap_search($imapConnection, $where, $what, $mailbox, $color);
-      sqimap_mailbox_close($imapConnection);
    }
    do_hook("search_bottom");
    sqimap_logout ($imapConnection);