$read = trim(substr ($bodystructure, strpos(strtolower($bodystructure), 'bodystructure') + 13));
$msg = &new message();
$read = trim(substr ($read, 0, -1));
- echo $read;
$msg = $msg->parseStructure($read,0);
$msg->setEnt('0');
if (count($flags)) {
}
break;
case 'M':
- if (strtolower($flag) == '\$mdnsent') {
- $msg->is_mdn = true;
+ if (strtolower($flag) == '$mdnsent') {
+ $msg->is_mdnsent = true;
}
break;
default:
}
}
}
+// listEntities($msg);
return( $msg );
}
if (!ini_get("safe_mode")) {
set_time_limit(0);
}
+ if ($uid_support) {
+ $sid_s = substr($sid,0,strpos($sid, ' '));
+ } else {
+ $sid_s = $sid;
+ }
+ $body = mime_fetch_body ($imap_stream, $id, $ent_id);
+ echo decodeBody($body, $encoding);
+ return;
+/*
fputs ($imap_stream, "$sid FETCH $id BODY[$ent_id]\r\n");
$cnt = 0;
$continue = true;
- $read = fgets ($imap_stream,4096);
- if (preg_match('/.*\{(\d+)\}.*/',$read,$regs)) {
- $size = $regs[1];
- $size_div = (int) ($size / 4096);
- $size_mod = $size % 4096;
- if (!$size_mod) $size_div++;
- $read = '';
- for ($i=0;$i<$size_div;$i++) {
- $read .= fread ($imap_stream,4096);
- }
- if ($size_mod > 0) {
- $read .= fread ($imap_stream, $size_mod);
- }
- return decodeBody($read, $encoding);
- }
+ $read = fgets ($imap_stream,8192);
+
+
// This could be bad -- if the section has sqimap_session_id() . ' OK'
// or similar, it will kill the download.
- while (!ereg("^".$sid." (OK|BAD|NO)(.*)$", $read, $regs)) {
- if (trim($read) == ')==') {
- $read1 = $read;
- $read = fgets ($imap_stream,4096);
- if (ereg("^".$sid." (OK|BAD|NO)(.*)$", $read, $regs)) {
- return;
- } else {
- echo decodeBody($read1, $encoding) .
- decodeBody($read, $encoding);
- }
- } else if ($cnt) {
- echo decodeBody($read, $encoding);
- }
- $read = fgets ($imap_stream,4096);
- $cnt++;
+ while (!ereg("^".$sid_s." (OK|BAD|NO)(.*)$", $read, $regs)) {
+ if (trim($read) == ')==') {
+ $read1 = $read;
+ $read = fgets ($imap_stream,4096);
+ if (ereg("^".$sid." (OK|BAD|NO)(.*)$", $read, $regs)) {
+ return;
+ } else {
+ echo decodeBody($read1, $encoding) .
+ decodeBody($read, $encoding);
+ }
+ } else if ($cnt) {
+ echo decodeBody($read, $encoding);
+ }
+ $read = fgets ($imap_stream,4096);
+ $cnt++;
+// break;
}
+*/
}
/* -[ END MIME DECODING ]----------------------------------------------------------- */
+/* findDisplayEntity
+ * Checks to see if $message contains content of type $type0/$type1
+ * returns the first entity number it finds of that type, or NULL if
+ * none is found. Takes optional argument $start to allow the caller
+ * to continue where they left off
+ */
+function findDisplayEntity($message, $type0, $type1, $start=0) {
+ if ($message) {
+ for ($i = $start;isset($message->entities[$i]); $i++) {
+ $entity = $message->entities[$i];
+ if ($entity->type0 == $type0 && $entity->type1 == $type1) {
+ return $i;
+ }
+ }
+ }
+ return NULL;
+}
// This is here for debugging purposese. It will print out a list
// of all the entity IDs that are in the $message object.
}
}
+function getPriorityStr($priority) {
+ $priority_level = substr($priority,0,1);
-/* returns a $message object for a particular entity id */
-function getEntity ($message, $ent_id) {
- return $message->getEntity($ent_id);
-}
-
-/*
- * figures out what entity to display and returns the $message object
- * for that entity.
- */
-function findDisplayEntity ($msg, $textOnly = true, $entity = array() ) {
- global $show_html_default;
-
- $found = false;
- if ($msg) {
- $type = $msg->type0.'/'.$msg->type1;
- if ( $type == 'multipart/alternative') {
- $msg = findAlternativeEntity($msg, $textOnly);
- if (count($msg->entities) == 0) {
- $entity[] = $msg->entity_id;
- } else {
- $found = true;
- $entity =findDisplayEntity($msg,$textOnly, $entity);
- }
- } else if ( $type == 'multipart/related') {
- $msgs = findRelatedEntity($msg);
- for ($i = 0; $i < count($msgs); $i++) {
- $msg = $msgs[$i];
- if (count($msg->entities) == 0) {
- $entity[] = $msg->entity_id;
- } else {
- $found = true;
- $entity =findDisplayEntity($msg,$textOnly, $entity);
- }
- }
- } else if ( count($entity) == 0 &&
- $msg->type0 == 'text' &&
- ( $msg->type1 == 'plain' ||
- $msg->type1 == 'html' ) &&
- isset($msg->entity_id) ) {
- if (count($msg->entities) == 0) {
- $entity[] = $msg->entity_id;
- }
- }
- $i = 0;
- while ( isset($msg->entities[$i]) && count($entity) == 0 && !$found ) {
- $entity = findDisplayEntity($msg->entities[$i], $textOnly, $entity);
- $i++;
- }
- }
- if ( !isset($entity[0]) ) {
- $entity[]="";
- }
- return( $entity );
-}
+ switch($priority_level) {
+ /* check for a higher then normal priority. */
+ case '1':
+ case '2':
+ $priority_string = _("High");
+ break;
-/* Shows the HTML version */
-function findDisplayEntityHTML ($message) {
+ /* check for a lower then normal priority. */
+ case '4':
+ case '5':
+ $priority_string = _("Low");
+ break;
- if ( $message->header->type0 == 'text' &&
- $message->header->type1 == 'html' &&
- isset($message->header->entity_id)) {
- return $message->header->entity_id;
- }
- for ($i = 0; isset($message->entities[$i]); $i ++) {
- if ( $message->header->type0 == 'message' &&
- $message->header->type1 == 'rfc822' &&
- isset($message->header->entity_id)) {
- return 0;
- }
-
- $entity = findDisplayEntityHTML($message->entities[$i]);
- if ($entity != 0) {
- return $entity;
- }
- }
+ /* check for a normal priority. */
+ case '3':
+ default:
+ $priority_level = '3';
+ $priority_string = _("Normal");
+ break;
- return 0;
+ }
+ return $priority_string;
}
-function findAlternativeEntity ($message, $textOnly) {
- global $show_html_default;
- /* if we are dealing with alternative parts then we choose the best
- * viewable message supported by SM.
- */
- if ($show_html_default && !$textOnly) {
- $alt_order = array ('text/plain','text/html');
- } else {
- $alt_order = array ('text/plain');
- }
- $best_view = 0;
- $ent_id = 0;
- $k = 0;
- for ($i = 0; $i < count($message->entities); $i ++) {
- $type = $message->entities[$i]->header->type0.'/'.$message->entities[$i]->header->type1;
- if ($type == 'multipart/related') {
- $type = $message->entities[$i]->header->type;
- }
- for ($j = $k; $j < count($alt_order); $j++) {
- if ($alt_order[$j] == $type && $j > $best_view) {
- $best_view = $j;
- $ent_id = $i;
- $k = $j;
- }
- }
- }
- return $message->entities[$ent_id];
+/* returns a $message object for a particular entity id */
+function getEntity ($message, $ent_id) {
+ return $message->getEntity($ent_id);
}
-function findRelatedEntity ($message) {
- $msgs = array();
- for ($i = 0; $i < count($message->entities); $i ++) {
- $type = $message->entities[$i]->header->type0.'/'.$message->entities[$i]->header->type1;
- if ($message->header->type == $type) {
- $msgs[] = $message->entities[$i];
- }
- }
- return $msgs;
-}
-
/*
* translateText
* Extracted from strings.php 23/03/2002
everything needed, including HTML Tags, Attachments at the
bottom, etc.
*/
-function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num) {
+function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $mailbox='INBOX') {
// 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 $startMessage, $username, $key, $imapServerAddress, $imapPort,
$show_html_default, $has_unsafe_images, $view_unsafe_images, $sort;
- $has_unsafe_images = 0;
-
- $id = $message->id;
-
- $urlmailbox = urlencode($message->mailbox);
+ $has_unsafe_images= 0;
+ $body = '';
+ $urlmailbox = urlencode($mailbox);
$body_message = getEntity($message, $ent_num);
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);
$hookResults = do_hook("message_body", $body);
$body = $hookResults[1];
+
// If there are other types that shouldn't be formatted, add
// them here
if ($body_message->header->type1 == 'html') {
if ( $show_html_default <> 1 ) {
$body = strip_tags( $body );
- translateText($body, $wrap_at, $body_message->header->charset);
+ translateText($body, $wrap_at,
+ $body_message->header->getParameter['charset']);
} else {
- $body = magicHTML( $body, $id, $message );
+ $body = magicHTML( $body, $id, $message, $mailbox );
}
} else {
- translateText($body, $wrap_at, $body_message->header->charset);
+ translateText($body, $wrap_at,
+ $body_message->header->getParameter('charset'));
}
- $body .= "<CENTER><SMALL><A HREF=\"../src/download.php?absolute_dl=true&passed_id=$id&passed_ent_id=$ent_num&mailbox=$urlmailbox&showHeaders=1\">". _("Download this as a file") ."</A></SMALL></CENTER><BR>";
+
if ($has_unsafe_images) {
if ($view_unsafe_images) {
- $body .= "<CENTER><SMALL><A HREF=\"read_body.php?passed_id=$id&mailbox=$urlmailbox&sort=$sort&startMessage=$startMessage&show_more=0\">". _("Hide Unsafe Images") ."</A></SMALL></CENTER><BR>\n";
+ $body .= "<CENTER><SMALL><A HREF=\"read_body.php?passed_id=$id&passed_ent_id=".$message->entity_id."&mailbox=$urlmailbox&sort=$sort&startMessage=$startMessage&show_more=0\">". _("Hide Unsafe Images") ."</A></SMALL></CENTER><BR>\n";
} else {
- $body .= "<CENTER><SMALL><A HREF=\"read_body.php?passed_id=$id&mailbox=$urlmailbox&sort=$sort&startMessage=$startMessage&show_more=0&view_unsafe_images=1\">". _("View Unsafe Images") ."</A></SMALL></CENTER><BR>\n";
+ $body .= "<CENTER><SMALL><A HREF=\"read_body.php?passed_id=$id&passed_ent_id=".$message->entity_id."&mailbox=$urlmailbox&sort=$sort&startMessage=$startMessage&show_more=0&view_unsafe_images=1\">". _("View Unsafe Images") ."</A></SMALL></CENTER><BR>\n";
}
- }
-
- /** Display the ATTACHMENTS: message if there's more than one part **/
- if ($message->type0 == 'message') {
- $id = $message->id;
- $mailbox = $message->mailbox;
-// $message->header->setVar('message_id',$id);
-// $message->header->setVar('mailbox',$mailbox);
- }
- if (isset($message->entities[1])) {
- /* Header-type alternative means we choose the best one to display
- so don't show the alternatives as attachment. Header-type related
- means that the attachments are already part of the related message.
- */
- if ($message->header->type1 !='related' && $message->header->type1 !='alternative') {
- $body .= formatAttachments ($message, $ent_num, $message->mailbox, $id);
- }
- }
- } else {
- $body = formatAttachments ($message, -1, $message->mailbox, $id);
- }
+ }
+ }
return ($body);
}
-/*
- * A recursive function that returns a list of attachments with links
- * to where to download these attachments
- */
-function formatAttachments($message, $ent_id, $mailbox, $id) {
+
+function formatAttachments($message, $exclude_id, $mailbox, $id) {
global $where, $what;
global $startMessage, $color;
static $ShownHTML = 0;
- $body = '';
- if ($ShownHTML == 0) {
-
- $ShownHTML = 1;
- $body .= "<TABLE WIDTH=\"100%\" CELLSPACING=0 CELLPADDING=2 BORDER=0 BGCOLOR=\"$color[0]\"><TR>\n" .
- "<TH ALIGN=\"left\" BGCOLOR=\"$color[9]\"><B>\n" .
- _("Attachments") . ':' .
- "</B></TH></TR><TR><TD>\n" .
- "<TABLE CELLSPACING=0 CELLPADDING=1 BORDER=0>\n" .
- formatAttachments($message, $ent_id, $mailbox, $id) .
- "</TABLE></TD></TR></TABLE>";
-
- } else if ($message) {
- $header = $message->header;
+ $att_ar = $message->getAttachments($exclude_id);
+
+ if (!count($att_ar)) return '';
+
+ $attachments = '';
+
+ $urlMailbox = urlencode($mailbox);
+
+ foreach ($att_ar as $att) {
+
+ $ent = urldecode($att->entity_id);
+ $header = $att->header;
$type0 = strtolower($header->type0);
$type1 = strtolower($header->type1);
$name = '';
- if (isset($header->name)) {
- $name = decodeHeader($header->name);
- }
if ($type0 =='message' && $type1 == 'rfc822') {
-
- $filename = decodeHeader($message->header->subject);
+ $rfc822_header = $att->rfc822_header;
+ $filename = decodeHeader($rfc822_header->subject);
$display_filename = $filename;
- $urlMailbox = urlencode($mailbox);
- $ent = urlencode($message->entity_id);
-
$DefaultLink =
"../src/read_body.php?startMessage=$startMessage&passed_id=$id&mailbox=$urlMailbox&passed_ent_id=$ent";
if ($where && $what) {
$Links = $HookResults[1];
$DefaultLink = $HookResults[6];
- $body .= '<TR><TD> </TD><TD>' .
+ $attachments .= '<TR><TD>' .
"<A HREF=\"$DefaultLink\">$display_filename</A> </TD>" .
- '<TD><SMALL><b>' . show_readable_size($message->header->size) .
+ '<TD><SMALL><b>' . show_readable_size($header->size) .
'</b> </small></TD>' .
"<TD><SMALL>[ $type0/$type1 ] </SMALL></TD>" .
'<TD><SMALL>';
- $from_o = $message->header->from;
- if (isset($from_o)) {
+ $from_o = $rfc822_header->from;
+ if (is_object($from_o)) {
$from_name = $from_o->getAddress(false);
} else {
$from_name = _("Unknown sender");
}
$from_name = decodeHeader(htmlspecialchars($from_name));
- $body .= '<b>' . $from_name . '</b>';
- $body .= '</SMALL></TD><TD><SMALL> ';
+ $attachments .= '<b>' . $from_name . '</b>';
+ $attachments .= '</SMALL></TD><TD><SMALL> ';
$SkipSpaces = 1;
foreach ($Links as $Val) {
if ($SkipSpaces) {
$SkipSpaces = 0;
} else {
- $body .= ' | ';
+ $attachments .= ' | ';
}
- $
body .= '<a href="' . $Val['href'] . '">' . $Val['text'] . '</a>';
+ $
attachments .= '<a href="' . $Val['href'] . '">' . $Val['text'] . '</a>';
}
-
unset($Links);
-
- $body .= "</SMALL></TD></TR>\n";
-
- return( $body );
-
- } elseif (!$message->entities) {
-
- $type0 = strtolower($message->header->type0);
- $type1 = strtolower($message->header->type1);
- $name = decodeHeader($message->header->name);
-
- if ($message->entity_id != $ent_id) {
- $filename = decodeHeader($message->header->filename);
+ $attachments .= "</TD></TR>\n";
+ } else {
+ $filename = decodeHeader($header->getParameter('filename'));
if (trim($filename) == '') {
+ $name = decodeHeader($header->getParameter('name'));
if (trim($name) == '') {
- if ( trim( $message->header->id ) == '' )
- $display_filename = 'untitled-[' . $message->entity_id . ']' ;
+ if ( trim( $header->id ) == '' )
+ $display_filename = 'untitled-[' . $ent . ']' ;
else
- $display_filename = 'cid: ' . $message->header->id;
- // $display_filename = 'untitled-[' . $message->entity_id . ']' ;
+ $display_filename = 'cid: ' . $header->id;
} else {
$display_filename = $name;
$filename = $name;
$display_filename = $filename;
}
- $urlMailbox = urlencode($mailbox);
- $ent = urlencode($message->entity_id);
-
$DefaultLink =
"../src/download.php?startMessage=$startMessage&passed_id=$id&mailbox=$urlMailbox&passed_ent_id=$ent";
if ($where && $what) {
$Links = $HookResults[1];
$DefaultLink = $HookResults[6];
- $body .= '<TR><TD> </TD><TD>' .
+ $attachments .= '<TR><TD>' .
"<A HREF=\"$DefaultLink\">$display_filename</A> </TD>" .
- '<TD><SMALL><b>' . show_readable_size($message->header->size) .
+ '<TD><SMALL><b>' . show_readable_size($header->size) .
'</b> </small></TD>' .
"<TD><SMALL>[ $type0/$type1 ] </SMALL></TD>" .
'<TD><SMALL>';
if ($message->header->description) {
- $body .= '<b>' . htmlspecialchars(_($message->header->description)) . '</b>';
+ $attachments .= '<b>' . htmlspecialchars(_($header->description)) . '</b>';
}
- $body .= '</SMALL></TD><TD><SMALL> ';
-
+ $attachments .= '</SMALL></TD><TD><SMALL> ';
$SkipSpaces = 1;
foreach ($Links as $Val) {
if ($SkipSpaces) {
$SkipSpaces = 0;
} else {
- $body .= ' | ';
+ $attachments .= ' | ';
}
- $
body .= '<a href="' . $Val['href'] . '">' . $Val['text'] . '</a>';
+ $
attachments .= '<a href="' . $Val['href'] . '">' . $Val['text'] . '</a>';
}
-
+ $attachments .= "</TD></TR>\n";
unset($Links);
-
- $body .= "</SMALL></TD></TR>\n";
- }
- } else {
- for ($i = 0; $i < count($message->entities); $i++) {
- $body .= formatAttachments($message->entities[$i], $ent_id, $mailbox, $id);
- }
- }
- }
- return( $body );
+ }
+
+ }
+
+ return $attachments;
}
-
/** this function decodes the body depending on the encoding type. **/
function decodeBody($body, $encoding) {
$body = str_replace("\r\n", "\n", $body);
$bad_attvals,
$add_attr_to_tag,
$message,
- $id
+ $id,
+ $mailbox
){
$me = "sq_fixatts";
while (list($attname, $attvalue) = each($attary)){
* Turn cid: urls into http-friendly ones.
*/
if (preg_match("/^[\'\"]\s*cid:/si", $attvalue)){
- $attary{$attname} = sq_cid2http($message, $id, $attvalue);
+ $attary{$attname} = sq_cid2http($message, $id, $attvalue, $mailbox);
}
}
/**
* @param $cidurl the cid: url.
* @return a string with a http-friendly url
*/
-function sq_cid2http($message, $id, $cidurl){
+function sq_cid2http($message, $id, $cidurl, $mailbox){
/**
* Get rid of quotes.
*/
$cidurl = str_replace($quotchar, "", $cidurl);
$cidurl = substr(trim($cidurl), 4);
$httpurl = $quotchar . "../src/download.php?absolute_dl=true&" .
- "passed_id=$id&mailbox=" . urlencode($message->header->mailbox) .
+ "passed_id=$id&mailbox=" . urlencode($mailbox) .
"&passed_ent_id=" . find_ent_id($cidurl, $message) . $quotchar;
return $httpurl;
}
$bad_attvals,
$add_attr_to_tag,
$message,
- $id
+ $id,
+ $mailbox
){
$me = "sq_sanitize";
/**
$bad_attvals,
$add_attr_to_tag,
$message,
- $id
+ $id,
+ $mailbox
);
}
/**
* @param $id the id of the message
* @return a string with html safe to display in the browser.
*/
-function magicHTML($body, $id, $message){
+function magicHTML($body, $id, $message, $mailbox = 'INBOX'){
global $attachment_common_show_images, $view_unsafe_images,
$has_unsafe_images;
/**
"meta",
"html",
"head",
- "base"
+ "base",
+ "link"
);
$rm_tags_with_content = Array(
$bad_attvals,
$add_attr_to_tag,
$message,
- $id
+ $id,
+ $mailbox
);
if (preg_match("|$secremoveimg|si", $trusted)){
$has_unsafe_images = true;
- }
+ }
return $trusted;
}
-?>
\ No newline at end of file
+?>
projects / squirrelmail.git / blobdiff