From 4d302738d499c71819e6e218944a73aff55cdb21 Mon Sep 17 00:00:00 2001 From: Branislav Viest Date: Tue, 23 May 2023 11:53:22 +0200 Subject: [PATCH 1/2] Configure Default mysql remote server regardless where website and database are created --- interface/web/sites/database_edit.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php index 55c582eeda..ccaf4a500e 100644 --- a/interface/web/sites/database_edit.php +++ b/interface/web/sites/database_edit.php @@ -388,6 +388,14 @@ class page_action extends tform_actions { } } } + } else { + // Add default remote_ips from Main Configuration. + $remote_ips = explode(",", $global_config['default_remote_dbserver']); + + if($this->dataRecord['remote_access'] != 'y'){ + $this->dataRecord['remote_ips'] = implode(',', $remote_ips); + $this->dataRecord['remote_access'] = 'y'; + } } if ($app->tform->errorMessage == '') { @@ -478,6 +486,14 @@ class page_action extends tform_actions { } } } + } else { + // Add default remote_ips from Main Configuration. + $remote_ips = explode(",", $global_config['default_remote_dbserver']); + + if($this->dataRecord['remote_access'] != 'y'){ + $this->dataRecord['remote_ips'] = implode(',', $remote_ips); + $this->dataRecord['remote_access'] = 'y'; + } } if ($app->tform->errorMessage == '') { -- GitLab From e1adb40d456148fcce40b510a55dcfb5a69eb879 Mon Sep 17 00:00:00 2001 From: Branislav Viest Date: Tue, 23 May 2023 11:59:47 +0200 Subject: [PATCH 2/2] Added check if default configuration is set --- interface/web/sites/database_edit.php | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php index ccaf4a500e..528ec444ed 100644 --- a/interface/web/sites/database_edit.php +++ b/interface/web/sites/database_edit.php @@ -389,12 +389,14 @@ class page_action extends tform_actions { } } } else { - // Add default remote_ips from Main Configuration. - $remote_ips = explode(",", $global_config['default_remote_dbserver']); + if(!empty($global_config['default_remote_dbserver'])) { + // Add default remote_ips from Main Configuration. + $remote_ips = explode(",", $global_config['default_remote_dbserver']); - if($this->dataRecord['remote_access'] != 'y'){ - $this->dataRecord['remote_ips'] = implode(',', $remote_ips); - $this->dataRecord['remote_access'] = 'y'; + if($this->dataRecord['remote_access'] != 'y'){ + $this->dataRecord['remote_ips'] = implode(',', $remote_ips); + $this->dataRecord['remote_access'] = 'y'; + } } } @@ -487,12 +489,14 @@ class page_action extends tform_actions { } } } else { - // Add default remote_ips from Main Configuration. - $remote_ips = explode(",", $global_config['default_remote_dbserver']); + if(!empty($global_config['default_remote_dbserver'])) { + // Add default remote_ips from Main Configuration. + $remote_ips = explode(",", $global_config['default_remote_dbserver']); - if($this->dataRecord['remote_access'] != 'y'){ - $this->dataRecord['remote_ips'] = implode(',', $remote_ips); - $this->dataRecord['remote_access'] = 'y'; + if($this->dataRecord['remote_access'] != 'y'){ + $this->dataRecord['remote_ips'] = implode(',', $remote_ips); + $this->dataRecord['remote_access'] = 'y'; + } } } -- GitLab