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;
/* 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." -->";
}
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;
}
?>
$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) {
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
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);
}
}
sqimap_logout ($imapConnection);
echo '</body></html>';
-?>
\ No newline at end of file
+?>