X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=74f4e96008221366fbf291aaebe35eabb28d1fb7;hb=e50f5ac2682d655013d18d97f9a2aa30b7ed9485;hp=faed6afaa1b57f8ddb1f238ce56f94b5597a2577;hpb=134e4174c8919790bcc463587e90ac37cabc2f90;p=squirrelmail.git diff --git a/src/read_body.php b/src/read_body.php index faed6afa..74f4e960 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -3,7 +3,7 @@ /** * read_body.php * - * Copyright (c) 1999-2004 The SquirrelMail Project Team + * Copyright (c) 1999-2005 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This file is used for reading the msgs array and displaying @@ -91,7 +91,7 @@ function findPreviousMessage($uidset, $passed_id) { * @param int $passed_id */ function printer_friendly_link($mailbox, $passed_id, $passed_ent_id) { - global $javascript_on, $color; + global $javascript_on; $params = '?passed_ent_id=' . urlencode($passed_ent_id) . '&mailbox=' . urlencode($mailbox) . @@ -125,15 +125,13 @@ function ServerMDNSupport($aFlags) { } function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { - global $username, $attachment_dir, - $version, $attachments, $squirrelmail_language, $default_charset, - $languages, $useSendmail, $domain, $sent_folder, - $popuser, $data_dir, $username; + global $username, $attachment_dir, $popuser, $username, $color, + $version, $squirrelmail_language, $default_charset, + $languages, $useSendmail, $domain, $sent_folder; sqgetGlobalVar('SERVER_NAME', $SERVER_NAME, SQ_SERVER); $header = $message->rfc822_header; - $hashed_attachment_dir = getHashedDir($username, $attachment_dir); $rfc822_header = new Rfc822Header(); $content_type = new ContentType('multipart/report'); @@ -203,6 +201,8 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { $special_encoding = '7bit'; } } + } elseif (sq_is8bit($body)) { + $special_encoding = '8bit'; } $part1 = new Message(); $part1->setBody($body); @@ -254,7 +254,7 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { } else { require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php'); $deliver = new Deliver_SMTP(); - global $smtpServerAddress, $smtpPort, $smtp_auth_mech, $pop_before_smtp; + global $smtpServerAddress, $smtpPort, $pop_before_smtp; $authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false; get_smtp_user($user, $pass); $stream = $deliver->initStream($composeMessage,$domain,0, @@ -368,7 +368,7 @@ function formatRecipientString($recipients, $item ) { function formatEnvheader($aMailbox, $passed_id, $passed_ent_id, $message, $color, $FirstTimeSee) { - global $msn_user_support, $default_use_mdn, $default_use_priority, + global $default_use_mdn, $default_use_priority, $show_xmailer_default, $mdn_user_support, $PHP_SELF, $javascript_on, $squirrelmail_language; @@ -461,7 +461,7 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed global $base_uri, $draft_folder, $where, $what, $color, $sort, $startMessage, $PHP_SELF, $save_as_draft, $enable_forward_as_attachment, $imapConnection, $lastTargetMailbox, - $data_dir, $username, $delete_prev_next_display, + $username, $delete_prev_next_display, $compose_new_win, $javascript_on; //FIXME cleanup argument list, use $aMailbox where possible @@ -597,7 +597,7 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed // BEGIN MENU ROW - DELETE/REPLY/FORWARD/MOVE/etc. - $menu_row = '