[Svn] r4045 - in trunk/roundcubemail: config installer program/localization/en_US program/localization/pl_PL program/steps/mail program/steps/settings

trac at roundcube.net trac at roundcube.net
Wed Oct 6 09:23:17 CEST 2010


Author: alec
Date: 2010-10-06 02:23:17 -0500 (Wed, 06 Oct 2010)
New Revision: 4045

Modified:
   trunk/roundcubemail/config/main.inc.php.dist
   trunk/roundcubemail/installer/config.php
   trunk/roundcubemail/program/localization/en_US/labels.inc
   trunk/roundcubemail/program/localization/pl_PL/labels.inc
   trunk/roundcubemail/program/steps/mail/show.inc
   trunk/roundcubemail/program/steps/settings/func.inc
Log:
- Add mdn_request=4


Modified: trunk/roundcubemail/config/main.inc.php.dist
===================================================================
--- trunk/roundcubemail/config/main.inc.php.dist	2010-10-06 07:06:03 UTC (rev 4044)
+++ trunk/roundcubemail/config/main.inc.php.dist	2010-10-06 07:23:17 UTC (rev 4045)
@@ -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.

Modified: trunk/roundcubemail/installer/config.php
===================================================================
--- trunk/roundcubemail/installer/config.php	2010-10-06 07:06:03 UTC (rev 4044)
+++ trunk/roundcubemail/installer/config.php	2010-10-06 07:23:17 UTC (rev 4045)
@@ -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',
 );
 

Modified: trunk/roundcubemail/program/localization/en_US/labels.inc
===================================================================
--- trunk/roundcubemail/program/localization/en_US/labels.inc	2010-10-06 07:06:03 UTC (rev 4044)
+++ trunk/roundcubemail/program/localization/en_US/labels.inc	2010-10-06 07:23:17 UTC (rev 4045)
@@ -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';

Modified: trunk/roundcubemail/program/localization/pl_PL/labels.inc
===================================================================
--- trunk/roundcubemail/program/localization/pl_PL/labels.inc	2010-10-06 07:06:03 UTC (rev 4044)
+++ trunk/roundcubemail/program/localization/pl_PL/labels.inc	2010-10-06 07:23:17 UTC (rev 4045)
@@ -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';
 
 ?>

Modified: trunk/roundcubemail/program/steps/mail/show.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/show.inc	2010-10-06 07:06:03 UTC (rev 4044)
+++ trunk/roundcubemail/program/steps/mail/show.inc	2010-10-06 07:23:17 UTC (rev 4045)
@@ -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);

Modified: trunk/roundcubemail/program/steps/settings/func.inc
===================================================================
--- trunk/roundcubemail/program/steps/settings/func.inc	2010-10-06 07:06:03 UTC (rev 4044)
+++ trunk/roundcubemail/program/steps/settings/func.inc	2010-10-06 07:23:17 UTC (rev 4045)
@@ -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(

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn


More information about the Svn mailing list