From a204303e5099dcb88e5e4760a09e7de9a96c4ea3 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Fri, 17 Oct 2014 08:05:51 -0400
Subject: [PATCH] moved "function send_notification_email" from 300-quota_notify.inc.php to monitor_tools.inc.php
---
interface/web/admin/form/server_config.tform.php | 458 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 394 insertions(+), 64 deletions(-)
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index fe2a1c6..d1634f3 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -55,9 +55,9 @@
'width' => 70,
'template' => "templates/server_config_server_edit.htm",
'fields' => array(
- ##################################
- # Begin Datatable fields
- ##################################
+ //#################################
+ // Begin Datatable fields
+ //#################################
'auto_network_configuration' => array(
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
@@ -86,6 +86,18 @@
'width' => '15',
'maxlength' => '255'
),
+ 'v6_prefix' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'validators' => array( 0 => array('type' => 'ISV6PREFIX',
+ 'errmsg' => 'v6_prefix_wrong'),
+ 1 => array('type' => 'V6PREFIXEND',
+ 'errmsg' => 'v6_prefix_end'),
+ 2 => array('type' => 'V6PREFIXLENGTH',
+ 'errmsg' => 'v6_prefix_length')
+ ),
+ 'default' => ''
+ ),
'gateway' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -97,10 +109,25 @@
'width' => '15',
'maxlength' => '255'
),
+ 'firewall' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'SELECT',
+ 'default' => 'bastille',
+ 'value' => array('bastille' => 'bastille', 'ufw' => 'ufw'),
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
'hostname' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => 'server1.domain.tld',
+ 'filters' => array( 0 => array( 'event' => 'SAVE',
+ 'type' => 'IDNTOASCII'),
+ 1 => array( 'event' => 'SHOW',
+ 'type' => 'IDNTOUTF8'),
+ 2 => array( 'event' => 'SAVE',
+ 'type' => 'TOLOWER')
+ ),
'validators' => array(0 => array('type' => 'NOTEMPTY',
'errmsg' => 'hostname_error_empty'),
),
@@ -127,6 +154,14 @@
'width' => '40',
'maxlength' => '255'
),
+ 'admin_notify_events' => array(
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'SELECT',
+ 'default' => '1',
+ 'value' => array('3' => 'no_notifications_txt', '0' => 'Debug', '1' => 'Warnings', '2' => 'Errors'),
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
'backup_dir' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -138,15 +173,99 @@
'width' => '40',
'maxlength' => '255'
),
- 'backup_dir_ftpread' => array(
+ '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',
+ 'default' => 'userzip',
+ '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')
),
- ##################################
- # ENDE Datatable fields
- ##################################
+ 'monit_url' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'validators' => array ( 0 => array ( 'type' => 'REGEX',
+ 'regex' => '/^[0-9a-zA-Z\:\/\-\.\[\]]{0,255}$/',
+ 'errmsg'=> 'monit_url_error_regex'),
+ ),
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
+ 'monit_user' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
+ 'monit_password' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
+ 'munin_url' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'validators' => array ( 0 => array ( 'type' => 'REGEX',
+ 'regex' => '/^[0-9a-zA-Z\:\/\-\.\[\]]{0,255}$/',
+ 'errmsg'=> 'munin_url_error_regex'),
+ ),
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
+ 'munin_user' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
+ 'munin_password' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
+ 'monitor_system_updates' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ //#################################
+ // ENDE Datatable fields
+ //#################################
)
);
@@ -155,9 +274,9 @@
'width' => 60,
'template' => "templates/server_config_mail_edit.htm",
'fields' => array(
- ##################################
- # Begin Datatable fields
- ##################################
+ //#################################
+ // Begin Datatable fields
+ //#################################
'module' => array(
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
@@ -186,6 +305,29 @@
'width' => '40',
'maxlength' => '255'
),
+ 'dkim_path' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '/var/lib/amavis/dkim',
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
+ 'dkim_strength' => array(
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'SELECT',
+ 'default' => '1024',
+ 'value' => array('1024' => 'normal (1024)', '2048' => 'strong (2048)', '4096' => 'very strong (4096)')
+ ),
+ 'relayhost_password' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
+
'pop3_imap_daemon' => array(
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
@@ -242,6 +384,16 @@
'width' => '10',
'maxlength' => '255'
),
+ 'mailbox_virtual_uidgid_maps' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'validators' => array (0 => array ( 'type' => 'CUSTOM',
+ 'class' => 'validate_server_mail_config',
+ 'function' => 'mailbox_virtual_uidgid_maps'),
+ ),
+ 'default' => 'n',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
'relayhost' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -282,9 +434,53 @@
'width' => '10',
'maxlength' => '15'
),
- ##################################
- # ENDE Datatable fields
- ##################################
+ 'mailbox_quota_stats' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'realtime_blackhole_list' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'validators' => array ( 0 => array ( 'type' => 'REGEX',
+ 'regex' => '/^((([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)+([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])(,\s*(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)+([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9]))*)?$/',
+ 'errmsg'=> 'rbl_error_regex'),
+ ),
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
+ 'overquota_notify_admin' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'overquota_notify_client' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'overquota_notify_freq' => array(
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'default' => '7',
+ 'value' => '',
+ 'width' => '20',
+ 'maxlength' => '255'
+ ),
+ 'overquota_notify_onok' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ //#################################
+ // ENDE Datatable fields
+ //#################################
)
);
@@ -293,9 +489,9 @@
'width' => 80,
'template' => "templates/server_config_getmail_edit.htm",
'fields' => array(
- ##################################
- # Begin Datatable fields
- ##################################
+ //#################################
+ // Begin Datatable fields
+ //#################################
'getmail_config_dir' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -307,9 +503,9 @@
'width' => '40',
'maxlength' => '255'
),
- ##################################
- # ENDE Datatable fields
- ##################################
+ //#################################
+ // ENDE Datatable fields
+ //#################################
)
);
@@ -318,9 +514,9 @@
'width' => 60,
'template' => "templates/server_config_web_edit.htm",
'fields' => array(
- ##################################
- # Begin Datatable fields
- ##################################
+ //#################################
+ // Begin Datatable fields
+ //#################################
'server_type' => array(
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
@@ -364,8 +560,24 @@
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'n',
- 'value' => array(0 => 'n',1 => 'y')
+ 'value' => array(0 => 'n', 1 => 'y')
),
+ 'website_autoalias' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
+ /*
+'vhost_rewrite_v6' => array (
+'datatype' => 'VARCHAR',
+'formtype' => 'CHECKBOX',
+'default' => 'n',
+'value' => array(0 => 'n',1 => 'y')
+),
+*/
'vhost_conf_dir' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -432,6 +644,24 @@
'default' => '20',
'value' => array('10' => 'Medium', '20' => 'High')
),
+ 'set_folder_permissions_on_update' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'web_folder_protection' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'add_web_users_to_sshusers_group' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
'check_apache_config' => array(
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
@@ -442,6 +672,62 @@
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'enable_ip_wildcard' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'overtraffic_notify_admin' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'overtraffic_notify_client' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'overquota_notify_admin' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'y',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'overquota_notify_client' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ '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',
+ 'default' => '7',
+ 'value' => '',
+ 'width' => '20',
+ 'maxlength' => '255'
+ ),
+ 'overquota_notify_onok' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
'user' => array(
@@ -461,6 +747,23 @@
'default' => '',
'validators' => array(0 => array('type' => 'NOTEMPTY',
'errmsg' => 'apache_group_error_empty'),
+ ),
+ 'value' => '',
+ 'width' => '40',
+ 'maxlength' => '255'
+ ),
+ 'connect_userid_to_webid' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'connect_userid_to_webid_start' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '10000',
+ 'validators' => array(0 => array('type' => 'ISINT',
+ 'errmsg' => 'connect_userid_to_webid_startid_isint'),
),
'value' => '',
'width' => '40',
@@ -576,6 +879,24 @@
'width' => '40',
'maxlength' => '4000'
),
+ 'php_ini_check_minutes' => array(
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'default' => '1',
+ 'validators' => array(0 => array('type' => 'NOTEMPTY',
+ 'errmsg' => 'php_ini_check_minutes_error_empty'),
+ ),
+ 'value' => '',
+ 'width' => '10',
+ 'maxlength' => '255'
+ ),
+ 'php_handler' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'SELECT',
+ 'default' => 'fast-cgi',
+ 'value' => array('no' => 'disabled_txt', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM'),
+ 'searchable' => 2
+ ),
'nginx_cgi_socket' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -660,9 +981,9 @@
'width' => '40',
'maxlength' => '255'
),
- ##################################
- # ENDE Datatable fields
- ##################################
+ //#################################
+ // ENDE Datatable fields
+ //#################################
)
);
@@ -671,9 +992,9 @@
'width' => 60,
'template' => "templates/server_config_dns_edit.htm",
'fields' => array(
- ##################################
- # Begin Datatable fields
- ##################################
+ //#################################
+ // Begin Datatable fields
+ //#################################
'bind_user' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -729,9 +1050,9 @@
'width' => '40',
'maxlength' => '255'
),
- ##################################
- # ENDE Datatable fields
- ##################################
+ //#################################
+ // ENDE Datatable fields
+ //#################################
)
);
@@ -740,9 +1061,9 @@
'width' => 80,
'template' => "templates/server_config_fastcgi_edit.htm",
'fields' => array(
- ##################################
- # Begin Datatable fields
- ##################################
+ //#################################
+ // Begin Datatable fields
+ //#################################
'fastcgi_starter_path' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -802,7 +1123,10 @@
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => '',
- 'validators' => array(0 => array('type' => 'NOTEMPTY',
+ 'validators' => array( 0 => array( 'type' => 'ISINT',
+ 'errmsg' => 'fastcgi_max_requests_error_empty'),
+ 1 => array( 'type' => 'RANGE',
+ 'range' => '0:',
'errmsg' => 'fastcgi_max_requests_error_empty'),
),
'value' => '',
@@ -828,9 +1152,9 @@
'width' => '40',
'maxlength' => '255'
),
- ##################################
- # ENDE Datatable fields
- ##################################
+ //#################################
+ // ENDE Datatable fields
+ //#################################
)
);
@@ -840,9 +1164,9 @@
'width' => 80,
'template' => "templates/server_config_jailkit_edit.htm",
'fields' => array(
- ##################################
- # Begin Datatable fields
- ##################################
+ //#################################
+ // Begin Datatable fields
+ //#################################
'jailkit_chroot_home' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -887,9 +1211,9 @@
'width' => '40',
'maxlength' => '1000'
),
- ##################################
- # ENDE Datatable fields
- ##################################
+ //#################################
+ // ENDE Datatable fields
+ //#################################
)
);
@@ -962,9 +1286,9 @@
'width' => 80,
'template' => "templates/server_config_vlogger_edit.htm",
'fields' => array(
- ##################################
- # Begin Datatable fields
- ##################################
+ //#################################
+ // Begin Datatable fields
+ //#################################
'config_dir' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -976,9 +1300,9 @@
'width' => '40',
'maxlength' => '255'
),
- ##################################
- # ENDE Datatable fields
- ##################################
+ //#################################
+ // ENDE Datatable fields
+ //#################################
)
);
@@ -989,9 +1313,9 @@
'width' => 80,
'template' => "templates/server_config_cron_edit.htm",
'fields' => array(
- ##################################
- # Begin Datatable fields
- ##################################
+ //#################################
+ // Begin Datatable fields
+ //#################################
'init_script' => array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -1025,9 +1349,9 @@
'width' => '40',
'maxlength' => '255'
),
- ##################################
- # ENDE Datatable fields
- ##################################
+ //#################################
+ // ENDE Datatable fields
+ //#################################
)
);
@@ -1036,16 +1360,22 @@
'width' => 80,
'template' => "templates/server_config_rescue_edit.htm",
'fields' => array(
- ##################################
- # Begin Datatable fields
- ##################################
+ //#################################
+ // Begin Datatable fields
+ //#################################
'try_rescue' => array(
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
- 'do_not_try_rescue_apache' => array(
+ 'do_not_try_rescue_httpd' => array(
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOX',
+ 'default' => 'n',
+ 'value' => array(0 => 'n', 1 => 'y')
+ ),
+ 'do_not_try_rescue_mongodb' => array(
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'n',
@@ -1063,9 +1393,9 @@
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
- ##################################
- # ENDE Datatable fields
- ##################################
+ //#################################
+ // ENDE Datatable fields
+ //#################################
)
);
?>
--
Gitblit v1.9.1