/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/global.php');
require_once(SM_PATH . 'functions/imap.php');
require_once(SM_PATH . 'functions/mime.php');
require_once(SM_PATH . 'functions/date.php');
require_once(SM_PATH . 'functions/url_parser.php');
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
}
$rfc822_header->content_type = $content_type;
$rfc822_header->to[] = $header->dnt;
- $rfc822_header->subject = _("Read:") . ' ' . decodeHeader($header->subject);
-
-
- $reply_to = '';
- if (isset($identity) && $identity != 'default') {
- $from_mail = getPref($data_dir, $username,
- 'email_address' . $identity);
- $full_name = getPref($data_dir, $username,
- 'full_name' . $identity);
- $from_addr = '"'.$full_name.'" <'.$from_mail.'>';
- $reply_to = getPref($data_dir, $username,
- 'reply_to' . $identity);
+ $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 {
- $from_mail = getPref($data_dir, $username, 'email_address');
- $full_name = getPref($data_dir, $username, 'full_name');
- $from_addr = '"'.$full_name.'" <'.$from_mail.'>';
- $reply_to = getPref($data_dir, $username,'reply_to');
+ $popuser = $username;
}
- if (!$from_addr) {
- $from_addr = "$popuser@$domain";
- $from_mail = $from_addr;
+
+ $reply_to = '';
+ $ident = get_identities();
+ if(!isset($identity)) $identity = 0;
+ $full_name = $ident[$identity]['full_name'];
+ $from_mail = $ident[$identity]['email_address'];
+ $from_addr = '"'.$full_name.'" <'.$from_mail.'>';
+ $reply_to = $ident[$identity]['reply_to'];
+
+ if (!$from_mail) {
+ $from_mail = "$popuser@$domain";
+ $from_addr = $from_mail;
}
$rfc822_header->from = $rfc822_header->parseAddress($from_addr,true);
if ($reply_to) {
$now = getLongDateString( time() );
set_my_charset();
$body = _("Your message") . "\r\n\r\n" .
- "\t" . _("To:") . ' ' . decodeHeader($to) . "\r\n" .
- "\t" . _("Subject:") . ' ' . decodeHeader($header->subject) . "\r\n" .
+ "\t" . _("To:") . ' ' . decodeHeader($to,false,false) . "\r\n" .
+ "\t" . _("Subject:") . ' ' . decodeHeader($header->subject,false,false) . "\r\n" .
"\t" . _("Sent:") . ' ' . $senton . "\r\n" .
"\r\n" .
sprintf( _("Was displayed on %s"), $now );
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 {
+ if ($smtp_auth_mech == 'none') {
+ $user = '';
+ $pass = '';
+ } else {
global $key, $onetimepad;
$user = $username;
$pass = OneTimePadDecrypt($key, $onetimepad);
$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;
function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response) {
global $base_uri, $draft_folder, $where, $what, $color, $sort,
- $startMessage, $compose_new_win, $PHP_SELF, $save_as_draft,
+ $startMessage, $PHP_SELF, $save_as_draft,
$enable_forward_as_attachment;
$topbar_delimiter = ' | ';
$s .= '<a href="' . $delete_url . '">' . _("Delete") . '</a>';
}
- $comp_uri = $base_uri . 'src/compose.php' .
+ $comp_uri = 'src/compose.php' .
'?passed_id=' . $passed_id .
'&mailbox=' . $urlMailbox .
+ '&startMessage=' . $startMessage .
(isset($passed_ent_id)?'&passed_ent_id='.$passed_ent_id:'');
- if ($compose_new_win == '1') {
- $link_open = '<a href="javascript:void(0)" onclick="comp_in_new(\'';
- $link_close = '\')">';
- } else {
- $link_open = '<a href="';
- $link_close = '">';
- }
if (($mailbox == $draft_folder) && ($save_as_draft)) {
- $comp_alt_uri = $comp_uri . '&action=draft';
+ $comp_alt_uri = $comp_uri . '&smaction=draft';
$comp_alt_string = _("Resume Draft");
} else if (handleAsSent($mailbox)) {
- $comp_alt_uri = $comp_uri . '&action=edit_as_new';
+ $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 .= $link_open . $comp_alt_uri . $link_close . $comp_alt_string . '</a>';
+ $s .= makeComposeLink($comp_alt_uri, $comp_alt_string);
}
$s .= '</small></td><td align="center" width="33%"><small>';
$s .= '</small></td>' . "\n" .
html_tag( 'td', '', 'right', '', 'width="33%" nowrap' ) . '<small>';
- $comp_action_uri = $comp_uri . '&action=forward';
- $s .= $link_open . $comp_action_uri . $link_close . _("Forward") . '</a>';
+ $comp_action_uri = $comp_uri . '&smaction=forward';
+ $s .= makeComposeLink($comp_action_uri, _("Forward"));
if ($enable_forward_as_attachment) {
- $comp_action_uri = $comp_uri . '&action=forward_as_attachment';
+ $comp_action_uri = $comp_uri . '&smaction=forward_as_attachment';
$s .= $topbar_delimiter;
- $s .= $link_open . $comp_action_uri . $link_close . _("Forward as Attachment") . '</a>';
+ $s .= makeComposeLink($comp_action_uri, _("Forward as Attachment"));
}
- $comp_action_uri = $comp_uri . '&action=reply';
+ $comp_action_uri = $comp_uri . '&smaction=reply';
$s .= $topbar_delimiter;
- $s .= $link_open . $comp_action_uri . $link_close . _("Reply") . '</a>';
+ $s .= makeComposeLink($comp_action_uri, _("Reply"));
- $comp_action_uri = $comp_uri . '&action=reply_all';
+ $comp_action_uri = $comp_uri . '&smaction=reply_all';
$s .= $topbar_delimiter;
- $s .= $link_open . $comp_action_uri . $link_close . _("Reply All") . '</a>';
+ $s .= makeComposeLink($comp_action_uri, _("Reply All"));
$s .= '</small></td></tr></table>';
- do_hook("read_body_menu_top");
+ do_hook('read_body_menu_top');
echo $s;
- do_hook("read_body_menu_bottom");
+ do_hook('read_body_menu_bottom');
}
function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
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);
$attachmentsdisplay = formatAttachments($message,$ent_ar,$mailbox, $passed_id);
if ($attachmentsdisplay) {
- echo ' <tr><td>';
+ echo ' </table>';
echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';
echo ' <tr><td>';
echo ' <table width="100%" cellpadding="0" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
- // echo ' <tr><td ALIGN="left" bgcolor="'.$color[9].'">';
echo ' <tr>' . html_tag( 'td', '', 'left', $color[9] );
echo ' <b>' . _("Attachments") . ':</b>';
echo ' </td></tr>';
echo $attachmentsdisplay;
echo ' </td></tr></table>';
echo ' </td></tr></table>';
- echo ' </td></tr></table>';
echo ' </td></tr>';
echo '<TR><TD HEIGHT="5" COLSPAN="2" BGCOLOR="'.
$color[4].'"></TD></TR>';