From b972b4c4c079898250912588d1eb1d8907dfe868 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 30 Oct 2013 12:04:09 +0100
Subject: Add an option to disable smart Reply-List behaviour - reply_all_mode
 (#1488734)

---
 program/js/app.js                     |  2 +-
 program/localization/en_US/labels.inc |  3 +++
 program/steps/mail/func.inc           |  1 +
 program/steps/settings/func.inc       | 18 ++++++++++++++++++
 program/steps/settings/save_prefs.inc |  1 +
 5 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'program')

diff --git a/program/js/app.js b/program/js/app.js
index 59105ffb6..81b796ec1 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1065,7 +1065,7 @@ function rcube_webmail()
           url = {_reply_uid: uid, _mbox: this.env.mailbox};
           if (command == 'reply-all')
             // do reply-list, when list is detected and popup menu wasn't used
-            url._all = (!props && this.commands['reply-list'] ? 'list' : 'all');
+            url._all = (!props && this.env.reply_all_mode == 1 && this.commands['reply-list'] ? 'list' : 'all');
           else if (command == 'reply-list')
             url._all = 'list';
 
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 69ef2505c..8f221a3a9 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -493,6 +493,9 @@ $labels['standardwindows'] = 'Handle popups as standard windows';
 $labels['forwardmode'] = 'Messages forwarding';
 $labels['inline'] = 'inline';
 $labels['asattachment'] = 'as attachment';
+$labels['replyallmode'] = 'Default action of [Reply all] button';
+$labels['replyalldefault'] = 'reply to all';
+$labels['replyalllist'] = 'reply to mailing list only (if found)';
 
 $labels['folder']  = 'Folder';
 $labels['folders']  = 'Folders';
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 70441e0d7..3c1c2bb65 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -97,6 +97,7 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') {
   $OUTPUT->set_env('delimiter', $delimiter);
   $OUTPUT->set_env('threading', $threading);
   $OUTPUT->set_env('threads', $threading || $RCMAIL->storage->get_capability('THREAD'));
+  $OUTPUT->set_env('reply_all_mode', (int) $RCMAIL->config->get('reply_all_mode'));
   $OUTPUT->set_env('preview_pane_mark_read', $RCMAIL->config->get('preview_pane_mark_read', 0));
   if ($RCMAIL->storage->get_capability('QUOTA')) {
     $OUTPUT->set_env('quota', true);
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 38bb09c8d..c922aca08 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -869,6 +869,24 @@ function rcmail_user_prefs($current = null)
                         $select_default_font_size->show($RCMAIL->config->get('default_font_size', 1))
                 );
             }
+
+            if (!isset($no_override['reply_all_mode'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_reply_all_mode';
+                $select   = new html_select(array('name' => '_reply_all_mode', 'id' => $field_id));
+
+                $select->add(rcube_label('replyalldefault'), 0);
+                $select->add(rcube_label('replyalllist'), 1);
+
+                $blocks['main']['options']['reply_all_mode'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('replyallmode'))),
+                    'content' => $select->show(intval($config['reply_all_mode'])),
+                );
+            }
+
         break;
 
         // Addressbook config
diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
index 717c7ad8c..bcd05bb85 100644
--- a/program/steps/settings/save_prefs.inc
+++ b/program/steps/settings/save_prefs.inc
@@ -90,6 +90,7 @@ switch ($CURR_SECTION)
       'strip_existing_sig' => isset($_POST['_strip_existing_sig']),
       'default_font'       => get_input_value('_default_font', RCUBE_INPUT_POST),
       'default_font_size'  => get_input_value('_default_font_size', RCUBE_INPUT_POST),
+      'reply_all_mode'     => intval($_POST['_reply_all_mode']),
       'forward_attachment' => !empty($_POST['_forward_attachment']),
     );
 
-- 
cgit v1.2.3