X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmime.php;h=19fa5a83adde004d75fe329cae722b3a0134b4b2;hb=710a8254ee65541ea794849eeebb59c65356e349;hp=4ff2542a88f499503fa98b5d14e2619c153b4ba7;hpb=0e5b61b4d0ba2f19d8bdee947a766382bc63d0fa;p=squirrelmail.git diff --git a/functions/mime.php b/functions/mime.php index 4ff2542a..19fa5a83 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. @@ -323,7 +324,14 @@ 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, $has_unsafe_images, $sort; + + if ( !check_php_version(4,1) ) { + global $_GET; + } + if(isset($_GET['view_unsafe_images'])) { + $view_unsafe_images = $_GET['view_unsafe_images']; + } $has_unsafe_images= 0; $body = ''; @@ -404,7 +412,9 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) { $default_page = '../src/read_body.php'; $rfc822_header = $att->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); @@ -452,7 +462,7 @@ 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); } @@ -626,9 +636,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; - } +// } } } } @@ -1495,8 +1505,8 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX'){ "head", "base", "link", - "frame", - "iframe" + "frame", + "iframe" ); $rm_tags_with_content = Array( @@ -1582,6 +1592,9 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX'){ ) ) ); + if(isset($_GET['view_unsafe_images'])) { + $view_unsafe_images = $_GET['view_unsafe_images']; + } if (!$view_unsafe_images){ /** * Remove any references to http/https if view_unsafe_images set