X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_messages.php;h=a3b81d98c489279feb163a7f5b44c5170799829f;hb=a91b14d8a4ff44c8af0976949e9fd84cae1306dd;hp=4b23cf334fd8736e701d02585d6b29e277262489;hpb=a5227f0e0e694520ffd17ceea1b8c270064caa88;p=squirrelmail.git
diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 4b23cf33..a3b81d98 100755
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -7,14 +7,16 @@
** $Id$
**/
- if (!isset($mime_php)) include "../functions/mime.php";
+ if (defined ('imap_messages_php'))
+ return;
+ define ('imap_messages_php', true);
/******************************************************************************
** Copies specified messages to specified folder
******************************************************************************/
function sqimap_messages_copy ($imap_stream, $start, $end, $mailbox) {
- fputs ($imap_stream, "a001 COPY $start:$end \"$mailbox\"\r\n");
- $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
+ fputs ($imap_stream, sqimap_session_id() . " COPY $start:$end \"$mailbox\"\r\n");
+ $read = sqimap_read_data ($imap_stream, sqimap_session_id(), true, $response, $message);
}
/******************************************************************************
@@ -35,8 +37,8 @@
** Sets the specified messages with specified flag
******************************************************************************/
function sqimap_messages_flag ($imap_stream, $start, $end, $flag) {
- fputs ($imap_stream, "a001 STORE $start:$end +FLAGS (\\$flag)\r\n");
- $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
+ fputs ($imap_stream, sqimap_session_id() . " STORE $start:$end +FLAGS (\\$flag)\r\n");
+ $read = sqimap_read_data ($imap_stream, sqimap_session_id(), true, $response, $message);
}
@@ -44,8 +46,8 @@
** Remove specified flag from specified messages
******************************************************************************/
function sqimap_messages_remove_flag ($imap_stream, $start, $end, $flag) {
- fputs ($imap_stream, "a001 STORE $start:$end -FLAGS (\\$flag)\r\n");
- $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
+ fputs ($imap_stream, sqimap_session_id() . " STORE $start:$end -FLAGS (\\$flag)\r\n");
+ $read = sqimap_read_data ($imap_stream, sqimap_session_id(), true, $response, $message);
}
@@ -58,99 +60,218 @@
}
function sqimap_get_small_header ($imap_stream, $id, $sent) {
-
- fputs ($imap_stream, "a001 FETCH $id BODY.PEEK[HEADER.FIELDS (Date To From Cc Subject Message-Id X-Priority Content-Type)]\r\n");
- $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-
- $subject = _("(no subject)");
- $from = _("Unknown Sender");
- $priority = "0";
- $messageid = "<>";
- $cc = "";
- $to = "";
- $date = "";
- $type[0] = "";
- $type[1] = "";
-
- $g = 0;
- for ($i = 0; $i < count($read); $i++) {
- if (eregi ("^to:(.*)$", $read[$i], $regs)) {
- //$to = sqimap_find_displayable_name(substr($read[$i], 3));
- $to = $regs[1];
- } else if (eregi ("^from:(.*)$", $read[$i], $regs)) {
- //$from = sqimap_find_displayable_name(substr($read[$i], 5));
- $from = $regs[1];
- } else if (eregi ("^x-priority:(.*)$", $read[$i], $regs)) {
- $priority = trim($regs[1]);
- } else if (eregi ("^message-id:(.*)$", $read[$i], $regs)) {
- $messageid = trim($regs[1]);
- } else if (eregi ("^cc:(.*)$", $read[$i], $regs)) {
- $cc = $regs[1];
- } else if (eregi ("^date:(.*)$", $read[$i], $regs)) {
- $date = $regs[1];
- } else if (eregi ("^subject:(.*)$", $read[$i], $regs)) {
- $subject = htmlspecialchars(trim($regs[1]));
- if ($subject == "")
- $subject = _("(no subject)");
- } else if (eregi ("^content-type:(.*)$", $read[$i], $regs)) {
- $type = strtolower(trim($regs[1]));
- if ($pos = strpos($type, ";"))
- $type = substr($type, 0, $pos);
- $type = explode("/", $type);
- }
-
+ $res = sqimap_get_small_header_list($imap_stream, array($id), $sent);
+ return $res[0];
+ }
+
+ // Sort the message list and crunch to be as small as possible
+ // (overflow could happen, so make it small if possible)
+ function sqimap_message_list_squisher($messages_array) {
+ if( !is_array( $messages_array ) ) return;
+ sort($messages_array, SORT_NUMERIC);
+ $msgs_str = '';
+ while ($messages_array) {
+ $start = array_shift($messages_array);
+ $end = $start;
+ while (isset($messages_array[0]) && $messages_array[0] == $end + 1)
+ $end = array_shift($messages_array);
+ if ($msgs_str != '')
+ $msgs_str .= ',';
+ $msgs_str .= $start;
+ if ($start != $end)
+ $msgs_str .= ':' . $end;
}
-
- // If there isn't a date, it takes the internal date and uses
- // that as the normal date.
- if (trim($date) == "") {
- fputs ($imap_stream, "a002 FETCH $id INTERNALDATE\r\n");
- $internal_read = sqimap_read_data ($imap_stream, "a002", true, $r, $m);
-
- // * 22 FETCH (INTERNALDATE " 8-Sep-2000 13:17:07 -0500")
- $date = $internal_read[0];
- $date = eregi_replace(".*internaldate \"", "", $date);
- $date = eregi_replace("\".*", "", $date);
- $date_ary = explode(" ", trim($date));
- $date_ary[0] = str_replace("-", " ", $date_ary[0]);
- $date = implode (" ", $date_ary);
+
+ return $msgs_str;
+ }
+
+ function sqimap_get_small_header_list ($imap_stream, $msg_list, $issent) {
+ global $squirrelmail_language, $color;
+
+ /* Get the small headers for each message in $msg_list */
+ $sid = sqimap_session_id();
+ $maxmsg = sizeof($msg_list);
+ $msgs_str = sqimap_message_list_squisher($msg_list);
+ $results = array();
+ $read_list = array();
+ $sizes_list = array();
+
+ /**
+ * We need to return the data in the same order as the caller supplied
+ * in $msg_list, but IMAP servers are free to return responses in
+ * whatever order they wish... So we need to re-sort manually
+ */
+ for ($i = 0; $i < sizeof($msg_list); $i++) {
+ $id2index[$msg_list[$i]] = $i;
}
- fputs ($imap_stream, "a003 FETCH $id RFC822.SIZE\r\n");
- $read = sqimap_read_data($imap_stream, "a003", true, $r, $m);
- eregi("([0-9]+)[^0-9]*$", $read[0], $regs);
- $size = $regs[1];
+ $query = "$sid FETCH $msgs_str BODY.PEEK[HEADER.FIELDS (Date To From Cc Subject Message-Id X-Priority Content-Type)]\r\n";
+ fputs ($imap_stream, $query);
+ $readin_list = sqimap_read_data_list($imap_stream, $sid, true, $response, $message);
+
+ foreach ($readin_list as $r) {
+ if (!eregi("^\\* ([0-9]+) FETCH", $r[0], $regs)) {
+ set_up_language($squirrelmail_language);
+ echo '
' .
+ _("ERROR : Could not complete request.") .
+ '
' .
+ _("Unknown response from IMAP server: ") . ' 1.' .
+ $r[0] . "
\n";
+ // exit;
+ } else if (! isset($id2index[$regs[1]]) || !count($id2index[$regs[1]])) {
+ set_up_language($squirrelmail_language);
+ echo '
' .
+ _("ERROR : Could not complete request.") .
+ '
' .
+ _("Unknown message number in reply from server: ") .
+ $regs[1] . "
\n";
+ // exit;
+ } else {
+ $read_list[$id2index[$regs[1]]] = $r;
+ }
+ }
+ arsort($read_list);
- $header = new small_header;
- if ($sent == true)
- $header->from = (trim($to) != '')? $to : _("(only Cc/Bcc)");
- else
- $header->from = $from;
-
- $header->date = $date;
- $header->subject = $subject;
- $header->to = $to;
- $header->priority = $priority;
- $header->message_id = $messageid;
- $header->cc = $cc;
- $header->size = $size;
- $header->type0 = $type[0];
- $header->type1 = $type[1];
+ $query = "$sid FETCH $msgs_str RFC822.SIZE\r\n";
+ fputs ($imap_stream, $query);
+ $sizesin_list = sqimap_read_data_list($imap_stream, $sid, true, $response, $message);
- return $header;
+ foreach ($sizesin_list as $r) {
+ if (!eregi("^\\* ([0-9]+) FETCH", $r[0], $regs)) {
+ set_up_language($squirrelmail_language);
+ echo "
\n";
+ echo _("ERROR : Could not complete request.");
+ echo "
\n";
+ echo _("Unknown response from IMAP server: ") . ' 2.';
+ echo $r[0] . "
\n";
+ exit;
+ }
+ if (!count($id2index[$regs[1]])) {
+ set_up_language($squirrelmail_language);
+ echo "
\n";
+ echo _("ERROR : Could not complete request.");
+ echo "
\n";
+ echo _("Unknown messagenumber in reply from server: ");
+ echo $regs[1] . "
\n";
+ exit;
+ }
+ $sizes_list[$id2index[$regs[1]]] = $r;
+ }
+ arsort($sizes_list);
+
+ for ($msgi = 0; $msgi < $maxmsg; $msgi++) {
+ $subject = _("(no subject)");
+ $from = _("Unknown Sender");
+ $priority = 0;
+ $messageid = "<>";
+ $cc = "";
+ $to = "";
+ $date = "";
+ $type[0] = "";
+ $type[1] = "";
+ $read = $read_list[$msgi];
+
+ for ($i = 0; $i < count($read); $i++) {
+ if (eregi ("^to:(.*)$", $read[$i], $regs)) {
+ //$to = sqimap_find_displayable_name(substr($read[$i], 3));
+ $to = $regs[1];
+ } else if (eregi ("^from:(.*)$", $read[$i], $regs)) {
+ //$from = sqimap_find_displayable_name(substr($read[$i], 5));
+ $from = $regs[1];
+ } else if (eregi ("^x-priority:(.*)$", $read[$i], $regs)) {
+ $priority = trim($regs[1]);
+ } else if (eregi ("^message-id:(.*)$", $read[$i], $regs)) {
+ $messageid = trim($regs[1]);
+ } else if (eregi ("^cc:(.*)$", $read[$i], $regs)) {
+ $cc = $regs[1];
+ } else if (eregi ("^date:(.*)$", $read[$i], $regs)) {
+ $date = $regs[1];
+ } else if (eregi ("^subject:(.*)$", $read[$i], $regs)) {
+ $subject = htmlspecialchars(trim($regs[1]));
+ if ($subject == "")
+ $subject = _("(no subject)");
+ } else if (eregi ("^content-type:(.*)$", $read[$i], $regs)) {
+ $type = strtolower(trim($regs[1]));
+ if ($pos = strpos($type, ";"))
+ $type = substr($type, 0, $pos);
+ $type = explode("/", $type);
+ if (! isset($type[1]))
+ $type[1] = '';
+ }
+
+ }
+ if (trim($date) == "") {
+ fputs($imap_stream, "$sid FETCH $msg_list[$msgi] INTERNALDATE\r\n");
+ $readdate = sqimap_read_data($imap_stream, $sid, true, $response, $message);
+ if (eregi(".*INTERNALDATE \"(.*)\".*", $readdate[0], $regs)) {
+ $date_list = explode(" ", trim($regs[1]));
+ $date_list[0] = str_replace("-", " ", $date_list[0]);
+ $date = implode(" ", $date_list);
+ }
+ }
+ eregi("([0-9]+)[^0-9]*$", $sizes_list[$msgi][0], $regs);
+ $size = $regs[1];
+
+ $header = new small_header;
+ if ($issent == true) {
+ $header->from = (trim($to) != '' ? $to : '(' ._("No To Address") . ')');
+ } else {
+ $header->from = $from;
+ }
+
+ $header->date = $date;
+ $header->subject = $subject;
+ $header->to = $to;
+ $header->priority = $priority;
+ $header->message_id = $messageid;
+ $header->cc = $cc;
+ $header->size = $size;
+ $header->type0 = $type[0];
+ $header->type1 = $type[1];
+
+ $result[] = $header;
+ }
+ return $result;
}
/******************************************************************************
** Returns the flags for the specified messages
******************************************************************************/
function sqimap_get_flags ($imap_stream, $i) {
- fputs ($imap_stream, "a001 FETCH $i:$i FLAGS\r\n");
- $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
+ fputs ($imap_stream, sqimap_session_id() . " FETCH $i:$i FLAGS\r\n");
+ $read = sqimap_read_data ($imap_stream, sqimap_session_id(), true, $response, $message);
if (ereg("FLAGS(.*)", $read[0], $regs))
return explode(" ", trim(ereg_replace('[\\(\\)\\\\]', '', $regs[1])));
return Array('None');
}
+ function sqimap_get_flags_list ($imap_stream, $msg_list) {
+ $msgs_str = sqimap_message_list_squisher($msg_list);
+ for ($i = 0; $i < sizeof($msg_list); $i++) {
+ $id2index[$msg_list[$i]] = $i;
+ }
+ fputs ($imap_stream, sqimap_session_id() . " FETCH $msgs_str FLAGS\r\n");
+ $result_list = sqimap_read_data_list ($imap_stream, sqimap_session_id(), true, $response, $message);
+ $result_flags = array();
+
+ for ($i = 0; $i < sizeof($result_list); $i++) {
+ if (eregi("^\\* ([0-9]+).*FETCH.*FLAGS(.*)", $result_list[$i][0], $regs)
+ && isset($id2index[$regs[1]]) && count($id2index[$regs[1]])) {
+ $result_flags[$id2index[$regs[1]]] = explode(" ", trim(ereg_replace('[\\(\\)\\\\]', '', $regs[2])));
+ } else {
+ set_up_language($squirrelmail_language);
+ echo "
\n";
+ echo _("ERROR : Could not complete request.");
+ echo "
\n";
+ echo _("Unknown response from IMAP server: ");
+ echo $result_list[$i][0] . "
\n";
+ exit;
+ }
+ }
+ arsort($result_flags);
+ return $result_flags;
+ }
+
/******************************************************************************
** Returns a message array with all the information about a message. See
** the documentation folder for more information about this array.
@@ -164,8 +285,8 @@
** Wrapper function that reformats the header information.
******************************************************************************/
function sqimap_get_message_header ($imap_stream, $id, $mailbox) {
- fputs ($imap_stream, "a001 FETCH $id:$id BODY[HEADER]\r\n");
- $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
+ fputs ($imap_stream, sqimap_session_id() . " FETCH $id:$id BODY[HEADER]\r\n");
+ $read = sqimap_read_data ($imap_stream, sqimap_session_id(), true, $response, $message);
$header = sqimap_get_header($imap_stream, $read);
$header->id = $id;
@@ -330,6 +451,17 @@
$i++;
}
}
+ /** BCC **/
+ else if (strtolower(substr($read[$i], 0, 4)) == "bcc:") {
+ $pos = 0;
+ $hdr->bcc[$pos] = trim(substr($read[$i], 5));
+ $i++;
+ while (((substr($read[$i], 0, 1) == " ") || (substr($read[$i], 0, 1) == "\t")) && (trim($read[$i]) != "")){
+ $pos++;
+ $hdr->bcc[$pos] = trim($read[$i]);
+ $i++;
+ }
+ }
/** TO **/
else if (strtolower(substr($read[$i], 0, 3)) == "to:") {
$pos = 0;