X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_search.php;h=38832fc1be862cc1af0ec8fc60ea3d7ac8b743cb;hb=dd38100210b7d4473df1e5e55bd529107e420474;hp=e1cc1de2739d80563af70621c2acced5b1f7e998;hpb=29eb54865a68627bd3dc4934103a1a38f8db4678;p=squirrelmail.git
diff --git a/functions/imap_search.php b/functions/imap_search.php
index e1cc1de2..38832fc1 100644
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -1,162 +1,124 @@
' . _("No Messages Found") . '';
- return;
- } else if (isset($errors)) {
- echo "";
+ if (isset($errors)) {
+ if (strstr($errors,'* SEARCH')) {
+ return array();
+ }
+ echo '';
}
- /*
- HACKED CODED FROM ANOTHER FUNCTION, Could Probably dump this and mondify
- exsitising code with a search true/false varible.
- */
global $sent_folder;
- for ($q = 0; $q < count($messagelist); $q++) {
+
+ $cnt = count($messagelist);
+ for ($q = 0; $q < $cnt; $q++) {
$id[$q] = trim($messagelist[$q]);
}
$issent = ($mailbox == $sent_folder);
- $hdr_list = sqimap_get_small_header_list($imapConnection, $id, $issent);
- $flags = sqimap_get_flags_list($imapConnection, $id, $issent);
- foreach ($hdr_list as $hdr) {
- $from[] = $hdr->from;
- $date[] = $hdr->date;
- $subject[] = $hdr->subject;
- $to[] = $hdr->to;
- $priority[] = $hdr->priority;
- $cc[] = $hdr->cc;
- $size[] = $hdr->size;
- $type[] = $hdr->type0;
- }
- $j = 0;
- while ($j < count($messagelist)) {
- $date[$j] = ereg_replace(' ', ' ', $date[$j]);
- $tmpdate = explode(" ", trim($date[$j]));
-
- $messages[$j]["TIME_STAMP"] = getTimeStamp($tmpdate);
- $messages[$j]["DATE_STRING"] = getDateString($messages[$j]["TIME_STAMP"]);
- $messages[$j]["ID"] = $id[$j];
- $messages[$j]["FROM"] = decodeHeader($from[$j]);
- $messages[$j]["FROM-SORT"] = strtolower(sqimap_find_displayable_name(decodeHeader($from[$j])));
- $messages[$j]["SUBJECT"] = decodeHeader($subject[$j]);
- $messages[$j]["SUBJECT-SORT"] = strtolower(decodeHeader($subject[$j]));
- $messages[$j]["TO"] = decodeHeader($to[$j]);
- $messages[$j]["PRIORITY"] = $priority[$j];
- $messages[$j]["CC"] = $cc[$j];
- $messages[$j]["SIZE"] = $size[$j];
- $messages[$j]["TYPE0"] = $type[$j];
-
- $num = 0;
- while ($num < count($flags[$j])) {
- if ($flags[$j][$num] == 'Deleted') {
- $messages[$j]['FLAG_DELETED'] = true;
- } else if ($flags[$j][$num] == 'Answered') {
- $messages[$j]['FLAG_ANSWERED'] = true;
- } else if ($flags[$j][$num] == 'Seen') {
- $messages[$j]['FLAG_SEEN'] = true;
- } else if ($flags[$j][$num] == 'Flagged') {
- $messages[$j]['FLAG_FLAGGED'] = true;
- }
- $num++;
- }
- $j++;
- }
+ $msgs = fillMessageArray($imapConnection,$id,$cnt);
- /* Find and remove the ones that are deleted */
- $i = 0;
- $j = 0;
- while ($j < count($messagelist)) {
- if (isset($messages[$j]["FLAG_DELETED"]) && $messages[$j]["FLAG_DELETED"] == true) {
- $j++;
- continue;
- }
- $msgs[$i] = $messages[$j];
-
- $i++;
- $j++;
- }
- $numMessages = $i;
-
- /* There's gotta be messages in the array for it to sort them. */
-
- if (count($messagelist) > 0) {
- $j=0;
- if (!isset ($msg)) { $msg = ""; }
-
- mail_message_listing_beginning( $imapConnection,
- "move_messages.php?msg=$msg&mailbox=$urlMailbox&where=" . urlencode($search_where) . "&what=".urlencode($search_what),
- $mailbox,
- -1,
- '' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '',
- get_selectall_link($start_msg, $sort) );
+ return $msgs;
+}
- while ($j < count($msgs)) {
- printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, '', 0, $search_where, $search_what);
- $j++;
- }
- echo '';
- }
-}
-?>
\ No newline at end of file
+?>