X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fimap_messages.php;h=f03e46aa4a12f426ea455477bcc083f1c8de8615;hp=f80117992478c81544afc290aa05589e0e597920;hb=0f8a1ce94ff62c4a6022969cf2b3e8fb695282f4;hpb=8b673ac145ad6dc77796fc0c1ef48094c76b46e1
diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index f8011799..f03e46aa 100755
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -1,292 +1,530 @@
-";
- fputs ($imap_stream, "a001 COPY $start:$end \"$mailbox\"\n");
- $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
- }
-
- /******************************************************************************
- ** Deletes specified messages and moves them to trash if possible
- ******************************************************************************/
- function sqimap_messages_delete ($imap_stream, $start, $end, $mailbox) {
- global $move_to_trash, $trash_folder, $auto_expunge;
-
- if (($move_to_trash == true) && (sqimap_mailbox_exists($imap_stream, $trash_folder))) {
- sqimap_messages_copy ($imap_stream, $start, $end, $trash_folder);
- sqimap_messages_flag ($imap_stream, $start, $end, "Deleted");
- } else {
- sqimap_messages_flag ($imap_stream, $start, $end, "Deleted");
- }
- if ($auto_expunge == true)
- sqimap_mailbox_expunge ($imap_stream, $mailbox);
- }
-
- /******************************************************************************
- ** 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)\n");
- $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
- }
-
- /******************************************************************************
- ** Returns some general header information -- FROM, DATE, and SUBJECT
- ******************************************************************************/
- function sqimap_get_small_header ($imap_stream, $id, &$from, &$subject, &$date) {
- fputs ($imap_stream, "a001 FETCH $id:$id BODY[HEADER.FIELDS (From Subject Date)]\n");
- $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-
- for ($i = 0; $i < count($read); $i++) {
- if (strtolower(substr($read[$i], 0, 5)) == "from:") {
- $from = sqimap_find_displayable_name(substr($read[$i], 5));
- } else if (strtolower(substr($read[$i], 0, 5)) == "date:") {
- $date = substr($read[$i], 5);
- } else if (strtolower(substr($read[$i], 0, 8)) == "subject:") {
- $subject = htmlspecialchars(substr($read[$i], 8));
- if (strlen(trim($subject)) == 0)
- $subject = _("(no subject)");
- }
- }
- }
-
- /******************************************************************************
- ** Returns the flags for the specified messages
- ******************************************************************************/
- function sqimap_get_flags ($imap_stream, $start, $end) {
- fputs ($imap_stream, "a001 FETCH $start:$end FLAGS\n");
- $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
- $i = 0;
- while ($i < count($read)) {
- if (strpos($read[$i], "FLAGS")) {
- $tmp = ereg_replace("\(", "", $read[$i]);
- $tmp = ereg_replace("\)", "", $tmp);
- $tmp = str_replace("\\", "", $tmp);
- $tmp = substr($tmp, strpos($tmp, "FLAGS")+6, strlen($tmp));
- $tmp = trim($tmp);
- $flags[$i] = explode(" ", $tmp);
- } else {
- $flags[$i][0] = "None";
- }
- $i++;
- }
- return $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) {
- $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"]);
- return $message;
- }
-
- /******************************************************************************
- ** Wrapper function that reformats the header information.
- ******************************************************************************/
- function sqimap_get_message_header ($imap_stream, $id) {
- fputs ($imap_stream, "a001 FETCH $id:$id BODY[HEADER]\n");
- $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
+' .
+ _("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;
+ }
+
+ $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) {
+ $read = sqimap_run_command ($imap_stream, "FETCH $i:$i FLAGS", 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;
+ }
+ $result_list = sqimap_run_command_list ($imap_stream, "FETCH $msgs_str FLAGS", 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);
+ return sqimap_get_message_body($imap_stream, $header);
+}
+
+/****************************************************************************
+ ** Wrapper function that reformats the header information.
+ ****************************************************************************/
+function sqimap_get_message_header ($imap_stream, $id, $mailbox) {
+ $read = sqimap_run_command ($imap_stream, "FETCH $id:$id BODY[HEADER]", true, $response, $message);
- return sqimap_get_header($imap_stream, $read);
- }
-
- /******************************************************************************
- ** 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"];
- $type1 = $header["TYPE1"];
- $bound = $header["BOUNDARY"];
- $encoding = $header["ENCODING"];
- $charset = $header["CHARSET"];
- $filename = $header["FILENAME"];
- }
-
- /******************************************************************************
- ** Queries the IMAP server and gets all header information.
- ******************************************************************************/
- function sqimap_get_header ($imap_stream, $read) {
- $i = 0;
- while ($i < count($read)) {
- if (substr($read[$i], 0, 17) == "MIME-Version: 1.0") {
- $header["MIME"] = true;
+ $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"];
+ $type1 = $header["TYPE1"];
+ $bound = $header["BOUNDARY"];
+ $encoding = $header["ENCODING"];
+ $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 */
+ $hdr->type0 = "text";
+ $hdr->type1 = "plain";
+ $hdr->charset = "us-ascii";
+
+ while ($i < count($read)) {
+ if (substr($read[$i], 0, 17) == "MIME-Version: 1.0") {
+ $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)));
+ /** ENCODING TYPE **/
+ else if (substr(strtolower($read[$i]), 0, 26) == "content-transfer-encoding:") {
+ $hdr->encoding = strtolower(trim(substr($read[$i], 26)));
$i++;
- }
+ }
/** CONTENT-TYPE **/
- else if (substr($read[$i], 0, 13) == "Content-Type:") {
+ else if (strtolower(substr($read[$i], 0, 13)) == "content-type:") {
$cont = strtolower(trim(substr($read[$i], 13)));
- if (strpos($cont, ";"))
- $cont = substr($cont, 0, strpos($cont, ";"));
+ if (strpos($cont, ";")) {
+ $cont = substr($cont, 0, strpos($cont, ";"));
+ }
+
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;
}
+
$line = $read[$i];
$i++;
while ( (substr(substr($read[$i], 0, strpos($read[$i], " ")), -1) != ":") && (trim($read[$i]) != "") && (trim($read[$i]) != ")")) {
- str_replace("\n", "", $line);
- str_replace("\n", "", $read[$i]);
- $line = "$line $read[$i]";
- $i++;
+ str_replace("\n", "", $line);
+ str_replace("\n", "", $read[$i]);
+ $line = "$line $read[$i]";
+ $i++;
}
/** Detect the boundary of a multipart message **/
- if (strpos(strtolower(trim($line)), "boundary=")) {
- $pos = strpos($line, "boundary=") + 9;
- $bound = trim($line);
- if (strpos($line, " ", $pos) > 0) {
- $bound = substr($bound, $pos, strpos($line, " ", $pos));
- } else {
- $bound = substr($bound, $pos);
- }
- $bound = str_replace("\"", "", $bound);
- $header["BOUNDARY"] = $bound;
+ 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));
- } else {
- $charset = substr($charset, $pos);
- }
- $charset = str_replace("\"", "", $charset);
- $header["CHARSET"] = $charset;
+ $pos = strpos($line, "charset=") + 8;
+ $charset = trim($line);
+ if (strpos($line, ";", $pos) > 0) {
+ $charset = substr($charset, $pos, strpos($line, ";", $pos)-$pos);
+ } else {
+ $charset = substr($charset, $pos);
+ }
+ $charset = str_replace("\"", "", $charset);
+ $hdr->charset = $charset;
} else {
- $header["CHARSET"] = "us-ascii";
+ $hdr->charset = "us-ascii";
+ }
+ }
+
+ else if (strtolower(substr($read[$i], 0, 20)) == "content-disposition:") {
+ /** Add better dontent-disposition support **/
+
+ $line = $read[$i];
+ $i++;
+ while ( (substr(substr($read[$i], 0, strpos($read[$i], " ")), -1) != ":") && (trim($read[$i]) != "") && (trim($read[$i]) != ")")) {
+ str_replace("\n", "", $line);
+ str_replace("\n", "", $read[$i]);
+ $line = "$line $read[$i]";
+ $i++;
}
/** Detects filename if any **/
- if (strpos(strtolower(trim($line)), "name=")) {
- $pos = strpos($line, "name=") + 5;
- $name = trim($line);
- if (strpos($line, " ", $pos) > 0) {
- $name = substr($name, $pos, strpos($line, " ", $pos));
- } else {
- $name = substr($name, $pos);
- }
- $name = str_replace("\"", "", $name);
- $header["FILENAME"] = $name;
+ if (strpos(strtolower(trim($line)), "filename=")) {
+ $pos = strpos($line, "filename=") + 9;
+ $name = trim($line);
+ if (strpos($line, " ", $pos) > 0) {
+ $name = substr($name, $pos, strpos($line, " ", $pos));
+ } else {
+ $name = substr($name, $pos);
+ }
+ $name = str_replace("\"", "", $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])));
+ /** REPLY-TO **/
+ else if (strtolower(substr($read[$i], 0, 9)) == "reply-to:") {
+ $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"];
+ /** FROM **/
+ else if (strtolower(substr($read[$i], 0, 5)) == "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:") {
+ }
+ /** 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)");
+ }
+ /** SUBJECT **/
+ else if (strtolower(substr($read[$i], 0, 8)) == "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 = $what;
+ // $hdr->subject = eregi_replace($what, "\\0", $hdr->subject);
+ }
+ */
+
$i++;
- }
- /** CC **/
- else if (strtolower(substr($read[$i], 0, 3)) == "cc:") {
+ }
+ /** 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) == " ") && (trim($read[$i]) != "")) {
- $pos++;
- $header["CC"][$pos] = trim($read[$i]);
- $i++;
+ while (((substr($read[$i], 0, 1) == " ") || (substr($read[$i], 0, 1) == "\t")) && (trim($read[$i]) != "")){
+ $pos++;
+ $hdr->cc[$pos] = trim($read[$i]);
+ $i++;
}
- }
- /** TO **/
- else if (strtolower(substr($read[$i], 0, 3)) == "to:") {
+ }
+ /** BCC **/
+ else if (strtolower(substr($read[$i], 0, 4)) == "bcc:") {
$pos = 0;
- $header["TO"][$pos] = trim(substr($read[$i], 4));
+ $hdr->bcc[$pos] = trim(substr($read[$i], 5));
$i++;
- while ((substr($read[$i], 0, 1) == " ") && (trim($read[$i]) != "")){
- $pos++;
- $header["TO"][$pos] = trim($read[$i]);
- $i++;
+ while (((substr($read[$i], 0, 1) == " ") || (substr($read[$i], 0, 1) == "\t")) && (trim($read[$i]) != "")){
+ $pos++;
+ $hdr->bcc[$pos] = trim($read[$i]);
+ $i++;
}
- }
-
- /** ERROR CORRECTION **/
- else if (substr($read[$i], 0, 1) == ")") {
- if ($header["SUBJECT"] == "")
- $header["SUBJECT"] = _("(no subject)");
+ }
+ /** TO **/
+ else if (strtolower(substr($read[$i], 0, 3)) == "to:") {
+ $pos = 0;
+ $hdr->to[$pos] = trim(substr($read[$i], 4));
+ $i++;
+ while (((substr($read[$i], 0, 1) == " ") || (substr($read[$i], 0, 1) == "\t")) && (trim($read[$i]) != "")){
+ $pos++;
+ $hdr->to[$pos] = trim($read[$i]);
+ $i++;
+ }
+ }
+ /** MESSAGE ID **/
+ else if (strtolower(substr($read[$i], 0, 11)) == "message-id:") {
+ $hdr->message_id = trim(substr($read[$i], 11));
+ $i++;
+ }
- if ($header["FROM"] == "")
- $header["FROM"] = _("(unknown sender)");
- if ($header["DATE"] == "")
- $header["DATE"] = time();
+ /** ERROR CORRECTION **/
+ else if (substr($read[$i], 0, 1) == ")") {
+ if (strlen(trim($hdr->subject)) == 0) {
+ $hdr->subject = _("(no subject)");
+ }
+ if (strlen(trim($hdr->from)) == 0) {
+ $hdr->from = _("(unknown sender)");
+ }
+ 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 {
+ }
+ else {
$i++;
- }
- }
- return $header;
- }
-
-
- /******************************************************************************
- ** Returns the body of a message.
- ******************************************************************************/
- function sqimap_get_message_body ($imap_stream, $bound, $id, $type0, $type1, $encoding) {
- fputs ($imap_stream, "a001 FETCH $id:$id BODY[TEXT]\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);
- }
+ }
+ }
+ return $hdr;
+}
+
+
+/****************************************************************************
+ ** Returns the body of a message.
+ ****************************************************************************/
+function sqimap_get_message_body ($imap_stream, &$header) {
+ $id = $header->id;
+ return decodeMime($imap_stream, $header);
+}
+
+
+/****************************************************************************
+ ** Returns an array with the body structure
+ ****************************************************************************/
?>