X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmime.php;h=a9c22b7ae53617da8a11f5a4ced820e98fe8bc03;hp=c9623c0648dbc589379b93aac01c7de846f9274a;hb=9e0d6b0aded83550c1723746dc9a09f92fe22cb5;hpb=49255dcd4fd08bad0ed3eb1e89c6a6284a885fcd diff --git a/functions/mime.php b/functions/mime.php index c9623c06..a9c22b7a 100644 --- a/functions/mime.php +++ b/functions/mime.php @@ -6,17 +6,15 @@ ** ** $Id$ **/ + + if (defined('mime_php')) + return; + define('mime_php', true); + global $debug_mime; $debug_mime = false; - $mime_php = true; - - if (!isset($i18n_php)) - include "../functions/i18n.php"; - if (!isset($imap_php)) - include "../functions/imap.php"; - if (!isset($config_php)) - include "../config/config.php"; - + + include "../functions/imap.php"; /** Setting up the objects that have the structure for the message **/ @@ -122,8 +120,8 @@ $msg = mime_get_element ($structure, $msg, $ent_id); if ($debug_mime) echo "
"; } - return $msg; if ($debug_mime) echo "  END: mime_parse_structure()
"; + return $msg; } // Increments the element ID. An element id can look like any of @@ -384,7 +382,7 @@ 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); @@ -405,8 +403,6 @@ $str .= htmlspecialchars($d) . "\n"; } return $str; - - return "Body retrival error, please report this bug!\n\nTop line is \"$topline\"\n"; } function mime_print_body_lines ($imap_stream, $id, $ent_id, $encoding) { @@ -414,10 +410,16 @@ // that it is the first one. That is usually the case anyway. if (!$ent_id) $ent_id = 1; + // Don't kill the connection if the browser is over a dialup + // and it would take over 30 seconds to download it. + set_time_limit(0); + fputs ($imap_stream, "a001 FETCH $id BODY[$ent_id]\r\n"); $cnt = 0; $continue = true; $read = fgets ($imap_stream,4096); + // This could be bad -- if the section has 'a001 OK' + // or similar, it will kill the download. while (!ereg("^a001 (OK|BAD|NO)(.*)$", $read, $regs)) { if (trim($read) == ")==") { $read1 = $read; @@ -479,47 +481,48 @@ // figures out what entity to display and returns the $message object // for that entity. - function findDisplayEntity ($message, $textOnly = 1, $next = 'none') + function findDisplayEntity ($message, $textOnly = 1) { global $show_html_default; if (! $message) - return; - + return 0; + + if ($message->header->type0 == "multipart" && + $message->header->type1 == "alternative" && + $show_html_default && ! $textOnly) { + $entity = findDisplayEntityHTML($message); + if ($entity != 0) + return $entity; + } + // Show text/plain or text/html -- the first one we find. if ($message->header->type0 == 'text' && ($message->header->type1 == 'plain' || - $message->header->type2 == 'html')) - { - // If the next part is an HTML version, this will - // all be true. Show it, if the user so desires. - // HTML mails this way all have entity_id of 2. 1 = text/plain - if ($next != 'none' && - $textOnly == 0 && - $next->header->type0 == "text" && - $next->header->type1 == "html" && - $next->header->entity_id == 2 && - $message->header->type1 == "plain" && - isset($show_html_default) && - $show_html_default) - $message = $next; - - if (isset($message->header->entity_id)) - return $message->header->entity_id; - } - else - { - for ($i=0; $message->entities[$i]; $i++) - { - $next = 'none'; - if (isset($message->entities[$i + 1])) - $next = $message->entities[$i + 1]; - $entity = findDisplayEntity($message->entities[$i], - $textOnly, $next); - if ($entity != 0) - return $entity; - } - } + $message->header->type1 == 'html') && + isset($message->header->entity_id)) + return $message->header->entity_id; + + for ($i=0; isset($message->entities[$i]); $i++) { + $entity = findDisplayEntity($message->entities[$i], $textOnly); + if ($entity != 0) + return $entity; + } + + return 0; + } + + // Shows the HTML version + function findDisplayEntityHTML ($message) { + 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 ++) { + $entity = findDisplayEntityHTML($message->entities[$i]); + if ($entity != 0) + return $entity; + } return 0; } @@ -553,15 +556,16 @@ translateText($body, $wrap_at, $body_message->header->charset); } - $body .= "
". _("Download this as a file") ."

"; + $body .= "
". _("Download this as a file") ."

"; /** Display the ATTACHMENTS: message if there's more than one part **/ $body .= ""; if (isset($message->entities[0])) { $body .= formatAttachments ($message, $ent_num, $message->header->mailbox, $id); } + $body .= ""; } else { - $body .= formatAttachments ($message, -1, $message->header->mailbox, $id); + $body = formatAttachments ($message, -1, $message->header->mailbox, $id); } return $body; } @@ -700,7 +704,7 @@ $replace = ereg_replace("_", " ", $res[3]); // Convert lowercase Quoted Printable to uppercase for // quoted_printable_decode to understand it. - while (ereg("(=([0-9][abcdef])|([abcdef][0-9])|([abcdef][abcdef]))", $replace, $res)) { + while (ereg("(=(([0-9][abcdef])|([abcdef][0-9])|([abcdef][abcdef])))", $replace, $res)) { $replace = str_replace($res[1], strtoupper($res[1]), $replace); } $replace = quoted_printable_decode($replace); @@ -708,9 +712,10 @@ $replace = charset_decode ($res[1], $replace); - $string = eregi_replace - ('=\\?([^?]+)\\?(q|b)\\?([^?]+)\\?=', + // Remove the name of the character set. + $string = eregi_replace ('=\\?([^?]+)\\?(q|b)\\?([^?]+)\\?=', $replace, $string); + // In case there should be more encoding in the string: recurse return (decodeHeader($string)); } else @@ -724,7 +729,7 @@ global $default_charset; // Encode only if the string contains 8-bit characters or =? - if (ereg("([\200-\377]|=\\?)", $string)) { + if (ereg("([\\200-\\377]|=\\?)", $string)) { // First the special characters $string = str_replace("=", "=3D", $string);