X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsearch.php;h=9fedb9559e23cdd3a588df591681faa104c61efc;hb=95e9357118f315822eaea0f35a81e17933736c42;hp=2dda97c4e8482d9f6866f9d5a04b05c2d30b6983;hpb=6dc0e4643d9162034631ed7dac0a0a7cddc1f48d;p=squirrelmail.git

diff --git a/src/search.php b/src/search.php
index 2dda97c4..9fedb955 100644
--- a/src/search.php
+++ b/src/search.php
@@ -1,36 +1,58 @@
 <?php
 
-    /**
-     ** right_main.php
-     **
-     ** Copyright (c) 1999-2001 The Squirrelmail Development Team
-     ** Licensed under the GNU GPL. For full terms see the file COPYING.
-     **
-     ** $Id$
-     **/
+/**
+ * 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. ***/
+/*****************************************************************/
 
-   require_once('../src/validate.php');
-   require_once('../functions/imap.php');
-   require_once('../functions/imap_search.php');
-   require_once('../functions/array.php');
+require_once('../src/validate.php');
+require_once('../functions/imap.php');
+require_once('../functions/imap_search.php');
+require_once('../functions/array.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>';
+   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++) {
@@ -43,47 +65,36 @@
             echo "         <OPTION VALUE=\"$box\">$box2</OPTION>\n";
       }
    }
-   echo '         </SELECT></SMALL></TT>';
-   echo "       </TD>\n";
-   echo "        <TD ALIGN=\"CENTER\" WIDTH=\"33%\">\n";
+   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";
-   echo '        </TD>';
-   echo "       <TD ALIGN=\"RIGHT\" WIDTH=\"33%\">\n";
-   echo '         <SELECT NAME="where">';
-   
-   if (isset($where) && $where == 'BODY') echo '           <OPTION VALUE="BODY" SELECTED>'._("Body")."\n";
-   else echo '           <OPTION VALUE="BODY">'._("Body")."\n";
-   
-   if (isset($where) && $where == 'TEXT') echo '           <OPTION VALUE="TEXT" SELECTED>'._("Everywhere")."\n";
-   else echo '           <OPTION VALUE="TEXT">'._("Everywhere")."\n";
-   
-   if (isset($where) && $where == 'SUBJECT') echo '           <OPTION VALUE="SUBJECT" SELECTED>'._("Subject")."\n";
-   else echo '           <OPTION VALUE="SUBJECT">'._("Subject")."\n";
-   
-   if (isset($where) && $where == 'FROM') echo '           <OPTION VALUE="FROM" SELECTED>'._("From")."\n";
-   else echo '           <OPTION VALUE="FROM">'._("From")."\n";
-   
-   if (isset($where) && $where == 'CC') echo '           <OPTION VALUE="Cc" SELECTED>'._("Cc")."\n";
-   else echo '           <OPTION VALUE="CC">'._("Cc")."\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";
-   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 "          <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 (isset($where) && $where && isset($what) && $what) {   
       sqimap_mailbox_select($imapConnection, $mailbox);
@@ -92,4 +103,4 @@
    do_hook("search_bottom");
    sqimap_logout ($imapConnection);
 ?>
-</body></html>
\ No newline at end of file
+</body></html>