<?php
-
/**
* read_body.php
*
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 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
* the resulting emails in the right frame.
*
* $Id$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
+/** Path for SquirrelMail required files. */
define('SM_PATH','../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'functions/html.php');
require_once(SM_PATH . 'functions/global.php');
require_once(SM_PATH . 'functions/identity.php');
+require_once(SM_PATH . 'functions/mailbox_display.php');
/**
* Given an IMAP message id number, this will look it up in the cached
- * and sorted msgs array and return the index. Used for finding the next
- * and previous messages.
+ * and sorted msgs array and return the index of the next message
*
+ * @param int $passed_id The current message UID
* @return the index of the next valid message from the array
*/
function findNextMessage($passed_id) {
return $result;
}
-/** returns the index of the previous message from the array. */
+/**
+ * Given an IMAP message id number, this will look it up in the cached
+ * and sorted msgs array and return the index of the previous message
+ *
+ * @param int $passed_id The current message UID
+ * @return the index of the next valid message from the array
+ */
function findPreviousMessage($numMessages, $passed_id) {
global $msort, $sort, $msgs,
$thread_sort_messages,
/**
* Displays a link to a page where the message is displayed more
* "printer friendly".
+ * @param string $mailbox Name of current mailbox
+ * @param int $passed_id
*/
-function printer_friendly_link($mailbox, $passed_id, $passed_ent_id, $color) {
- global $javascript_on;
+function printer_friendly_link($mailbox, $passed_id, $passed_ent_id) {
+ global $javascript_on, $color;
$params = '?passed_ent_id=' . $passed_ent_id .
'&mailbox=' . urlencode($mailbox) .
function ServerMDNSupport($read) {
/* escaping $ doesn't work -> \x36 */
- $ret = preg_match('/(\x36MDNSent|\\\*)/i', $read);
+ $ret = preg_match('/(\x36MDNSent|\\\\\*)/i', $read);
return $ret;
}
$rfc822_header->to[] = $header->dnt;
$rfc822_header->subject = _("Read:") . ' ' . encodeHeader($header->subject);
+ // Patch #793504 Return Receipt Failing with <@> from Tim Craig (burny_md)
+ // This merely comes from compose.php and only happens when there is no
+ // email_addr specified in user's identity (which is the startup config)
+ if (ereg("^([^@%/]+)[@%/](.+)$", $username, $usernamedata)) {
+ $popuser = $usernamedata[1];
+ $domain = $usernamedata[2];
+ unset($usernamedata);
+ } else {
+ $popuser = $username;
+ }
$reply_to = '';
$ident = get_identities();
$from_addr = '"'.$full_name.'" <'.$from_mail.'>';
$reply_to = $ident[$identity]['reply_to'];
- if (!$from_addr) {
- $from_addr = "$popuser@$domain";
- $from_mail = $from_addr;
+ if (!$from_mail) {
+ $from_mail = "$popuser@$domain";
+ $from_addr = $from_mail;
}
$rfc822_header->from = $rfc822_header->parseAddress($from_addr,true);
if ($reply_to) {
require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
$deliver = new Deliver_SMTP();
global $smtpServerAddress, $smtpPort, $smtp_auth_mech, $pop_before_smtp;
- if ($smtp_auth_mech == 'none') {
- $user = '';
- $pass = '';
- } else {
- global $key, $onetimepad;
- $user = $username;
- $pass = OneTimePadDecrypt($key, $onetimepad);
- }
$authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false;
+ get_smtp_user($user, $pass);
$stream = $deliver->initStream($composeMessage,$domain,0,
$smtpServerAddress, $smtpPort, $user, $pass, $authPop);
}
return $success;
}
-function ToggleMDNflag ($set ,$imapConnection, $mailbox, $passed_id, $uid_support) {
+function ToggleMDNflag ($set ,$imapConnection, $mailbox, $passed_id) {
$sg = $set?'+':'-';
$cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)';
$read = sqimap_run_command ($imapConnection, $cmd, true, $response,
- $readmessage, $uid_support);
+ $readmessage, TRUE);
}
function ClearAttachments() {
$header = $message->rfc822_header;
$env = array();
- $env[_("Subject")] = decodeHeader($header->subject);
+ $env[_("Subject")] = str_replace(" "," ",decodeHeader($header->subject));
+
$from_name = $header->getAddr_s('from');
- if (!$from_name) {
+ if (!$from_name)
$from_name = $header->getAddr_s('sender');
- if (!$from_name) {
- $from_name = _("Unknown sender");
- }
- }
- $env[_("From")] = decodeHeader($from_name);
+ if (!$from_name)
+ $env[_("From")] = _("Unknown sender");
+ else
+ $env[_("From")] = decodeHeader($from_name);
$env[_("Date")] = getLongDateString($header->date);
$env[_("To")] = formatRecipientString($header->to, "to");
$env[_("Cc")] = formatRecipientString($header->cc, "cc");
if ($mdn_user_support) {
if ($header->dnt) {
if ($message->is_mdnsent) {
- $env[_("Read receipt")] = _("send");
+ $env[_("Read receipt")] = _("sent");
} else {
$env[_("Read receipt")] = _("requested");
if (!(handleAsSent($mailbox) ||
}
}
echo '<TABLE BGCOLOR="'.$color[9].'" WIDTH="100%" CELLPADDING="1"'.
- ' CELLSPACING="0" BORDER="0" ALIIGN="center">'."\n";
+ ' CELLSPACING="0" BORDER="0" ALIGN="center">'."\n";
echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.
$color[4].'"></TD></TR><TR><TD align=center>'."\n";
echo $s;
echo '</TABLE>';
}
-function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response) {
+/**
+ * Format message toolbar
+ *
+ * @param string $mailbox Name of current mailbox
+ * @param int $passed_id UID of current message
+ * @param int $passed_ent_id Id of entity within message
+ * @param object $message Current message object
+ * @param object $mbx_response
+ */
+function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response, $nav_on_top = TRUE) {
global $base_uri, $draft_folder, $where, $what, $color, $sort,
- $startMessage, $PHP_SELF, $save_as_draft,
- $enable_forward_as_attachment;
+ $startMessage, $PHP_SELF, $save_as_draft,
+ $enable_forward_as_attachment, $imapConnection, $lastTargetMailbox,
+ $data_dir, $username, $delete_prev_next_display,
+ $compose_new_win, $javascript_on;
$topbar_delimiter = ' | ';
+ $double_delimiter = ' ';
$urlMailbox = urlencode($mailbox);
- $s = '<table width="100%" cellpadding="3" cellspacing="0" align="center"'.
- ' border="0" bgcolor="'.$color[9].'"><tr>' .
- html_tag( 'td', '', 'left', '', 'width="33%"' ) . '<small>';
$msgs_url = $base_uri . 'src/';
- if (isset($where) && isset($what)) {
- $msgs_url .= 'search.php?where=' . urlencode($where) .
- '&what=' . urlencode($what) . '&mailbox=' . $urlMailbox;
- $msgs_str = _("Search results");
- } else {
- $msgs_url .= 'right_main.php?sort=' . $sort . '&startMessage=' .
- $startMessage . '&mailbox=' . $urlMailbox;
- $msgs_str = _("Message List");
- }
- $s .= '<a href="' . $msgs_url . '">' . $msgs_str . '</a>';
-
- $delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox .
- '&message=' . $passed_id . '&';
- if (!(isset($passed_ent_id) && $passed_ent_id)) {
- if ($where && $what) {
- $delete_url .= 'where=' . urlencode($where) . '&what=' . urlencode($what);
- } else {
- $delete_url .= 'sort=' . $sort . '&startMessage=' . $startMessage;
- }
- $s .= $topbar_delimiter;
- $s .= '<a href="' . $delete_url . '">' . _("Delete") . '</a>';
- }
-
- $comp_uri = 'src/compose.php' .
- '?passed_id=' . $passed_id .
- '&mailbox=' . $urlMailbox .
- '&startMessage=' . $startMessage .
- (isset($passed_ent_id)?'&passed_ent_id='.$passed_ent_id:'');
-
- if (($mailbox == $draft_folder) && ($save_as_draft)) {
- $comp_alt_uri = $comp_uri . '&smaction=draft';
- $comp_alt_string = _("Resume Draft");
- } else if (handleAsSent($mailbox)) {
- $comp_alt_uri = $comp_uri . '&smaction=edit_as_new';
- $comp_alt_string = _("Edit Message as New");
- }
- if (isset($comp_alt_uri)) {
- $s .= $topbar_delimiter;
- $s .= makeComposeLink($comp_alt_uri, $comp_alt_string);
- }
- $s .= '</small></td><td align="center" width="33%"><small>';
+ // BEGIN NAV ROW - PREV/NEXT, DEL PREV/NEXT, LINKS TO INDEX, etc.
+ $nav_row = '<tr><td align="left" colspan="2" style="border: 1px solid '.$color[9].';"><small>';
- if (!(isset($where) && isset($what)) && !$passed_ent_id) {
- $prev = findPreviousMessage($mbx_response['EXISTS'], $passed_id);
- $next = findNextMessage($passed_id);
- if ($prev != -1) {
- $uri = $base_uri . 'src/read_body.php?passed_id='.$prev.
- '&mailbox='.$urlMailbox.'&sort='.$sort.
- '&startMessage='.$startMessage.'&show_more=0';
- $s .= '<a href="'.$uri.'">'._("Previous").'</a>';
- } else {
- $s .= _("Previous");
- }
- $s .= $topbar_delimiter;
- if ($next != -1) {
- $uri = $base_uri . 'src/read_body.php?passed_id='.$next.
- '&mailbox='.$urlMailbox.'&sort='.$sort.
- '&startMessage='.$startMessage.'&show_more=0';
- $s .= '<a href="'.$uri.'">'._("Next").'</a>';
- } else {
- $s .= _("Next");
- }
- } else if (isset($passed_ent_id) && $passed_ent_id) {
- /* code for navigating through attached message/rfc822 messages */
+ // Create Prev & Next links
+ // Handle nested entities first (i.e. Mime Attach parts)
+ if (isset($passed_ent_id) && $passed_ent_id) {
+ // code for navigating through attached message/rfc822 messages
$url = set_url_var($PHP_SELF, 'passed_ent_id',0);
- $s .= '<a href="'.$url.'">'._("View Message").'</a>';
$entities = array();
$entity_count = array();
$c = 0;
$entities[$ent->entity_id] = $c;
}
}
+
$prev_link = _("Previous");
- $next_link = _("Next");
if($entities[$passed_ent_id] > 1) {
$prev_ent_id = $entity_count[$entities[$passed_ent_id] - 1];
$prev_link = '<a href="'
. set_url_var($PHP_SELF, 'passed_ent_id', $prev_ent_id)
. '">' . $prev_link . '</a>';
}
+
+ $next_link = _("Next");
if($entities[$passed_ent_id] < $c) {
$next_ent_id = $entity_count[$entities[$passed_ent_id] + 1];
$next_link = '<a href="'
. set_url_var($PHP_SELF, 'passed_ent_id', $next_ent_id)
. '">' . $next_link . '</a>';
}
- $s .= $topbar_delimiter . $prev_link;
+
$par_ent_id = $message->parent->entity_id;
+ $up_link = '';
if ($par_ent_id) {
$par_ent_id = substr($par_ent_id,0,-2);
- $s .= $topbar_delimiter;
- $url = set_url_var($PHP_SELF, 'passed_ent_id',$par_ent_id);
- $s .= '<a href="'.$url.'">'._("Up").'</a>';
+ if ( $par_ent_id != 0 ) {
+ $up_link = $topbar_delimiter;
+ $url = set_url_var($PHP_SELF, 'passed_ent_id',$par_ent_id);
+ $up_link .= '<a href="'.$url.'">'._("Up").'</a>';
+ }
+ }
+
+ $nav_row .= $prev_link . $up_link . $topbar_delimiter . $next_link;
+ $nav_row .= $double_delimiter . '[<a href="'.$url.'">'._("View Message").'</a>]';
+
+ // Prev/Next links for regular messages
+ } else if ( !(isset($where) && isset($what)) ) {
+ $prev = findPreviousMessage($mbx_response['EXISTS'], $passed_id);
+ $next = findNextMessage($passed_id);
+
+ $prev_link = _("Previous");
+ if ($prev >= 0) {
+ $uri = $base_uri . 'src/read_body.php?passed_id='.$prev.
+ '&mailbox='.$urlMailbox.'&sort='.$sort.
+ '&startMessage='.$startMessage.'&show_more=0';
+ $prev_link = '<a href="'.$uri.'">'.$prev_link.'</a>';
+ }
+
+ $next_link = _("Next");
+ if ($next >= 0) {
+ $uri = $base_uri . 'src/read_body.php?passed_id='.$next.
+ '&mailbox='.$urlMailbox.'&sort='.$sort.
+ '&startMessage='.$startMessage.'&show_more=0';
+ $next_link = '<a href="'.$uri.'">'.$next_link.'</a>';
+ }
+
+ // Only bother with Delete & Prev and Delete & Next IF
+ // top display is enabled.
+ if ( $delete_prev_next_display == 1 ) {
+ $del_prev_link = _("Delete & Prev");
+ if ($prev >= 0) {
+ $uri = $base_uri . 'src/read_body.php?passed_id='.$prev.
+ '&mailbox='.$urlMailbox.'&sort='.$sort.
+ '&startMessage='.$startMessage.'&show_more=0'.
+ '&delete_id='.$passed_id;
+ $del_prev_link = '<a href="'.$uri.'">'.$del_prev_link.'</a>';
+ }
+
+ $del_next_link = _("Delete & Next");
+ if ($next >= 0) {
+ $uri = $base_uri . 'src/read_body.php?passed_id='.$next.
+ '&mailbox='.$urlMailbox.'&sort='.$sort.
+ '&startMessage='.$startMessage.'&show_more=0'.
+ '&delete_id='.$passed_id;
+ $del_next_link = '<a href="'.$uri.'">'.$del_next_link.'</a>';
+ }
+ }
+
+ $nav_row .= '['.$prev_link.$topbar_delimiter.$next_link.']';
+ if ( isset($del_prev_link) && isset($del_next_link) )
+ $nav_row .= $double_delimiter.'['.$del_prev_link.$topbar_delimiter.$del_next_link.']';
+ }
+
+ // Start with Search Results or Message List link.
+ if (isset($where) && isset($what)) {
+ $msgs_url .= 'search.php?where=' . urlencode($where) .
+ '&what=' . urlencode($what) . '&mailbox=' . $urlMailbox;
+ $msgs_str = _("Search Results");
+ } else {
+ $msgs_url .= 'right_main.php?sort=' . $sort . '&startMessage=' .
+ $startMessage . '&mailbox=' . $urlMailbox;
+ $msgs_str = _("Message List");
+ }
+ $nav_row .= $double_delimiter .
+ '[<a href="' . $msgs_url . '">' . $msgs_str . '</a>]';
+
+ $nav_row .= '</small></td></tr>';
+
+
+ // BEGIN MENU ROW - DELETE/REPLY/FORWARD/MOVE/etc.
+ $menu_row = '<tr bgcolor="'.$color[9].'"><td><small>';
+ $comp_uri = $base_uri.'src/compose.php' .
+ '?passed_id=' . $passed_id .
+ '&mailbox=' . $urlMailbox .
+ '&startMessage=' . $startMessage .
+ (isset($passed_ent_id) ? '&passed_ent_id='.$passed_ent_id : '');
+
+ // Start form for reply/reply all/forward..
+ $target = '';
+ $on_click='';
+ $method='method="get" ';
+ if ($compose_new_win == '1') {
+ if ( $javascript_on ) {
+ $on_click=' onclick="comp_in_new_form(\''.$comp_uri.'\', this, this.form)"';
+ $comp_uri = 'javascript:void(0)';
+ } else {
+ $target = 'target="_blank"';
+ $method='method="post" ';
}
- $s .= $topbar_delimiter . $next_link;
}
- $s .= '</small></td>' . "\n" .
- html_tag( 'td', '', 'right', '', 'width="33%" nowrap' ) . '<small>';
- $comp_action_uri = $comp_uri . '&smaction=forward';
- $s .= makeComposeLink($comp_action_uri, _("Forward"));
+ $menu_row .= "\n".'<form name="composeForm" action="'.$comp_uri.'" '.$method.$target.'><small>'."\n";
- if ($enable_forward_as_attachment) {
- $comp_action_uri = $comp_uri . '&smaction=forward_as_attachment';
- $s .= $topbar_delimiter;
- $s .= makeComposeLink($comp_action_uri, _("Forward as Attachment"));
+ // If Draft folder - create Resume link
+ if (($mailbox == $draft_folder) && ($save_as_draft)) {
+ $new_button = 'smaction_draft';
+ $comp_alt_string = _("Resume Draft");
+ } else if (handleAsSent($mailbox)) {
+ // If in Sent folder, edit as new
+ $new_button = 'smaction_edit_new';
+ $comp_alt_string = _("Edit Message as New");
}
+ // Show Alt URI for Draft/Sent
+ if (isset($comp_alt_string))
+ $menu_row .= getButton('SUBMIT', $new_button, $comp_alt_string, $on_click) . "\n";
- $comp_action_uri = $comp_uri . '&smaction=reply';
- $s .= $topbar_delimiter;
- $s .= makeComposeLink($comp_action_uri, _("Reply"));
+ $menu_row .= getButton('SUBMIT', 'smaction_reply', _("Reply"), $on_click) . "\n";
+ $menu_row .= getButton('SUBMIT', 'smaction_reply_all', _("Reply All"), $on_click) ."\n";
+ $menu_row .= getButton('SUBMIT', 'smaction_forward', _("Forward"), $on_click);
+ if ($enable_forward_as_attachment)
+ $menu_row .= '<input type="checkbox" name="smaction_attache">' . _("Attachment") ."\n";
- $comp_action_uri = $comp_uri . '&smaction=reply_all';
- $s .= $topbar_delimiter;
- $s .= makeComposeLink($comp_action_uri, _("Reply All"));
- $s .= '</small></td></tr></table>';
- do_hook('read_body_menu_top');
- echo $s;
+ $menu_row .= '</form>'.' '."\n";
+
+ // Form for deletion
+ $delete_url = $base_uri . 'src/delete_message.php?mailbox=' . $urlMailbox;
+ $menu_row .= '<form action="'.$delete_url.'" method="post" style="display: inline"><small>';
+
+ if (!(isset($passed_ent_id) && $passed_ent_id)) {
+ $menu_row .= '<input type="hidden" name="message" value="'.$passed_id.'" />';
+
+ if ($where && $what) {
+ $menu_row .= '<input type="hidden" name="where" value="'.$where.'" />';
+ $menu_row .= '<input type="hidden" name="what" value="'.$what.'" />';
+ } else {
+ $menu_row .= '<input type="hidden" name="sort" value="'.$sort.'" />';
+ $menu_row .= '<input type="hidden" name="startMessage" value="'.$startMessage.'" />';
+ }
+ $menu_row .= getButton('SUBMIT', 'delete', _("Delete"));
+ $menu_row .= '<input type="checkbox" name="bypass_trash">' . _("Bypass Trash");
+ }
+ else
+ $menu_row .= getButton('SUBMIT', 'delete', _("Delete"), '', FALSE) . "\n"; // delete button is disabled
+
+ $menu_row .= '</form>' . "\n";
+
+
+ // Add top move link
+ $menu_row .= '</small></td><td align="right">';
+ if ( !(isset($passed_ent_id) && $passed_ent_id) ) {
+
+ $current_box = 'mailbox='.$mailbox.'&sort='.$sort.'&startMessage='.$startMessage;
+
+ // Set subsequent location based on whether or not there is a 'next' message.
+ if ( isset($next) && $next >= 0 ) {
+ $location = $base_uri . 'src/read_body.php?passed_id='.$next.'&';
+ } else {
+ $location = $base_uri . 'src/right_main.php?';
+ }
+
+ $menu_row .= '<form action="'.$base_uri.'src/move_messages.php?'.$current_box.'" method="post">'.
+ '<small><input type="hidden" name="show_more" value="0" />'.
+ '<input type="hidden" name="location" value="'.$location.$current_box.'" />'.
+ '<input type="hidden" name="msg[0]" value="'.$passed_id.'" />'._("Move to:") .
+ '<select name="targetMailbox" style="padding: 0px; margin: 0px">';
+
+ if (isset($lastTargetMailbox) && !empty($lastTargetMailbox)) {
+ $menu_row .= sqimap_mailbox_option_list($imapConnection, array(strtolower($lastTargetMailbox)));
+ } else {
+ $menu_row .= sqimap_mailbox_option_list($imapConnection);
+ }
+ $menu_row .= '</select> ';
+
+ $menu_row .= getButton('SUBMIT', 'moveButton',_("Move")) . "\n" . '</form>';
+ }
+ $menu_row .= '</td></tr>';
+
+ // echo rows, with hooks
+ $ret = do_hook_function('read_body_menu_top', array($nav_row, $menu_row));
+ if (is_array($ret)) {
+ if (isset($ret[0]) && !empty($ret[0])) {
+ $nav_row = $ret[0];
+ }
+ if (isset($ret[1]) && !empty($ret[1])) {
+ $menu_row = $ret[1];
+ }
+ }
+ echo '<table width="100%" cellpadding="3" cellspacing="0" align="center" border="0">';
+ echo $nav_on_top ? $nav_row . $menu_row : $menu_row . $nav_row;
+ echo '</table>'."\n";
do_hook('read_body_menu_bottom');
}
/* Output the printer friendly link if we are in subtle mode. */
$s .= ' | ' .
- printer_friendly_link($mailbox, $passed_id, $passed_ent_id, $color);
+ printer_friendly_link($mailbox, $passed_id, $passed_ent_id);
echo $s;
do_hook("read_body_header_right");
$s = "</SMALL></TD>\n" .
$view_hdr = (int) $temp;
}
-/** POST VARS */
-sqgetGlobalVar('move_id', $move_id, SQ_POST);
-
/** GET/POST VARS */
sqgetGlobalVar('passed_ent_id', $passed_ent_id);
sqgetGlobalVar('mailbox', $mailbox);
}
/* end of get globals */
-global $uid_support, $sqimap_capabilities;
+global $sqimap_capabilities, $lastTargetMailbox;
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
+/**
+ * Process Delete from delete-move-next
+ * but only if delete_id was set
+ */
+if ( sqgetGlobalVar('delete_id', $delete_id, SQ_GET) ) {
+ sqimap_messages_delete($imapConnection, $delete_id, $delete_id, $mailbox);
+
+ sqimap_mailbox_expunge_dmn($delete_id);
+}
/**
* $message contains all information about the message
if (!isset($messages[$uidvalidity])) {
$messages[$uidvalidity] = array();
}
-if (!isset($messages[$uidvalidity][$passed_id]) || !$uid_support) {
+if (!isset($messages[$uidvalidity][$passed_id])) {
$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
$FirstTimeSee = !$message->is_seen;
$message->is_seen = true;
if ($message->type0 != 'message' && $message->type1 != 'rfc822') {
$message = $message->parent;
}
- $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY[$passed_ent_id.HEADER]", true, $response, $msg, $uid_support);
+ $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY[$passed_ent_id.HEADER]", true, $response, $msg, TRUE);
$rfc822_header = new Rfc822Header();
$rfc822_header->parseHeader($read);
$message->rfc822_header = $rfc822_header;
if (isset($sendreceipt)) {
if ( !$message->is_mdnsent ) {
- if (isset($identity) ) {
- $final_recipient = getPref($data_dir, $username, 'email_address' . '0', '' );
- } else {
- $final_recipient = getPref($data_dir, $username, 'email_address', '' );
- }
-
- $final_recipient = trim($final_recipient);
- if ($final_recipient == '' ) {
- $final_recipient = getPref($data_dir, $username, 'email_address', '' );
- }
+ $final_recipient = '';
+ if ((isset($identity)) && ($identity != 0)) //Main identity
+ $final_recipient = trim(getPref($data_dir, $username, 'email_address' . $identity, '' ));
+ if ($final_recipient == '' )
+ $final_recipient = trim(getPref($data_dir, $username, 'email_address', '' ));
$supportMDN = ServerMDNSupport($mbx_response["PERMANENTFLAGS"]);
if ( SendMDN( $mailbox, $passed_id, $final_recipient, $message, $imapConnection ) > 0 && $supportMDN ) {
- ToggleMDNflag( true, $imapConnection, $mailbox, $passed_id, $uid_support);
+ ToggleMDNflag( true, $imapConnection, $mailbox, $passed_id);
$message->is_mdnsent = true;
$messages[$uidvalidity][$passed_id]=$message;
}
}
}
+formatMenuBar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response, FALSE);
+
do_hook('read_body_bottom');
do_hook('html_bottom');
sqimap_logout($imapConnection);
projects / squirrelmail.git / blobdiff