X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmime.php;h=379bdb27757473a283a2a121a8612efb57116e4d;hb=090595e1141186141f2900aa1fc188e5f6b800f3;hp=e60bcb62e878b2d3fcaead6bb33f88ccdd8388e0;hpb=441f2d33bad826a0278aafe63e58d0b3c81b6e0c;p=squirrelmail.git
diff --git a/functions/mime.php b/functions/mime.php
index e60bcb62..379bdb27 100644
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -4,6 +4,7 @@
** This contains the functions necessary to detect and decode MIME
** messages.
**
+ ** $Id$
**/
$debug_mime = false;
@@ -23,10 +24,11 @@
/** msg_header contains generic variables for values that **/
/** could be in a header. **/
- 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;
+ var $type0 = '', $type1 = '', $boundary = '', $charset = '';
+ var $encoding = '', $size = 0, $to = '', $from = '', $date = '';
+ var $cc = '', $bcc = '', $reply_to = '', $subject = '';
+ var $id = 0, $mailbox = '', $description = '', $filename = '';
+ var $entity_id = 0, $message_id = 0;
}
class message {
@@ -35,11 +37,11 @@
more objects of type message. See documentation in mime.txt for
a better description of how this works.
**/
- var $header;
- var $entities;
+ var $header = '';
+ var $entities = '';
function addEntity ($msg) {
- $this->entities[count($this->entities)] = $msg;
+ $this->entities[] = $msg;
}
}
@@ -58,14 +60,17 @@
$id = $header->id;
fputs ($imap_stream, "a001 FETCH $id BODYSTRUCTURE\r\n");
+ //
+ // This should use sqimap_read_data instead of reading it itself
+ //
$read = fgets ($imap_stream, 10000);
$response = substr($read, 0, 4);
+ $bodystructure = "";
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
\n";
@@ -114,7 +119,7 @@
} else {
// parse the elements
if ($debug_mime) echo "
$structure
";
- $msg = mime_get_element (&$structure, $msg, $ent_id);
+ $msg = mime_get_element ($structure, $msg, $ent_id);
if ($debug_mime) echo "
";
}
return $msg;
@@ -168,6 +173,7 @@
// loop through until we find the matching quote, and return that as a string
$pos = 1;
$char = substr($structure, $pos, 1);
+ $text = "";
while ($char != "\"" && $pos < strlen($structure)) {
$text .= $char;
$pos++;
@@ -178,6 +184,8 @@
// comment me
$end = mime_match_parenthesis (0, $structure);
$sub = substr($structure, 1, $end-1);
+ if (! isset($properties))
+ $properties = array();
$properties = mime_get_props($properties, $sub);
$structure = substr($structure, strlen($sub) + 2);
} else {
@@ -288,6 +296,7 @@
if ($char == "\"") {
$pos = 1;
$char = substr($structure, $pos, 1);
+ $tmp = "";
while ($char != "\"" && $pos < strlen($structure)) {
$tmp .= $char;
$pos++;
@@ -299,6 +308,7 @@
if ($char == "\"") {
$pos = 1;
$char = substr($structure, $pos, 1);
+ $value = "";
while ($char != "\"" && $pos < strlen($structure)) {
$value .= $char;
$pos++;
@@ -312,6 +322,8 @@
} else if ($char == "(") {
$end = mime_match_parenthesis (0, $structure);
$sub = substr($structure, 1, $end-1);
+ if (! isset($props))
+ $props = array();
$props = mime_get_props($props, $sub);
$structure = substr($structure, strlen($sub) + 2);
}
@@ -361,17 +373,61 @@
// 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);
+ 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 fread ($imap_stream, $regs[1]);
+ 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");
+ $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 ]----------------------------------------------------------- */
@@ -379,7 +435,7 @@
/** This is the first function called. It decides if this is a multipart
message or if it should be handled as a single entity
**/
- function decodeMime ($imap_stream, $body, $header) {
+ function decodeMime ($imap_stream, &$header) {
global $username, $key, $imapServerAddress, $imapPort;
return mime_structure ($imap_stream, $header);
}
@@ -420,7 +476,9 @@
if ($message->header->type0 == "text") {
if ($message->header->type1 == "plain" ||
$message->header->type1 == "html") {
- return $message->header->entity_id;
+ if (isset($message->header->entity_id))
+ return $message->header->entity_id;
+ return 0;
}
} else {
for ($i=0; $message->entities[$i]; $i++) {
@@ -455,7 +513,7 @@
// If there are other types that shouldn't be formatted, add
// them here
- if ($message->header->type1 != "html") {
+ if ($body_message->header->type1 != "html") {
translateText($body, $wrap_at, $body_message->header->charset);
}
@@ -463,7 +521,7 @@
/** Display the ATTACHMENTS: message if there's more than one part **/
$body .= "";
- if ($message->entities) {
+ if (isset($message->entities[0])) {
$body .= formatAttachments ($message, $ent_num, $message->header->mailbox, $id);
}
} else {
@@ -477,8 +535,9 @@
function formatAttachments ($message, $ent_id, $mailbox, $id) {
global $where, $what;
global $startMessage, $color;
- static $ShownHTML;
+ static $ShownHTML = 0;
+ $body = "";
if ($ShownHTML == 0)
{
$ShownHTML = 1;
@@ -599,7 +658,7 @@
$replace = ereg_replace("_", " ", $res[3]);
// Convert lowercase Quoted Printable to uppercase for
// quoted_printable_decode to understand it.
- while (ereg("(=([0-9][a-f])|([a-f][0-9])|([a-f][0-9]))", $replace, $res)) {
+ while (ereg("(=([0-9][abcdef])|([abcdef][0-9])|([abcdef][abcdef]))", $replace, $res)) {
$replace = str_replace($res[1], strtoupper($res[1]), $replace);
}
$replace = quoted_printable_decode($replace);
@@ -632,11 +691,11 @@
$string = str_replace("_", "=5F", $string);
$string = str_replace(" ", "_", $string);
-
- while (ereg("([\200-\377])", $string, $regs)) {
- $replace = $regs[1];
- $insert = "=" . strtoupper(bin2hex($replace));
+ for ( $ch = 127 ; $ch <= 255 ; $ch++ ) {
+ $replace = chr($ch);
+ $insert = sprintf("=%02X", $ch);
$string = str_replace($replace, $insert, $string);
+ $ch++;
}
$newstring = "=?$default_charset?Q?".$string."?=";