}
$rfc822_header->content_type = $content_type;
$rfc822_header->to[] = $header->dnt;
- $rfc822_header->subject = _("Read:") . ' ' . decodeHeader($header->subject);
+ $rfc822_header->subject = _("Read:") . ' ' . encodeHeader($header->subject);
$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);
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 .
(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_string = _("Resume Draft");
}
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>';
+ $s .= makeComposeLink($comp_action_uri, _("Forward"));
if ($enable_forward_as_attachment) {
$comp_action_uri = $comp_uri . '&action=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';
$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';
$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) {
$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>';