From 8e1d27aaa108597b454f111556e5ea6dc9ec567b Mon Sep 17 00:00:00 2001 From: kink Date: Fri, 20 Dec 2002 18:58:53 +0000 Subject: [PATCH] use handleAsSent in stead of == $sent_folder. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4292 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/read_body.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/read_body.php b/src/read_body.php index 1948ed5f..1e48b44f 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -386,9 +386,8 @@ function formatRecipientString($recipients, $item ) { function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $color, $FirstTimeSee) { - global $msn_user_support, $default_use_mdn, $draft_folder, $sent_folder, - $default_use_priority, $show_xmailer_default, - $mdn_user_support, $PHP_SELF, $javascript_on; + global $msn_user_support, $default_use_mdn, $default_use_priority, + $show_xmailer_default, $mdn_user_support, $PHP_SELF, $javascript_on; $header = $message->rfc822_header; $env = array(); @@ -418,8 +417,7 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, $env[_("Read receipt")] = _("send"); } else { $env[_("Read receipt")] = _("requested"); - if (!($mailbox == $draft_folder || - $mailbox == $sent_folder || + if (!(handleAsSent($mailbox) || $message->is_deleted || $passed_ent_id)) { $mdn_url = $PHP_SELF . '&sendreceipt=1'; @@ -466,7 +464,7 @@ function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message, } function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_response) { - global $base_uri, $sent_folder, $draft_folder, $where, $what, $color, $sort, + global $base_uri, $draft_folder, $where, $what, $color, $sort, $startMessage, $compose_new_win, $PHP_SELF, $save_as_draft, $enable_forward_as_attachment; @@ -514,7 +512,7 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp if (($mailbox == $draft_folder) && ($save_as_draft)) { $comp_alt_uri = $comp_uri . '&action=draft'; $comp_alt_string = _("Resume Draft"); - } else if ($mailbox == $sent_folder) { + } else if (handleAsSent($mailbox)) { $comp_alt_uri = $comp_uri . '&action=edit_as_new'; $comp_alt_string = _("Edit Message as New"); } -- 2.25.1