X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=d77f5240abbbebbb50e181d73b0174f4164b6e1e;hb=44c046311a3f62a461a82d31f792f3fc4421f820;hp=102b683532ab00996124c5652e6a46070ed5399c;hpb=8672576304f4da444b9b1e0e4ca81505af0267ec;p=squirrelmail.git
diff --git a/src/read_body.php b/src/read_body.php
index 102b6835..d77f5240 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -16,13 +16,14 @@
define('SM_PATH','../');
/* SquirrelMail required files. */
-require_once(SM_PATH . 'src/validate.php');
+require_once(SM_PATH . 'include/validate.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');
+
/**
* 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
@@ -40,38 +41,37 @@ function findNextMessage($passed_id) {
}
$result = -1;
if ($thread_sort_messages || $allow_server_sort) {
- reset($server_sort_array);
- while(list($key, $value) = each ($server_sort_array)) {
+ $count = count($server_sort_array) - 1;
+ foreach($server_sort_array as $key=>$value) {
if ($passed_id == $value) {
- if ($key == (count($server_sort_array) - 1)) {
- $result = -1;
+ if ($key == $count) {
break;
}
$result = $server_sort_array[$key + 1];
break;
}
}
- } else if ($sort == 6 && !$allow_server_sort &&
- !$thread_sort_messages ) {
- if ($passed_id != 1) {
- $result = $passed_id - 1;
- }
- } else if (!$allow_server_sort && !$thread_sort_messages ) {
- if (!is_array($msort)) {
- return -1;
- }
- for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) {
- if ($passed_id == $msgs[$key]['ID']) {
- next($msort);
- $key = key($msort);
- if (isset($key)){
- $result = $msgs[$key]['ID'];
- break;
+ } else {
+ if ($sort == 6) {
+ if ($passed_id != 1) {
+ $result = $passed_id - 1;
+ }
+ } else {
+ if (is_array($msort)) {
+ for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) {
+ if ($passed_id == $msgs[$key]['ID']) {
+ next($msort);
+ $key = key($msort);
+ if (isset($key)){
+ $result = $msgs[$key]['ID'];
+ break;
+ }
+ }
}
}
}
}
- return ($result);
+ return $result;
}
/** returns the index of the previous message from the array. */
@@ -85,39 +85,37 @@ function findPreviousMessage($numMessages, $passed_id) {
$allow_server_sort = FALSE;
}
if ($thread_sort_messages || $allow_server_sort ) {
- reset($server_sort_array);
- while(list($key, $value) = each ($server_sort_array)) {
+ foreach($server_sort_array as $key=>$value) {
if ($passed_id == $value) {
if ($key == 0) {
- $result = -1;
break;
}
- $result = $server_sort_array[$key -1];
+ $result = $server_sort_array[$key - 1];
break;
}
}
- } else if ($sort == 6 && !$allow_server_sort &&
- !$thread_sort_messages) {
- if ($passed_id != $numMessages) {
- $result = $passed_id + 1;
- }
- } else if (!$thread_sort_messages && !$allow_server_sort) {
- if (!is_array($msort)) {
- return -1;
- }
- for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) {
- if ($passed_id == $msgs[$key]['ID']) {
- prev($msort);
- $key = key($msort);
- if (isset($key)) {
- //echo $msort[$key]; /* Why again were we echoing here? */
- $result = $msgs[$key]['ID'];
- break;
+ } else {
+ if ($sort == 6) {
+ if ($passed_id != $numMessages) {
+ $result = $passed_id + 1;
+ }
+ } else {
+ if (is_array($msort)) {
+ for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) {
+ if ($passed_id == $msgs[$key]['ID']) {
+ prev($msort);
+ $key = key($msort);
+ if (isset($key)) {
+ //echo $msort[$key]; /* Why again were we echoing here? */
+ $result = $msgs[$key]['ID'];
+ break;
+ }
+ }
}
}
}
}
- return ($result);
+ return $result;
}
/**
@@ -128,8 +126,8 @@ function printer_friendly_link($mailbox, $passed_id, $passed_ent_id, $color) {
global $javascript_on;
$params = '?passed_ent_id=' . $passed_ent_id .
- '&mailbox=' . urlencode($mailbox) .
- '&passed_id=' . $passed_id;
+ '&mailbox=' . urlencode($mailbox) .
+ '&passed_id=' . $passed_id;
$print_text = _("View Printable Version");
@@ -137,43 +135,43 @@ function printer_friendly_link($mailbox, $passed_id, $passed_ent_id, $color) {
/* Output the link. */
if ($javascript_on) {
$result .= '\n" .
- "$print_text\n";
+ '\n" .
+ "\n" .
+ "$print_text\n";
} else {
$result .= '$print_text\n";
+ "$params\">$print_text\n";
}
- return ($result);
+ return $result;
}
-function ServerMDNSupport( $read ) {
+function ServerMDNSupport($read) {
/* escaping $ doesn't work -> \x36 */
- $ret = preg_match( '/(\x36MDNSent|\\\*)/i', $read );
- return ( $ret );
+ $ret = preg_match('/(\x36MDNSent|\\\*)/i', $read);
+ return $ret;
}
function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
global $username, $attachment_dir, $SERVER_NAME,
$version, $attachments, $squirrelmail_language, $default_charset,
- $languages, $useSendmail, $domain, $sent_folder,
- $popuser, $data_dir, $username;
+ $languages, $useSendmail, $domain, $sent_folder,
+ $popuser, $data_dir, $username;
$header = $message->rfc822_header;
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
$rfc822_header = new Rfc822Header();
- $content_type = new ContentType('multipart/report');
+ $content_type = new ContentType('multipart/report');
$content_type->properties['report-type']='disposition-notification';
-
+
set_my_charset();
if ($default_charset) {
- $content_type->properties['charset']=$default_charset;
+ $content_type->properties['charset']=$default_charset;
}
$rfc822_header->content_type = $content_type;
$rfc822_header->to[] = $header->dnt;
@@ -183,17 +181,17 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
$reply_to = '';
if (isset($identity) && $identity != 'default') {
$from_mail = getPref($data_dir, $username,
- 'email_address' . $identity);
+ 'email_address' . $identity);
$full_name = getPref($data_dir, $username,
- 'full_name' . $identity);
+ 'full_name' . $identity);
$from_addr = '"'.$full_name.'" <'.$from_mail.'>';
- $reply_to = getPref($data_dir, $username,
- 'reply_to' . $identity);
+ $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');
+ $reply_to = getPref($data_dir, $username,'reply_to');
}
if (!$from_addr) {
$from_addr = "$popuser@$domain";
@@ -203,7 +201,7 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
if ($reply_to) {
$rfc822_header->reply_to = $rfc822_header->parseAddress($reply_to,true);
}
-
+
// part 1 (RFC2298)
$senton = getLongDateString( $header->date );
$to_array = $header->to;
@@ -224,14 +222,14 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
$body = $languages[$squirrelmail_language]['XTRA_CODE']('encode', $body);
- if (strtolower($default_charset) == 'iso-2022-jp') {
- if (mb_detect_encoding($body) == 'ASCII') {
- $special_encoding = '8bit';
- } else {
- $body = mb_convert_encoding($body, 'JIS');
- $special_encoding = '7bit';
- }
- }
+ if (strtolower($default_charset) == 'iso-2022-jp') {
+ if (mb_detect_encoding($body) == 'ASCII') {
+ $special_encoding = '8bit';
+ } else {
+ $body = mb_convert_encoding($body, 'JIS');
+ $special_encoding = '7bit';
+ }
+ }
}
$part1 = new Message();
$part1->setBody($body);
@@ -240,7 +238,7 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
$mime_header->type1 = 'plain';
if ($special_encoding) {
$mime_header->encoding = $special_encoding;
- } else {
+ } else {
$mime_header->encoding = 'us-ascii';
}
if ($default_charset) {
@@ -249,7 +247,7 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
$part1->mime_header = $mime_header;
// part2 (RFC2298)
- $original_recipient = $to;
+ $original_recipient = $to;
$original_message_id = $header->message_id;
$report = "Reporting-UA : $SERVER_NAME ; SquirrelMail (version $version) \r\n";
@@ -275,133 +273,127 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
$composeMessage->addEntity($part2);
- if (!$useSendmail) {
- require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
- $deliver = new Deliver_SMTP();
- global $smtpServerAddress, $smtpPort, $use_authenticated_smtp, $pop_before_smtp;
- if ($use_authenticated_smtp) {
- global $key, $onetimepad;
- $user = $username;
- $pass = OneTimePadDecrypt($key, $onetimepad);
- } else {
- $user = '';
- $pass = '';
- }
- $authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false;
- $stream = $deliver->initStream($composeMessage,$domain,0,
- $smtpServerAddress, $smtpPort, $authPop);
+ if ($useSendmail) {
+ require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php');
+ global $sendmail_path;
+ $deliver = new Deliver_SendMail();
+ $stream = $deliver->initStream($composeMessage,$sendmail_path);
} else {
- require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php');
- global $sendmail_path;
- $deliver = new Deliver_SendMail();
- $stream = $deliver->initStream($composeMessage,$sendmail_path);
- }
- $succes = false;
+ require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
+ $deliver = new Deliver_SMTP();
+ global $smtpServerAddress, $smtpPort, $use_authenticated_smtp, $pop_before_smtp;
+ if ($use_authenticated_smtp) {
+ global $key, $onetimepad;
+ $user = $username;
+ $pass = OneTimePadDecrypt($key, $onetimepad);
+ } else {
+ $user = '';
+ $pass = '';
+ }
+ $authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false;
+ $stream = $deliver->initStream($composeMessage,$domain,0,
+ $smtpServerAddress, $smtpPort, $authPop);
+ }
+ $success = false;
if ($stream) {
- $length = $deliver->mail($composeMessage, $stream);
- $succes = $deliver->finalizeStream($stream);
+ $length = $deliver->mail($composeMessage, $stream);
+ $success = $deliver->finalizeStream($stream);
}
- if (!$succes) {
+ if (!$success) {
$msg = $deliver->dlv_msg . '
Server replied: '.$deliver->dlv_ret_nr;
- require_once(SM_PATH . 'functions/display_messages.php');
+ require_once(SM_PATH . 'functions/display_messages.php');
plain_error_message($msg, $color);
} else {
unset ($deliver);
- if (sqimap_mailbox_exists ($imapConnection, $sent_folder)) {
- sqimap_append ($imapConnection, $sent_folder, $length);
- require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
- $imap_deliver = new Deliver_IMAP();
- $imap_deliver->mail($composeMessage, $imapConnection);
- sqimap_append_done ($imapConnection);
- unset ($imap_deliver);
- }
- }
- return $succes;
+ if (sqimap_mailbox_exists ($imapConnection, $sent_folder)) {
+ sqimap_append ($imapConnection, $sent_folder, $length);
+ require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
+ $imap_deliver = new Deliver_IMAP();
+ $imap_deliver->mail($composeMessage, $imapConnection);
+ sqimap_append_done ($imapConnection);
+ unset ($imap_deliver);
+ }
+ }
+ return $success;
}
-function ToggleMDNflag ( $set ,$imapConnection, $mailbox, $passed_id, $uid_support) {
- $sg = $set?'+':'-';
- $cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)';
+function ToggleMDNflag ($set ,$imapConnection, $mailbox, $passed_id, $uid_support) {
+ $sg = $set?'+':'-';
+ $cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)';
$read = sqimap_run_command ($imapConnection, $cmd, true, $response,
$readmessage, $uid_support);
}
function ClearAttachments() {
- global $username, $attachments, $attachment_dir;
-
- $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
-
- $rem_attachments = array();
- foreach ($attachments as $info) {
- if ($info['session'] == -1) {
- $attached_file = "$hashed_attachment_dir/$info[localfilename]";
- if (file_exists($attached_file)) {
- unlink($attached_file);
- }
- } else {
- $rem_attachments[] = $info;
- }
- }
- $attachments = $rem_attachments;
+ global $username, $attachments, $attachment_dir;
+
+ $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+
+ $rem_attachments = array();
+ foreach ($attachments as $info) {
+ if ($info['session'] == -1) {
+ $attached_file = "$hashed_attachment_dir/$info[localfilename]";
+ if (file_exists($attached_file)) {
+ unlink($attached_file);
+ }
+ } else {
+ $rem_attachments[] = $info;
+ }
+ }
+ $attachments = $rem_attachments;
}
function formatRecipientString($recipients, $item ) {
- global $show_more_cc, $show_more, $show_more_bcc,
- $PHP_SELF;
+ global $show_more_cc, $show_more, $show_more_bcc,
+ $PHP_SELF;
+ $string = '';
if ((is_array($recipients)) && (isset($recipients[0]))) {
- $string = '';
- $ary = $recipients;
- $show = false;
+ $show = false;
if ($item == 'to') {
- if ($show_more) {
- $show = true;
- $url = set_url_var($PHP_SELF, 'show_more',0);
- } else {
- $url = set_url_var($PHP_SELF, 'show_more',1);
- }
- } else if ($item == 'cc') {
- if ($show_more_cc) {
- $url = set_url_var($PHP_SELF, 'show_more_cc',0);
- $show = true;
- } else {
- $url = set_url_var($PHP_SELF, 'show_more_cc',1);
- }
- } else if ($item == 'bcc') {
- if ($show_more_bcc) {
- $url = set_url_var($PHP_SELF, 'show_more_bcc',0);
- $show = true;
- } else {
- $url = set_url_var($PHP_SELF, 'show_more_bcc',1);
- }
- }
-
- $cnt = count($ary);
- $i = 0;
- while ($i < $cnt) {
- $ary[$i] = htmlspecialchars($ary[$i]->getAddress());
- if ($string) {
- $string .= '
'.$ary[$i];
- } else {
- $string = $ary[$i];
- if ($cnt>1) {
+ if ($show_more) {
+ $show = true;
+ $url = set_url_var($PHP_SELF, 'show_more',0);
+ } else {
+ $url = set_url_var($PHP_SELF, 'show_more',1);
+ }
+ } else if ($item == 'cc') {
+ if ($show_more_cc) {
+ $show = true;
+ $url = set_url_var($PHP_SELF, 'show_more_cc',0);
+ } else {
+ $url = set_url_var($PHP_SELF, 'show_more_cc',1);
+ }
+ } else if ($item == 'bcc') {
+ if ($show_more_bcc) {
+ $show = true;
+ $url = set_url_var($PHP_SELF, 'show_more_bcc',0);
+ } else {
+ $url = set_url_var($PHP_SELF, 'show_more_bcc',1);
+ }
+ }
+
+ $cnt = count($recipients);
+ foreach($recipients as $r) {
+ $add = htmlspecialchars($r->getAddress());
+ if ($string) {
+ $string .= '
' . $add;
+ } else {
+ $string = $add;
+ if ($cnt > 1) {
$string .= ' ('._("less").')';
- } else {
- $string .= '">'._("more").')';
- break;
- }
- }
- }
- $i++;
+ if ($show) {
+ $string .= '">'._("less").')';
+ } else {
+ $string .= '">'._("more").')';
+ break;
+ }
+ }
+ }
}
}
- else {
- $string = '';
- }
return $string;
}
@@ -411,229 +403,210 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message,
$default_use_priority, $show_xmailer_default,
$mdn_user_support, $PHP_SELF, $javascript_on;
- $header = $message->rfc822_header;
- $env = array();
- $env[_("Subject")] = htmlspecialchars(decodeHeader($header->subject));
- $from_name = $header->getAddr_s('from');
- if (!$from_name) {
- $from_name = $header->getAddr_s('sender');
- if (!$from_name) {
- $from_name = _("Unknown sender");
- }
- }
- $env[_("From")] = htmlspecialchars(decodeHeader($from_name));
- $env[_("Date")] = getLongDateString($header->date);
- $env[_("To")] = formatRecipientString($header->to, "to");
- $env[_("Cc")] = formatRecipientString($header->cc, "cc");
- $env[_("Bcc")] = formatRecipientString($header->bcc, "bcc");
- if ($default_use_priority) {
- $env[_("Priority")] = getPriorityStr($header->priority);
- }
- if ($show_xmailer_default) {
- $env[_("Mailer")] = decodeHeader($header->xmailer);
- }
- if ($default_use_mdn) {
- if ($mdn_user_support) {
- if ($header->dnt) {
- if ($message->is_mdnsent) {
- $env[_("Read receipt")] = _("send");
- } else {
- if ( !($mailbox == $draft_folder ||
- $mailbox == $sent_folder ||
- $message->is_deleted ||
- $passed_ent_id)) {
- $mdn_url = $PHP_SELF . '&sendreceipt=1';
- if ($FirstTimeSee && $javascript_on) {
- $script = ''. "\n";
- echo $script;
- }
- $env[_("Read receipt")] = _("requested") .
- ' ['. _("Send read receipt now") .']';
- } else {
- $env[_("Read receipt")] = _("requested");
- }
- }
- }
- }
- }
+ $header = $message->rfc822_header;
+ $env = array();
+ $env[_("Subject")] = htmlspecialchars(decodeHeader($header->subject));
+ $from_name = $header->getAddr_s('from');
+ if (!$from_name) {
+ $from_name = $header->getAddr_s('sender');
+ if (!$from_name) {
+ $from_name = _("Unknown sender");
+ }
+ }
+ $env[_("From")] = htmlspecialchars(decodeHeader($from_name));
+ $env[_("Date")] = getLongDateString($header->date);
+ $env[_("To")] = formatRecipientString($header->to, "to");
+ $env[_("Cc")] = formatRecipientString($header->cc, "cc");
+ $env[_("Bcc")] = formatRecipientString($header->bcc, "bcc");
+ if ($default_use_priority) {
+ $env[_("Priority")] = getPriorityStr($header->priority);
+ }
+ if ($show_xmailer_default) {
+ $env[_("Mailer")] = decodeHeader($header->xmailer);
+ }
+ if ($default_use_mdn) {
+ if ($mdn_user_support) {
+ if ($header->dnt) {
+ if ($message->is_mdnsent) {
+ $env[_("Read receipt")] = _("send");
+ } else {
+ $env[_("Read receipt")] = _("requested");
+ if (!($mailbox == $draft_folder ||
+ $mailbox == $sent_folder ||
+ $message->is_deleted ||
+ $passed_ent_id)) {
+ $mdn_url = $PHP_SELF . '&sendreceipt=1';
+ if ($FirstTimeSee && $javascript_on) {
+ $script = ''. "\n";
+ echo $script;
+ }
+ $env[_("Read receipt")] .= ' [' .
+ _("Send read receipt now") . ']';
+ }
+ }
+ }
+ }
+ }
- $s = '
'; - $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 .= ''.$msgs_str.''; - $s .= $topbar_delimiter; - - $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 .= ''._("Delete").''; - } + $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 .= '' . $msgs_str . ''; + $s .= $topbar_delimiter; + + $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 .= '' . _("Delete") . ''; + } - $comp_uri = $base_uri . 'src/compose.php'. - '?passed_id='.$passed_id. - '&mailbox='.$urlMailbox. - (isset($passed_ent_id)?'&passed_ent_id='.$passed_ent_id:''); - - if (($mailbox == $draft_folder) && ($save_as_draft)) { - $comp_alt_uri = $comp_uri . '&action=draft'; - $comp_alt_string = _("Resume Draft"); - } else if ($mailbox == $sent_folder) { - $comp_alt_uri = $comp_uri . '&action=edit_as_new'; - $comp_alt_string = _("Edit Message as New"); - } - if (isset($comp_alt_uri)) { - $s .= $topbar_delimiter; - if ($compose_new_win == '1') { - $s .= ''.$comp_alt_string.''; - } else { - $s .= ''.$comp_alt_string.''; - } - } + $comp_uri = $base_uri . 'src/compose.php' . + '?passed_id=' . $passed_id . + '&mailbox=' . $urlMailbox . + (isset($passed_ent_id)?'&passed_ent_id='.$passed_ent_id:''); - $s .= ' | '; + 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_string = _("Resume Draft"); + } else if ($mailbox == $sent_folder) { + $comp_alt_uri = $comp_uri . '&action=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 . ''; + } - 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 .= ''._("Previous").''; - } 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 .= ''._("Next").''; - } else { - $s .= _("Next"); - } - } else 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 .= ''._("View Message").''; - $par_ent_id = $message->parent->entity_id; - if ($par_ent_id) { - $par_ent_id = substr($par_ent_id,0,-2); + $s .= ' | '; + + 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 .= ''._("Previous").''; + } else { + $s .= _("Previous"); + } $s .= $topbar_delimiter; - $url = set_url_var($PHP_SELF, 'passed_ent_id',$par_ent_id); - $s .= ''._("Up").''; - } - } + if ($next != -1) { + $uri = $base_uri . 'src/read_body.php?passed_id='.$next. + '&mailbox='.$urlMailbox.'&sort='.$sort. + '&startMessage='.$startMessage.'&show_more=0'; + $s .= ''._("Next").''; + } else { + $s .= _("Next"); + } + } else 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 .= ''._("View Message").''; + $par_ent_id = $message->parent->entity_id; + 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 .= ''._("Up").''; + } + } - $s .= ' | '; - $comp_action_uri = $comp_uri . '&action=forward'; - if ($compose_new_win == '1') { - $s .= ''._("Forward").''; - } else { - $s .= ''._("Forward").''; - } - $s .= $topbar_delimiter; + $s .= ' | ' . "\n" . ''; + $comp_action_uri = $comp_uri . '&action=forward'; + $s .= $link_open . $comp_action_uri . $link_close . _("Forward") . ''; + $s .= $topbar_delimiter; - if ($enable_forward_as_attachment) { - $comp_action_uri = $comp_uri . '&action=forward_as_attachment'; - if ($compose_new_win == '1') { - $s .= ''._("Forward as Attachment").''; - } else { - $s .= ''._("Forward as Attachment").''; - } - $s .= $topbar_delimiter; - } + if ($enable_forward_as_attachment) { + $comp_action_uri = $comp_uri . '&action=forward_as_attachment'; + $s .= $link_open . $comp_action_uri . $link_close . _("Forward as Attachment") . ''; + $s .= $topbar_delimiter; + } - $comp_action_uri = decodeHeader($comp_uri . '&action=reply'); - if ($compose_new_win == '1') { - $s .= ''._("Reply").''; - } else { - $s .= ''._("Reply").''; - } - $s .= $topbar_delimiter; - - $comp_action_uri = $comp_uri . '&action=reply_all'; - if ($compose_new_win == '1') { - $s .= ''._("Reply All").''; - } else { - $s .= ''._("Reply All").''; - } - $s .= ' |