Changeset 6c6bb09 in github

Timestamp:

Oct 6, 2010 3:23:17 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

d24b845

Parents:

50baa6c

Message:

• Add mdn_request=4

Files:

• config/main.inc.php.dist (modified) (1 diff)
• installer/config.php (modified) (1 diff)
• program/localization/en_US/labels.inc (modified) (1 diff)
• program/localization/pl_PL/labels.inc (modified) (2 diffs)
• program/steps/mail/show.inc (modified) (2 diffs)
• program/steps/settings/func.inc (modified) (1 diff)

config/main.inc.php.dist

@@ -338 +338 @@
 // 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;
 

installer/config.php

@@ -575 +575 @@
     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',
 );

program/localization/en_US/labels.inc

@@ -327 +327 @@
 $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';

program/localization/pl_PL/labels.inc

@@ -299 +299 @@
 $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Ä
@@ -400 +401 @@
 $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';
 
 ?>

program/steps/mail/show.inc

@@ -77 +77 @@
     $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))
@@ -83 +83 @@
       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');

program/steps/settings/func.inc

@@ -325 +325 @@
       $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);