X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_search.php;h=858e3beebe980a82510ccadfa47a1b58b13f144a;hb=e976319c39def9b07d04b41b8cf6f1918472bf9e;hp=3759a45a9d6a2b238a3306d8b343690d71993c43;hpb=e5837601c28172b0a44f8fa6099584b6dbc8cf61;p=squirrelmail.git
diff --git a/functions/imap_search.php b/functions/imap_search.php
index 3759a45a..858e3bee 100644
--- a/functions/imap_search.php
+++ b/functions/imap_search.php
@@ -1,174 +1,215 @@
-
No Messages Found";
- return;
- } else {
- echo "";
- }
-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++) {
- $messagelist[$q] = trim($messagelist[$q]);
- if ($mailbox == $sent_folder)
- $hdr = sqimap_get_small_header ($imapConnection, $messagelist[$q], true);
- else
- $hdr = sqimap_get_small_header ($imapConnection, $messagelist[$q], false);
- $from[$q] = $hdr->from;
- $date[$q] = $hdr->date;
- $subject[$q] = $hdr->subject;
- $id[$q] = $messagelist[$q];
-
- $flags[$q] = sqimap_get_flags ($imapConnection, $messagelist[$q]);
+' . _("No Messages Found") . '';
+ return;
+ }
+ else {
+ return;
+ }
+ }
+ else if (isset($errors)) {
+ 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++) {
+ $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] = str_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]["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++;
+ 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++;
- }
-
- /** Find and remove the ones that are deleted */
- $i = 0;
- $j = 0;
- while ($j < count($messagelist)) {
- if ($messages[$j]["FLAG_DELETED"] == true) {
- $j++;
- continue;
- }
- $msgs[$i] = $messages[$j];
+ }
- $i++;
+ /* 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']) {
+ $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 = '';
+ }
+ if ($search_all != 'all') {
+ if ( !isset( $start_msg ) ) {
+ $start_msg =0;
+ }
+ if ( !isset( $sort ) ) {
+ $sort = 0;
+ }
+ mail_message_listing_beginning( $imapConnection,
+ "move_messages.php?msg=$msg&mailbox=$urlMailbox&pos=$pos&where=" . urlencode($search_where) . "&what=".urlencode($search_what),
+ $mailbox,
+ -1,
+ '' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . ''.
+ get_selectall_link($start_msg, $sort));
+ }
+ else {
+ mail_message_listing_beginning( $imapConnection,
+ "move_messages.php?msg=$msg&mailbox=$urlMailbox&pos=$pos&where=" . urlencode($search_where) . "&what=".urlencode($search_what),
+ $mailbox,
+ -1,
+ '' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '
');
+ }
+ if ( $mailbox == 'INBOX' ) {
+ $showbox = _("INBOX");
+ } else {
+ $showbox = $mailbox;
+ }
+ echo '' . _("Folder:") . " $showbox";
+ while ($j < count($msgs)) {
+ printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, '', 0, $search_where, $search_what);
$j++;
- }
- $numMessages = $i;
-
- // There's gotta be messages in the array for it to sort them.
-
-# Carn't Use the Display messages function it assumes messages are in order.
-# Again More code Hacked from else where
-
-# AT THE MOMENT YOU CARN'T SORT SEARCH RESULTS
-
-# ACTULLY THE CODE IS PROLLY BROKEN ANY HOW!
-
- if (count($messagelist) > 0) {
- $j=0;
-echo ""._("Found")." ".count($messagelist)." "._("Messages")."\n";
-echo "
\n";
-echo "";
- echo "";
-
- echo "\n\n\n |
";
-echo "";
- echo "";
- echo "";
- echo " | ";
- /** FROM HEADER **/
- if ($mailbox == $sent_folder)
- echo " ". _("To") ." | ";
- else
- echo " ". _("From") ." | ";
- /** DATE HEADER **/
- echo " ". _("Date") ." | ";
- echo " | \n";
- /** SUBJECT HEADER **/
- echo " ". _("Subject") ." | \n";
- echo " ";
-
-while ($j < count($msgs)) {
- printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, "", 0);
- //echo $msgs[$j]["SUBJECT"]." ";
- $j++;
- }
-echo " ";
-echo " |
";
- }
+ echo '
';
+ }
+ echo '';
+ $count_all = count($msgs);
+ }
+ return $count_all;
}
?>