X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fsearch.php;h=9fedb9559e23cdd3a588df591681faa104c61efc;hp=03945730b8b7ccaedf6a305e1a1cc93399a5b07e;hb=3392dc867232037b2c6e2089ebcab9d64e154db7;hpb=3604c641607660243271429041e78d03a9c5d268

diff --git a/src/search.php b/src/search.php
index 03945730..9fedb955 100644
--- a/src/search.php
+++ b/src/search.php
@@ -1,103 +1,102 @@
 <?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;
-   }
+/**
+ * right_main.php
+ *
+ * Copyright (c) 1999-2001 The Squirrelmail Development Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * $Id$
+ */
+
+/*****************************************************************/
+/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
+/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
+/***    + Base level indent should begin at left margin, as    ***/
+/***      the require_once below looks.                        ***/
+/***    + All identation should consist of four space blocks   ***/
+/***    + Tab characters are evil.                             ***/
+/***    + all comments should use "slash-star ... star-slash"  ***/
+/***      style -- no pound characters, no slash-slash style   ***/
+/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
+/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
+/***    + Please use ' instead of ", when possible. Note "     ***/
+/***      should always be used in _( ) function calls.        ***/
+/*** Thank you for your help making the SM code more readable. ***/
+/*****************************************************************/
 
-   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");
+require_once('../src/validate.php');
+require_once('../functions/imap.php');
+require_once('../functions/imap_search.php');
+require_once('../functions/array.php');
 
-   include("../src/load_prefs.php");
+    function s_opt( $val, $sel, $tit ) {
+        echo "            <option value=\"$val\"";
+        if ( $sel )
+            echo 'selected';
+        echo  ">$tit</option>\n";
+    }
 
    displayPageHeader($color, $mailbox);
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
-   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>";
+   do_hook('search_before_form');
+   echo "<br>\n".
+        "      <table width=95% align=center cellpadding=2 cellspacing=0 border=0>\n".
+        "      <tr><td bgcolor=\"$color[0]\">\n".
+        "          <center><b>"._("Search")."</b></center>\n".
+        "      </td></tr>\n".
+        '      <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\">";
+        "<FORM ACTION=\"search.php\" NAME=s>\n".
+        "   <TABLE WIDTH=\"75%\">\n".
+        "     <TR>\n".
+        "       <TD WIDTH=\"33%\">\n".
+        '         <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";
+            echo "         <OPTION VALUE=\"$box\" SELECTED>$box2</OPTION>\n";
          else
-            echo "         <OPTION VALUE=\"$box\">$box2\n";
+            echo "         <OPTION VALUE=\"$box\">$box2</OPTION>\n";
       }
    }
-   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);
-   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";
-   
-   if ($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 ($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";
-   
-   echo "         </SELECT>\n";
-   echo "        </TD>\n";
-   echo "       <TD COLSPAN=\"3\" ALIGN=\"CENTER\">\n";
-   echo "         <INPUT TYPE=\"submit\" VALUE=\""._("Search")."\">\n";
-   echo "       </TD>\n";
-   echo "     </TR>\n";
-   echo "   </TABLE>\n"; 
-   echo "</FORM>";
-   echo "</td></tr></table>";
+   echo '         </SELECT></SMALL></TT>'.
+        "       </TD>\n".
+        "        <TD ALIGN=\"CENTER\" WIDTH=\"33%\">\n";
+   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".
+                '</TD>'.
+               "<TD ALIGN=\"RIGHT\" WIDTH=\"33%\">\n".
+                 '<SELECT NAME="where">';
+
+   s_opt( 'BODY', ($where == 'BODY'), _("Body") );
+   s_opt( 'TEXT', ($where == 'TEXT'), _("Everywhere") );
+   s_opt( 'SUBJECT', ($where == 'SUBJECT'), _("Subject") );
+   s_opt( 'FROM', ($where == 'FROM'), _("From") );
+   s_opt( 'CC', ($where == 'CC'), _("Cc") );
+   s_opt( 'TO', ($where == 'TO'), _("To") );
+
+   echo "         </SELECT>\n" .
+        "        </TD>\n".
+        "       <TD COLSPAN=\"3\" ALIGN=\"CENTER\">\n".
+        "         <INPUT TYPE=\"submit\" VALUE=\""._("Search")."\">\n".
+        "       </TD>\n".
+        "     </TR>\n".
+        "   </TABLE>\n".
+        "</FORM>".
+        "</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);
    }