From 88d47d2ce65e549ffccda213f4e53609cc75d882 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 23 Jan 2014 05:31:58 -0500
Subject: [PATCH] Resolved differences in sql incremental files between master and stable
---
interface/web/admin/templates/server_config_mail_edit.htm | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm
index 0374931..991f1b0 100644
--- a/interface/web/admin/templates/server_config_mail_edit.htm
+++ b/interface/web/admin/templates/server_config_mail_edit.htm
@@ -56,6 +56,12 @@
<input name="mailuser_group" id="mailuser_group" value="{tmpl_var name='mailuser_group'}" size="10" maxlength="255" type="text" class="textInput formLengthHalf" />
</div>
<div class="ctrlHolder">
+ <p class="label">{tmpl_var name='mailbox_virtual_uidgid_maps_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='mailbox_virtual_uidgid_maps'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
<label for="relayhost">{tmpl_var name='relayhost_txt'}</label>
<input name="relayhost" id="relayhost" value="{tmpl_var name='relayhost'}" size="40" maxlength="255" type="text" class="textInput formLengthHalf" />
</div>
@@ -85,9 +91,27 @@
<label for="realtime_blackhole_list">{tmpl_var name='realtime_blackhole_list_txt'}</label>
<input name="realtime_blackhole_list" id="realtime_blackhole_list" value="{tmpl_var name='realtime_blackhole_list'}" size="40" maxlength="255" type="text" class="textInput" /> {tmpl_var name='realtime_blackhole_list_note_txt'}
</div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='overquota_notify_admin_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='overquota_notify_admin'}
+ </div>
+ </div>
<div class="ctrlHolder">
- <label for="sendmail_path">{tmpl_var name='sendmail_path_txt'}</label>
- <input name="sendmail_path" id="sendmail_path" value="{tmpl_var name='sendmail_path'}" size="40" maxlength="255" type="text" class="textInput" />
+ <p class="label">{tmpl_var name='overquota_notify_client_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='overquota_notify_client'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <label for="overquota_notify_freq">{tmpl_var name='overquota_notify_freq_txt'}</label>
+ <input name="overquota_notify_freq" id="overquota_notify_freq" value="{tmpl_var name='overquota_notify_freq'}" size="40" maxlength="255" type="text" class="textInput" /> {tmpl_var name='overquota_notify_freq_note_txt'}
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='overquota_notify_onok_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='overquota_notify_onok'}
+ </div>
</div>
</fieldset>
--
Gitblit v1.9.1