X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmime.php;h=09cdec965ff4bd4f2e8b17d8ec99f56ef3fa72f3;hp=76faea0ad55db650ec6e6e5ef77fc0930f706884;hb=dfc64d149b23ad2e06a10ff4f187ea9ce664bbc9;hpb=c25f2fbb684d684604ba069f6a20302c207561b5
diff --git a/functions/mime.php b/functions/mime.php
index 76faea0a..b17eb5b2 100644
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -1,33 +1,55 @@
url_parser
+translateText => url_parser
+
*/
-/** The typical includes... */
-require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/attachment_common.php');
/* -------------------------------------------------------------------------- */
/* 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.
-*/
+ * 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. */
@@ -35,20 +57,20 @@ function mime_structure ($bodystructure, $flags=array()) {
$read = trim(substr ($read, 0, -1));
$i = 0;
$msg = Message::parseStructure($read,$i);
+
if (!is_object($msg)) {
- include_once(SM_PATH . 'functions/display_messages.php');
global $color, $mailbox;
- /* removed urldecode because $_GET is auto urldecoded ??? */
displayPageHeader( $color, $mailbox );
$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 ); + $errormessage .= '
' . sm_encode_html_special_chars($read) . ''; + plain_error_message( $errormessage ); echo '