** This contains the functions necessary to detect and decode MIME
** messages.
**
+ ** $Id$
**/
$debug_mime = false;
/** 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 = array(), $from = '', $date = '';
+ var $cc = array(), $bcc = array(), $reply_to = '', $subject = '';
+ var $id = 0, $mailbox = '', $description = '', $filename = '';
+ var $entity_id = 0, $message_id = 0, $name = '';
}
class message {
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 = array();
function addEntity ($msg) {
- $this->entities[count($this->entities)] = $msg;
+ $this->entities[] = $msg;
}
}
$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 "<tt>$read</tt><br><br>\n";
} else {
// parse the elements
if ($debug_mime) echo "<br><font color=0000aa><tt>$structure</tt></font><br>";
- $msg = mime_get_element (&$structure, $msg, $ent_id);
+ $msg = mime_get_element ($structure, $msg, $ent_id);
if ($debug_mime) echo "<br>";
}
return $msg;
$elem_num = 1;
$msg->header = new msg_header();
$msg->header->entity_id = $ent_id;
+ $properties = array();
while (strlen($structure) > 0) {
$structure = trim($structure);
// 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++;
// loop through until we find a space or an end parenthesis
$pos = 0;
$char = substr($structure, $pos, 1);
+ $text = "";
while ($char != " " && $char != ")" && $pos < strlen($structure)) {
$text .= $char;
$pos++;
if ($char == "\"") {
$pos = 1;
$char = substr($structure, $pos, 1);
+ $tmp = "";
while ($char != "\"" && $pos < strlen($structure)) {
$tmp .= $char;
$pos++;
if ($char == "\"") {
$pos = 1;
$char = substr($structure, $pos, 1);
+ $value = "";
while ($char != "\"" && $pos < strlen($structure)) {
$value .= $char;
$pos++;
} 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);
}
// ignore all extra characters
// If inside of a string, skip string -- Boundary IDs and other
// things can have ) in them.
+ if ($char != '(')
+ return strlen($structure);
while ($pos < strlen($structure)) {
$pos++;
$char = substr($structure, $pos, 1);
$pos ++;
while (substr($structure, $pos, 1) != '"' &&
$pos < strlen($structure)) {
+ if (substr($structure, $pos, 2) == '\\"')
+ $pos ++;
+ elseif (substr($structure, $pos, 2) == '\\\\')
+ $pos ++;
$pos ++;
}
} else if ($char == "(") {
$pos = mime_match_parenthesis ($pos, $structure);
}
}
+ echo "Error decoding mime structure. Report this as a bug!<br>\n";
+ return $pos;
}
function mime_fetch_body ($imap_stream, $id, $ent_id) {
// 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)
+ while (! ereg('\\* [0-9]+ FETCH ', $topline) && data)
$topline = array_shift($data);
$wholemessage = implode('', $data);
- if (ereg('\{([^\}]*)\}', $topline, $regs)) {
+ if (ereg('\\{([^\\}]*)\\}', $topline, $regs)) {
return substr($wholemessage, 0, $regs[1]);
}
else if (ereg('"([^"]*)"', $topline, $regs)) {
/** 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);
}
if ($message->header->entity_id == $ent_id && strlen($ent_id) == strlen($message->header->entity_id)) {
return $message;
} else {
- for ($i = 0; $message->entities[$i]; $i++) {
+ for ($i = 0; isset($message->entities[$i]); $i++) {
$msg = getEntity ($message->entities[$i], $ent_id);
if ($msg)
return $msg;
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++) {
if (($body_message->header->type0 == "text") ||
($body_message->header->type0 == "rfc822")) {
- $body = mime_fetch_body ($imap_stream, $id, $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
translateText($body, $wrap_at, $body_message->header->charset);
}
- $body .= "<SMALL><CENTER><A HREF=\"../src/download.php?absolute_dl=true&passed_id=$id&passed_ent_id=$ent_num&mailbox=$urlmailbox&otp=".$GLOBALS["onetimepad"]."\">". _("Download this as a file") ."</A></CENTER><BR></SMALL>";
+ $body .= "<SMALL><CENTER><A HREF=\"../src/download.php?absolute_dl=true&passed_id=$id&passed_ent_id=$ent_num&mailbox=$urlmailbox\">". _("Download this as a file") ."</A></CENTER><BR></SMALL>";
/** Display the ATTACHMENTS: message if there's more than one part **/
$body .= "</TD></TR></TABLE>";
- if ($message->entities) {
+ if (isset($message->entities[0])) {
$body .= formatAttachments ($message, $ent_num, $message->header->mailbox, $id);
}
} else {
function formatAttachments ($message, $ent_id, $mailbox, $id) {
global $where, $what;
global $startMessage, $color;
- static $ShownHTML;
+ static $ShownHTML = 0;
+ $body = "";
if ($ShownHTML == 0)
{
$ShownHTML = 1;
$body .= "<TABLE WIDTH=100% CELLSPACING=0 CELLPADDING=2 BORDER=0 BGCOLOR=\"$color[0]\"><TR>\n";
$body .= "<TH ALIGN=\"left\" BGCOLOR=\"$color[9]\"><B>\n";
- $body .= _('Attachments') . ':';
+ $body .= _("Attachments") . ':';
$body .= "</B></TH></TR><TR><TD>\n";
$body .= "<TABLE CELLSPACING=0 CELLPADDING=1 BORDER=0>\n";
if (!$message->entities) {
$type0 = strtolower($message->header->type0);
$type1 = strtolower($message->header->type1);
+ $name = decodeHeader($message->header->name);
if ($message->header->entity_id != $ent_id) {
$filename = decodeHeader($message->header->filename);
if (trim($filename) == "") {
- $display_filename = "untitled-".$message->header->entity_id;
+ if (trim($name) == "") {
+ $display_filename = "untitled-".$message->header->entity_id;
+ } else {
+ $display_filename = $name;
+ $filename = $name;
+ }
} else {
$display_filename = $filename;
}
$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']['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,
// This functions decode strings that is encoded according to
// RFC1522 (MIME Part Two: Message Header Extensions for Non-ASCII Text).
function decodeHeader ($string) {
- if (eregi('=\?([^?]+)\?(q|b)\?([^?]+)\?=',
+ if (eregi('=\\?([^?]+)\\?(q|b)\\?([^?]+)\\?=',
$string, $res)) {
if (ucfirst($res[2]) == "B") {
$replace = base64_decode($res[3]);
$replace = charset_decode ($res[1], $replace);
$string = eregi_replace
- ('=\?([^?]+)\?(q|b)\?([^?]+)\?=',
+ ('=\\?([^?]+)\\?(q|b)\\?([^?]+)\\?=',
$replace, $string);
// In case there should be more encoding in the string: recurse
return (decodeHeader($string));
projects / squirrelmail.git / blobdiff