From b3660bbdc3a7dcae7873016f10ddc0b7c82e17b7 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 29 Sep 2010 08:58:23 -0400
Subject: [PATCH] - Add option to "Return receipt" will be always checked (1486352)
---
program/steps/mail/compose.inc | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index d01ca36..5a66af1 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -1073,7 +1073,7 @@
function rcmail_receipt_checkbox($attrib)
{
- global $MESSAGE, $compose_mode;
+ global $RCMAIL, $MESSAGE, $compose_mode;
list($form_start, $form_end) = get_form_tags($attrib);
unset($attrib['form']);
@@ -1085,9 +1085,13 @@
$attrib['value'] = '1';
$checkbox = new html_checkbox($attrib);
+ if ($MESSAGE && in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT)))
+ $mdn_default = (bool) $MESSAGE->headers->mdn_to;
+ else
+ $mdn_default = $RCMAIL->config->get('mdn_default');
+
$out = $form_start ? "$form_start\n" : '';
- $out .= $checkbox->show(in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))
- && $MESSAGE->headers->mdn_to ? 1 : 0);
+ $out .= $checkbox->show($mdn_default);
$out .= $form_end ? "\n$form_end" : '';
return $out;
--
Gitblit v1.9.1