From 6c6bb09b1556d176d3e0bfafd014e1e78eb6184b Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 06 Oct 2010 03:23:17 -0400
Subject: [PATCH] - Add mdn_request=4
---
installer/config.php | 3 ++-
program/steps/settings/func.inc | 1 +
program/localization/en_US/labels.inc | 3 ++-
program/steps/mail/show.inc | 6 +++---
program/localization/pl_PL/labels.inc | 12 +++++++++++-
config/main.inc.php.dist | 1 +
6 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index b71d409..00ba825 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -337,6 +337,7 @@
// Behavior if a received message requests a message delivery notification (read receipt)
// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask)
// 3 = send automatically if sender is in addressbook, otherwise ask the user
+// 4 = send automatically if sender is in addressbook, otherwise ignore
$rcmail_config['mdn_requests'] = 0;
// Make use of the built-in spell checker. It is based on GoogieSpell.
diff --git a/installer/config.php b/installer/config.php
index c9eeaeb..f35c6c2 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -574,7 +574,8 @@
$mdn_opts = array(
0 => 'ask the user',
1 => 'send automatically',
- 3 => 'send receipt to user contacts only',
+ 3 => 'send receipt to user contacts, otherwise ask the user',
+ 4 => 'send receipt to user contacts, otherwise ignore',
2 => 'ignore',
);
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 4de0515..c067210 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -326,7 +326,8 @@
$labels['mdnrequests'] = 'On request for return receipt';
$labels['askuser'] = 'ask me';
$labels['autosend'] = 'send receipt';
-$labels['autosendknown'] = 'send receipt to my contacts only';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
$labels['ignore'] = 'ignore';
$labels['readwhendeleted'] = 'Mark the message as read on delete';
$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index b94a3a1..ba9e1a2 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -263,7 +263,8 @@
$labels['mdnrequests'] = 'Na żadanie potwierdzenia odbioru';
$labels['askuser'] = 'pytaj mnie';
$labels['autosend'] = 'wyślij potwierdzenie';
-$labels['autosendknown'] = 'wyślij potwierdzenie tylko do moich kontaktów';
+$labels['autosendknown'] = 'wyślij potwierdzenie tylko do moich kontaktów, pytaj o pozostałe';
+$labels['autosendknownignore'] = 'wyślij potwierdzenie tylko do moich kontaktów, pozostałe ignoruj';
$labels['ignore'] = 'ignoruj';
$labels['readwhendeleted'] = 'Podczas usuwania oznacz wiadomość jako przeczytaną';
$labels['flagfordeletion'] = 'Oznacz wiadomość do usunięcia zamiast ją usuwać';
@@ -349,5 +350,14 @@
$labels['folderactions'] = 'Działania na folderach...';
$labels['contacts'] = 'Kontakty';
$labels['messageoptions'] = 'Opcje wiadomości...';
+$labels['mailreplyto'] = 'Mail-Reply-To';
+$labels['mailfollowupto'] = 'Mail-Followup-To';
+$labels['mailreply-to'] = 'Mail-Reply-To';
+$labels['mailfollowup-to'] = 'Mail-Followup-To';
+$labels['replyall'] = 'Odpowiedz wszystkim';
+$labels['replylist'] = 'Odpowiedz na listę';
+$labels['editidents'] = 'Edytuj tożsamości';
+$labels['addmailreplyto'] = 'Dodaj Mail-Reply-To';
+$labels['addmailfollowupto'] = 'Dodaj Mail-Followup-To';
?>
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 3b357ac..328e9d0 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -76,16 +76,16 @@
{
$mdn_cfg = intval($CONFIG['mdn_requests']);
- if ($mdn_cfg == 1 || ($mdn_cfg == 3 && rcmail_contact_exists($MESSAGE->sender['mailto']))) {
+ if ($mdn_cfg == 1 || (($mdn_cfg == 3 || $mdn_cfg == 4) && rcmail_contact_exists($MESSAGE->sender['mailto']))) {
// Send MDN
if (rcmail_send_mdn($MESSAGE, $smtp_error))
$OUTPUT->show_message('receiptsent', 'confirmation');
else if ($smtp_error)
$OUTPUT->show_message($smtp_error['label'], 'error', $smtp_error['vars']);
- else
+ else
$OUTPUT->show_message('errorsendingreceipt', 'error');
}
- else if ($mdn_cfg != 2) {
+ else if ($mdn_cfg != 2 && $mdn_cfg != 4) {
// Ask user
$OUTPUT->add_label('mdnrequest');
$OUTPUT->set_env('mdn_request', true);
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 00c2cf7..6717b2c 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -324,6 +324,7 @@
$select_mdn_requests->add(rcube_label('askuser'), 0);
$select_mdn_requests->add(rcube_label('autosend'), 1);
$select_mdn_requests->add(rcube_label('autosendknown'), 3);
+ $select_mdn_requests->add(rcube_label('autosendknownignore'), 4);
$select_mdn_requests->add(rcube_label('ignore'), 2);
$blocks['main']['options']['mdn_requests'] = array(
--
Gitblit v1.9.1