From df75da91e28610160a40a330506a867facd62e38 Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Mon, 8 Jun 2020 12:57:01 -0600
Subject: [PATCH] keep quota related settings grouped together
---
interface/web/admin/form/server_config.tform.php | 12 ++++++------
.../web/admin/templates/server_config_mail_edit.htm | 8 ++++----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index 680a52c574..9ae7745656 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -654,12 +654,6 @@ $form["tabs"]['mail'] = array(
'width' => '10',
'maxlength' => '15'
),
- 'mailbox_quota_stats' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'y',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
'realtime_blackhole_list' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -672,6 +666,12 @@ $form["tabs"]['mail'] = array(
'width' => '40',
'maxlength' => '255'
),
+ 'mailbox_quota_stats' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
'overquota_notify_admin' => array(
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm
index 6ba37104ef..de98c4af78 100644
--- a/interface/web/admin/templates/server_config_mail_edit.htm
+++ b/interface/web/admin/templates/server_config_mail_edit.htm
@@ -99,6 +99,10 @@
<label for="message_size_limit" class="col-sm-3 control-label">{tmpl_var name='message_size_limit_txt'}</label>
<div class="col-sm-6"><input type="text" name="message_size_limit" id="message_size_limit" value="{tmpl_var name='message_size_limit'}" class="form-control" /></div><div class="col-sm-3 input-sm"> MB
</div></div>
+ <div class="form-group">
+ <label for="realtime_blackhole_list" class="col-sm-3 control-label">{tmpl_var name='realtime_blackhole_list_txt'}</label>
+ <div class="col-sm-6"><input type="text" name="realtime_blackhole_list" id="realtime_blackhole_list" value="{tmpl_var name='realtime_blackhole_list'}" class="form-control" /></div><div class="col-sm-3 input-sm"> {tmpl_var name='realtime_blackhole_list_note_txt'}
+ </div></div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='mailbox_quota_stats_txt'}</label>
<div class="col-sm-9">
@@ -106,10 +110,6 @@
</div>
</div>
<div class="form-group">
- <label for="realtime_blackhole_list" class="col-sm-3 control-label">{tmpl_var name='realtime_blackhole_list_txt'}</label>
- <div class="col-sm-6"><input type="text" name="realtime_blackhole_list" id="realtime_blackhole_list" value="{tmpl_var name='realtime_blackhole_list'}" class="form-control" /></div><div class="col-sm-3 input-sm"> {tmpl_var name='realtime_blackhole_list_note_txt'}
- </div></div>
- <div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='overquota_notify_admin_txt'}</label>
<div class="col-sm-9">
{tmpl_var name='overquota_notify_admin'}
--
GitLab