X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_messages.php;h=dbb59f4e31fab9f79970327175c8ae2a841bd715;hp=98449ad9e079b567580e442a0dd9fd2b9f538364;hb=15e6162eacc97158393bc75aed3afeb7b19c24a6;hpb=f9b3e5d9902a047bfa8995c1d795cae2226a857a
diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 98449ad9..dbb59f4e 100755
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -1,18 +1,38 @@
";
-
- $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);
+ $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;
}
-
}
-
- // 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);
+ arsort($read_list);
+
+ $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);
+
+ 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;
}
-
- fputs ($imap_stream, "a003 FETCH $id RFC822.SIZE\r\n");
- $read = sqimap_read_data($imap_stream, "a003", true, $r, $m);
- preg_match("/([0-9]+)\)\s*$/i", $read[0], $regs);
- $size = $regs[1];
+ arsort($sizes_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];
+ 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;
+ }
- return $header;
+ $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 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.
******************************************************************************/
function sqimap_get_message ($imap_stream, $id, $mailbox) {
$header = sqimap_get_message_header($imap_stream, $id, $mailbox);
- $msg = sqimap_get_message_body($imap_stream, &$header);
- return $msg;
+ return sqimap_get_message_body($imap_stream, $header);
}
/******************************************************************************
** 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;
@@ -195,9 +339,6 @@
$hdr->type1 = "plain";
$hdr->charset = "us-ascii";
- preg_match("/\{([0-9]+)\}/", $read[$i], $regs);
- preg_match("/[0-9]+/", $regs[0], $regs);
-
while ($i < count($read)) {
if (substr($read[$i], 0, 17) == "MIME-Version: 1.0") {
$hdr->mime = true;
@@ -235,7 +376,7 @@
}
/** Detect the boundary of a multipart message **/
- if (eregi("boundary=\"([^\"]+)\"", $line, $regs)) {
+ if (eregi('boundary="([^"]+)"', $line, $regs)) {
$hdr->boundary = $regs[1];
}
@@ -243,8 +384,8 @@
if (strpos(strtolower(trim($line)), "charset=")) {
$pos = strpos($line, "charset=") + 8;
$charset = trim($line);
- if (strpos($line, " ", $pos) > 0) {
- $charset = substr($charset, $pos, strpos($line, " ", $pos));
+ if (strpos($line, ";", $pos) > 0) {
+ $charset = substr($charset, $pos, strpos($line, ";", $pos)-$pos);
} else {
$charset = substr($charset, $pos);
}
@@ -256,7 +397,7 @@
}
- else if (strtolower(substr($read[$i], 0, 20)) == "content-disposition:") {
+ else if (strtolower(substr($read[$i], 0, 20)) == "content-disposition:") {
/** Add better dontent-disposition support **/
$line = $read[$i];
@@ -291,7 +432,7 @@
/** FROM **/
else if (strtolower(substr($read[$i], 0, 5)) == "from:") {
$hdr->from = trim(substr($read[$i], 5, strlen($read[$i]) - 6));
- if ($hdr->replyto == "")
+ if (! isset($hdr->replyto) || $hdr->replyto == "")
$hdr->replyto = $hdr->from;
$i++;
}
@@ -299,8 +440,8 @@
else if (strtolower(substr($read[$i], 0, 5)) == "date:") {
$d = substr($read[$i], 5);
$d = trim($d);
- $d = ereg_replace(" ", " ", $d);
- $d = explode(" ", $d);
+ $d = strtr($d, array(' ' => ' '));
+ $d = explode(' ', $d);
$hdr->date = getTimeStamp($d);
$i++;
}
@@ -326,6 +467,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;
@@ -356,6 +508,11 @@
$hdr->date = time();
$i++;
}
+ /** X-PRIORITY **/
+ else if (strtolower(substr($read[$i], 0, 11)) == "x-priority:") {
+ $hdr->priority = trim(substr($read[$i], 11));
+ $i++;
+ }
else {
$i++;
}
@@ -369,7 +526,7 @@
******************************************************************************/
function sqimap_get_message_body ($imap_stream, &$header) {
$id = $header->id;
- return decodeMime($imap_stream, $body, &$header);
+ return decodeMime($imap_stream, $header);
}