-<?php
-/******************************************************************
- ** IMAP SEARCH ROUTIES
- *****************************************************************/
- if (!isset($imap_php))
- include("../functions/imap.php");
- if (!isset($date_php))
- include("../functions/date.php");
- if (!isset($array_php))
- include("../functions/array.php");
- if (!isset($mailbox_display_php))
- include("../functions/mailbox_display.php");
- if (!isset($mime_php))
- include("../functions/mime.php");
-
- $imap_search_php = true;
+<?php
+ /******************************************************************
+ ** IMAP SEARCH ROUTIES
+ ** $Id$
+ *****************************************************************/
+
+ if (defined ('imap_search_php'))
+ return;
+ define ('imap_search_php', true);
+
+ require_once('../functions/imap.php');
+ require_once('../functions/date.php');
+ 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) {
global $msgs, $message_highlight_list, $squirrelmail_language, $languages, $index_order;
+
$urlMailbox = urlencode($mailbox);
-
- # Construct the Search QuERY
-
- if ($languages[$squirrelmail_language]["CHARSET"]) {
- $ss = "a001 SEARCH CHARSET ".$languages[$squirrelmail_language]["CHARSET"]." ALL $search_where \"$search_what\"\r\n";
+ $isid = sqimap_session_id();
+
+ /* Construct the Search QuERY */
+ $ss = $isid;
+ if (isset($languages[$squirrelmail_language]['CHARSET']) &&
+ $languages[$squirrelmail_language]['CHARSET']) {
+ $ss .= " SEARCH CHARSET ".$languages[$squirrelmail_language]['CHARSET']." ALL $search_where \"$search_what\"\r\n";
} else {
- $ss = "a001 SEARCH ALL $search_where \"$search_what\"\r\n";
+ $ss .= " SEARCH ALL $search_where \"$search_what\"\r\n";
}
fputs($imapConnection,$ss);
# Read Data Back From IMAP
- $readin = sqimap_read_data ($imapConnection, "a001", true, $result, $message);
+ $readin = sqimap_read_data ($imapConnection, $isid, false, $result, $message);
+ if (isset($languages[$squirrelmail_language]['CHARSET']) && strtolower($result) == 'no') {
+ $ss = $isid . " SEARCH CHARSET \"US-ASCII\" ALL $search_where \"$search_what\"\r\n";
+ fputs ($imapConnection, $ss);
+ $readin = sqimap_read_data ($imapConnection, $isid, true, $result, $message);
+ }
+
unset($messagelist); $msgs=""; $c = 0;
- #Keep going till we find the SEARCH responce
- while ($c < count($readin)) {
+ /* Keep going till we find the SEARCH responce */
+ while ($c < count( $readin )) {
- #Check to see if a SEARCH Responce was recived
+ /* Check to see if a SEARCH Responce was recived */
if (substr($readin[$c],0,9) == "* SEARCH ")
$messagelist = explode(" ",substr($readin[$c],9));
- else
+ else if (isset($errors))
$errors = $errors.$readin[$c];
+ else
+ $errors = $readin[$c];
$c++;
}
#If nothing is found * SEARCH should be the first error else echo errors
- if (strstr($errors,"* SEARCH")) {
+ if (isset($errors) && strstr($errors,"* SEARCH")) {
echo "<br><CENTER>No Messages Found</CENTER>";
return;
- } else {
+ } else if (isset($errors)) {
echo "<!-- ".$errors." -->";
}
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;
- $to[$q] = $hdr->to;
- $priority[$q] = $hdr->priority;
- $cc[$q] = $hdr->cc;
- $size[$q] = $hdr->size;
- $type[$q] = $hdr->type0;
- $id[$q] = $messagelist[$q];
- $flags[$q] = sqimap_get_flags ($imapConnection, $messagelist[$q]);
- }
-
- $j = 0;
- while ($j < count($messagelist)) {
- $date[$j] = ereg_replace(" ", " ", $date[$j]);
+ $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);
$num++;
}
$j++;
- }
+ }
/** Find and remove the ones that are deleted */
$i = 0;
$j = 0;
while ($j < count($messagelist)) {
- if ($messages[$j]["FLAG_DELETED"] == true) {
+ if (isset($messages[$j]["FLAG_DELETED"]) && $messages[$j]["FLAG_DELETED"] == true) {
$j++;
continue;
}
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),
- '', -1, '<b>' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '</b>',
+ $mailbox, -1, '<b>' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '</b>',
' ');
printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, "", 0, $search_where, $search_what);
$j++;
}
- echo "</table>";
- echo "</tr></td></table>";
+ echo '</table></tr></td></table>';
}
}