X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmime.php;h=5e6371ff17d333dc8fd35250684e57faa9328e77;hp=6e7bbe553c809155fa24311068c0e711114d900e;hb=7aad7b77593da6babf8d8ec8746cbd222f9941fa;hpb=bd9c880b180d3db597909c87c7cbf3fadef40be2
diff --git a/functions/mime.php b/functions/mime.php
index 6e7bbe55..5e6371ff 100644
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -29,16 +29,15 @@ function mime_structure ($bodystructure, $flags=array()) {
/* Isolate the body structure and remove beginning and end parenthesis. */
$read = trim(substr ($bodystructure, strpos(strtolower($bodystructure), 'bodystructure') + 13));
$read = trim(substr ($read, 0, -1));
- $msg =& new Message();
- $res = $msg->parseStructure($read);
- $msg = $res[0];
+ $i = 0;
+ $msg = Message::parseStructure($read,$i);
if (!is_object($msg)) {
include_once(SM_PATH . 'functions/display_messages.php');
global $color, $mailbox;
displayPageHeader( $color, urldecode($mailbox) );
echo "
\n\n" .
'';
- $errormessage = _("Squirrelmail could not decode the bodystructure of the message");
+ $errormessage = _("SquirrelMail could not decode the bodystructure of the message");
$errormessage .= '
'._("the provided bodystructure by your imap-server").':
';
$errormessage .= '' . htmlspecialchars($read) . ' |
';
plain_error_message( $errormessage, $color );
@@ -84,6 +83,8 @@ function mime_structure ($bodystructure, $flags=array()) {
return $msg;
}
+
+
/* This starts the parsing of a particular structure. It is called recursively,
* so it can be passed different structures. It returns an object of type
* $message.
@@ -134,14 +135,12 @@ function mime_fetch_body($imap_stream, $id, $ent_id) {
echo '
' .
'' .
'
' .
- _("Body retrieval error. The reason for this is most probably that the message is malformed. Please help us making future versions better by submitting this message to the developers knowledgebase!") .
- " " .
- _("Submit message") . ' ' .
+ _("Body retrieval error. The reason for this is most probably that the message is malformed.") .
' |
' .
- '' . _("Command:") . " | $cmd | " .
- '' . _("Response:") . " | $response | " .
- '' . _("Message:") . " | $message | " .
- '' . _("FETCH line:") . " | $topline | " .
+ '' . _("Command:") . " | $cmd |
" .
+ '' . _("Response:") . " | $response |
" .
+ '' . _("Message:") . " | $message |
" .
+ '' . _("FETCH line:") . " | $topline |
" .
"
";
$data = sqimap_run_command ($imap_stream, "FETCH $passed_id BODY[]", true, $response, $message, $uid_support);
@@ -325,9 +324,17 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma
* order that is their priority.
*/
global $startMessage, $username, $key, $imapServerAddress, $imapPort,
- $show_html_default, $has_unsafe_images, $view_unsafe_images, $sort;
+ $show_html_default, $sort, $has_unsafe_images;
+
+ if ( !check_php_version(4,1) ) {
+ global $_GET;
+ }
+ if(isset($_GET['view_unsafe_images'])) {
+ $view_unsafe_images = $_GET['view_unsafe_images'];
+ } else {
+ $view_unsafe_images = false;
+ }
- $has_unsafe_images= 0;
$body = '';
$urlmailbox = urlencode($mailbox);
$body_message = getEntity($message, $ent_num);
@@ -364,17 +371,20 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma
$body_message->header->getParameter('charset'));
}
- if ($has_unsafe_images) {
- if ($view_unsafe_images) {
- $untext = '">' . _("Hide Unsafe Images");
- } else {
- $untext = '&view_unsafe_images=1">' . _("View Unsafe Images");
- }
- $body .= '' . _("Hide Unsafe Images");
+ } else {
+ if (isset($has_unsafe_images) && $has_unsafe_images) {
+ $untext = '&view_unsafe_images=1">' . _("View Unsafe Images");
+ } else {
+ $untext = '';
+ }
}
+ $body .= 'rfc822_header;
$filename = decodeHeader($rfc822_header->subject);
-
+ if (trim( $filename ) == '') {
+ $filename = 'untitled-[' . $ent . ']' ;
+ }
$from_o = $rfc822_header->from;
if (is_object($from_o)) {
$from_name = $from_o->getAddress(false);
@@ -454,9 +466,9 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) {
}
$defaultlink = $default_page . "?startMessage=$startMessage"
. "&passed_id=$id&mailbox=$urlMailbox"
- . '&ent_id='.$ent.$passed_ent_id_link;
+ . '&ent_id='.$ent.$passed_ent_id_link.'&absolute_dl=true';
if ($where && $what) {
- $defaultlink = '&where='. urlencode($where).'&what='.urlencode($what);
+ $defaultlink .= '&where='. urlencode($where).'&what='.urlencode($what);
}
/* This executes the attachment hook with a specific MIME-type.
* If that doesn't have results, it tries if there's a rule
@@ -628,9 +640,9 @@ function find_ent_id($id, $message) {
$ret = find_ent_id($id, $message->entities[$i]);
} else {
if (strcasecmp($message->entities[$i]->header->id, $id) == 0) {
- if (sq_check_save_extension($message->entities[$i])) {
+// if (sq_check_save_extension($message->entities[$i])) {
return $message->entities[$i]->entity_id;
- }
+// }
}
}
}
@@ -1482,7 +1494,7 @@ function sq_sanitize($body,
* @param $id the id of the message
* @return a string with html safe to display in the browser.
*/
-function magicHTML($body, $id, $message, $mailbox = 'INBOX'){
+function magicHTML($body, $id, $message, $mailbox = 'INBOX') {
global $attachment_common_show_images, $view_unsafe_images,
$has_unsafe_images;
/**
@@ -1496,7 +1508,9 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX'){
"html",
"head",
"base",
- "link"
+ "link",
+ "frame",
+ "iframe"
);
$rm_tags_with_content = Array(
@@ -1582,6 +1596,11 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX'){
)
)
);
+ if(isset($_GET['view_unsafe_images'])) {
+ $view_unsafe_images = $_GET['view_unsafe_images'];
+ } else {
+ $view_unsafe_images = false;
+ }
if (!$view_unsafe_images){
/**
* Remove any references to http/https if view_unsafe_images set