X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmime.php;h=379bdb27757473a283a2a121a8612efb57116e4d;hb=090595e1141186141f2900aa1fc188e5f6b800f3;hp=668934cc2fdbf86468079abb87abe26edc5cad82;hpb=0ae64f08f1abfaf780f8dbad16223d2f0f28b313;p=squirrelmail.git
diff --git a/functions/mime.php b/functions/mime.php
index 668934cc..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,8 +373,8 @@
// 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");
- $data = sqimap_read_data ($imap_stream, 'a001', true, $response, $message);
+ 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);
@@ -423,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);
}
@@ -464,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++) {
@@ -503,11 +517,11 @@
translateText($body, $wrap_at, $body_message->header->charset);
}
- $body .= "". _("Download this as a file") ."
";
+ $body .= "". _("Download this as a file") ."
";
/** 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 {
@@ -521,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;
@@ -558,12 +573,12 @@
$ent = urlencode($message->header->entity_id);
$DefaultLink =
- "../src/download.php?startMessage=$startMessage&passed_id=$id&mailbox=$urlMailbox&passed_ent_id=$ent&otp=".$GLOBALS["onetimepad"];
+ "../src/download.php?startMessage=$startMessage&passed_id=$id&mailbox=$urlMailbox&passed_ent_id=$ent";
if ($where && $what)
$DefaultLink .= '&where=' . urlencode($where) . '&what=' . urlencode($what);
$Links['download link']['text'] = _('download');
$Links['download link']['href'] =
- "../src/download.php?absolute_dl=true&passed_id=$id&mailbox=$urlMailbox&passed_ent_id=$ent&otp=".$GLOBALS["onetimepad"];
+ "../src/download.php?absolute_dl=true&passed_id=$id&mailbox=$urlMailbox&passed_ent_id=$ent";
$ImageURL = '';
$HookResults = do_hook("attachment $type0/$type1", $Links,