X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_messages.php;h=dbb59f4e31fab9f79970327175c8ae2a841bd715;hp=9898710ecc95477b87122f18430493233858c530;hb=61e2e861b0a0b5a056e2bdc33e8f59eeb8dbfba3;hpb=16530f8b571a483145ef053c9d884e23dea6c7c1
diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 9898710e..dbb59f4e 100755
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -1,16 +1,38 @@
from = $from;
- $header->date = $date;
- $header->subject = $subject;
+ $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);
+
+ $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;
+ }
+ 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;
+ }
- 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);
- if (strpos($read[0], "FLAGS")) {
- $tmp = ereg_replace("\(", "", $read[0]);
- $tmp = ereg_replace("\)", "", $tmp);
- $tmp = str_replace("\\", "", $tmp);
- $tmp = substr($tmp, strpos($tmp, "FLAGS")+6, strlen($tmp));
- $tmp = trim($tmp);
- $flags = explode(" ", $tmp);
- } else {
- $flags[0] = "None";
+ 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;
+ }
}
- return $flags;
+ arsort($result_flags);
+ return $result_flags;
}
/******************************************************************************
@@ -101,26 +293,28 @@
** the documentation folder for more information about this array.
******************************************************************************/
function sqimap_get_message ($imap_stream, $id, $mailbox) {
- $message["INFO"]["ID"] = $id;
- $message["INFO"]["MAILBOX"] = $mailbox;
- $message["HEADER"] = sqimap_get_message_header($imap_stream, $id);
- $message["ENTITIES"] = sqimap_get_message_body($imap_stream, $message["HEADER"]["BOUNDARY"], $id, $message["HEADER"]["TYPE0"], $message["HEADER"]["TYPE1"], $message["HEADER"]["ENCODING"], $message["HEADER"]["CHARSET"]);
- return $message;
+ $header = sqimap_get_message_header($imap_stream, $id, $mailbox);
+ return sqimap_get_message_body($imap_stream, $header);
}
/******************************************************************************
** Wrapper function that reformats the header information.
******************************************************************************/
- function sqimap_get_message_header ($imap_stream, $id) {
- fputs ($imap_stream, "a001 FETCH $id:$id BODY[HEADER]\r\n");
- $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
+ function sqimap_get_message_header ($imap_stream, $id, $mailbox) {
+ 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);
- return sqimap_get_header($imap_stream, $read);
+ $header = sqimap_get_header($imap_stream, $read);
+ $header->id = $id;
+ $header->mailbox = $mailbox;
+
+ return $header;
}
/******************************************************************************
** Wrapper function that returns entity headers for use by decodeMime
******************************************************************************/
+ /*
function sqimap_get_entity_header ($imap_stream, &$read, &$type0, &$type1, &$bound, &$encoding, &$charset, &$filename) {
$header = sqimap_get_header($imap_stream, $read);
$type0 = $header["TYPE0"];
@@ -130,26 +324,30 @@
$charset = $header["CHARSET"];
$filename = $header["FILENAME"];
}
+ */
/******************************************************************************
** Queries the IMAP server and gets all header information.
******************************************************************************/
function sqimap_get_header ($imap_stream, $read) {
+ global $where, $what;
+
+ $hdr = new msg_header();
$i = 0;
// Set up some defaults
- $header["TYPE0"] = "text";
- $header["TYPE1"] = "plain";
- $header["CHARSET"] = "us-ascii";
+ $hdr->type0 = "text";
+ $hdr->type1 = "plain";
+ $hdr->charset = "us-ascii";
while ($i < count($read)) {
if (substr($read[$i], 0, 17) == "MIME-Version: 1.0") {
- $header["MIME"] = true;
+ $hdr->mime = true;
$i++;
}
/** ENCODING TYPE **/
else if (substr(strtolower($read[$i]), 0, 26) == "content-transfer-encoding:") {
- $header["ENCODING"] = strtolower(trim(substr($read[$i], 26)));
+ $hdr->encoding = strtolower(trim(substr($read[$i], 26)));
$i++;
}
@@ -161,10 +359,10 @@
if (strpos($cont, "/")) {
- $header["TYPE0"] = substr($cont, 0, strpos($cont, "/"));
- $header["TYPE1"] = substr($cont, strpos($cont, "/")+1);
+ $hdr->type0 = substr($cont, 0, strpos($cont, "/"));
+ $hdr->type1 = substr($cont, strpos($cont, "/")+1);
} else {
- $header["TYPE0"] = $cont;
+ $hdr->type0 = $cont;
}
@@ -178,28 +376,28 @@
}
/** Detect the boundary of a multipart message **/
- if (eregi("boundary=\"([^\"]+)\"", $line, $regs)) {
- $header["BOUNDARY"] = $regs[1];
+ if (eregi('boundary="([^"]+)"', $line, $regs)) {
+ $hdr->boundary = $regs[1];
}
/** Detect the charset **/
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);
}
$charset = str_replace("\"", "", $charset);
- $header["CHARSET"] = $charset;
+ $hdr->charset = $charset;
} else {
- $header["CHARSET"] = "us-ascii";
+ $hdr->charset = "us-ascii";
}
}
- 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];
@@ -221,106 +419,118 @@
$name = substr($name, $pos);
}
$name = str_replace("\"", "", $name);
- $header["FILENAME"] = $name;
+ $hdr->filename = $name;
}
}
/** REPLY-TO **/
else if (strtolower(substr($read[$i], 0, 9)) == "reply-to:") {
- $header["REPLYTO"] = trim(substr($read[$i], 9, strlen($read[$i])));
+ $hdr->replyto = trim(substr($read[$i], 9, strlen($read[$i])));
$i++;
}
/** FROM **/
else if (strtolower(substr($read[$i], 0, 5)) == "from:") {
- $header["FROM"] = trim(substr($read[$i], 5, strlen($read[$i]) - 6));
- if ($header["REPLYTO"] == "")
- $header["REPLYTO"] = $header["FROM"];
+ $hdr->from = trim(substr($read[$i], 5, strlen($read[$i]) - 6));
+ if (! isset($hdr->replyto) || $hdr->replyto == "")
+ $hdr->replyto = $hdr->from;
$i++;
}
/** DATE **/
else if (strtolower(substr($read[$i], 0, 5)) == "date:") {
$d = substr($read[$i], 5);
$d = trim($d);
- $d = ereg_replace(" ", " ", $d);
- $d = explode(" ", $d);
- $header["DATE"] = getTimeStamp($d);
+ $d = strtr($d, array(' ' => ' '));
+ $d = explode(' ', $d);
+ $hdr->date = getTimeStamp($d);
$i++;
}
/** SUBJECT **/
else if (strtolower(substr($read[$i], 0, 8)) == "subject:") {
- $header["SUBJECT"] = trim(substr($read[$i], 8, strlen($read[$i]) - 9));
- if (strlen(Chop($header["SUBJECT"])) == 0)
- $header["SUBJECT"] = _("(no subject)");
+ $hdr->subject = trim(substr($read[$i], 8, strlen($read[$i]) - 9));
+ if (strlen(Chop($hdr->subject)) == 0)
+ $hdr->subject = _("(no subject)");
+
+ if ($where == "SUBJECT") {
+ $hdr->subject = eregi_replace($what, "\\0", $hdr->subject);
+ }
$i++;
}
/** CC **/
else if (strtolower(substr($read[$i], 0, 3)) == "cc:") {
$pos = 0;
- $header["CC"][$pos] = trim(substr($read[$i], 4));
+ $hdr->cc[$pos] = trim(substr($read[$i], 4));
+ $i++;
+ while (((substr($read[$i], 0, 1) == " ") || (substr($read[$i], 0, 1) == "\t")) && (trim($read[$i]) != "")){
+ $pos++;
+ $hdr->cc[$pos] = trim($read[$i]);
+ $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) == " ") && (trim($read[$i]) != "")) {
+ while (((substr($read[$i], 0, 1) == " ") || (substr($read[$i], 0, 1) == "\t")) && (trim($read[$i]) != "")){
$pos++;
- $header["CC"][$pos] = trim($read[$i]);
+ $hdr->bcc[$pos] = trim($read[$i]);
$i++;
}
}
/** TO **/
else if (strtolower(substr($read[$i], 0, 3)) == "to:") {
$pos = 0;
- $header["TO"][$pos] = trim(substr($read[$i], 4));
+ $hdr->to[$pos] = trim(substr($read[$i], 4));
$i++;
- while ((substr($read[$i], 0, 1) == " ") && (trim($read[$i]) != "")){
+ while (((substr($read[$i], 0, 1) == " ") || (substr($read[$i], 0, 1) == "\t")) && (trim($read[$i]) != "")){
$pos++;
- $header["TO"][$pos] = trim($read[$i]);
+ $hdr->to[$pos] = trim($read[$i]);
$i++;
}
}
/** MESSAGE ID **/
else if (strtolower(substr($read[$i], 0, 11)) == "message-id:") {
- $header["MESSAGE-ID"] = trim(substr($read[$i], 11));
+ $hdr->message_id = trim(substr($read[$i], 11));
$i++;
}
/** ERROR CORRECTION **/
else if (substr($read[$i], 0, 1) == ")") {
- if ($header["SUBJECT"] == "")
- $header["SUBJECT"] = _("(no subject)");
+ if (strlen(trim($hdr->subject)) == 0)
+ $hdr->subject = _("(no subject)");
- if ($header["FROM"] == "")
- $header["FROM"] = _("(unknown sender)");
+ if (strlen(trim($hdr->from)) == 0)
+ $hdr->from = _("(unknown sender)");
- if ($header["DATE"] == "")
- $header["DATE"] = time();
+ if (strlen(trim($hdr->date)) == 0)
+ $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++;
}
}
- return $header;
+ return $hdr;
}
/******************************************************************************
** Returns the body of a message.
******************************************************************************/
- function sqimap_get_message_body ($imap_stream, $bound, $id, $type0, $type1, $encoding, $charset) {
- fputs ($imap_stream, "a001 FETCH $id:$id BODY[TEXT]\r\n");
- $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-
- $i = 0;
- $j = 0;
- while ($i < count($read)-1) {
- if ( ($i != 0) ) {
- $bodytmp[$j] = $read[$i];
- $j++;
- }
- $i++;
- }
- $body = $bodytmp;
-
- return decodeMime($body, $bound, $type0, $type1, $encoding, $charset);
+ function sqimap_get_message_body ($imap_stream, &$header) {
+ $id = $header->id;
+ return decodeMime($imap_stream, $header);
}
+
+
+ /******************************************************************************
+ ** Returns an array with the body structure
+ ******************************************************************************/
?>