X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmime.php;h=4ed4435af077628e1115cbc08e2c889baa7edfa0;hb=2ef37ed49077a9a0064e15b79cd319f486cde113;hp=eeb461b34e830deb63d5715bee583e23bf5e1f91;hpb=2c252f5a03a5cdaea32c9aa7abf8daf5ab0a342d;p=squirrelmail.git
diff --git a/functions/mime.php b/functions/mime.php
index eeb461b3..4ed4435a 100644
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -23,7 +23,7 @@
/** msg_header contains generic variables for values that **/
/** could be in a header. **/
- var $type0, $type1, $boundary, $charset, $encoding;
+ var $type0, $type1, $boundary, $charset, $encoding, $size;
var $to, $from, $date, $cc, $bcc, $reply_to, $subject;
var $id, $mailbox, $description;
var $entity_id, $message_id, $charset;
@@ -59,12 +59,18 @@
$id = $header->id;
fputs ($imap_stream, "a001 FETCH $id BODYSTRUCTURE\r\n");
$read = fgets ($imap_stream, 10000);
- $endline = fgets($imap_stream, 1024);
- $read = strtolower($read);
+ $response = substr($read, 0, 4);
+ while ($response != "a001") {
+ $bodystructure .= $read;
+ $read = fgets ($imap_stream, 10000);
+ $response = substr($read, 0, 4);
+ }
+ // $read = strtolower($bodystructure);
+ $read = $bodystructure;
- if ($debug_mime) echo "$read
";
+ if ($debug_mime) echo "$read
\n";
// isolate the body structure and remove beginning and end parenthesis
- $read = trim(substr ($read, strpos($read, "bodystructure") + 13));
+ $read = trim(substr ($read, strpos(strtolower($read), "bodystructure") + 13));
$read = trim(substr ($read, 0, -1));
$end = mime_match_parenthesis(0, $read);
while ($end == strlen($read)-1) {
@@ -73,7 +79,7 @@
$end = mime_match_parenthesis(0, $read);
}
- if ($debug_mime) echo "$read
";
+ if ($debug_mime) echo "$read
\n";
$msg = mime_parse_structure ($read, 0);
$msg->header = $header;
@@ -89,7 +95,7 @@
// to mime_get_elements()
function mime_parse_structure ($structure, $ent_id) {
global $debug_mime;
- if ($debug_mime) echo "START: mime_parse_structure()
";
+ if ($debug_mime) echo "START: mime_parse_structure()
\n";
$msg = new message();
if (substr($structure, 0, 1) == "(") {
$ent_id = mime_new_element_level($ent_id);
@@ -155,7 +161,7 @@
$structure = trim($structure);
$char = substr($structure, 0, 1);
- if (substr($structure, 0, 3) == "nil") {
+ if (strtolower(substr($structure, 0, 3)) == "nil") {
$text = "";
$structure = substr($structure, 3);
} else if ($char == "\"") {
@@ -190,20 +196,20 @@
// This is where all the text parts get put into the header
switch ($elem_num) {
case 1:
- $msg->header->type0 = $text;
- if ($debug_mime) echo "type0 = $text
";
+ $msg->header->type0 = strtolower($text);
+ if ($debug_mime) echo "type0 = ".strtolower($text)."
";
break;
case 2:
- $msg->header->type1 = $text;
- if ($debug_mime) echo "type1 = $text
";
+ $msg->header->type1 = strtolower($text);
+ if ($debug_mime) echo "type1 = ".strtolower($text)."
";
break;
case 5:
$msg->header->description = $text;
if ($debug_mime) echo "description = $text
";
break;
case 6:
- $msg->header->encoding = $text;
- if ($debug_mime) echo "encoding = $text
";
+ $msg->header->encoding = strtolower($text);
+ if ($debug_mime) echo "encoding = ".strtolower($text)."
";
break;
case 7:
$msg->header->size = $text;
@@ -301,7 +307,7 @@
$structure = trim(substr($structure, strlen($tmp) + 2));
$k = count($props);
- $props[$k]["name"] = $tmp;
+ $props[$k]["name"] = strtolower($tmp);
$props[$k]["value"] = $value;
} else if ($char == "(") {
$end = mime_match_parenthesis (0, $structure);
@@ -331,11 +337,19 @@
$char = substr($structure, $pos, 1);
// ignore all extra characters
+ // If inside of a string, skip string -- Boundary IDs and other
+ // things can have ) in them.
while ($pos < strlen($structure)) {
$pos++;
$char = substr($structure, $pos, 1);
if ($char == ")") {
return $pos;
+ } else if ($char == '"') {
+ $pos ++;
+ while (substr($structure, $pos, 1) != '"' &&
+ $pos < strlen($structure)) {
+ $pos ++;
+ }
} else if ($char == "(") {
$pos = mime_match_parenthesis ($pos, $structure);
}
@@ -347,12 +361,59 @@
// that it is the first one. That is usually the case anyway.
if (!$ent_id) $ent_id = 1;
+ fputs ($imap_stream, "a010 FETCH $id BODY[$ent_id]\r\n");
+ $data = sqimap_read_data ($imap_stream, 'a010', true, $response, $message);
+ $topline = array_shift($data);
+ while (! ereg('\* [0-9]+ FETCH ', $topline) && data)
+ $topline = array_shift($data);
+ $wholemessage = implode('', $data);
+
+ if (ereg('\{([^\}]*)\}', $topline, $regs)) {
+ return substr($wholemessage, 0, $regs[1]);
+ }
+ else if (ereg('"([^"]*)"', $topline, $regs)) {
+ return $regs[1];
+ }
+
+ $str = "Body retrival error. Please report this bug!\n";
+ $str .= "Response: $response\n";
+ $str .= "Message: $message\n";
+ $str .= "FETCH line: $topline";
+ $str .= "---------------\n$wholemessage";
+ foreach ($data as $d)
+ {
+ $str .= htmlspecialchars($d) . "\n";
+ }
+ return $str;
+
+ return "Body retrival error, please report this bug!\n\nTop line is \"$topline\"\n";
+ }
+
+ function mime_print_body_lines ($imap_stream, $id, $ent_id, $encoding) {
+ // do a bit of error correction. If we couldn't find the entity id, just guess
+ // that it is the first one. That is usually the case anyway.
+ if (!$ent_id) $ent_id = 1;
+
fputs ($imap_stream, "a001 FETCH $id BODY[$ent_id]\r\n");
- $topline = fgets ($imap_stream, 1024);
- $size = substr ($topline, strpos($topline, "{")+1);
- $size = substr ($size, 0, strpos($size, "}"));
- $read = fread ($imap_stream, $size);
- return $read;
+ $cnt = 0;
+ $continue = true;
+ $read = fgets ($imap_stream,4096);
+ while (!ereg("^a001 (OK|BAD|NO)(.*)$", $read, $regs)) {
+ if (trim($read) == ")==") {
+ $read1 = $read;
+ $read = fgets ($imap_stream,4096);
+ if (ereg("^a001 (OK|BAD|NO)(.*)$", $read, $regs)) {
+ return;
+ } else {
+ echo decodeBody($read1, $encoding);
+ echo decodeBody($read, $encoding);
+ }
+ } else if ($cnt) {
+ echo decodeBody($read, $encoding);
+ }
+ $read = fgets ($imap_stream,4096);
+ $cnt++;
+ }
}
/* -[ END MIME DECODING ]----------------------------------------------------------- */
@@ -422,7 +483,7 @@
// this if statement checks for the entity to show as the
// primary message. To add more of them, just put them in the
// order that is their priority.
- global $username, $key, $imapServerAddress, $imapPort;
+ global $startMessage, $username, $key, $imapServerAddress, $imapPort;
$id = $message->header->id;
$urlmailbox = urlencode($message->header->mailbox);
@@ -430,28 +491,27 @@
// Get the right entity and redefine message to be this entity
$ent_num = findDisplayEntity ($message);
$body_message = getEntity($message, $ent_num);
-
- $body = mime_fetch_body ($imap_stream, $id, $ent_num);
- $body = decodeBody($body, $body_message->header->encoding);
-
- // If there are other types that shouldn't be formatted, add
- // them here
- if ($message->header->type1 != "html") {
- $body = translateText($body, $wrap_at, $body_message->header->charset);
- }
-
- $body .= "
";
-
- /** Display the ATTACHMENTS: message if there's more than one part **/
- if ($message->entities) {
- $body .= "
"; - $body .= "ATTACHMENTS:"; - $body .= " |
";
- $num = 0;
-
- /** make this recurisve at some point **/
- $body .= formatAttachments ($message, $ent_num, $message->header->mailbox, $id);
+ if (($body_message->header->type0 == "text") ||
+ ($body_message->header->type0 == "rfc822")) {
+
+ $body = mime_fetch_body ($imap_stream, $id, $ent_num);
+ $body = decodeBody($body, $body_message->header->encoding);
+
+ // If there are other types that shouldn't be formatted, add
+ // them here
+ if ($body_message->header->type1 != "html") {
+ translateText($body, $wrap_at, $body_message->header->charset);
+ }
+
+ $body .= " "; + + /** Display the ATTACHMENTS: message if there's more than one part **/ $body .= " |
\n"; + $body .= _('Attachments') . ':'; + $body .= " |
---|
\n";
+
+ $body .= " |