X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fread_body.php;h=3c1b7eb92add2d2bbcbb4ff792e1b91446c41426;hp=1358b3109752aa4a39896dc37224869bdae988e9;hb=da9a8410fa32eb91f44576621e566f386500f0de;hpb=e95c04ec0bd313d953842a9bb96e02d10ac30300 diff --git a/src/read_body.php b/src/read_body.php index 1358b310..3c1b7eb9 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -17,12 +17,14 @@ define('SM_PATH','../'); /* 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'); /** * Given an IMAP message id number, this will look it up in the cached @@ -164,24 +166,17 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { } $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 = ''; - 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); - } 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'); - } + $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_addr) { $from_addr = "$popuser@$domain"; $from_mail = $from_addr; @@ -201,8 +196,8 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { $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 ); @@ -271,10 +266,10 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { 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); @@ -369,7 +364,7 @@ function formatRecipientString($recipients, $item ) { $cnt = count($recipients); foreach($recipients as $r) { - $add = htmlspecialchars(decodeHeader($r->getAddress())); + $add = decodeHeader($r->getAddress(true)); if ($string) { $string .= '
' . $add; } else { @@ -397,7 +392,7 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $header = $message->rfc822_header; $env = array(); - $env[_("Subject")] = htmlspecialchars(decodeHeader($header->subject)); + $env[_("Subject")] = decodeHeader($header->subject); $from_name = $header->getAddr_s('from'); if (!$from_name) { $from_name = $header->getAddr_s('sender'); @@ -405,7 +400,7 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $from_name = _("Unknown sender"); } } - $env[_("From")] = htmlspecialchars(decodeHeader($from_name)); + $env[_("From")] = decodeHeader($from_name); $env[_("Date")] = getLongDateString($header->date); $env[_("To")] = formatRecipientString($header->to, "to"); $env[_("Cc")] = formatRecipientString($header->cc, "cc"); @@ -414,13 +409,13 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $env[_("Priority")] = htmlspecialchars(getPriorityStr($header->priority)); } if ($show_xmailer_default) { - $env[_("Mailer")] = htmlspecialchars(decodeHeader($header->xmailer)); + $env[_("Mailer")] = decodeHeader($header->xmailer); } if ($default_use_mdn) { 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) || @@ -458,7 +453,7 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, } } echo ''."\n"; + ' CELLSPACING="0" BORDER="0" ALIGN="center">'."\n"; echo '' . "\n" . html_tag( 'td', '', 'right', '', 'width="33%" nowrap' ) . ''; - $comp_action_uri = $comp_uri . '&action=forward'; - $s .= $link_open . $comp_action_uri . $link_close . _("Forward") . ''; + $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") . ''; + $s .= makeComposeLink($comp_action_uri, _("Forward as Attachment")); } - $comp_action_uri = decodeHeader($comp_uri . '&action=reply'); + $comp_action_uri = $comp_uri . '&smaction=reply'; $s .= $topbar_delimiter; - $s .= $link_open . $comp_action_uri . $link_close . _("Reply") . ''; + $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") . ''; + $s .= makeComposeLink($comp_action_uri, _("Reply All")); $s .= '
'."\n"; echo $s; @@ -471,7 +466,7 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, 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 = ' | '; @@ -504,28 +499,22 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp $s .= '' . _("Delete") . ''; } - $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 = ''; - } else { - $link_open = ''; - } 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 . ''; + $s .= makeComposeLink($comp_alt_uri, $comp_alt_string); } $s .= ''; @@ -592,26 +581,26 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp $s .= '
'; - 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) { @@ -643,12 +632,12 @@ function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) { /* get the globals we may need */ -/** SESSION VARS */ +sqgetGlobalVar('key', $key, SQ_COOKIE); sqgetGlobalVar('username', $username, SQ_SESSION); sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION); -sqgetGlobalVar('msgs', $msgs, SQ_SESSION); -sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION); sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); +sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION); + sqgetGlobalVar('msgs', $msgs, SQ_SESSION); sqgetGlobalVar('msort', $msort, SQ_SESSION); sqgetGlobalVar('lastTargetMailbox', $lastTargetMailbox, SQ_SESSION); @@ -657,9 +646,6 @@ if (!sqgetGlobalVar('messages', $messages, SQ_SESSION) ) { $messages = array(); } -/** COOKIE VARS */ -sqgetGlobalVar('key', $key, SQ_COOKIE); - /** GET VARS */ sqgetGlobalVar('sendreceipt', $sendreceipt, SQ_GET); sqgetGlobalVar('where', $where, SQ_GET); @@ -697,10 +683,6 @@ if ( sqgetGlobalVar('startMessage', $temp) ) { /* end of get globals */ global $uid_support, $sqimap_capabilities; -if (isset($mailbox)) { - $mailbox = urldecode( $mailbox ); -} - $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); $mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true); @@ -812,11 +794,10 @@ echo ''; echo ' '; echo ' '; - // echo ' ' . html_tag( 'td', '', 'left', $color[9] ); echo ' ' . _("Attachments") . ':'; echo ' '; @@ -825,7 +806,6 @@ if ($attachmentsdisplay) { echo $attachmentsdisplay; echo '
'; echo '
'; echo ' '; - echo ' '; echo ' '; echo '';