From 0207c45c90818e7c7df64ea52c61050850dee13d Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 02 Nov 2009 04:58:14 -0500
Subject: [PATCH] More options for top posting feature (#1484272) using patch from Phil Weir
---
program/steps/settings/func.inc | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index e451d57..30a7951 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -409,6 +409,7 @@
$blocks = array(
'main' => array('name' => Q(rcube_label('mainoptions'))),
+ 'sig' => array('name' => Q(rcube_label('signatureoptions'))),
);
// Show checkbox for HTML Editor
@@ -443,7 +444,7 @@
$select_param_folding->add(rcube_label('2047folding'), 2);
$blocks['main']['options']['mime_param_folding'] = array(
- 'advanced' => true,
+ 'advanced' => true,
'title' => html::label($field_id, Q(rcube_label('mimeparamfolding'))),
'content' => $select_param_folding->show($config['mime_param_folding']),
);
@@ -451,25 +452,47 @@
if (!isset($no_override['top_posting'])) {
$field_id = 'rcmfd_top_posting';
- $input_topposting = new html_checkbox(array('name' => '_top_posting', 'id' => $field_id, 'value' => 1));
+ $select_replymode = new html_select(array('name' => '_top_posting', 'id' => $field_id));
+ $select_replymode->add(rcube_label('replybottomposting'), 0);
+ $select_replymode->add(rcube_label('replytopposting'), 1);
$blocks['main']['options']['top_posting'] = array(
- 'title' => html::label($field_id, Q(rcube_label('top_posting'))),
- 'content' => $input_topposting->show($config['top_posting']?1:0),
+ 'title' => html::label($field_id, Q(rcube_label('whenreplying'))),
+ 'content' => $select_replymode->show($config['top_posting']?1:0),
);
}
if (!isset($no_override['show_sig'])) {
$field_id = 'rcmfd_show_sig';
$select_show_sig = new html_select(array('name' => '_show_sig', 'id' => $field_id));
- $select_show_sig->add(rcube_label('always'), 0);
- $select_show_sig->add(rcube_label('never'), 1);
- $select_show_sig->add(rcube_label('new_msg_only'), 2);
- $select_show_sig->add(rcube_label('reply_forward_only'), 3);
+ $select_show_sig->add(rcube_label('never'), 0);
+ $select_show_sig->add(rcube_label('always'), 1);
+ $select_show_sig->add(rcube_label('newmessageonly'), 2);
+ $select_show_sig->add(rcube_label('replyandforwardonly'), 3);
- $blocks['main']['options']['show_sig'] = array(
- 'title' => html::label($field_id, Q(rcube_label('auto_add_sig'))),
- 'content' => $select_show_sig->show(intval($config['show_sig'])),
+ $blocks['sig']['options']['show_sig'] = array(
+ 'title' => html::label($field_id, Q(rcube_label('autoaddsignature'))),
+ 'content' => $select_show_sig->show($config['show_sig']),
+ );
+ }
+
+ if (!isset($no_override['sig_above'])) {
+ $field_id = 'rcmfd_sig_above';
+ $input_sigabove = new html_checkbox(array('name' => '_sig_above', 'id' => $field_id, 'value' => 1));
+
+ $blocks['sig']['options']['sig_above'] = array(
+ 'title' => html::label($field_id, Q(rcube_label('replysignatureabove'))),
+ 'content' => $input_sigabove->show($config['sig_above']?1:0),
+ );
+ }
+
+ if (!isset($no_override['strip_existing_sig'])) {
+ $field_id = 'rcmfd_strip_existing_sig';
+ $input_stripexistingsig = new html_checkbox(array('name' => '_strip_existing_sig', 'id' => $field_id, 'value' => 1));
+
+ $blocks['sig']['options']['strip_existing_sig'] = array(
+ 'title' => html::label($field_id, Q(rcube_label('replyremovesignature'))),
+ 'content' => $input_stripexistingsig->show($config['strip_existing_sig']?1:0),
);
}
--
Gitblit v1.9.1