X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsearch.php;h=78f3f7e77d801b11b28f64a60090591e80ae770d;hb=3d8fe250df02c0414bc3014a46cf82374f96c975;hp=00c46a79fd279ccbd45b38baddd5da2c956b125a;hpb=91954f9e073843968c0c6cc575bf0af38410d7a7;p=squirrelmail.git

diff --git a/src/search.php b/src/search.php
index 00c46a79..78f3f7e7 100644
--- a/src/search.php
+++ b/src/search.php
@@ -16,9 +16,9 @@ require_once('../functions/array.php');
 require_once('../functions/strings.php');
 
 
-//	here are some functions, could go in imap_search.php
-//	this was here, pretty handy
+/*  here are some functions, could go in imap_search.php
 
+    this was here, pretty handy  */
 function s_opt( $val, $sel, $tit ) {
     echo "            <option value=\"$val\"";
     if ( $sel == $val ) {
@@ -27,76 +27,91 @@ function s_opt( $val, $sel, $tit ) {
     echo  ">$tit</option>\n";
 }
 
-//	function to get the recent searches and put them in arrays
-
+/*  function to get the recent searches and put them in arrays  */
 function get_recent($pref_name, $username, $data_dir) {
     $array = array ();
     $recent_count = getPref($data_dir, $username, 'search_memory', 0);
     $n = 0;
     for ($x=1;$x<=$recent_count;$x++) {
-	$array[$n] = getPref($data_dir, $username, "$pref_name" . "$x", "");
-	$n++;
+    $array[$n] = getPref($data_dir, $username, "$pref_name" . "$x", "");
+    $n++;
     }
     return $array;
 }
 
-//	function to get the saved searches and put them in arrays
-
+/*  function to get the saved searches and put them in arrays  */
 function get_saved($pref_name, $username, $data_dir) {
     $array = array ();
     $n = 0;
     for ($x=1;;$x++) {
         $array[$n] = getPref($data_dir, $username, "$pref_name" . "$x", "");
-	if ($array[$n] == "") {
-	    array_pop($array);
-	    return $array;
-	}
-	$n++;
+    if ($array[$n] == "") {
+        array_pop($array);
+        return $array;
+    }
+    $n++;
     }
     return $array;
 }
 
-//	function to update pref file with recent searches
-
-function update_recent($array, $recent_value, $pref_name, $username, $data_dir) {
-    $array = get_recent($pref_name, $username, $data_dir);
-    array_push ($array, $recent_value);
-    array_shift ($array);
+/*  function to update recent pref arrays  */
+function update_recent($what, $where, $mailbox, $username, $data_dir) {
+    $what_array = get_recent('search_what', $username, $data_dir);
+    $where_array = get_recent('search_where', $username, $data_dir);
+    $folder_array = get_recent('search_folder', $username, $data_dir);
+    $dupe = 'no';
+    for ($i=0;$i<count($what_array);$i++) {
+        if ($what == $what_array[$i] &&
+            $where == $where_array[$i] &&
+            $mailbox == $folder_array[$i]) {
+
+            $dupe = 'yes';
+        }
+    }
+    if ($dupe == 'no') {
+    array_push ($what_array, $what);
+    array_push ($where_array, $where);
+    array_push ($folder_array, $mailbox);
+    array_shift ($what_array);
+    array_shift ($where_array);
+    array_shift ($folder_array);
     $recent_count = getPref($data_dir, $username, 'search_memory', 0);
     $n=0;
     for ($i=1;$i<=$recent_count;$i++) {
-       setPref($data_dir, $username, "$pref_name" . "$i", $array[$n]);
+        setPref($data_dir, $username, "search_what$i", $what_array[$n]);
+        setPref($data_dir, $username, "search_where$i", $where_array[$n]);
+        setPref($data_dir, $username, "search_folder$i", $folder_array[$n]);
        $n++;
+       }
     }
 }
 
-//	function to "forget" a recent search
-
+/*  function to forget a recent search  */
 function forget_recent($forget_index, $username, $data_dir) {
-    $what_array = get_recent("search_what", $username, $data_dir);
-    $where_array = get_recent("search_where", $username, $data_dir);
-    $folder_array = get_recent("search_folder", $username, $data_dir);
+    $what_array = get_recent('search_what', $username, $data_dir);
+    $where_array = get_recent('search_where', $username, $data_dir);
+    $folder_array = get_recent('search_folder', $username, $data_dir);
     array_splice($what_array, $forget_index, 1);
     array_splice($where_array, $forget_index, 1);
     array_splice($folder_array, $forget_index, 1);
-	array_unshift($what_array, "");
-	array_unshift($where_array, "");
-	array_unshift($folder_array, "");
+    array_unshift($what_array, '');
+    array_unshift($where_array, '');
+    array_unshift($folder_array, '');
     $recent_count = getPref($data_dir, $username, 'search_memory', 0);
     $n=0;
     for ($i=1;$i<=$recent_count;$i++) {
-        setPref($data_dir, $username, "search_what" . "$i", $what_array[$n]);
-	setPref($data_dir, $username, "search_where" . "$i", $where_array[$n]);
-	setPref($data_dir, $username, "search_folder" . "$i", $folder_array[$n]);
-	$n++;
+        setPref($data_dir, $username, "search_what$i", $what_array[$n]);
+        setPref($data_dir, $username, "search_where$i", $where_array[$n]);
+        setPref($data_dir, $username, "search_folder$i", $folder_array[$n]);
+        $n++;
     }
-
-//		function to delete a saved search
 }
+
+/*  function to delete a saved search  */
 function delete_saved($delete_index, $username, $data_dir) {
-    $saved_what_array = get_saved("saved_what", $username, $data_dir); 
-    $saved_where_array = get_saved("saved_where", $username, $data_dir);
-    $saved_folder_array = get_saved("saved_folder", $username, $data_dir);
+    $saved_what_array = get_saved('saved_what', $username, $data_dir);
+    $saved_where_array = get_saved('saved_where', $username, $data_dir);
+    $saved_folder_array = get_saved('saved_folder', $username, $data_dir);
     array_splice($saved_what_array, $delete_index, 1);
     array_splice($saved_where_array, $delete_index, 1);
     array_splice($saved_folder_array, $delete_index, 1);
@@ -105,142 +120,138 @@ function delete_saved($delete_index, $username, $data_dir) {
     $last_element = $saved_count + 1;
     if ($last_element < 1) {
         for ($i=1;$i<=$saved_count;$i++) {
-            setPref($data_dir, $username, "saved_what" . "$i", $saved_what_array[$n]);
-	    setPref($data_dir, $username, "saved_where" . "$i", $saved_where_array[$n]);
-	    setPref($data_dir, $username, "saved_folder" . "$i", $saved_folder_array[$n]);
-	    $n++;
+            setPref($data_dir, $username, "saved_what$i", $saved_what_array[$n]);
+        setPref($data_dir, $username, "saved_where$i", $saved_where_array[$n]);
+        setPref($data_dir, $username, "saved_folder$i", $saved_folder_array[$n]);
+        $n++;
         }
     }
-    removePref($data_dir, $username, "saved_what" . "$last_element");
-    removePref($data_dir, $username, "saved_where" . "$last_element");
-    removePref($data_dir, $username, "saved_folder" . "$last_element");
-}    
-
-//		function to save a search from recent to saved
+    removePref($data_dir, $username, "saved_what$last_element");
+    removePref($data_dir, $username, "saved_where$last_element");
+    removePref($data_dir, $username, "saved_folder$last_element");
+}
 
+/*  function to save a search from recent to saved  */
 function save_recent($save_index, $username, $data_dir) {
-    $what_array = get_recent("search_what", $username, $data_dir);
-    $where_array = get_recent("search_where", $username, $data_dir);
-    $folder_array = get_recent("search_folder", $username, $data_dir);
+    $what_array = get_recent('search_what', $username, $data_dir);
+    $where_array = get_recent('search_where', $username, $data_dir);
+    $folder_array = get_recent('search_folder', $username, $data_dir);
     $saved_what_once = array_slice($what_array, $save_index, 1);
     $saved_where_once = array_slice($where_array, $save_index, 1);
     $saved_folder_once = array_slice($folder_array, $save_index, 1);
-    $saved_array = get_saved("saved_what", $username, $data_dir);
+    $saved_array = get_saved('saved_what', $username, $data_dir);
     $saved_count = (count($saved_array) + 1);
-    setPref($data_dir, $username, "saved_what" . "$saved_count", $saved_what_once[0]);
-    setPref($data_dir, $username, "saved_where" . "$saved_count", $saved_where_once[0]);
-    setPref($data_dir, $username, "saved_folder" . "$saved_count", $saved_folder_once[0]);
+    setPref($data_dir, $username, "saved_what$saved_count", $saved_what_once[0]);
+    setPref($data_dir, $username, "saved_where$saved_count", $saved_where_once[0]);
+    setPref($data_dir, $username, "saved_folder$saved_count", $saved_folder_once[0]);
 }
 
-
-
 /* ------------------------ main ------------------------ */
 
-//	reset these arrays on each page load just in case
-
+/*  reset these arrays on each page load just in case  */
 $what_array = array ();
 $where_array = array ();
 $folder_array = array ();
 $saved_what_array = array ();
 $saved_where_array = array ();
 $saved_folder_array = array ();
-$search_all = "none";
-
-//	get mailbox names
+$search_all = 'none';
+$perbox_count = array ();
 
+/*  get mailbox names  */
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 $boxes = sqimap_mailbox_list($imapConnection);
 
-
-//	set current mailbox to INBOX if none was selected or if page
-//	was called to search all folders.
-
-if ($mailbox == 'None' || $mailbox == "" ) {
+/*  set current mailbox to INBOX if none was selected or if page
+    was called to search all folders.  */
+if ( !isset($mailbox) || $mailbox == 'None' || $mailbox == '' ) {
     $mailbox = $boxes[0]['unformatted'];
 }
-if ($mailbox == "All Folders") {
-    $search_all = "all";
+if ($mailbox == 'All Folders') {
+    $search_all = 'all';
 }
 
-//	page headers
-
 displayPageHeader($color, $mailbox);
 
-//	if the page is called from a search link or button  update recent values
-//	in pref files here
-
-if ($submit == "Search" && !empty($what)) {
-    update_recent($what_array, $what, "search_what", $username, $data_dir);
-    update_recent($where_array, $where, "search_where", $username, $data_dir);
-    update_recent($folder_array, $mailbox, "search_folder", $username, $data_dir);
+/*  See how the page was called and fire off correct function  */
+if ((!isset($submit) || empty($submit)) && !empty($what)) {
+    $submit = _("Search");
+}
+if ( !isset( $submit ) ) {
+    /*
+        Jason, leave E_ALL only on error reporting in php.ini
+        Variables must contain a value befor to check them,
+        or else there are compilation slow down as PHP has
+        to guess.
+        Remove this comment once read 8-)
+    */
+    $submit = '';
+} else if ($submit == _("Search") && !empty($what)) {
+    update_recent($what, $where, $mailbox, $username, $data_dir);
 }
-//	if the page is called from a "forget recent" link remove search from pref file
-elseif ($submit == "forget") {
+elseif ($submit == 'forget') {
     forget_recent($count, $username, $data_dir);
 }
-//	if the page is called from a "save recent" link add search to saved searches
-elseif ($submit == "save") {
+elseif ($submit == 'save') {
     save_recent($count, $username, $data_dir);
 }
-elseif ($submit == "delete") {
+elseif ($submit == 'delete') {
     delete_saved($count, $username, $data_dir);
 }
-//	if the page is called from a "delete saved" link delete saved search
+
 do_hook('search_before_form');
 
 echo "<BR>\n".
-     "      <table width=\"100%\">\n".
-     "      <TR><td bgcolor=\"$color[0]\">\n".
-     "          <CENTER><B>"._("Search")."</B></CENTER>\n".
-     "      </TD></TR>\n".
-	 "		</TABLE>\n";
-#     '      <TR><td align=center>';
-
-//	update the recent and saved searches from the pref files
-
-$what_array = get_recent("search_what", $username, $data_dir);
-$where_array = get_recent("search_where", $username, $data_dir);
-$folder_array = get_recent("search_folder", $username, $data_dir);
+     "<table width=\"100%\">\n".
+        "<TR><td bgcolor=\"$color[0]\">\n".
+            "<CENTER><B>" . _("Search") . "</B></CENTER>\n".
+        "</TD></TR>\n".
+     "</TABLE>\n";
+
+/*  update the recent and saved searches from the pref files  */
+$what_array = get_recent('search_what', $username, $data_dir);
+$where_array = get_recent('search_where', $username, $data_dir);
+$folder_array = get_recent('search_folder', $username, $data_dir);
 $recent_count = getPref($data_dir, $username, 'search_memory', 0);
-$saved_what_array = get_saved("saved_what", $username, $data_dir); 
-$saved_where_array = get_saved("saved_where", $username, $data_dir);
-$saved_folder_array = get_saved("saved_folder", $username, $data_dir);
+$saved_what_array = get_saved('saved_what', $username, $data_dir);
+$saved_where_array = get_saved('saved_where', $username, $data_dir);
+$saved_folder_array = get_saved('saved_folder', $username, $data_dir);
 $saved_count = count($saved_what_array);
 $count_all = 0;
 
 /* Saved Search Table */
 if ($saved_count > 0) {
     echo "<BR>\n"
-       . "<TABLE WIDTH=\"95%\" BGCOLOR=\"$color[9]\" ALIGN=\"CENTER\" CELLPADDING=1 CELLSPACING=1>"
-       . '<TR><TD align=center><B>Saved Searches</B></TD></TR><TR><TD>'
-       . '<TABLE WIDTH="100%" ALIGN="CENTER" CELLPADDING=0 CELLSPACING=0>';
+    . "<TABLE WIDTH=\"95%\" BGCOLOR=\"$color[9]\" ALIGN=\"CENTER\" CELLPADDING=1 CELLSPACING=1>"
+    . '<TR><TD align=center><B>Saved Searches</B></TD></TR><TR><TD>'
+    . '<TABLE WIDTH="100%" ALIGN="CENTER" CELLPADDING=0 CELLSPACING=0>';
     for ($i=0; $i < $saved_count; ++$i) {
-		if ($i % 2) {
-			echo "<TR BGCOLOR=\"$color[0]\">";
-		} else {
+        if ($i % 2) {
+            echo "<TR BGCOLOR=\"$color[0]\">";
+        } else {
             echo "<TR BGCOLOR=\"$color[4]\">";
         }
         echo "<TD WIDTH=\"35%\">$saved_folder_array[$i]</TD>"
-           . "<TD ALIGN=LEFT>$saved_what_array[$i]</TD>"
-           . "<TD ALIGN=CENTER>$saved_where_array[$i]</TD>"
-           . '<TD ALIGN=RIGHT>'
-           .   '<A HREF=search.php'
-	       .     '?mailbox=' . urlencode($saved_folder_array[$i])
-	       .     '&what=' . urlencode($saved_what_array[$i])
-	       .     '&where=' . urlencode($saved_where_array[$i])
-	       .   '>' . _("edit") . '</A>'
-	       .   '&nbsp;|&nbsp;'
-           .   '<A HREF=search.php'
-	       .     '?mailbox=' . urlencode($saved_folder_array[$i])
-	       .     '&what=' . urlencode($saved_what_array[$i])
-	       .     '&where=' . urlencode($saved_where_array[$i])
-	       .     '&submit=Search_no_update'
-           .   '>' . _("search") . '</A>'
-	       .   '&nbsp;|&nbsp;'
-	       .   "<A HREF=search.php?count=$i&submit=delete>"
-           .     _("delete")
-           .   '</A>'
-	       . '</TD></TR>';
+        . "<TD ALIGN=LEFT>$saved_what_array[$i]</TD>"
+        . "<TD ALIGN=CENTER>$saved_where_array[$i]</TD>"
+        . '<TD ALIGN=RIGHT>'
+        .   '<A HREF=search.php'
+        .     '?mailbox=' . urlencode($saved_folder_array[$i])
+        .     '&what=' . urlencode($saved_what_array[$i])
+        .     '&where=' . urlencode($saved_where_array[$i])
+        .   '>' . _("edit") . '</A>'
+        .   '&nbsp;|&nbsp;'
+        .   '<A HREF=search.php'
+        .     '?mailbox=' . urlencode($saved_folder_array[$i])
+        .     '&what=' . urlencode($saved_what_array[$i])
+        .     '&where=' . urlencode($saved_where_array[$i])
+        .     '&submit=Search_no_update'
+        .   '>' . _("search") . '</A>'
+        .   '&nbsp;|&nbsp;'
+        .   "<A HREF=search.php?count=$i&submit=delete>"
+        .     _("delete")
+        .   '</A>'
+        . '</TD></TR>';
     }
     echo "</TABLE></TD></TR></TABLE>\n";
 }
@@ -286,7 +297,7 @@ if ($recent_count > 0) {
 }
 
 /* Search Form */
-echo '<B>Current Search</B>'
+echo '<B>' . _("Current Search") . '</B>'
    . '<FORM ACTION="search.php" NAME=s>'
    . '   <TABLE WIDTH="95%" CELLPADDING=0 CELLSPACING=0>'
    . '     <TR>'
@@ -295,12 +306,15 @@ for ($i = 0; $i < count($boxes); $i++) {
     if (!in_array('noselect', $boxes[$i]['flags'])) {
         $box = $boxes[$i]['unformatted'];
         $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']);
+        if( $box2 == 'INBOX' ) {
+            $box2 = _("INBOX");
+        }
         if ($mailbox == $box) {
             echo "         <OPTION VALUE=\"$box\" SELECTED>$box2</OPTION>\n";
         }
         else {
             echo "         <OPTION VALUE=\"$box\">$box2</OPTION>\n";
-        }  
+        }
     }
 }
         echo "<OPTION VALUE=\"All Folders\"";
@@ -311,6 +325,9 @@ for ($i = 0; $i < count($boxes); $i++) {
 echo '         </SELECT>'.
      "       </TD>\n".
      "        <TD ALIGN=\"CENTER\">\n";
+if ( !isset( $what ) ) {
+    $what = '';
+}
 $what_disp = str_replace(',', ' ', $what);
 $what_disp = str_replace('\\\\', '\\', $what_disp);
 $what_disp = str_replace('\\"', '"', $what_disp);
@@ -328,7 +345,7 @@ s_opt( 'TO', $where, _("To") );
 echo "         </SELECT>\n" .
      "        </TD>\n".
      "       <TD COLSPAN=\"3\" ALIGN=\"CENTER\">\n".
-     "         <INPUT TYPE=\"submit\" NAME=\"submit\" VALUE=\"Search\">\n".
+     "         <INPUT TYPE=\"submit\" NAME=\"submit\" VALUE=\"" . _("Search") . "\">\n".
      "       </TD>\n".
      "     </TR>\n".
      "</FORM>\n".
@@ -336,50 +353,59 @@ echo "         </SELECT>\n" .
      "</TD></TR></TABLE>\n";
 
 
-do_hook("search_after_form");
+do_hook('search_after_form');
 
-//	search all folders option still in the works. returns a table for each 
-//	folder it finds a match in. The toggle all link does not work
+/*
+    search all folders option still in the works. returns a table for each
+    folder it finds a match in.
+*/
 
-
-if ($search_all == "all") {
-    $mailbox == "";
+if ($search_all == 'all') {
+    $mailbox == '';
     $boxcount = count($boxes);
-    echo "<BR><CENTER><B>Search Results</B><CENTER><BR>\n";
+    echo '<BR><CENTER><B>' .
+         _("Search Results") .
+         "</B><CENTER><BR>\n";
     for ($x=0;$x<$boxcount;$x++) {
         if (!in_array('noselect', $boxes[$x]['flags'])) {
-	    $mailbox = $boxes[$x]['unformatted'];
-	}
-        if (($submit == "Search" || $submit == "Search_no_update") && !empty($what)) {
+            $mailbox = $boxes[$x]['unformatted'];
+        }
+        if (($submit == _("Search") || $submit == 'Search_no_update') && !empty($what)) {
             sqimap_mailbox_select($imapConnection, $mailbox);
-           $count_all = sqimap_search($imapConnection, $where, $what, $mailbox, $color, $pos, $search_all, $count_all);
-       }
+            $count_all = sqimap_search($imapConnection, $where, $what, $mailbox, $color, 0, $search_all, $count_all);
+        array_push($perbox_count, $count_all);
+        }
+    }
+    for ($i=0;$i<count($perbox_count);$i++) {
+        if ($perbox_count[$i] != "") {
+           break;
+        }
+        $count_all = "none";
+    }
+    if ($count_all == "none") {
+        echo '<br><b>' .
+             _("No Messages found") .
+             '</b><br>';
     }
-	if ($count_all == 0) {
-	echo "<br><b>No Messages found</b><br>";
-	}
 }
 
-//	search one folder option
-
+/*  search one folder option  */
 else {
-    if (($submit == "Search" || $submit == "Search_no_update") && !empty($what)) {
-        echo "<BR><CENTER><B>Search Results</B></CENTER>\n";
+    if (($submit == _("Search") || $submit == 'Search_no_update') && !empty($what)) {
+        echo '<BR><CENTER><B>' .
+             _("Search Results") .
+             "</B></CENTER>\n";
         sqimap_mailbox_select($imapConnection, $mailbox);
-        sqimap_search($imapConnection, $where, $what, $mailbox, $color, $pos, $search_all, $count_all);
+        sqimap_search($imapConnection, $where, $what, $mailbox, $color, 0, $search_all, $count_all);
     }
 }
 
-//	must have search terms to search
-
-if ($submit == "Search" && empty($what)) {
+/*  must have search terms to search  */
+if ($submit == _("Search") && empty($what)) {
     echo "<BR><CENTER><B>Please enter something to search for</B></CENTER>\n";
 }
 
-do_hook("search_bottom");
-
-//	all done
-
+do_hook('search_bottom');
 sqimap_logout ($imapConnection);
 echo '</body></html>';