From 6d6e2b813a275cce2d945f82e599a4848cca87e5 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Tue, 8 Jan 2019 15:18:25 +0100 Subject: [PATCH 01/28] Update interface/web/sites/database_edit.php --- interface/web/sites/database_edit.php | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php index 71e5acaf27..22f3302c6c 100644 --- a/interface/web/sites/database_edit.php +++ b/interface/web/sites/database_edit.php @@ -152,6 +152,12 @@ class page_action extends tform_actions { $app->tpl->setVar("database_name_prefix", $app->tools_sites->getPrefix($this->dataRecord['database_name_prefix'], $dbname_prefix, $global_config['dbname_prefix']), true); } + if($global_config['disable_client_remote_dbserver'] == 'y' && $_SESSION["s"]["user"]["typ"] != 'admin') { + $app->tpl->setVar("disable_remote_db", 1); + } else { + $app->tpl->setVar("disable_remote_db", 0); + } + if($this->id > 0) { //* we are editing a existing record $edit_disabled = @($_SESSION["s"]["user"]["typ"] == 'admin')? 0 : 1; //* admin can change the database-name @@ -351,9 +357,14 @@ class page_action extends tform_actions { if($tmp['server_id'] && $tmp['server_id'] != $this->dataRecord['server_id']) { // we need remote access rights for this server, so get it's ip address $server_config = $app->getconf->get_server_config($tmp['server_id'], 'server'); + + // Add default remote_ips from Main Configuration. + $remote_ips = explode(",", $global_config['default_remote_dbserver']); + if (!in_array($server_config['ip_address'], $default_remote_db)) { $remote_ips[] = $server_config['ip_address']; } + if($server_config['ip_address']!='') { if($this->dataRecord['remote_access'] != 'y'){ - $this->dataRecord['remote_ips'] = $server_config['ip_address']; + $this->dataRecord['remote_ips'] = implode(',', $remote_ips); $this->dataRecord['remote_access'] = 'y'; } else { if($this->dataRecord['remote_ips'] != ''){ @@ -361,6 +372,7 @@ class page_action extends tform_actions { $this->dataRecord['remote_ips'] .= ',' . $server_config['ip_address']; } $tmp = preg_split('/\s*,\s*/', $this->dataRecord['remote_ips']); + $tmp = array_merge($tmp, $remote_ips); $tmp = array_unique($tmp); $this->dataRecord['remote_ips'] = implode(',', $tmp); unset($tmp); @@ -430,9 +442,14 @@ class page_action extends tform_actions { if($tmp['server_id'] && $tmp['server_id'] != $this->dataRecord['server_id']) { // we need remote access rights for this server, so get it's ip address $server_config = $app->getconf->get_server_config($tmp['server_id'], 'server'); + + // Add default remote_ips from Main Configuration. + $remote_ips = explode(",", $global_config['default_remote_dbserver']); + if (!in_array($server_config['ip_address'], $default_remote_db)) { $remote_ips[] = $server_config['ip_address']; } + if($server_config['ip_address']!='') { if($this->dataRecord['remote_access'] != 'y'){ - $this->dataRecord['remote_ips'] = $server_config['ip_address']; + $this->dataRecord['remote_ips'] = implode(',', $remote_ips); $this->dataRecord['remote_access'] = 'y'; } else { if($this->dataRecord['remote_ips'] != ''){ @@ -440,6 +457,7 @@ class page_action extends tform_actions { $this->dataRecord['remote_ips'] .= ',' . $server_config['ip_address']; } $tmp = preg_split('/\s*,\s*/', $this->dataRecord['remote_ips']); + $tmp = array_merge($tmp, $remote_ips); $tmp = array_unique($tmp); $this->dataRecord['remote_ips'] = implode(',', $tmp); unset($tmp); -- GitLab From 15506bef8018548c7da59a599db9d67416121c67 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Tue, 8 Jan 2019 15:19:23 +0100 Subject: [PATCH 02/28] Update interface/web/sites/templates/database_edit.htm --- interface/web/sites/templates/database_edit.htm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm index 290ae30a96..0d5be00130 100644 --- a/interface/web/sites/templates/database_edit.htm +++ b/interface/web/sites/templates/database_edit.htm @@ -97,6 +97,7 @@ +
@@ -106,6 +107,7 @@
+
-- GitLab From fefa02d353b7aca12cebe7f245588a4d1c336991 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Tue, 8 Jan 2019 15:33:54 +0100 Subject: [PATCH 03/28] Update interface/web/admin/lib/lang/en_system_config.lng, interface/web/admin/lib/lang/it_system_config.lng, interface/web/admin/templates/system_config_sites_edit.htm, interface/web/admin/form/system_config.tform.php files --- .../web/admin/form/system_config.tform.php | 21 ++++++++++++++++++- .../web/admin/lib/lang/en_system_config.lng | 2 ++ .../web/admin/lib/lang/it_system_config.lng | 2 ++ .../templates/system_config_sites_edit.htm | 13 +++++++++++- 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php index 449805f3c1..fb2f1f7264 100644 --- a/interface/web/admin/form/system_config.tform.php +++ b/interface/web/admin/form/system_config.tform.php @@ -200,6 +200,25 @@ $form["tabs"]['sites'] = array ( 'value' => '', 'name' => 'default_dbserver' ), + 'disable_client_remote_dbserver' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'n', + 'value' => array(0 => 'n', 1 => 'y') + ), + 'default_remote_dbserver' => array ( + 'datatype' => 'TEXT', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'CUSTOM', + 'class' => 'validate_database', + 'function' => 'valid_ip_list', + 'errmsg' => 'database_remote_error_ips'), + ), + 'default' => '', + 'value' => '', + 'width' => '60', + 'searchable' => 2 + ), //################################# // ENDE Datatable fields //################################# @@ -731,4 +750,4 @@ $form["tabs"]['misc'] = array ( ); -?> +?> \ No newline at end of file diff --git a/interface/web/admin/lib/lang/en_system_config.lng b/interface/web/admin/lib/lang/en_system_config.lng index 38f178f9f5..1a7d18b9e7 100644 --- a/interface/web/admin/lib/lang/en_system_config.lng +++ b/interface/web/admin/lib/lang/en_system_config.lng @@ -84,4 +84,6 @@ $wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websi $wb["custom_login_text_txt"] = "Custom Text on Login-Page"; $wb["custom_login_link_txt"] = "Custom Link on Login-Page"; $wb["login_link_error_regex"] = "Invalid Link for Custom Login"; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; ?> diff --git a/interface/web/admin/lib/lang/it_system_config.lng b/interface/web/admin/lib/lang/it_system_config.lng index 396503f02e..bc72844ed8 100644 --- a/interface/web/admin/lib/lang/it_system_config.lng +++ b/interface/web/admin/lib/lang/it_system_config.lng @@ -81,4 +81,6 @@ $wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websi $wb['custom_login_text_txt'] = 'Custom Text on Login-Page'; $wb['custom_login_link_txt'] = 'Custom Link on Login-Page'; $wb['login_link_error_regex'] = 'Invalid Link for Custom Login'; +$wb["default_remote_dbserver_txt"] = "DB remoti predefiniti"; +$wb["disable_client_remote_dbserver_txt"] = "Disabilita la configurazione dei DB Remoti per i clienti"; ?> diff --git a/interface/web/admin/templates/system_config_sites_edit.htm b/interface/web/admin/templates/system_config_sites_edit.htm index 1c4c5c6f9a..8ab35989ff 100644 --- a/interface/web/admin/templates/system_config_sites_edit.htm +++ b/interface/web/admin/templates/system_config_sites_edit.htm @@ -75,7 +75,18 @@ {tmpl_var name='default_dbserver'}
- +
+ +
+ {tmpl_var name='disable_client_remote_dbserver'} +
+
+
+ +
+
+ +
-- GitLab From 0c0dd4652bee894003806692b1a2c3529ed78154 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Tue, 8 Jan 2019 15:35:07 +0100 Subject: [PATCH 04/28] Show DNS Slave Zone menu only if enabled by limits. --- interface/web/dns/lib/module.conf.php | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/interface/web/dns/lib/module.conf.php b/interface/web/dns/lib/module.conf.php index 75b17a98e8..4e4c645470 100644 --- a/interface/web/dns/lib/module.conf.php +++ b/interface/web/dns/lib/module.conf.php @@ -1,5 +1,7 @@ auth->get_user_id(); + $module["name"] = "dns"; $module["title"] = "top_menu_dns"; $module["template"] = "module.tpl.htm"; @@ -56,19 +58,23 @@ $module["nav"][] = array( 'title' => 'DNS', unset($items); -$items[] = array( 'title' => "Secondary Zones", - 'target' => 'content', - 'link' => 'dns/dns_slave_list.php', - 'html_id' => 'dns_slave_list'); - -$module["nav"][] = array( 'title' => 'Secondary DNS', - 'open' => 1, - 'items' => $items); +if($app->auth->get_client_limit($userid, 'dns_slave_zone') != 0) +{ + $items[] = array( 'title' => "Secondary Zones", + 'target' => 'content', + 'link' => 'dns/dns_slave_list.php', + 'html_id' => 'dns_slave_list'); + + $module["nav"][] = array( 'title' => 'Secondary DNS', + 'open' => 1, + 'items' => $items); + + unset($items); +} -unset($items); -?> +?> \ No newline at end of file -- GitLab From fa6b3c67d0a7c276673afa97f3b2af9fc45e035b Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Sat, 13 Jun 2020 17:30:28 +0200 Subject: [PATCH 05/28] Update de_system_config.lng --- interface/web/admin/lib/lang/de_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng index 76910e1db3..79048a8298 100644 --- a/interface/web/admin/lib/lang/de_system_config.lng +++ b/interface/web/admin/lib/lang/de_system_config.lng @@ -81,6 +81,8 @@ $wb['default_webserver_txt'] = 'Default Webserver'; $wb['default_dnsserver_txt'] = 'Default DNS Server'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; $wb['default_dbserver_txt'] = 'Default Database Server'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Name'; $wb['ca_issue_txt'] = 'Issue'; $wb['ca_wildcard_txt'] = 'Wildcard verwenden'; -- GitLab From ff43d3ff5e029410b486d49436962c58e0aa9f3e Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Sat, 13 Jun 2020 17:30:46 +0200 Subject: [PATCH 06/28] Update se_system_config.lng --- interface/web/admin/lib/lang/se_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/se_system_config.lng b/interface/web/admin/lib/lang/se_system_config.lng index 74ae16734f..bb0e2cac5e 100644 --- a/interface/web/admin/lib/lang/se_system_config.lng +++ b/interface/web/admin/lib/lang/se_system_config.lng @@ -81,6 +81,8 @@ $wb['default_webserver_txt'] = 'Default Webserver'; $wb['default_dnsserver_txt'] = 'Default DNS Server'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; $wb['default_dbserver_txt'] = 'Default Database Server'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Name'; $wb['ca_issue_txt'] = 'Issue'; $wb['ca_wildcard_txt'] = 'Use Wildcard'; -- GitLab From 55a33fdbfd510b32e8f66be3e32bbfdb696aafa8 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Sat, 13 Jun 2020 17:31:04 +0200 Subject: [PATCH 07/28] Update tr_system_config.lng --- interface/web/admin/lib/lang/tr_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/tr_system_config.lng b/interface/web/admin/lib/lang/tr_system_config.lng index 3ef8e26875..3b89919129 100644 --- a/interface/web/admin/lib/lang/tr_system_config.lng +++ b/interface/web/admin/lib/lang/tr_system_config.lng @@ -84,4 +84,6 @@ $wb['reseller_can_use_options_txt'] = 'Bayi web siteleri için seçenek sekmesin $wb['custom_login_text_txt'] = 'Oturum Açma Sayfası Metni'; $wb['custom_login_link_txt'] = 'Oturum Açma Sayfası Bağlantısı'; $wb['login_link_error_regex'] = 'Oturum Açma Bağlantısı Geçersiz'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; ?> -- GitLab From 56ad3421ef7acef5ba022daf44a5ccabe7054030 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Sat, 13 Jun 2020 17:31:21 +0200 Subject: [PATCH 08/28] Update ar_system_config.lng --- interface/web/admin/lib/lang/ar_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/ar_system_config.lng b/interface/web/admin/lib/lang/ar_system_config.lng index 0a830014d8..664221e728 100644 --- a/interface/web/admin/lib/lang/ar_system_config.lng +++ b/interface/web/admin/lib/lang/ar_system_config.lng @@ -81,6 +81,8 @@ $wb['default_webserver_txt'] = 'Default Webserver'; $wb['default_dnsserver_txt'] = 'Default DNS Server'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; $wb['default_dbserver_txt'] = 'Default Database Server'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Name'; $wb['ca_issue_txt'] = 'Issue'; $wb['ca_wildcard_txt'] = 'Use Wildcard'; -- GitLab From ffb8eeb696dcfa53ec1a56205ebe06cd56fbeab5 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Sat, 13 Jun 2020 17:31:34 +0200 Subject: [PATCH 09/28] Update bg_system_config.lng --- interface/web/admin/lib/lang/bg_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/bg_system_config.lng b/interface/web/admin/lib/lang/bg_system_config.lng index 130cb596aa..83fcbaa839 100644 --- a/interface/web/admin/lib/lang/bg_system_config.lng +++ b/interface/web/admin/lib/lang/bg_system_config.lng @@ -81,6 +81,8 @@ $wb['default_webserver_txt'] = 'Default Webserver'; $wb['default_dnsserver_txt'] = 'Default DNS Server'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; $wb['default_dbserver_txt'] = 'Default Database Server'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Name'; $wb['ca_issue_txt'] = 'Issue'; $wb['ca_wildcard_txt'] = 'Use Wildcard'; -- GitLab From 4571bcb4e45cfe6216a452b238208462beeb8c6d Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Sat, 13 Jun 2020 17:31:50 +0200 Subject: [PATCH 10/28] Update br_system_config.lng --- interface/web/admin/lib/lang/br_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/br_system_config.lng b/interface/web/admin/lib/lang/br_system_config.lng index 98bd4c9614..e405e7bb1b 100644 --- a/interface/web/admin/lib/lang/br_system_config.lng +++ b/interface/web/admin/lib/lang/br_system_config.lng @@ -81,6 +81,8 @@ $wb['reseller_can_use_options_txt'] = 'Revendas podem utilizar o menu sites'; $wb['custom_login_text_txt'] = 'Texto personalizado para a página de acesso'; $wb['custom_login_link_txt'] = 'Link personalizado para página de acesso'; $wb['login_link_error_regex'] = 'Link personalizado para acesso inválido'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Nome'; $wb['ca_issue_txt'] = 'Questão'; $wb['ca_wildcard_txt'] = 'Usar curingas'; -- GitLab From 27c15175f9bbb4dcdcd6e32d1c5830523ede62c6 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Sat, 13 Jun 2020 17:32:12 +0200 Subject: [PATCH 11/28] Update ca_system_config.lng --- interface/web/admin/lib/lang/ca_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/ca_system_config.lng b/interface/web/admin/lib/lang/ca_system_config.lng index cc3c11c6c5..267e41b65b 100644 --- a/interface/web/admin/lib/lang/ca_system_config.lng +++ b/interface/web/admin/lib/lang/ca_system_config.lng @@ -81,6 +81,8 @@ $wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websi $wb['custom_login_text_txt'] = 'Custom Text on Login-Page'; $wb['custom_login_link_txt'] = 'Custom Link on Login-Page'; $wb['login_link_error_regex'] = 'Invalid Link for Custom Login'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Name'; $wb['ca_issue_txt'] = 'Issue'; $wb['ca_wildcard_txt'] = 'Use Wildcard'; -- GitLab From 5c163fd95157a8285248ef359b7afd77c5e058b5 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Sat, 13 Jun 2020 17:32:26 +0200 Subject: [PATCH 12/28] Update cz_system_config.lng --- interface/web/admin/lib/lang/cz_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng index 3660e1b689..40c78c1856 100644 --- a/interface/web/admin/lib/lang/cz_system_config.lng +++ b/interface/web/admin/lib/lang/cz_system_config.lng @@ -81,6 +81,8 @@ $wb['reseller_can_use_options_txt'] = 'Distributor (prodejce) může použít ka $wb['custom_login_text_txt'] = 'Vlastní text na přihlašovací stránce'; $wb['custom_login_link_txt'] = 'Vlastní odkaz (URL) na přihlašovací stránce (vlastní text)'; $wb['login_link_error_regex'] = 'Neplatný formát URL pro vlastní odkaz na přihlašovací stránce'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Název vydavatele'; $wb['ca_issue_txt'] = 'Doména vydavatele'; $wb['ca_wildcard_txt'] = 'Použít Wildcard (*)'; -- GitLab From 901caa6a2299258c9d43881c1af91c4dca2643ce Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Sat, 13 Jun 2020 17:32:42 +0200 Subject: [PATCH 13/28] Update dk_system_config.lng --- interface/web/admin/lib/lang/dk_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/dk_system_config.lng b/interface/web/admin/lib/lang/dk_system_config.lng index 26b0fe7e78..ad3ecbf4db 100644 --- a/interface/web/admin/lib/lang/dk_system_config.lng +++ b/interface/web/admin/lib/lang/dk_system_config.lng @@ -81,6 +81,8 @@ $wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websi $wb['custom_login_text_txt'] = 'Custom Text on Login-Page'; $wb['custom_login_link_txt'] = 'Custom Link on Login-Page'; $wb['login_link_error_regex'] = 'Invalid Link for Custom Login'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Name'; $wb['ca_issue_txt'] = 'Issue'; $wb['ca_wildcard_txt'] = 'Use Wildcard'; -- GitLab From dd6e7deb2c51b6b0c704d82d4001fb1b497452d9 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Sat, 13 Jun 2020 17:32:55 +0200 Subject: [PATCH 14/28] Update el_system_config.lng --- interface/web/admin/lib/lang/el_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng index 640d6f00a9..3276653f33 100644 --- a/interface/web/admin/lib/lang/el_system_config.lng +++ b/interface/web/admin/lib/lang/el_system_config.lng @@ -81,6 +81,8 @@ $wb['default_webserver_txt'] = 'Default Webserver'; $wb['default_dnsserver_txt'] = 'Default DNS Server'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; $wb['default_dbserver_txt'] = 'Default Database Server'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Name'; $wb['ca_issue_txt'] = 'Issue'; $wb['ca_wildcard_txt'] = 'Use Wildcard'; -- GitLab From d9fd5475927d51047913abe0d68cfe897b398866 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Sat, 13 Jun 2020 17:33:26 +0200 Subject: [PATCH 15/28] Update es_system_config.lng --- interface/web/admin/lib/lang/es_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/es_system_config.lng b/interface/web/admin/lib/lang/es_system_config.lng index 043c52cfdd..39fae409ce 100755 --- a/interface/web/admin/lib/lang/es_system_config.lng +++ b/interface/web/admin/lib/lang/es_system_config.lng @@ -81,6 +81,8 @@ $wb['webftp_url_txt'] = 'Enlace al cliente FTP por web'; $wb['webmail_url_error_regex'] = 'Dirección del correo web inválida'; $wb['webmail_url_note_txt'] = 'Marcador de posición:'; $wb['webmail_url_txt'] = 'URL de correo web'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Name'; $wb['ca_issue_txt'] = 'Issue'; $wb['ca_wildcard_txt'] = 'Use Wildcard'; -- GitLab From b55a43a2a464a0633f7b1866a488aa40be24e6b1 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Sat, 13 Jun 2020 17:33:39 +0200 Subject: [PATCH 16/28] Update fi_system_config.lng --- interface/web/admin/lib/lang/fi_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/fi_system_config.lng b/interface/web/admin/lib/lang/fi_system_config.lng index c0972c49d8..be49b16ef4 100644 --- a/interface/web/admin/lib/lang/fi_system_config.lng +++ b/interface/web/admin/lib/lang/fi_system_config.lng @@ -81,6 +81,8 @@ $wb['default_webserver_txt'] = 'Default Webserver'; $wb['default_dnsserver_txt'] = 'Default DNS Server'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; $wb['default_dbserver_txt'] = 'Default Database Server'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Name'; $wb['ca_issue_txt'] = 'Issue'; $wb['ca_wildcard_txt'] = 'Use Wildcard'; -- GitLab From 41b9ce463aff3a04774b6c5dc5bc9e642ab8cf74 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Sat, 13 Jun 2020 17:33:49 +0200 Subject: [PATCH 17/28] Update fr_system_config.lng --- interface/web/admin/lib/lang/fr_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/fr_system_config.lng b/interface/web/admin/lib/lang/fr_system_config.lng index 18f0dbbed4..8ef8aa64e6 100644 --- a/interface/web/admin/lib/lang/fr_system_config.lng +++ b/interface/web/admin/lib/lang/fr_system_config.lng @@ -81,6 +81,8 @@ $wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websi $wb['custom_login_text_txt'] = 'Custom Text on Login-Page'; $wb['custom_login_link_txt'] = 'Custom Link on Login-Page'; $wb['login_link_error_regex'] = 'Invalid Link for Custom Login'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Name'; $wb['ca_issue_txt'] = 'Issue'; $wb['ca_wildcard_txt'] = 'Use Wildcard'; -- GitLab From 44ed03e7d3d9fcc0a70e8143836a3e5b8d685da4 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Sat, 13 Jun 2020 17:33:58 +0200 Subject: [PATCH 18/28] Update hr_system_config.lng --- interface/web/admin/lib/lang/hr_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/hr_system_config.lng b/interface/web/admin/lib/lang/hr_system_config.lng index a7735647b1..e08fdfbb3c 100644 --- a/interface/web/admin/lib/lang/hr_system_config.lng +++ b/interface/web/admin/lib/lang/hr_system_config.lng @@ -81,6 +81,8 @@ $wb['default_webserver_txt'] = 'Default Webserver'; $wb['default_dnsserver_txt'] = 'Default DNS Server'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; $wb['default_dbserver_txt'] = 'Default Database Server'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Name'; $wb['ca_issue_txt'] = 'Issue'; $wb['ca_wildcard_txt'] = 'Use Wildcard'; -- GitLab From 36b256bf706a38abe86d791e01d19747c0ca91da Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Sat, 13 Jun 2020 17:34:06 +0200 Subject: [PATCH 19/28] Update hu_system_config.lng --- interface/web/admin/lib/lang/hu_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/hu_system_config.lng b/interface/web/admin/lib/lang/hu_system_config.lng index cee497fe19..613ad88a22 100644 --- a/interface/web/admin/lib/lang/hu_system_config.lng +++ b/interface/web/admin/lib/lang/hu_system_config.lng @@ -81,6 +81,8 @@ $wb['default_webserver_txt'] = 'Default Webserver'; $wb['default_dnsserver_txt'] = 'Default DNS Server'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; $wb['default_dbserver_txt'] = 'Default Database Server'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Name'; $wb['ca_issue_txt'] = 'Issue'; $wb['ca_wildcard_txt'] = 'Use Wildcard'; -- GitLab From 65b8b7219f688a5dbd49edad9e15b51e21dbb1d1 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Sat, 13 Jun 2020 17:34:15 +0200 Subject: [PATCH 20/28] Update id_system_config.lng --- interface/web/admin/lib/lang/id_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/id_system_config.lng b/interface/web/admin/lib/lang/id_system_config.lng index 344185b84d..f2dfeb6734 100644 --- a/interface/web/admin/lib/lang/id_system_config.lng +++ b/interface/web/admin/lib/lang/id_system_config.lng @@ -81,6 +81,8 @@ $wb['default_webserver_txt'] = 'Default Webserver'; $wb['default_dnsserver_txt'] = 'Default DNS Server'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; $wb['default_dbserver_txt'] = 'Default Database Server'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Name'; $wb['ca_issue_txt'] = 'Issue'; $wb['ca_wildcard_txt'] = 'Use Wildcard'; -- GitLab From 1d2f3be54065b93026d4442feb33b6f803a989a0 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Sat, 13 Jun 2020 17:34:25 +0200 Subject: [PATCH 21/28] Update ja_system_config.lng --- interface/web/admin/lib/lang/ja_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/ja_system_config.lng b/interface/web/admin/lib/lang/ja_system_config.lng index aa5cc6a7a3..718e4302c5 100644 --- a/interface/web/admin/lib/lang/ja_system_config.lng +++ b/interface/web/admin/lib/lang/ja_system_config.lng @@ -81,6 +81,8 @@ $wb['default_webserver_txt'] = 'Default Webserver'; $wb['default_dnsserver_txt'] = 'Default DNS Server'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; $wb['default_dbserver_txt'] = 'Default Database Server'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Name'; $wb['ca_issue_txt'] = 'Issue'; $wb['ca_wildcard_txt'] = 'Use Wildcard'; -- GitLab From 55791026e43fce7acf80f0f98e339ec237714e80 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Sat, 13 Jun 2020 17:34:35 +0200 Subject: [PATCH 22/28] Update nl_system_config.lng --- interface/web/admin/lib/lang/nl_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng index 44a58b7646..fda9056d8d 100644 --- a/interface/web/admin/lib/lang/nl_system_config.lng +++ b/interface/web/admin/lib/lang/nl_system_config.lng @@ -81,6 +81,8 @@ $wb['default_webserver_txt'] = 'Default Webserver'; $wb['default_dnsserver_txt'] = 'Default DNS Server'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; $wb['default_dbserver_txt'] = 'Default Database Server'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Name'; $wb['ca_issue_txt'] = 'Issue'; $wb['ca_wildcard_txt'] = 'Use Wildcard'; -- GitLab From cb1342c8f338e7633be68485908058c0798fb968 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Fri, 19 Jun 2020 20:37:27 +0200 Subject: [PATCH 23/28] Update ru_system_config.lng --- interface/web/admin/lib/lang/ru_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/ru_system_config.lng b/interface/web/admin/lib/lang/ru_system_config.lng index baed497b0e..b5ef1fba74 100644 --- a/interface/web/admin/lib/lang/ru_system_config.lng +++ b/interface/web/admin/lib/lang/ru_system_config.lng @@ -81,6 +81,8 @@ $wb['default_webserver_txt'] = 'Web-сервер по умолчанию'; $wb['default_dnsserver_txt'] = 'DNS-сервер по умолчанию'; $wb['default_slave_dnsserver_txt'] = 'Вторичный DNS-сервер по умолчанию'; $wb['default_dbserver_txt'] = 'Сервер базы данных по умолчанию'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Name'; $wb['ca_issue_txt'] = 'Issue'; $wb['ca_wildcard_txt'] = 'Use Wildcard'; -- GitLab From 3381004ce49faf48d0c67187c336cf82ab654444 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Fri, 19 Jun 2020 20:37:42 +0200 Subject: [PATCH 24/28] Update sk_system_config.lng --- interface/web/admin/lib/lang/sk_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/sk_system_config.lng b/interface/web/admin/lib/lang/sk_system_config.lng index 90418e87d5..a8de64e7d0 100644 --- a/interface/web/admin/lib/lang/sk_system_config.lng +++ b/interface/web/admin/lib/lang/sk_system_config.lng @@ -81,6 +81,8 @@ $wb['default_webserver_txt'] = 'Default Webserver'; $wb['default_dnsserver_txt'] = 'Default DNS Server'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; $wb['default_dbserver_txt'] = 'Default Database Server'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Name'; $wb['ca_issue_txt'] = 'Issue'; $wb['ca_wildcard_txt'] = 'Use Wildcard'; -- GitLab From 30f00bd12977380bfac62ff11e4456fb312ccf8a Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Fri, 19 Jun 2020 20:37:52 +0200 Subject: [PATCH 25/28] Update ro_system_config.lng --- interface/web/admin/lib/lang/ro_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/ro_system_config.lng b/interface/web/admin/lib/lang/ro_system_config.lng index 2a39a454e8..9740c7e290 100644 --- a/interface/web/admin/lib/lang/ro_system_config.lng +++ b/interface/web/admin/lib/lang/ro_system_config.lng @@ -81,6 +81,8 @@ $wb['default_webserver_txt'] = 'Default Webserver'; $wb['default_dnsserver_txt'] = 'Default DNS Server'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; $wb['default_dbserver_txt'] = 'Default Database Server'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Name'; $wb['ca_issue_txt'] = 'Issue'; $wb['ca_wildcard_txt'] = 'Use Wildcard'; -- GitLab From 60b1864288f918c89cc1cc210ddc7ab8a22b4059 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Fri, 19 Jun 2020 20:38:01 +0200 Subject: [PATCH 26/28] Update pl_system_config.lng --- interface/web/admin/lib/lang/pl_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng index a809251ec1..78abd19c38 100644 --- a/interface/web/admin/lib/lang/pl_system_config.lng +++ b/interface/web/admin/lib/lang/pl_system_config.lng @@ -81,6 +81,8 @@ $wb['default_webserver_txt'] = 'Default Webserver'; $wb['default_dnsserver_txt'] = 'Default DNS Server'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; $wb['default_dbserver_txt'] = 'Default Database Server'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Name'; $wb['ca_issue_txt'] = 'Issue'; $wb['ca_wildcard_txt'] = 'Use Wildcard'; -- GitLab From e5c401a21d7bdd6e675b2c4152437b3c5ea2be70 Mon Sep 17 00:00:00 2001 From: Massimiliano Date: Fri, 19 Jun 2020 20:38:15 +0200 Subject: [PATCH 27/28] Update pt_system_config.lng --- interface/web/admin/lib/lang/pt_system_config.lng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/web/admin/lib/lang/pt_system_config.lng b/interface/web/admin/lib/lang/pt_system_config.lng index 6fc26344c0..f5688291d8 100644 --- a/interface/web/admin/lib/lang/pt_system_config.lng +++ b/interface/web/admin/lib/lang/pt_system_config.lng @@ -81,6 +81,8 @@ $wb['default_webserver_txt'] = 'Default Webserver'; $wb['default_dnsserver_txt'] = 'Default DNS Server'; $wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; $wb['default_dbserver_txt'] = 'Default Database Server'; +$wb["default_remote_dbserver_txt"] = "Default DB Remote servers"; +$wb["disable_client_remote_dbserver_txt"] = "Disable DB Remote sections for Clients"; $wb['ca_name_txt'] = 'Name'; $wb['ca_issue_txt'] = 'Issue'; $wb['ca_wildcard_txt'] = 'Use Wildcard'; -- GitLab From 1076198f1126b9edb87715bb8e5de0c1f1729b87 Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Thu, 23 Jul 2020 14:40:53 +0200 Subject: [PATCH 28/28] Update system_config.tform.php to trigger MR pipeline --- interface/web/admin/form/system_config.tform.php | 1 - 1 file changed, 1 deletion(-) diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php index 84c586da89..562c3a5226 100644 --- a/interface/web/admin/form/system_config.tform.php +++ b/interface/web/admin/form/system_config.tform.php @@ -776,4 +776,3 @@ $form['tabs']['dns_ca'] = array ( ) ); -?> \ No newline at end of file -- GitLab