X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmime.php;h=bcd174090636b6b2fb5427085cec4e5f7b4bef7c;hb=84edf699d419494324e08176c89e9fbfc5a23818;hp=7704e9303f3b061005edc705c4560ed5f0e2572c;hpb=10dec454f7aeb0be71c75094c3b0c6990d8b1c5e;p=squirrelmail.git
diff --git a/functions/mime.php b/functions/mime.php
index 7704e930..bcd17409 100644
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -3,75 +3,116 @@
/**
* mime.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
* This contains the functions necessary to detect and decode MIME
* messages.
*
- * $Id$
+ * @copyright 1999-2009 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
*/
-require_once('../functions/imap.php');
-require_once('../functions/attachment_common.php');
+/**
+ * dependency information
+ functions dependency
+ mime_structure
+ class/mime/Message.class.php
+ Message::parseStructure
+ functions/page_header.php
+ displayPageHeader
+ functions/display_messages.php
+ plain_error_message
+ mime_fetch_body
+ functions/imap_general.php
+ sqimap_run_command
+ mime_print_body_lines
+
-/* --------------------------------------------------------------------------------- */
-/* MIME DECODING */
-/* --------------------------------------------------------------------------------- */
-/* This function gets the structure of a message and stores it in the "message" class.
+functions/imap.php
+functions/attachment_common.php
+functions/display_messages.php
+
+magicHtml => url_parser
+translateText => url_parser
+
+*/
+
+
+/* -------------------------------------------------------------------------- */
+/* MIME DECODING */
+/* -------------------------------------------------------------------------- */
+
+/**
+ * Get the MIME structure
+ *
+ * This function gets the structure of a message and stores it in the "message" class.
* It will return this object for use with all relevant header information and
* fully parsed into the standard "message" object format.
*/
-
function mime_structure ($bodystructure, $flags=array()) {
- // isolate the body structure and remove beginning and end parenthesis
+ /* Isolate the body structure and remove beginning and end parenthesis. */
$read = trim(substr ($bodystructure, strpos(strtolower($bodystructure), 'bodystructure') + 13));
- $msg = &new message();
$read = trim(substr ($read, 0, -1));
- $res = $msg->parseStructure($read);
- $msg = $res[0];
- $msg->setEnt('0');
+ $i = 0;
+ $msg = Message::parseStructure($read,$i);
+
+ if (!is_object($msg)) {
+ global $color, $mailbox;
+ displayPageHeader( $color, $mailbox );
+ $errormessage = _("SquirrelMail could not decode the bodystructure of the message");
+ $errormessage .= '
'._("The bodystructure provided by your IMAP server:").'
';
+ $errormessage .= '
' . htmlspecialchars($read) . ''; + plain_error_message( $errormessage ); + echo '