From 022bcd11320398b6652eacc5c264a87adc16af84 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 27 Oct 2010 08:45:51 -0400
Subject: [PATCH] - When contacts search returns no rows display message of type 'notice' instead of 'warning'
---
installer/config.php | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/installer/config.php b/installer/config.php
index 073b7b5..5250782 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -14,7 +14,6 @@
'smtp_log' => 1,
'prefer_html' => 1,
'preview_pane' => 1,
- 'htmleditor' => 1,
'debug_level' => 1,
);
@@ -543,13 +542,16 @@
<dt class="propname">htmleditor <span class="userconf">*</span></dt>
<dd>
+<label for="cfghtmlcompose">Compose HTML formatted messages</label>
<?php
-$check_htmlcomp = new html_checkbox(array('name' => '_htmleditor', 'id' => "cfghtmlcompose", 'value' => 1));
-echo $check_htmlcomp->show(intval($RCI->getprop('htmleditor')));
+$select_htmlcomp = new html_select(array('name' => '_htmleditor', 'id' => "cfghtmlcompose"));
+$select_htmlcomp->add('never', 0);
+$select_htmlcomp->add('always', 1);
+$select_htmlcomp->add('on reply to HTML message only', 2);
+echo $select_htmlcomp->show(intval($RCI->getprop('htmleditor')));
?>
-<label for="cfghtmlcompose">Compose HTML formatted messages</label><br />
</dd>
<dt class="propname">draft_autosave <span class="userconf">*</span></dt>
@@ -571,8 +573,16 @@
<dd>
<?php
+$mdn_opts = array(
+ 0 => 'ask the user',
+ 1 => 'send automatically',
+ 3 => 'send receipt to user contacts, otherwise ask the user',
+ 4 => 'send receipt to user contacts, otherwise ignore',
+ 2 => 'ignore',
+);
+
$select_mdnreq = new html_select(array('name' => '_mdn_requests', 'id' => "cfgmdnreq"));
-$select_mdnreq->add(array('ask the user', 'send automatically', 'ignore'), array(0, 1, 2));
+$select_mdnreq->add(array_values($mdn_opts), array_keys($mdn_opts));
echo $select_mdnreq->show(intval($RCI->getprop('mdn_requests')));
?>
--
Gitblit v1.9.1