From 1838fd1c4b1ceae77c852fe25e97a30592d44a69 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Thu, 06 Mar 2014 09:47:16 -0500
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
---
interface/web/admin/form/server_config.tform.php | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index ade8c13..98337b9 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -173,6 +173,20 @@
'width' => '40',
'maxlength' => '255'
),
+ 'backup_dir_is_mount' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'backup_dir_mount_cmd' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
'backup_mode' => array(
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
@@ -180,6 +194,12 @@
'value' => array('userzip' => 'backup_mode_userzip', 'rootgz' => 'backup_mode_rootgz'),
'width' => '40',
'maxlength' => '255'
+ ),
+ 'backup_delete' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
),
'monit_url' => array(
'datatype' => 'VARCHAR',
@@ -283,15 +303,19 @@
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => '/var/lib/amavis/dkim',
- 'validators' => array ( 0 => array ('type' => 'CUSTOM',
- 'class' => 'validate_dkim',
- 'function' => 'check_dkim_path',
- 'errmsg'=> 'dkim_path_error'),
- ),
'value' => '',
'width' => '40',
'maxlength' => '255'
),
+ 'relayhost_password' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
+
'pop3_imap_daemon' => array(
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
@@ -347,6 +371,12 @@
'value' => '',
'width' => '10',
'maxlength' => '255'
+ ),
+ 'mailbox_virtual_uidgid_maps' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(0 => 'n', 1 => 'y')
),
'relayhost' => array(
'datatype' => 'VARCHAR',
@@ -658,6 +688,18 @@
'default' => 'y',
'value' => array(0 => 'n', 1 => 'y')
),
+ 'overquota_db_notify_admin' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'overquota_db_notify_client' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
'overquota_notify_freq' => array(
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
--
Gitblit v1.9.1