From 91954f9e073843968c0c6cc575bf0af38410d7a7 Mon Sep 17 00:00:00 2001
From: jmunro <jmunro@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Fri, 1 Feb 2002 17:04:50 +0000
Subject: [PATCH 1/1] Improved "all folder" output display removed "toggle all"
 for now Its not done, but its better

jason


git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2336 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/imap_search.php | 25 ++++++++++++++++++-------
 src/search.php            | 11 +++++++----
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/functions/imap_search.php b/functions/imap_search.php
index 86e6f2bd..fad2f502 100644
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -17,7 +17,7 @@ require_once('../functions/array.php');
 require_once('../functions/mailbox_display.php');
 require_once('../functions/mime.php');
 
-function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$color, $search_position = '') {
+function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$color, $search_position = '', $search_all, $count_all) {
 
     global $msgs, $message_highlight_list, $squirrelmail_language, $languages, $index_order;
     global $pos;
@@ -79,9 +79,18 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
 
     /* If nothing is found * SEARCH should be the first error else echo errors */
     if (isset($errors) && strstr($errors,"* SEARCH")) {
+		if ($search_all != "all") {
         echo '<br><CENTER>' . _("No Messages Found") . '</CENTER>';
         return;
-    } else if (isset($errors)) {
+		}
+		else {
+        return;
+		}
+    }
+//	else if ($search_all == 'all') {
+//		return;
+//	}
+	else if (isset($errors)) {
         echo "<!-- ".$errors." -->";
     }
 
@@ -164,22 +173,24 @@ function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$colo
         if (!isset ($msg)) { 
             $msg = ''; 
         }
-
         mail_message_listing_beginning( $imapConnection,
             "move_messages.php?msg=$msg&mailbox=$urlMailbox&pos=$pos&where=" . urlencode($search_where) . "&what=".urlencode($search_what),
             $mailbox,
             -1,
-            '<b>' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '</b>',
-            get_selectall_link($start_msg, $sort) );
-
+            '<b>' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '</b>');
+            #get_selectall_link($start_msg, $sort) );
 
+#		echo '<table width=100%>';
+		echo "<b><big><center>$mailbox</center></big></b>";
         while ($j < count($msgs)) {
             printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, '', 0, $search_where, $search_what);
             $j++;
+			echo '</td></tr>';
         }
         echo '</table></td></tr></table></form>';
-
+		$count_all += count($msgs);
     }
+		return $count_all;
 }
 
 ?>
diff --git a/src/search.php b/src/search.php
index 7245baa2..00c46a79 100644
--- a/src/search.php
+++ b/src/search.php
@@ -206,6 +206,7 @@ $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) {
@@ -349,12 +350,14 @@ if ($search_all == "all") {
         if (!in_array('noselect', $boxes[$x]['flags'])) {
 	    $mailbox = $boxes[$x]['unformatted'];
 	}
-	echo "<BR><CENTER><B>Folder: $mailbox</CENTER></B>";
         if (($submit == "Search" || $submit == "Search_no_update") && !empty($what)) {
             sqimap_mailbox_select($imapConnection, $mailbox);
-            sqimap_search($imapConnection, $where, $what, $mailbox, $color, $pos);
+           $count_all = sqimap_search($imapConnection, $where, $what, $mailbox, $color, $pos, $search_all, $count_all);
        }
     }
+	if ($count_all == 0) {
+	echo "<br><b>No Messages found</b><br>";
+	}
 }
 
 //	search one folder option
@@ -363,7 +366,7 @@ else {
     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);
+        sqimap_search($imapConnection, $where, $what, $mailbox, $color, $pos, $search_all, $count_all);
     }
 }
 
@@ -380,4 +383,4 @@ do_hook("search_bottom");
 sqimap_logout ($imapConnection);
 echo '</body></html>';
 
-?>
\ No newline at end of file
+?>
-- 
2.25.1