*/
function mime_structure ($imap_stream, $header) {
- sqimap_messages_flag ($imap_stream, $header->id, $header->id, 'Seen');
$ssid = sqimap_session_id();
$lsid = strlen( $ssid );
$id = $header->id;
$text = "";
}
// loop through the additional properties and put those in the various headers
- if ($msg->header->type0 != 'message') {
+// if ($msg->header->type0 != 'message') {
for ($i=0; $i < count($properties); $i++) {
$msg->header->{$properties[$i]['name']} = $properties[$i]['value'];
}
- }
+// }
return $msg;
}
$ent_id = 1;
}
- $cmd = "FETCH $id BODY[$ent_id] ";
+ $cmd = "FETCH $id BODY[$ent_id]";
$data = sqimap_run_command ($imap_stream, $cmd, true, $response, $message);
do {
- $topline = array_shift( $data );
- } while( $topline && $topline == '*' && !preg_match( '/\\* [0-9] FETCH.*/i', $topline )) ;
+ $topline = trim(array_shift( $data ));
+ } while( $topline && $topline[0] == '*' && !preg_match( '/\* [0-9]+ FETCH.*/i', $topline )) ;
$wholemessage = implode('', $data);
if (ereg('\\{([^\\}]*)\\}', $topline, $regs)) {
*/
if ( $ret{0} == '<' ) {
$data = sqimap_run_command ($imap_stream, "FETCH $id BODY[$ent_id.MIME]", true, $response, $message);
- $base = '';
- $k = 10;
- foreach( $data as $d ) {
- if ( substr( $d, 0, 13 ) == 'Content-Base:' ) {
- $j = strlen( $d );
- $i = 13;
- $base = '';
- while ( $i < $j &&
- ( !isNoSep( $d{$i} ) || $d{$i} == '"' ) )
- $i++;
- while ( $i < $j ) {
- if ( isNoSep( $d{$i} ) )
- $base .= $d{$i};
- $i++;
- }
- $k = 0;
- } elseif ( $k == 1 && !isnosep( $d{0} ) ) {
- $base .= substr( $d, 1 );
- }
- $k++;
- }
- if ( $base <> '' ) {
- $ret = "<base href=\"$base\">" . $ret;
- }
+ /* BASE within HTML documents is illegal (see w3 spec)
+* $base = '';
+* $k = 10;
+* foreach( $data as $d ) {
+* if ( substr( $d, 0, 13 ) == 'Content-Base:' ) {
+* $j = strlen( $d );
+* $i = 13;
+* $base = '';
+* while ( $i < $j &&
+* ( !isNoSep( $d{$i} ) || $d{$i} == '"' ) )
+* $i++;
+* while ( $i < $j ) {
+* if ( isNoSep( $d{$i} ) )
+* $base .= $d{$i};
+* $i++;
+* }
+* $k = 0;
+* } elseif ( $k == 1 && !isnosep( $d{0} ) ) {
+* $base .= substr( $d, 1 );
+* }
+* $k++;
+* }
+* if ( $base <> '' ) {
+* $ret = "<base href=\"$base\">" . $ret;
+* }
+* */
}
} else if (ereg('"([^"]*)"', $topline, $regs)) {
$ret = $regs[1];
} else {
global $where, $what, $mailbox, $passed_id, $startMessage;
- $par = 'mailbox=' . urlencode($mailbox) . "&passed_id=$passed_id";
+ $par = 'mailbox=' . urlencode($mailbox) . "&passed_id=$passed_id";
if (isset($where) && isset($what)) {
- $par .= '&where='. urlencode($where) . "&what=" . urlencode($what);
+ $par .= '&where='. urlencode($where) . "&what=" . urlencode($what);
} else {
- $par .= "&startMessage=$startMessage&show_more=0";
+ $par .= "&startMessage=$startMessage&show_more=0";
}
- $par .= '&response=' . urlencode($response) .
- '&message=' . urlencode($message).
- '&topline=' . urlencode($topline);
+ $par .= '&response=' . urlencode($response) .
+ '&message=' . urlencode($message).
+ '&topline=' . urlencode($topline);
echo '<tt><br>' .
'<table width="80%"><tr>' .
// This is here for debugging purposese. It will print out a list
// of all the entity IDs that are in the $message object.
-/*
+
function listEntities ($message) {
if ($message) {
if ($message->header->entity_id)
}
}
}
-*/
+
/* returns a $message object for a particular entity id */
function getEntity ($message, $ent_id) {
if ($message) {
if ( $message->header->type0 == 'multipart' &&
( $message->header->type1 == 'alternative' ||
+ $message->header->type1 == 'mixed' ||
$message->header->type1 == 'related' ) &&
$show_html_default && ! $textOnly ) {
$entity = findDisplayEntityHTML($message);
}
-
+
// Show text/plain or text/html -- the first one we find.
if ( $entity == 0 &&
$message->header->type0 == 'text' &&
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;
// 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;
-
+ global $startMessage, $username, $key, $imapServerAddress, $imapPort, $body,
+ $show_html_default, $has_unsafe_images, $view_unsafe_images, $sort;
+
+ $has_unsafe_images = 0;
+
$id = $message->header->id;
+
$urlmailbox = urlencode($message->header->mailbox);
-
+
// Get the right entity and redefine message to be this entity
// Pass the 0 to mean that we want the 'best' viewable one
$ent_num = findDisplayEntity ($message, 0);
$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') {
} else {
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&showHeaders=1\">". _("Download this as a file") ."</A></CENTER><BR></SMALL>";
+
+ $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";
+ } 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";
+ }
+ }
/** Display the ATTACHMENTS: message if there's more than one part **/
- $body .= "</TD></TR></TABLE>";
if (isset($message->entities[0])) {
$body .= formatAttachments ($message, $ent_num, $message->header->mailbox, $id);
}
- $body .= "</TD></TR></TABLE>";
} else {
$body = formatAttachments ($message, -1, $message->header->mailbox, $id);
}
"</TABLE></TD></TR></TABLE>";
} else if ($message) {
+ $header = $message->header;
+ $type0 = strtolower($header->type0);
+ $type1 = strtolower($header->type1);
+ $name = decodeHeader($header->name);
+
+ if ($type0 =='message' && $type1 = 'rfc822') {
+
+ $filename = decodeHeader($message->header->filename);
+ if (trim($filename) == '') {
+ if (trim($name) == '') {
+ $display_filename = 'untitled-[' . $message->header->entity_id . ']' ;
+ } else {
+ $display_filename = $name;
+ $filename = $name;
+ }
+ } else {
+ $display_filename = $filename;
+ }
+
+ $urlMailbox = urlencode($mailbox);
+ $ent = urlencode($message->header->entity_id);
- if (!$message->entities) {
+ $DefaultLink =
+ "../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";
+ $ImageURL = '';
+
+ /* this executes the attachment hook with a specific MIME-type.
+ * if that doens't have results, it tries if there's a rule
+ * for a more generic type. */
+ $HookResults = do_hook("attachment $type0/$type1", $Links,
+ $startMessage, $id, $urlMailbox, $ent, $DefaultLink, $display_filename, $where, $what);
+ if(count($HookResults[1]) <= 1) {
+ $HookResults = do_hook("attachment $type0/*", $Links,
+ $startMessage, $id, $urlMailbox, $ent, $DefaultLink,
+ $display_filename, $where, $what);
+ }
+
+ $Links = $HookResults[1];
+ $DefaultLink = $HookResults[6];
+
+ $body .= '<TR><TD> </TD><TD>' .
+ "<A HREF=\"$DefaultLink\">$display_filename</A> </TD>" .
+ '<TD><SMALL><b>' . show_readable_size($message->header->size) .
+ '</b> </small></TD>' .
+ "<TD><SMALL>[ $type0/$type1 ] </SMALL></TD>" .
+ '<TD><SMALL>';
+ if ($message->header->description) {
+ $body .= '<b>' . htmlspecialchars(_($message->header->description)) . '</b>';
+ }
+ $body .= '</SMALL></TD><TD><SMALL> ';
+
+
+ $SkipSpaces = 1;
+ foreach ($Links as $Val) {
+ if ($SkipSpaces) {
+ $SkipSpaces = 0;
+ } else {
+ $body .= ' | ';
+ }
+ $body .= '<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);
$ent = urlencode($message->header->entity_id);
$DefaultLink =
- "../src/download.php?startMessage=$startMessage&passed_id=$id&mailbox=$urlMailbox&passed_ent_id=$ent";
+ "../src/download.php?startMessage=$startMessage&passed_id=$id&mailbox=$urlMailbox&passed_ent_id=$ent";
if ($where && $what) {
- $DefaultLink .= '&where=' . urlencode($where) . '&what=' . urlencode($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";
+ "../src/download.php?absolute_dl=true&passed_id=$id&mailbox=$urlMailbox&passed_ent_id=$ent";
$ImageURL = '';
/* this executes the attachment hook with a specific MIME-type.
*/
function encodeHeader ($string) {
global $default_charset;
-
+
// Encode only if the string contains 8-bit characters or =?
$j = strlen( $string );
$l = strstr($string, '=?'); // Must be encoded ?
$ret .= $string{$i};
}
}
-
+
if ( $l ) {
$string = "=?$default_charset?Q?$ret?=";
}
*/
function MagicHTML( $body, $id ) {
- global $message, $HTTP_SERVER_VARS,
+ global $message, $HTTP_SERVER_VARS,
$attachment_common_show_images;
$attachment_common_show_images =
$pos = $i + 1;
$tag = '';
while ($body{$pos} == ' ' || $body{$pos} == "\t" ||
- $body{$pos} == "\n") {
+ $body{$pos} == "\n" ) {
$pos ++;
}
while (strlen($tag) < 4 && $body{$pos} != ' ' &&
- $body{$pos} != "\t" && $body{$pos} != "\n") {
+ $body{$pos} != "\t" && $body{$pos} != "\n" &&
+ $pos < $j ) {
$tag .= $body{$pos};
$pos ++;
}
+ /*
+ A comment in HTML is only three characters and isn't
+ guaranteed to have a space after it. This fudges so
+ it will be caught by the switch statement.
+ */
+ if (ereg("!--", $tag)) {
+ $tag = "!-- ";
+ }
switch( strtoupper( $tag ) ) {
// Strips the entire tag and contents
case 'APPL':
- case 'EMBB':
+ case 'EMBE':
case 'FRAM':
case 'SCRI':
case 'OBJE':
$ret .= '<font color=#000000>';
break;
case 'BASE':
- $i += 5;
+ $i += 4;
$base = '';
+ if ( strncasecmp($body{$i}, 'font', 4) ) {
+ $i += 5;
+ while ( !isNoSep( $body{$i} ) && $i < $j ) {
+ $i++;
+ }
+ while ( $body{$i} <> '>' && $i < $j ) {
+ $base .= $body{$i};
+ $i++;
+ }
+ $ret .= "<BASEFONT $base>\n";
+ break;
+ }
+ $i++;
while ( !isNoSep( $body{$i} ) &&
$i < $j ) {
$i++;
return( "\n\n<!-- HTML Output ahead -->\n" .
$ret .
+ /* Base is illegal within HTML
"\n<!-- END of HTML Output --><base href=\"".
get_location() . '/'.
"\">\n\n" );
+ */
+ "\n<!-- END of HTML Output -->\n\n" );
}
function isNoSep( $char ) {
function stripEvent( &$i, $j, &$body, $id, $base ) {
- global $message, $base_uri;
+ global $message, $base_uri, $has_unsafe_images, $view_unsafe_images;
$ret = '';
$src .= $body{$k};
$k++;
}
+ $k++;
while( !isNoSep( $body{$k} ) &&
$k < $j ) {
$k++;
}
+ $k++;
if ( strtolower( substr( $src, 0, 4 ) ) == 'cid:' ) {
$src = substr( $src, 4 );
- $src = "../src/download.php?absolute_dl=true&passed_id=$id&mailbox=" .
+ $src = "../src/download.php?absolute_dl=true&passed_id=$id&mailbox=" .
urlencode( $message->header->mailbox ) .
- "&passed_ent_id=" . find_ent_id( $src, $message );
- } else if ( strtolower( substr( $src, 0, 4 ) ) <> 'http' ||
+ "&passed_ent_id=" . find_ent_id( $src, $message );
+ } else if ( strtolower( substr( $src, 0, 4 ) ) <> 'http' ||
stristr( $src, $base_uri ) ) {
/* Javascript and local urls goes out */
- $src = '../images/' . _("sec_remove_eng.png");
+ if (!$view_unsafe_images) {
+ $src = '../images/' . _("sec_remove_eng.png");
+ }
+ $has_unsafe_images = 1;
}
$ret .= 'src="' . $src . '" ';
$i = $k - 2;
$name .= $body{$i++};
}
if ( $name <> '' ) {
- $ret .= "../src/download.php?absolute_dl=true&passed_id=$id&mailbox=" .
+ $ret .= "../src/download.php?absolute_dl=true&passed_id=$id&mailbox=" .
urlencode( $message->header->mailbox ) .
- "&passed_ent_id=" . find_ent_id( $name, $message );
+ "&passed_ent_id=" . find_ent_id( $name, $message );
if ( $body{$k} == '"' )
$ret .= '" ';
else
projects / squirrelmail.git / blobdiff