From 38c9efa19abe61a310ba17007d198d6b2b09c1e5 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Thu, 3 Dec 2020 15:31:42 +0100 Subject: [PATCH 01/29] Add a monitor check for MX records --- interface/lib/classes/tools_monitor.inc.php | 19 +++ interface/web/monitor/lib/lang/en.lng | 3 + interface/web/monitor/show_data.php | 8 + interface/web/monitor/show_sys_state.php | 16 ++ .../classes/cron.d/100-monitor_domain_mx.php | 138 ++++++++++++++++++ server/lib/classes/functions.inc.php | 57 ++++++++ 6 files changed, 241 insertions(+) create mode 100755 server/lib/classes/cron.d/100-monitor_domain_mx.php diff --git a/interface/lib/classes/tools_monitor.inc.php b/interface/lib/classes/tools_monitor.inc.php index d57b9b7a3f..7a5efea279 100644 --- a/interface/lib/classes/tools_monitor.inc.php +++ b/interface/lib/classes/tools_monitor.inc.php @@ -576,6 +576,25 @@ class tools_monitor { return $html; } + function showMx_ip_match() { + global $app; + + /* fetch the Data from the DB */ + $record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'mx_ip_match' and server_id = ? ORDER BY created DESC", $_SESSION['monitor']['server_id']); + + if(isset($record['data'])) { + $data = unserialize($record['data']); + $html = ''; + foreach ($data as $domain => $text) { + $html .= "$domain: $text
"; + } + } else { + $html = '

'.$app->lng("no_data_mx_ip_match_txt").'

'; + } + + return $html; + } + function getDataTime($type) { global $app; diff --git a/interface/web/monitor/lib/lang/en.lng b/interface/web/monitor/lib/lang/en.lng index c790ed1d76..eec736c548 100644 --- a/interface/web/monitor/lib/lang/en.lng +++ b/interface/web/monitor/lib/lang/en.lng @@ -166,4 +166,7 @@ $wb['no_munin_url_defined_txt'] = 'No Munin URL defined.'; $wb['no_permissions_to_view_munin_txt'] = 'You are not allowed to access Munin.'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_matchwarning_txt'] = 'Not all DNS MX records match the server IP'; ?> diff --git a/interface/web/monitor/show_data.php b/interface/web/monitor/show_data.php index 80f246ee2d..1325839841 100644 --- a/interface/web/monitor/show_data.php +++ b/interface/web/monitor/show_data.php @@ -114,6 +114,14 @@ case 'mailq': $description = ''; $add_padding = true; break; +case 'mx_ip_match': + $template = 'templates/show_data.htm'; + $output .= $app->tools_monitor->showMx_ip_match(); + $time = $app->tools_monitor->getDataTime('mx_ip_match'); + $title = $app->lng("monitor_title_mx_ip_match_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')'; + $description = ''; + $add_padding = true; + break; case 'raid_state': $template = 'templates/show_data.htm'; $output .= $app->tools_monitor->showRaidState(); diff --git a/interface/web/monitor/show_sys_state.php b/interface/web/monitor/show_sys_state.php index 9e70496a81..fdfc47e253 100644 --- a/interface/web/monitor/show_sys_state.php +++ b/interface/web/monitor/show_sys_state.php @@ -557,6 +557,22 @@ function _processDbState($type, $serverId, $serverState, $messages) { break; } } + if ($type == 'mx_ip_match') { + switch ($record['state']) { + case 'ok': + $messages[$app->lng("monitor_serverstate_listok_txt")][] = $app->lng("monitor_serverstate_mx_ip_matchok_txt") . ' ' . + "[" . $app->lng("monitor_serverstate_more_txt") . "]"; + break; + case 'warning': + $messages[$app->lng("monitor_serverstate_listwarning_txt")][] = $app->lng("monitor_serverstate_mx_ip_matchwarning_txt") . ' ' . + "[" . $app->lng("monitor_serverstate_more_txt") . "]"; + break; + default: + $messages[$app->lng("monitor_serverstate_listunknown_txt")][] = $app->lng("monitor_serverstate_mx_ip_match_unknown_txt") . ' ' . + "[" . $app->lng("monitor_serverstate_more_txt") . "]"; + break; + } + } if ($type == 'sys_log') { switch ($record['state']) { diff --git a/server/lib/classes/cron.d/100-monitor_domain_mx.php b/server/lib/classes/cron.d/100-monitor_domain_mx.php new file mode 100755 index 0000000000..fe1494ddb5 --- /dev/null +++ b/server/lib/classes/cron.d/100-monitor_domain_mx.php @@ -0,0 +1,138 @@ +uses('getconf,functions'); + $mail_config = $app->getconf->get_server_config($conf['server_id'], 'server'); + + /* used for all monitor cronjobs */ + $app->load('monitor_tools'); + $this->_tools = new monitor_tools(); + /* end global section for monitor cronjobs */ + + + // Initialize data array + $data = array(); + + // the id of the server as int + $server_id = intval($conf['server_id']); + + $smtpin_ips = gethostbynamel($mail_config['hostname']); + $smtpin_ips_v6 = $app->functions->gethostbynamel6($mail_config['hostname']); + if ($smtpin_ips_v6) { + $smtpin_ips = array_merge($smtpin_ips, $smtpin_ips_v6); + } + $maildomains = $app->db->queryAllRecords("SELECT domain, active FROM mail_domain WHERE server_id = ?", $server_id); + if(is_array($maildomains)) { + foreach ($maildomains as $maildomain) { + $mx = array(); + $found_mx = getmxrr($maildomain['domain'], $mx); + + $app->log('mx re:' . print_r($mx, 1)); + + $first_mx = array_shift($mx); + $mx_ip = gethostbyname($first_mx); + + if (!in_array( $mx_ip, $smtpin_ips)) { + if ($maildomain['active'] == 'y') { + $app->log('Mail domain[' . $maildomain['domain'] . '] is active but the DNS does not match our IP.', LOGLEVEL_WARN); + $state = 'warning'; + $data[$maildomain['domain']] = 'Domain is active but the DNS does not match our IP.'; + } else { + + $app->log('Good, the mail domain[' . $maildomain['domain'] . '] is not active and DNS is not pointing to us.', LOGLEVEL_DEBUG); + } + } + else { + if ($maildomain['active'] == 'n') { + $app->log('DNS points to our IP but the mail domain[' . $maildomain['domain'] . '] is not active.', LOGLEVEL_WARN); + $state = 'warning'; + $data[$maildomain['domain']] = 'DNS points to our IP but the mail domain is not active.'; + } + else { + // DNS OK. + } + } + } + } + + $res = array(); + $res['server_id'] = $server_id; + $res['type'] = 'mx_ip_match'; + $res['data'] = $data; + $res['state'] = $state; + + /** + * Insert the data into the database + */ + $sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' . + 'VALUES (?, ?, UNIX_TIMESTAMP(), ?, ?)'; + $app->dbmaster->query($sql, $res['server_id'], $res['type'], serialize($res['data']), $res['state']); + + // The new data is written, now we can delete the old one. + $this->_tools->delOldRecords($res['type'], $res['server_id']); + + parent::onRunJob(); + } + + /* this function is optional if it contains no custom code */ + public function onAfterRun() { + global $app; + + parent::onAfterRun(); + } + +} + +?> diff --git a/server/lib/classes/functions.inc.php b/server/lib/classes/functions.inc.php index 5296c3012b..7cd5a62da5 100644 --- a/server/lib/classes/functions.inc.php +++ b/server/lib/classes/functions.inc.php @@ -481,6 +481,63 @@ class functions { } } + /** + * From https://www.php.net/manual/en/function.gethostbyname.php#70936 + */ + public function gethostbyname6($host, $try_a = false) { + // get AAAA record for $host + // if $try_a is true, if AAAA fails, it tries for A + // the first match found is returned + // otherwise returns false + + $dns = gethostbynamel6($host, $try_a); + if ($dns == false) { return false; } + else { return $dns[0]; } + } + + /** + * From https://www.php.net/manual/en/function.gethostbyname.php#70936 + */ + public function gethostbynamel6($host, $try_a = false) { + // get AAAA records for $host, + // if $try_a is true, if AAAA fails, it tries for A + // results are returned in an array of ips found matching type + // otherwise returns false + + $dns6 = dns_get_record($host, DNS_AAAA); + if ($try_a == true) { + $dns4 = dns_get_record($host, DNS_A); + $dns = array_merge($dns4, $dns6); + } + else { $dns = $dns6; } + $ip6 = array(); + $ip4 = array(); + foreach ($dns as $record) { + if ($record["type"] == "A") { + $ip4[] = $record["ip"]; + } + if ($record["type"] == "AAAA") { + $ip6[] = $record["ipv6"]; + } + } + if (count($ip6) < 1) { + if ($try_a == true) { + if (count($ip4) < 1) { + return false; + } + else { + return $ip4; + } + } + else { + return false; + } + } + else { + return $ip6; + } + } + } ?> -- GitLab From a17b6a21e119c0adce11c430488a3c76b0b254b1 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Mon, 7 Dec 2020 16:02:10 +0100 Subject: [PATCH 02/29] Fix record sorting, Update log messages --- .../classes/cron.d/100-monitor_domain_mx.php | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/server/lib/classes/cron.d/100-monitor_domain_mx.php b/server/lib/classes/cron.d/100-monitor_domain_mx.php index fe1494ddb5..fb8ab60668 100755 --- a/server/lib/classes/cron.d/100-monitor_domain_mx.php +++ b/server/lib/classes/cron.d/100-monitor_domain_mx.php @@ -76,29 +76,38 @@ class cronjob_monitor_domain_mx extends cronjob { $maildomains = $app->db->queryAllRecords("SELECT domain, active FROM mail_domain WHERE server_id = ?", $server_id); if(is_array($maildomains)) { foreach ($maildomains as $maildomain) { - $mx = array(); - $found_mx = getmxrr($maildomain['domain'], $mx); + $mx_records = array(); + $mx_weight = array(); + $found_mx = getmxrr($maildomain['domain'], $mx_records, $mx_weight) ; - $app->log('mx re:' . print_r($mx, 1)); + $mx_sorted = array(); - $first_mx = array_shift($mx); + // Merge records and weight into a single array to sort on priority. + // ignore multiple mx's at the same weight + foreach ($mx_records as $key => $name) { + $mx_sorted[$mx_weight[$key]] = $mx_records[$key]; + } + ksort ($mx_sorted, SORT_NUMERIC); + reset ($mx_sorted); + + $first_mx = array_shift($mx_sorted); $mx_ip = gethostbyname($first_mx); if (!in_array( $mx_ip, $smtpin_ips)) { if ($maildomain['active'] == 'y') { $app->log('Mail domain[' . $maildomain['domain'] . '] is active but the DNS does not match our IP.', LOGLEVEL_WARN); $state = 'warning'; - $data[$maildomain['domain']] = 'Domain is active but the DNS does not match our IP.'; + $data[$maildomain['domain']] = 'Email domain is active but the DNS does not match our IP.'; } else { - $app->log('Good, the mail domain[' . $maildomain['domain'] . '] is not active and DNS is not pointing to us.', LOGLEVEL_DEBUG); + $app->log('Good, the email domain[' . $maildomain['domain'] . '] is not active and DNS is not pointing to us.', LOGLEVEL_DEBUG); } } else { if ($maildomain['active'] == 'n') { - $app->log('DNS points to our IP but the mail domain[' . $maildomain['domain'] . '] is not active.', LOGLEVEL_WARN); + $app->log('DNS points to our IP but the email domain[' . $maildomain['domain'] . '] is not active.', LOGLEVEL_WARN); $state = 'warning'; - $data[$maildomain['domain']] = 'DNS points to our IP but the mail domain is not active.'; + $data[$maildomain['domain']] = 'DNS points to our IP but the email domain is not active.'; } else { // DNS OK. -- GitLab From a72062341a214c5a72fd4c8290ec3f3d8af56547 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Mon, 7 Dec 2020 16:29:28 +0100 Subject: [PATCH 03/29] set initial state --- server/lib/classes/cron.d/100-monitor_domain_mx.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/lib/classes/cron.d/100-monitor_domain_mx.php b/server/lib/classes/cron.d/100-monitor_domain_mx.php index fb8ab60668..688f2edfa9 100755 --- a/server/lib/classes/cron.d/100-monitor_domain_mx.php +++ b/server/lib/classes/cron.d/100-monitor_domain_mx.php @@ -64,6 +64,7 @@ class cronjob_monitor_domain_mx extends cronjob { // Initialize data array $data = array(); + $state = 'no_state'; // the id of the server as int $server_id = intval($conf['server_id']); @@ -75,6 +76,7 @@ class cronjob_monitor_domain_mx extends cronjob { } $maildomains = $app->db->queryAllRecords("SELECT domain, active FROM mail_domain WHERE server_id = ?", $server_id); if(is_array($maildomains)) { + $state = 'ok'; foreach ($maildomains as $maildomain) { $mx_records = array(); $mx_weight = array(); -- GitLab From 5a5afb3891983d7bc97b7ab2d2ab293ec6d2586b Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Fri, 5 Mar 2021 11:37:13 +0100 Subject: [PATCH 04/29] Fix schedule --- server/lib/classes/cron.d/100-monitor_domain_mx.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/lib/classes/cron.d/100-monitor_domain_mx.php b/server/lib/classes/cron.d/100-monitor_domain_mx.php index 688f2edfa9..b3ed306831 100755 --- a/server/lib/classes/cron.d/100-monitor_domain_mx.php +++ b/server/lib/classes/cron.d/100-monitor_domain_mx.php @@ -31,7 +31,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. class cronjob_monitor_domain_mx extends cronjob { // job schedule - protected $_schedule = '* 6 * * *'; + protected $_schedule = '30 6 * * *'; protected $_run_at_new = true; private $_tools = null; -- GitLab From 174013da4fbe021cb441f8a4cf37dfd28be635c2 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Mon, 8 Mar 2021 15:32:39 +0100 Subject: [PATCH 05/29] Use hostname() and read additional_smtp_ips from ini config --- server/lib/classes/cron.d/100-monitor_domain_mx.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/server/lib/classes/cron.d/100-monitor_domain_mx.php b/server/lib/classes/cron.d/100-monitor_domain_mx.php index b3ed306831..2254efddc6 100755 --- a/server/lib/classes/cron.d/100-monitor_domain_mx.php +++ b/server/lib/classes/cron.d/100-monitor_domain_mx.php @@ -54,26 +54,30 @@ class cronjob_monitor_domain_mx extends cronjob { global $app, $conf; $app->uses('getconf,functions'); - $mail_config = $app->getconf->get_server_config($conf['server_id'], 'server'); + $mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail'); /* used for all monitor cronjobs */ $app->load('monitor_tools'); $this->_tools = new monitor_tools(); /* end global section for monitor cronjobs */ - // Initialize data array $data = array(); $state = 'no_state'; // the id of the server as int $server_id = intval($conf['server_id']); + $hostname = $app->system->hostname(); - $smtpin_ips = gethostbynamel($mail_config['hostname']); - $smtpin_ips_v6 = $app->functions->gethostbynamel6($mail_config['hostname']); + $smtpin_ips = gethostbynamel($hostname); + $smtpin_ips_v6 = $app->functions->gethostbynamel6($hostname); if ($smtpin_ips_v6) { $smtpin_ips = array_merge($smtpin_ips, $smtpin_ips_v6); } + + # Add additional IP's , e.g. for secondary IP on the same box or a proxy. + $smtpin_ips = array_merge($smtpin_ips, explode(',', $mail_config['additional_smtp_ips'])); + $maildomains = $app->db->queryAllRecords("SELECT domain, active FROM mail_domain WHERE server_id = ?", $server_id); if(is_array($maildomains)) { $state = 'ok'; -- GitLab From 59c86cd2f15adc5ebcc6070d97b433b98a053e92 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Mon, 8 Mar 2021 15:33:09 +0100 Subject: [PATCH 06/29] String changes --- server/lib/classes/cron.d/100-monitor_domain_mx.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/lib/classes/cron.d/100-monitor_domain_mx.php b/server/lib/classes/cron.d/100-monitor_domain_mx.php index 2254efddc6..b1af19e85c 100755 --- a/server/lib/classes/cron.d/100-monitor_domain_mx.php +++ b/server/lib/classes/cron.d/100-monitor_domain_mx.php @@ -103,17 +103,17 @@ class cronjob_monitor_domain_mx extends cronjob { if ($maildomain['active'] == 'y') { $app->log('Mail domain[' . $maildomain['domain'] . '] is active but the DNS does not match our IP.', LOGLEVEL_WARN); $state = 'warning'; - $data[$maildomain['domain']] = 'Email domain is active but the DNS does not match our IP.'; + $data[$maildomain['domain']] = 'Domain is active but the DNS does not match our IP.'; } else { - $app->log('Good, the email domain[' . $maildomain['domain'] . '] is not active and DNS is not pointing to us.', LOGLEVEL_DEBUG); + $app->log('Good, the mail domain[' . $maildomain['domain'] . '] is not active and DNS is not pointing to us.', LOGLEVEL_DEBUG); } } else { if ($maildomain['active'] == 'n') { - $app->log('DNS points to our IP but the email domain[' . $maildomain['domain'] . '] is not active.', LOGLEVEL_WARN); + $app->log('DNS points to our IP but the mail domain[' . $maildomain['domain'] . '] is not active.', LOGLEVEL_WARN); $state = 'warning'; - $data[$maildomain['domain']] = 'DNS points to our IP but the email domain is not active.'; + $data[$maildomain['domain']] = 'DNS points to our IP but the mail domain is not active.'; } else { // DNS OK. -- GitLab From c69319034667b450fda4551ea5e06f5b48638d1e Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sun, 21 Mar 2021 21:30:45 +0100 Subject: [PATCH 07/29] draft additional_smtp_hostnames option --- .../classes/cron.d/100-monitor_domain_mx.php | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/server/lib/classes/cron.d/100-monitor_domain_mx.php b/server/lib/classes/cron.d/100-monitor_domain_mx.php index b1af19e85c..bcbb415d20 100755 --- a/server/lib/classes/cron.d/100-monitor_domain_mx.php +++ b/server/lib/classes/cron.d/100-monitor_domain_mx.php @@ -50,6 +50,15 @@ class cronjob_monitor_domain_mx extends cronjob { return parent::onBeforeRun(); } + private function _resolveHostnameBoth($hostname) { + $smtpin_ips = gethostbynamel($hostname); + $smtpin_ips_v6 = $app->functions->gethostbynamel6($hostname); + if ($smtpin_ips_v6) { + $smtpin_ips = array_merge($smtpin_ips, $smtpin_ips_v6); + } + return $smtpin_ips; + } + public function onRunJob() { global $app, $conf; @@ -69,10 +78,14 @@ class cronjob_monitor_domain_mx extends cronjob { $server_id = intval($conf['server_id']); $hostname = $app->system->hostname(); - $smtpin_ips = gethostbynamel($hostname); - $smtpin_ips_v6 = $app->functions->gethostbynamel6($hostname); - if ($smtpin_ips_v6) { - $smtpin_ips = array_merge($smtpin_ips, $smtpin_ips_v6); + $smtpin_ips = $this->_resolveHostnameBoth($hostname); + + # Add additional IP's, e.g. an extrernal spamfilter/proxy. + foreach (explode(',', $mail_config['additional_smtp_hostnames'] as $hostname) { + $extra = $this->_resolveHostnameBoth($hostname); + if ($extra) { + $smtpin_ips = array_merge($smtpin_ips, $extra); + } } # Add additional IP's , e.g. for secondary IP on the same box or a proxy. -- GitLab From f2d445755a161470fddd2d493c0cc8525ba41b39 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sun, 21 Mar 2021 21:50:20 +0100 Subject: [PATCH 08/29] Rename to include .inc --- .../{100-monitor_domain_mx.php => 100-monitor_domain_mx.inc.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename server/lib/classes/cron.d/{100-monitor_domain_mx.php => 100-monitor_domain_mx.inc.php} (100%) diff --git a/server/lib/classes/cron.d/100-monitor_domain_mx.php b/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php similarity index 100% rename from server/lib/classes/cron.d/100-monitor_domain_mx.php rename to server/lib/classes/cron.d/100-monitor_domain_mx.inc.php -- GitLab From 79a2d2ff7e77fbaee1d908976e0829d83c2ce6d6 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sun, 21 Mar 2021 21:53:57 +0100 Subject: [PATCH 09/29] Add additional_smtp_hostnames option --- .../cron.d/100-monitor_domain_mx.inc.php | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php b/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php index bcbb415d20..60224df1f3 100755 --- a/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php +++ b/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php @@ -50,13 +50,15 @@ class cronjob_monitor_domain_mx extends cronjob { return parent::onBeforeRun(); } - private function _resolveHostnameBoth($hostname) { - $smtpin_ips = gethostbynamel($hostname); - $smtpin_ips_v6 = $app->functions->gethostbynamel6($hostname); - if ($smtpin_ips_v6) { - $smtpin_ips = array_merge($smtpin_ips, $smtpin_ips_v6); - } - return $smtpin_ips; + private function _resolveHostnameBoth46($hostname) { + global $app; + $app->uses('getconf,functions'); + $smtpin_ips = gethostbynamel($hostname); + $smtpin_ips_v6 = $app->functions->gethostbynamel6($hostname); + if ($smtpin_ips_v6) { + $smtpin_ips = array_merge($smtpin_ips, $smtpin_ips_v6); + } + return $smtpin_ips; } public function onRunJob() { @@ -76,20 +78,25 @@ class cronjob_monitor_domain_mx extends cronjob { // the id of the server as int $server_id = intval($conf['server_id']); - $hostname = $app->system->hostname(); - $smtpin_ips = $this->_resolveHostnameBoth($hostname); + $hostname = $app->system->hostname(); + $smtpin_ips = $this->_resolveHostnameBoth46($hostname); # Add additional IP's, e.g. an extrernal spamfilter/proxy. - foreach (explode(',', $mail_config['additional_smtp_hostnames'] as $hostname) { - $extra = $this->_resolveHostnameBoth($hostname); - if ($extra) { - $smtpin_ips = array_merge($smtpin_ips, $extra); + if (!empty($mail_config['additional_smtp_hostnames'])) { + $additional_smtp_hostnames = explode(',', $mail_config['additional_smtp_hostnames']); + foreach ($additional_smtp_hostnames as $hostname) { + $extra = $this->_resolveHostnameBoth46($hostname); + if ($extra) { + $smtpin_ips = array_merge($smtpin_ips, $extra); + } } } # Add additional IP's , e.g. for secondary IP on the same box or a proxy. - $smtpin_ips = array_merge($smtpin_ips, explode(',', $mail_config['additional_smtp_ips'])); + if (!empty($mail_config['additional_smtp_ips'])) { + $smtpin_ips = array_merge($smtpin_ips, explode(',', $mail_config['additional_smtp_ips'])); + } $maildomains = $app->db->queryAllRecords("SELECT domain, active FROM mail_domain WHERE server_id = ?", $server_id); if(is_array($maildomains)) { -- GitLab From cd4d21705d595408b9c43d8e2bd813c2eff373e9 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Thu, 28 Apr 2022 21:32:02 +0200 Subject: [PATCH 10/29] Add found_mx to log message --- server/lib/classes/cron.d/100-monitor_domain_mx.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php b/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php index 60224df1f3..ecae0370df 100755 --- a/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php +++ b/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php @@ -121,9 +121,10 @@ class cronjob_monitor_domain_mx extends cronjob { if (!in_array( $mx_ip, $smtpin_ips)) { if ($maildomain['active'] == 'y') { - $app->log('Mail domain[' . $maildomain['domain'] . '] is active but the DNS does not match our IP.', LOGLEVEL_WARN); + $str = 'Domain is active but the DNS does not match our IP. ( points to: ' . ($first_mx ?? 'not found') . ')'; + $app->log('Mail domain[' . $maildomain['domain'] . ']: ' . $str, LOGLEVEL_WARN); $state = 'warning'; - $data[$maildomain['domain']] = 'Domain is active but the DNS does not match our IP.'; + $data[$maildomain['domain']] = $str; } else { $app->log('Good, the mail domain[' . $maildomain['domain'] . '] is not active and DNS is not pointing to us.', LOGLEVEL_DEBUG); -- GitLab From 5661ae42682af9ed109baac72676462112495a47 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sun, 4 Dec 2022 19:43:22 +0100 Subject: [PATCH 11/29] Extra warning about our own hostname --- server/lib/classes/cron.d/100-monitor_domain_mx.inc.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php b/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php index ecae0370df..5f350a80c5 100755 --- a/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php +++ b/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php @@ -81,6 +81,9 @@ class cronjob_monitor_domain_mx extends cronjob { $hostname = $app->system->hostname(); $smtpin_ips = $this->_resolveHostnameBoth46($hostname); + if (empty($smtpin_ips)) { + $app->log('Our hostname['. $hostname . '] doet not resolve.', LOGLEVEL_WARN); + } # Add additional IP's, e.g. an extrernal spamfilter/proxy. if (!empty($mail_config['additional_smtp_hostnames'])) { -- GitLab From 26fca13fbcb13a869b8dd476dcc48cbb1d3b0cfd Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sun, 4 Dec 2022 19:54:50 +0100 Subject: [PATCH 12/29] fix translation strings --- interface/web/monitor/lib/lang/en.lng | 4 +++- interface/web/monitor/show_sys_state.php | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/interface/web/monitor/lib/lang/en.lng b/interface/web/monitor/lib/lang/en.lng index eec736c548..1757e56985 100644 --- a/interface/web/monitor/lib/lang/en.lng +++ b/interface/web/monitor/lib/lang/en.lng @@ -168,5 +168,7 @@ $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; $wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; -$wb['monitor_serverstate_mx_ip_matchwarning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/show_sys_state.php b/interface/web/monitor/show_sys_state.php index fdfc47e253..c2af8dd07f 100644 --- a/interface/web/monitor/show_sys_state.php +++ b/interface/web/monitor/show_sys_state.php @@ -560,11 +560,11 @@ function _processDbState($type, $serverId, $serverState, $messages) { if ($type == 'mx_ip_match') { switch ($record['state']) { case 'ok': - $messages[$app->lng("monitor_serverstate_listok_txt")][] = $app->lng("monitor_serverstate_mx_ip_matchok_txt") . ' ' . + $messages[$app->lng("monitor_serverstate_listok_txt")][] = $app->lng("monitor_serverstate_mx_ip_match_ok_txt") . ' ' . "[" . $app->lng("monitor_serverstate_more_txt") . "]"; break; case 'warning': - $messages[$app->lng("monitor_serverstate_listwarning_txt")][] = $app->lng("monitor_serverstate_mx_ip_matchwarning_txt") . ' ' . + $messages[$app->lng("monitor_serverstate_listwarning_txt")][] = $app->lng("monitor_serverstate_mx_ip_match_warning_txt") . ' ' . "[" . $app->lng("monitor_serverstate_more_txt") . "]"; break; default: -- GitLab From a04c9b00bdd51ff6595ad1f85cdf339db1d36649 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sun, 4 Dec 2022 20:14:33 +0100 Subject: [PATCH 13/29] Add config form elements for the new options --- .../web/admin/form/server_config.tform.php | 17 +++++++++++++++++ .../web/admin/lib/lang/en_server_config.lng | 2 ++ .../admin/templates/server_config_mail_edit.htm | 6 ++++++ 3 files changed, 25 insertions(+) diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index a7947ba147..2d4a1d2b75 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -790,6 +790,23 @@ $form["tabs"]['mail'] = array( 'width' => '40', 'maxlength' => '255' ), + 'additional_smtp_hostnames' => array( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'width' => '20', + 'maxlength' => '255' + ), + 'additional_smtp_ips' => array( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'width' => '20', + 'maxlength' => '255' + ), + //################################# // END Datatable fields //################################# diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng index 0d09d4222a..514ac4b2da 100644 --- a/interface/web/admin/lib/lang/en_server_config.lng +++ b/interface/web/admin/lib/lang/en_server_config.lng @@ -343,3 +343,5 @@ $wb['tooltip_jailkit_hardlinks_txt'] = 'Using hardlinks is insecure, but saves d $wb['jailkit_hardlinks_allow_txt'] = 'Allow hardlinks within the jail'; $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm index d23a23a59c..db887b6ce9 100644 --- a/interface/web/admin/templates/server_config_mail_edit.htm +++ b/interface/web/admin/templates/server_config_mail_edit.htm @@ -173,6 +173,12 @@ {tmpl_var name='overquota_notify_onok'} +
+ +
+
+ +
-- GitLab From a69e5dde9851bbbe26521a92026c1842b06c6771 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sun, 4 Dec 2022 20:20:34 +0100 Subject: [PATCH 14/29] Nothing to link to for ok case --- interface/web/monitor/show_sys_state.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/interface/web/monitor/show_sys_state.php b/interface/web/monitor/show_sys_state.php index c2af8dd07f..8f97723904 100644 --- a/interface/web/monitor/show_sys_state.php +++ b/interface/web/monitor/show_sys_state.php @@ -560,8 +560,7 @@ function _processDbState($type, $serverId, $serverState, $messages) { if ($type == 'mx_ip_match') { switch ($record['state']) { case 'ok': - $messages[$app->lng("monitor_serverstate_listok_txt")][] = $app->lng("monitor_serverstate_mx_ip_match_ok_txt") . ' ' . - "[" . $app->lng("monitor_serverstate_more_txt") . "]"; + $messages[$app->lng("monitor_serverstate_listok_txt")][] = $app->lng("monitor_serverstate_mx_ip_match_ok_txt"); break; case 'warning': $messages[$app->lng("monitor_serverstate_listwarning_txt")][] = $app->lng("monitor_serverstate_mx_ip_match_warning_txt") . ' ' . -- GitLab From 1159df5fb36a212cacf308140cd810a4e194ee83 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Mon, 26 Dec 2022 12:34:41 +0100 Subject: [PATCH 15/29] Avoid php8.1 warning about possibly passing null to gethostbyname --- server/lib/classes/cron.d/100-monitor_domain_mx.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php b/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php index 5f350a80c5..e7e566417d 100755 --- a/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php +++ b/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php @@ -120,9 +120,11 @@ class cronjob_monitor_domain_mx extends cronjob { reset ($mx_sorted); $first_mx = array_shift($mx_sorted); - $mx_ip = gethostbyname($first_mx); + if (!empty($first_mx)) { + $mx_ip = gethostbyname($first_mx); + } - if (!in_array( $mx_ip, $smtpin_ips)) { + if (empty($mx_ip) || !in_array( $mx_ip, $smtpin_ips)) { if ($maildomain['active'] == 'y') { $str = 'Domain is active but the DNS does not match our IP. ( points to: ' . ($first_mx ?? 'not found') . ')'; $app->log('Mail domain[' . $maildomain['domain'] . ']: ' . $str, LOGLEVEL_WARN); -- GitLab From 6a5aa03dc8c3a0e08f37ecf37c7373cf51218207 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Tue, 27 Dec 2022 23:34:17 +0100 Subject: [PATCH 16/29] Add translation strings --- interface/web/admin/lib/lang/ar_server_config.lng | 2 ++ interface/web/admin/lib/lang/bg_server_config.lng | 2 ++ interface/web/admin/lib/lang/br_server_config.lng | 2 ++ interface/web/admin/lib/lang/ca_server_config.lng | 2 ++ interface/web/admin/lib/lang/cz_server_config.lng | 2 ++ interface/web/admin/lib/lang/de_server_config.lng | 2 ++ interface/web/admin/lib/lang/dk_server_config.lng | 2 ++ interface/web/admin/lib/lang/el_server_config.lng | 2 ++ interface/web/admin/lib/lang/es_server_config.lng | 2 ++ interface/web/admin/lib/lang/fi_server_config.lng | 2 ++ interface/web/admin/lib/lang/fr_server_config.lng | 2 ++ interface/web/admin/lib/lang/hr_server_config.lng | 2 ++ interface/web/admin/lib/lang/hu_server_config.lng | 2 ++ interface/web/admin/lib/lang/id_server_config.lng | 2 ++ interface/web/admin/lib/lang/it_server_config.lng | 2 ++ interface/web/admin/lib/lang/ja_server_config.lng | 2 ++ interface/web/admin/lib/lang/nl_server_config.lng | 2 ++ interface/web/admin/lib/lang/pl_server_config.lng | 2 ++ interface/web/admin/lib/lang/pt_server_config.lng | 2 ++ interface/web/admin/lib/lang/ro_server_config.lng | 2 ++ interface/web/admin/lib/lang/ru_server_config.lng | 2 ++ interface/web/admin/lib/lang/se_server_config.lng | 2 ++ interface/web/admin/lib/lang/sk_server_config.lng | 2 ++ interface/web/admin/lib/lang/tr_server_config.lng | 2 ++ interface/web/monitor/lib/lang/ar.lng | 5 +++++ interface/web/monitor/lib/lang/bg.lng | 5 +++++ interface/web/monitor/lib/lang/br.lng | 5 +++++ interface/web/monitor/lib/lang/ca.lng | 5 +++++ interface/web/monitor/lib/lang/cz.lng | 5 +++++ interface/web/monitor/lib/lang/de.lng | 5 +++++ interface/web/monitor/lib/lang/dk.lng | 5 +++++ interface/web/monitor/lib/lang/el.lng | 5 +++++ interface/web/monitor/lib/lang/es.lng | 5 +++++ interface/web/monitor/lib/lang/fi.lng | 5 +++++ interface/web/monitor/lib/lang/fr.lng | 5 +++++ interface/web/monitor/lib/lang/hr.lng | 5 +++++ interface/web/monitor/lib/lang/hu.lng | 5 +++++ interface/web/monitor/lib/lang/id.lng | 5 +++++ interface/web/monitor/lib/lang/it.lng | 5 +++++ interface/web/monitor/lib/lang/ja.lng | 5 +++++ interface/web/monitor/lib/lang/nl.lng | 5 +++++ interface/web/monitor/lib/lang/pl.lng | 5 +++++ interface/web/monitor/lib/lang/pt.lng | 5 +++++ interface/web/monitor/lib/lang/ro.lng | 5 +++++ interface/web/monitor/lib/lang/ru.lng | 5 +++++ interface/web/monitor/lib/lang/se.lng | 5 +++++ interface/web/monitor/lib/lang/sk.lng | 5 +++++ interface/web/monitor/lib/lang/tr.lng | 5 +++++ 48 files changed, 168 insertions(+) diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng index a58dbaaf44..916ce91040 100644 --- a/interface/web/admin/lib/lang/ar_server_config.lng +++ b/interface/web/admin/lib/lang/ar_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng index c856e7640f..4eb7cee8e1 100644 --- a/interface/web/admin/lib/lang/bg_server_config.lng +++ b/interface/web/admin/lib/lang/bg_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng index 1041676ceb..d2ee0b997c 100644 --- a/interface/web/admin/lib/lang/br_server_config.lng +++ b/interface/web/admin/lib/lang/br_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'Não, remover arquivos de links físicos'; $wb['jailkit_hardlinks_yes_txt'] = 'Sim, usar links físicos quando possível'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/ca_server_config.lng b/interface/web/admin/lib/lang/ca_server_config.lng index 3d4ad3a70c..5e8683cacf 100644 --- a/interface/web/admin/lib/lang/ca_server_config.lng +++ b/interface/web/admin/lib/lang/ca_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng index bdc1152cbc..d6f17458d9 100644 --- a/interface/web/admin/lib/lang/cz_server_config.lng +++ b/interface/web/admin/lib/lang/cz_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'Ne, odstranit soubory s pevným odkazem'; $wb['jailkit_hardlinks_yes_txt'] = 'Ano, pokud je to možné, použijte pevné odkazy'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng index 42046a2e44..3eb095b561 100644 --- a/interface/web/admin/lib/lang/de_server_config.lng +++ b/interface/web/admin/lib/lang/de_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'Nein, entferne hardgelinkte Dateien'; $wb['jailkit_hardlinks_yes_txt'] = 'Ja, benutze hardlinks wenn möglich'; $wb['mailbox_soft_delete_txt'] = 'Postfach Soft-Löschung'; $wb['mailbox_soft_delete_info_txt'] = 'wird standardmäßig nach 7 Tagen gelöscht.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/dk_server_config.lng b/interface/web/admin/lib/lang/dk_server_config.lng index d7b081150d..580e353299 100644 --- a/interface/web/admin/lib/lang/dk_server_config.lng +++ b/interface/web/admin/lib/lang/dk_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng index 40af42057f..f6a2789088 100644 --- a/interface/web/admin/lib/lang/el_server_config.lng +++ b/interface/web/admin/lib/lang/el_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng index 528dfe36af..d405ad124c 100644 --- a/interface/web/admin/lib/lang/es_server_config.lng +++ b/interface/web/admin/lib/lang/es_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng index 906013f785..f11c2a7ecd 100644 --- a/interface/web/admin/lib/lang/fi_server_config.lng +++ b/interface/web/admin/lib/lang/fi_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng index 274c2b6804..a3eddc6bf4 100644 --- a/interface/web/admin/lib/lang/fr_server_config.lng +++ b/interface/web/admin/lib/lang/fr_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng index 5d35d0d33f..801741a4f9 100644 --- a/interface/web/admin/lib/lang/hr_server_config.lng +++ b/interface/web/admin/lib/lang/hr_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng index 74a5b15701..fc7e890d9b 100644 --- a/interface/web/admin/lib/lang/hu_server_config.lng +++ b/interface/web/admin/lib/lang/hu_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng index 2419ee63f1..c2c02173ed 100644 --- a/interface/web/admin/lib/lang/id_server_config.lng +++ b/interface/web/admin/lib/lang/id_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng index 4d01d70b22..b74fe88859 100644 --- a/interface/web/admin/lib/lang/it_server_config.lng +++ b/interface/web/admin/lib/lang/it_server_config.lng @@ -343,3 +343,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, rimuovi i file con hardlink'; $wb['jailkit_hardlinks_yes_txt'] = 'Si, usa hardlinks se possibile'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng index 66d505562b..553d01a271 100644 --- a/interface/web/admin/lib/lang/ja_server_config.lng +++ b/interface/web/admin/lib/lang/ja_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng index 8ea60a21a8..bb24b3eedb 100644 --- a/interface/web/admin/lib/lang/nl_server_config.lng +++ b/interface/web/admin/lib/lang/nl_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng index c186f5d2a6..ed0c280d49 100644 --- a/interface/web/admin/lib/lang/pl_server_config.lng +++ b/interface/web/admin/lib/lang/pl_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng index 2e398500db..89bd4f5e89 100644 --- a/interface/web/admin/lib/lang/pt_server_config.lng +++ b/interface/web/admin/lib/lang/pt_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng index 2756ae7acd..6f89821735 100644 --- a/interface/web/admin/lib/lang/ro_server_config.lng +++ b/interface/web/admin/lib/lang/ro_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng index 2fbf9cf7d6..490e8f1aad 100644 --- a/interface/web/admin/lib/lang/ru_server_config.lng +++ b/interface/web/admin/lib/lang/ru_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng index e21017769c..ecf25c5b84 100644 --- a/interface/web/admin/lib/lang/se_server_config.lng +++ b/interface/web/admin/lib/lang/se_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng index 9ec5367be5..422de8eef0 100644 --- a/interface/web/admin/lib/lang/sk_server_config.lng +++ b/interface/web/admin/lib/lang/sk_server_config.lng @@ -344,3 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng index 29ccbe6129..c35f52dd99 100644 --- a/interface/web/admin/lib/lang/tr_server_config.lng +++ b/interface/web/admin/lib/lang/tr_server_config.lng @@ -341,3 +341,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; diff --git a/interface/web/monitor/lib/lang/ar.lng b/interface/web/monitor/lib/lang/ar.lng index c3604197a3..27dc3ab7c9 100644 --- a/interface/web/monitor/lib/lang/ar.lng +++ b/interface/web/monitor/lib/lang/ar.lng @@ -166,4 +166,9 @@ $wb['monitor_title_mongodb_txt'] = 'MongoDB Log'; $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/bg.lng b/interface/web/monitor/lib/lang/bg.lng index b6c94dcc51..b92185ab9b 100644 --- a/interface/web/monitor/lib/lang/bg.lng +++ b/interface/web/monitor/lib/lang/bg.lng @@ -166,4 +166,9 @@ $wb['monitor_title_mongodb_txt'] = 'MongoDB Log'; $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/br.lng b/interface/web/monitor/lib/lang/br.lng index 1ddfbb5fe3..850496eff1 100644 --- a/interface/web/monitor/lib/lang/br.lng +++ b/interface/web/monitor/lib/lang/br.lng @@ -164,3 +164,8 @@ $wb['Munin'] = 'Exibir Munin'; $wb['no_munin_url_defined_txt'] = 'Nenhuma URL do Munin definida.'; $wb['no_permissions_to_view_munin_txt'] = 'Você não tem permissão para acessar o Munin.'; $wb['Database size'] = 'Banco de Dados em uso'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/ca.lng b/interface/web/monitor/lib/lang/ca.lng index a1ef67cbae..90472d0cd5 100644 --- a/interface/web/monitor/lib/lang/ca.lng +++ b/interface/web/monitor/lib/lang/ca.lng @@ -166,4 +166,9 @@ $wb['monitor_title_mongodb_txt'] = 'MongoDB Log'; $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/cz.lng b/interface/web/monitor/lib/lang/cz.lng index 1310d3a05f..e8ad60ea50 100644 --- a/interface/web/monitor/lib/lang/cz.lng +++ b/interface/web/monitor/lib/lang/cz.lng @@ -164,3 +164,8 @@ $wb['monitor_title_mongodb_txt'] = 'MongoDB Log'; $wb['Data Log History'] = 'Protokol historie datového logu'; $wb['Database size'] = 'Velikost databáze'; $wb['MySQL Database size'] = 'Velikost databází MySQL'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/de.lng b/interface/web/monitor/lib/lang/de.lng index 629df19fdd..ca933db5e2 100644 --- a/interface/web/monitor/lib/lang/de.lng +++ b/interface/web/monitor/lib/lang/de.lng @@ -166,4 +166,9 @@ $wb['monitor_database_client_txt'] = 'Client'; $wb['monitor_database_domain_txt'] = 'Domain'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/dk.lng b/interface/web/monitor/lib/lang/dk.lng index efcbcc9d41..965de840ff 100644 --- a/interface/web/monitor/lib/lang/dk.lng +++ b/interface/web/monitor/lib/lang/dk.lng @@ -166,4 +166,9 @@ $wb['monitor_title_mongodb_txt'] = 'MongoDB Log'; $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/el.lng b/interface/web/monitor/lib/lang/el.lng index 798aae223a..f59488ab1a 100644 --- a/interface/web/monitor/lib/lang/el.lng +++ b/interface/web/monitor/lib/lang/el.lng @@ -166,4 +166,9 @@ $wb['monitor_title_mongodb_txt'] = 'MongoDB Log'; $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/es.lng b/interface/web/monitor/lib/lang/es.lng index ac044651a3..7a27b9b4d9 100644 --- a/interface/web/monitor/lib/lang/es.lng +++ b/interface/web/monitor/lib/lang/es.lng @@ -166,4 +166,9 @@ $wb['Users online'] = 'Usuarios en línea'; $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/fi.lng b/interface/web/monitor/lib/lang/fi.lng index 1e7943cc4e..0a401f414e 100644 --- a/interface/web/monitor/lib/lang/fi.lng +++ b/interface/web/monitor/lib/lang/fi.lng @@ -166,4 +166,9 @@ $wb['monitor_title_mongodb_txt'] = 'MongoDB Log'; $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/fr.lng b/interface/web/monitor/lib/lang/fr.lng index 53124875e9..e9d6a94f60 100644 --- a/interface/web/monitor/lib/lang/fr.lng +++ b/interface/web/monitor/lib/lang/fr.lng @@ -166,4 +166,9 @@ $wb['monitor_title_mongodb_txt'] = 'MongoDB Log'; $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/hr.lng b/interface/web/monitor/lib/lang/hr.lng index 357527b4ec..c5518ff2eb 100644 --- a/interface/web/monitor/lib/lang/hr.lng +++ b/interface/web/monitor/lib/lang/hr.lng @@ -166,4 +166,9 @@ $wb['monitor_title_mongodb_txt'] = 'MongoDB Log'; $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/hu.lng b/interface/web/monitor/lib/lang/hu.lng index fe80c1dbb1..8693c5a876 100644 --- a/interface/web/monitor/lib/lang/hu.lng +++ b/interface/web/monitor/lib/lang/hu.lng @@ -166,4 +166,9 @@ $wb['monitor_title_mongodb_txt'] = 'MongoDB Log'; $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/id.lng b/interface/web/monitor/lib/lang/id.lng index f36c9df9dd..1bb501b899 100644 --- a/interface/web/monitor/lib/lang/id.lng +++ b/interface/web/monitor/lib/lang/id.lng @@ -166,4 +166,9 @@ $wb['monitor_title_mongodb_txt'] = 'MongoDB Log'; $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/it.lng b/interface/web/monitor/lib/lang/it.lng index ddcabc45e7..832fef8b82 100644 --- a/interface/web/monitor/lib/lang/it.lng +++ b/interface/web/monitor/lib/lang/it.lng @@ -166,4 +166,9 @@ $wb['monitor_title_mongodb_txt'] = 'MongoDB Log'; $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/ja.lng b/interface/web/monitor/lib/lang/ja.lng index 266a81f3c3..3384e72087 100644 --- a/interface/web/monitor/lib/lang/ja.lng +++ b/interface/web/monitor/lib/lang/ja.lng @@ -166,4 +166,9 @@ $wb['monitor_title_mongodb_txt'] = 'MongoDB Log'; $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/nl.lng b/interface/web/monitor/lib/lang/nl.lng index 095a45090a..cef38b058b 100644 --- a/interface/web/monitor/lib/lang/nl.lng +++ b/interface/web/monitor/lib/lang/nl.lng @@ -166,4 +166,9 @@ $wb['monitor_title_mongodb_txt'] = 'MongoDB Log'; $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/pl.lng b/interface/web/monitor/lib/lang/pl.lng index 59f012cfa3..d9cedb8d1c 100644 --- a/interface/web/monitor/lib/lang/pl.lng +++ b/interface/web/monitor/lib/lang/pl.lng @@ -166,4 +166,9 @@ $wb['monitor_title_mongodb_txt'] = 'MongoDB Log'; $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'Pokaż rozmiar baz danych MySQL'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/pt.lng b/interface/web/monitor/lib/lang/pt.lng index b8ad5e533e..901cb5d6b6 100644 --- a/interface/web/monitor/lib/lang/pt.lng +++ b/interface/web/monitor/lib/lang/pt.lng @@ -166,4 +166,9 @@ $wb['monitor_title_mongodb_txt'] = 'MongoDB Log'; $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/ro.lng b/interface/web/monitor/lib/lang/ro.lng index 9ca3234362..3a947179a7 100644 --- a/interface/web/monitor/lib/lang/ro.lng +++ b/interface/web/monitor/lib/lang/ro.lng @@ -166,4 +166,9 @@ $wb['monitor_title_mongodb_txt'] = 'MongoDB Log'; $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/ru.lng b/interface/web/monitor/lib/lang/ru.lng index b5469fa174..6cec0ba6ec 100644 --- a/interface/web/monitor/lib/lang/ru.lng +++ b/interface/web/monitor/lib/lang/ru.lng @@ -166,4 +166,9 @@ $wb['monitor_title_mongodb_txt'] = 'Журнал MongoDB'; $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/se.lng b/interface/web/monitor/lib/lang/se.lng index 9093fb9600..1491b02085 100644 --- a/interface/web/monitor/lib/lang/se.lng +++ b/interface/web/monitor/lib/lang/se.lng @@ -166,4 +166,9 @@ $wb['monitor_title_mongodb_txt'] = 'MongoDB Log'; $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/sk.lng b/interface/web/monitor/lib/lang/sk.lng index 7b23b8c716..3d13de7ef7 100644 --- a/interface/web/monitor/lib/lang/sk.lng +++ b/interface/web/monitor/lib/lang/sk.lng @@ -166,4 +166,9 @@ $wb['monitor_title_mongodb_txt'] = 'MongoDB Log'; $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> diff --git a/interface/web/monitor/lib/lang/tr.lng b/interface/web/monitor/lib/lang/tr.lng index 90d96b5e39..1ddf2384fa 100644 --- a/interface/web/monitor/lib/lang/tr.lng +++ b/interface/web/monitor/lib/lang/tr.lng @@ -165,4 +165,9 @@ $wb['no_munin_url_defined_txt'] = 'Munin adresi belirtilmemiş.'; $wb['no_permissions_to_view_munin_txt'] = 'Munin erişimi izniniz yok.'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; +$wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; +$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; ?> -- GitLab From c94321c29a93361038e18ab9bc16cefd067c137f Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Fri, 30 Dec 2022 20:55:49 +0100 Subject: [PATCH 17/29] Missing one important word --- interface/web/monitor/lib/lang/ar.lng | 2 +- interface/web/monitor/lib/lang/bg.lng | 2 +- interface/web/monitor/lib/lang/br.lng | 2 +- interface/web/monitor/lib/lang/ca.lng | 2 +- interface/web/monitor/lib/lang/cz.lng | 2 +- interface/web/monitor/lib/lang/de.lng | 2 +- interface/web/monitor/lib/lang/dk.lng | 2 +- interface/web/monitor/lib/lang/el.lng | 2 +- interface/web/monitor/lib/lang/en.lng | 2 +- interface/web/monitor/lib/lang/es.lng | 2 +- interface/web/monitor/lib/lang/fi.lng | 2 +- interface/web/monitor/lib/lang/fr.lng | 2 +- interface/web/monitor/lib/lang/hr.lng | 2 +- interface/web/monitor/lib/lang/hu.lng | 2 +- interface/web/monitor/lib/lang/id.lng | 2 +- interface/web/monitor/lib/lang/it.lng | 2 +- interface/web/monitor/lib/lang/ja.lng | 2 +- interface/web/monitor/lib/lang/nl.lng | 2 +- interface/web/monitor/lib/lang/pl.lng | 2 +- interface/web/monitor/lib/lang/pt.lng | 2 +- interface/web/monitor/lib/lang/ro.lng | 2 +- interface/web/monitor/lib/lang/ru.lng | 2 +- interface/web/monitor/lib/lang/se.lng | 2 +- interface/web/monitor/lib/lang/sk.lng | 2 +- interface/web/monitor/lib/lang/tr.lng | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/interface/web/monitor/lib/lang/ar.lng b/interface/web/monitor/lib/lang/ar.lng index 27dc3ab7c9..d36b230e44 100644 --- a/interface/web/monitor/lib/lang/ar.lng +++ b/interface/web/monitor/lib/lang/ar.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/bg.lng b/interface/web/monitor/lib/lang/bg.lng index b92185ab9b..3f8fb1714b 100644 --- a/interface/web/monitor/lib/lang/bg.lng +++ b/interface/web/monitor/lib/lang/bg.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/br.lng b/interface/web/monitor/lib/lang/br.lng index 850496eff1..5cce0782f2 100644 --- a/interface/web/monitor/lib/lang/br.lng +++ b/interface/web/monitor/lib/lang/br.lng @@ -165,7 +165,7 @@ $wb['no_munin_url_defined_txt'] = 'Nenhuma URL do Munin definida.'; $wb['no_permissions_to_view_munin_txt'] = 'Você não tem permissão para acessar o Munin.'; $wb['Database size'] = 'Banco de Dados em uso'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/ca.lng b/interface/web/monitor/lib/lang/ca.lng index 90472d0cd5..f747e43d3d 100644 --- a/interface/web/monitor/lib/lang/ca.lng +++ b/interface/web/monitor/lib/lang/ca.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/cz.lng b/interface/web/monitor/lib/lang/cz.lng index e8ad60ea50..80bbfeb76f 100644 --- a/interface/web/monitor/lib/lang/cz.lng +++ b/interface/web/monitor/lib/lang/cz.lng @@ -165,7 +165,7 @@ $wb['Data Log History'] = 'Protokol historie datového logu'; $wb['Database size'] = 'Velikost databáze'; $wb['MySQL Database size'] = 'Velikost databází MySQL'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/de.lng b/interface/web/monitor/lib/lang/de.lng index ca933db5e2..6247b76afe 100644 --- a/interface/web/monitor/lib/lang/de.lng +++ b/interface/web/monitor/lib/lang/de.lng @@ -167,7 +167,7 @@ $wb['monitor_database_domain_txt'] = 'Domain'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/dk.lng b/interface/web/monitor/lib/lang/dk.lng index 965de840ff..f4f9b8b51a 100644 --- a/interface/web/monitor/lib/lang/dk.lng +++ b/interface/web/monitor/lib/lang/dk.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/el.lng b/interface/web/monitor/lib/lang/el.lng index f59488ab1a..4474dcc1f0 100644 --- a/interface/web/monitor/lib/lang/el.lng +++ b/interface/web/monitor/lib/lang/el.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/en.lng b/interface/web/monitor/lib/lang/en.lng index 1757e56985..e19d358689 100644 --- a/interface/web/monitor/lib/lang/en.lng +++ b/interface/web/monitor/lib/lang/en.lng @@ -167,7 +167,7 @@ $wb['no_permissions_to_view_munin_txt'] = 'You are not allowed to access Munin.' $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/es.lng b/interface/web/monitor/lib/lang/es.lng index 7a27b9b4d9..9e589739dd 100644 --- a/interface/web/monitor/lib/lang/es.lng +++ b/interface/web/monitor/lib/lang/es.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/fi.lng b/interface/web/monitor/lib/lang/fi.lng index 0a401f414e..728355c92d 100644 --- a/interface/web/monitor/lib/lang/fi.lng +++ b/interface/web/monitor/lib/lang/fi.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/fr.lng b/interface/web/monitor/lib/lang/fr.lng index e9d6a94f60..e691ad450e 100644 --- a/interface/web/monitor/lib/lang/fr.lng +++ b/interface/web/monitor/lib/lang/fr.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/hr.lng b/interface/web/monitor/lib/lang/hr.lng index c5518ff2eb..f41db5ba85 100644 --- a/interface/web/monitor/lib/lang/hr.lng +++ b/interface/web/monitor/lib/lang/hr.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/hu.lng b/interface/web/monitor/lib/lang/hu.lng index 8693c5a876..c59dcf943d 100644 --- a/interface/web/monitor/lib/lang/hu.lng +++ b/interface/web/monitor/lib/lang/hu.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/id.lng b/interface/web/monitor/lib/lang/id.lng index 1bb501b899..4e209ff1eb 100644 --- a/interface/web/monitor/lib/lang/id.lng +++ b/interface/web/monitor/lib/lang/id.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/it.lng b/interface/web/monitor/lib/lang/it.lng index 832fef8b82..cde4171be0 100644 --- a/interface/web/monitor/lib/lang/it.lng +++ b/interface/web/monitor/lib/lang/it.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/ja.lng b/interface/web/monitor/lib/lang/ja.lng index 3384e72087..52070313c7 100644 --- a/interface/web/monitor/lib/lang/ja.lng +++ b/interface/web/monitor/lib/lang/ja.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/nl.lng b/interface/web/monitor/lib/lang/nl.lng index cef38b058b..d3367ebb34 100644 --- a/interface/web/monitor/lib/lang/nl.lng +++ b/interface/web/monitor/lib/lang/nl.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/pl.lng b/interface/web/monitor/lib/lang/pl.lng index d9cedb8d1c..ee8afac132 100644 --- a/interface/web/monitor/lib/lang/pl.lng +++ b/interface/web/monitor/lib/lang/pl.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'Pokaż rozmiar baz danych MySQL'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/pt.lng b/interface/web/monitor/lib/lang/pt.lng index 901cb5d6b6..028a44c73d 100644 --- a/interface/web/monitor/lib/lang/pt.lng +++ b/interface/web/monitor/lib/lang/pt.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/ro.lng b/interface/web/monitor/lib/lang/ro.lng index 3a947179a7..4f0e6bf884 100644 --- a/interface/web/monitor/lib/lang/ro.lng +++ b/interface/web/monitor/lib/lang/ro.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/ru.lng b/interface/web/monitor/lib/lang/ru.lng index 6cec0ba6ec..2dcc7add36 100644 --- a/interface/web/monitor/lib/lang/ru.lng +++ b/interface/web/monitor/lib/lang/ru.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/se.lng b/interface/web/monitor/lib/lang/se.lng index 1491b02085..367a6a4fe1 100644 --- a/interface/web/monitor/lib/lang/se.lng +++ b/interface/web/monitor/lib/lang/se.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/sk.lng b/interface/web/monitor/lib/lang/sk.lng index 3d13de7ef7..b847c9eb5f 100644 --- a/interface/web/monitor/lib/lang/sk.lng +++ b/interface/web/monitor/lib/lang/sk.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/tr.lng b/interface/web/monitor/lib/lang/tr.lng index 1ddf2384fa..e4bfbf89c5 100644 --- a/interface/web/monitor/lib/lang/tr.lng +++ b/interface/web/monitor/lib/lang/tr.lng @@ -166,7 +166,7 @@ $wb['no_permissions_to_view_munin_txt'] = 'Munin erişimi izniniz yok.'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'MX record check data present'; +$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -- GitLab From f7d590c4b548e768c0515c17a1c246945f71522f Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Fri, 30 Dec 2022 21:00:53 +0100 Subject: [PATCH 18/29] Dutch translation --- interface/web/admin/lib/lang/nl_server_config.lng | 4 ++-- interface/web/monitor/lib/lang/nl.lng | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng index bb24b3eedb..f3d00e63ea 100644 --- a/interface/web/admin/lib/lang/nl_server_config.lng +++ b/interface/web/admin/lib/lang/nl_server_config.lng @@ -344,5 +344,5 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_ips_txt'] = 'Extra smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Extra smtp hostnames\'s'; diff --git a/interface/web/monitor/lib/lang/nl.lng b/interface/web/monitor/lib/lang/nl.lng index d3367ebb34..fd37a82d4d 100644 --- a/interface/web/monitor/lib/lang/nl.lng +++ b/interface/web/monitor/lib/lang/nl.lng @@ -167,8 +167,8 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; -$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; -$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; -$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['no_data_mx_ip_match_txt'] = 'Geen MX record controle data beschikbaar'; +$wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Niet alle DNS MX records komen overeen met het server IP'; +$wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'Alle mail domeinen kloppen met de DNS.'; +$wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domeinen MX check onbekend.'; ?> -- GitLab From 885d572b1ba78e4132e38e5c7f58de69f4ef934e Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sat, 31 Dec 2022 20:36:49 +0100 Subject: [PATCH 19/29] typo --- interface/web/admin/lib/lang/ar_server_config.lng | 2 +- interface/web/admin/lib/lang/bg_server_config.lng | 2 +- interface/web/admin/lib/lang/br_server_config.lng | 2 +- interface/web/admin/lib/lang/ca_server_config.lng | 2 +- interface/web/admin/lib/lang/cz_server_config.lng | 2 +- interface/web/admin/lib/lang/de_server_config.lng | 2 +- interface/web/admin/lib/lang/dk_server_config.lng | 2 +- interface/web/admin/lib/lang/el_server_config.lng | 2 +- interface/web/admin/lib/lang/en_server_config.lng | 2 +- interface/web/admin/lib/lang/es_server_config.lng | 2 +- interface/web/admin/lib/lang/fi_server_config.lng | 2 +- interface/web/admin/lib/lang/fr_server_config.lng | 2 +- interface/web/admin/lib/lang/hr_server_config.lng | 2 +- interface/web/admin/lib/lang/hu_server_config.lng | 2 +- interface/web/admin/lib/lang/id_server_config.lng | 2 +- interface/web/admin/lib/lang/it_server_config.lng | 2 +- interface/web/admin/lib/lang/ja_server_config.lng | 2 +- interface/web/admin/lib/lang/nl_server_config.lng | 2 +- interface/web/admin/lib/lang/pl_server_config.lng | 2 +- interface/web/admin/lib/lang/pt_server_config.lng | 2 +- interface/web/admin/lib/lang/ro_server_config.lng | 2 +- interface/web/admin/lib/lang/ru_server_config.lng | 2 +- interface/web/admin/lib/lang/se_server_config.lng | 2 +- interface/web/admin/lib/lang/sk_server_config.lng | 2 +- interface/web/admin/lib/lang/tr_server_config.lng | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng index 916ce91040..de9d7d84c7 100644 --- a/interface/web/admin/lib/lang/ar_server_config.lng +++ b/interface/web/admin/lib/lang/ar_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng index 4eb7cee8e1..37e3c2db64 100644 --- a/interface/web/admin/lib/lang/bg_server_config.lng +++ b/interface/web/admin/lib/lang/bg_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng index d2ee0b997c..0d0c971909 100644 --- a/interface/web/admin/lib/lang/br_server_config.lng +++ b/interface/web/admin/lib/lang/br_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Sim, usar links físicos quando possível'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/ca_server_config.lng b/interface/web/admin/lib/lang/ca_server_config.lng index 5e8683cacf..9b6913a0c4 100644 --- a/interface/web/admin/lib/lang/ca_server_config.lng +++ b/interface/web/admin/lib/lang/ca_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng index d6f17458d9..82cffeff8f 100644 --- a/interface/web/admin/lib/lang/cz_server_config.lng +++ b/interface/web/admin/lib/lang/cz_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Ano, pokud je to možné, použijte pevné o $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng index 3eb095b561..74ae9214ce 100644 --- a/interface/web/admin/lib/lang/de_server_config.lng +++ b/interface/web/admin/lib/lang/de_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Ja, benutze hardlinks wenn möglich'; $wb['mailbox_soft_delete_txt'] = 'Postfach Soft-Löschung'; $wb['mailbox_soft_delete_info_txt'] = 'wird standardmäßig nach 7 Tagen gelöscht.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/dk_server_config.lng b/interface/web/admin/lib/lang/dk_server_config.lng index 580e353299..ca0ad9bd35 100644 --- a/interface/web/admin/lib/lang/dk_server_config.lng +++ b/interface/web/admin/lib/lang/dk_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng index f6a2789088..e8978ae51d 100644 --- a/interface/web/admin/lib/lang/el_server_config.lng +++ b/interface/web/admin/lib/lang/el_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng index b8d21f0bbf..7dd3dc35cb 100644 --- a/interface/web/admin/lib/lang/en_server_config.lng +++ b/interface/web/admin/lib/lang/en_server_config.lng @@ -354,4 +354,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng index d405ad124c..345b332e8f 100644 --- a/interface/web/admin/lib/lang/es_server_config.lng +++ b/interface/web/admin/lib/lang/es_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng index f11c2a7ecd..010dd05f90 100644 --- a/interface/web/admin/lib/lang/fi_server_config.lng +++ b/interface/web/admin/lib/lang/fi_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng index a3eddc6bf4..1d6c36a558 100644 --- a/interface/web/admin/lib/lang/fr_server_config.lng +++ b/interface/web/admin/lib/lang/fr_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng index 801741a4f9..caa99a6e59 100644 --- a/interface/web/admin/lib/lang/hr_server_config.lng +++ b/interface/web/admin/lib/lang/hr_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng index fc7e890d9b..b69e563f20 100644 --- a/interface/web/admin/lib/lang/hu_server_config.lng +++ b/interface/web/admin/lib/lang/hu_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng index c2c02173ed..e8bdac2379 100644 --- a/interface/web/admin/lib/lang/id_server_config.lng +++ b/interface/web/admin/lib/lang/id_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng index b74fe88859..27eecf99ca 100644 --- a/interface/web/admin/lib/lang/it_server_config.lng +++ b/interface/web/admin/lib/lang/it_server_config.lng @@ -344,4 +344,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Si, usa hardlinks se possibile'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng index 553d01a271..221f7e9bc5 100644 --- a/interface/web/admin/lib/lang/ja_server_config.lng +++ b/interface/web/admin/lib/lang/ja_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng index f3d00e63ea..8cf674e52b 100644 --- a/interface/web/admin/lib/lang/nl_server_config.lng +++ b/interface/web/admin/lib/lang/nl_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Extra smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Extra smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Extra smtp hostnames'; diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng index ed0c280d49..9153e9d49e 100644 --- a/interface/web/admin/lib/lang/pl_server_config.lng +++ b/interface/web/admin/lib/lang/pl_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng index 89bd4f5e89..f041c2d859 100644 --- a/interface/web/admin/lib/lang/pt_server_config.lng +++ b/interface/web/admin/lib/lang/pt_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng index 6f89821735..15f68f37ce 100644 --- a/interface/web/admin/lib/lang/ro_server_config.lng +++ b/interface/web/admin/lib/lang/ro_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng index 490e8f1aad..d69ed3d0de 100644 --- a/interface/web/admin/lib/lang/ru_server_config.lng +++ b/interface/web/admin/lib/lang/ru_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng index ecf25c5b84..6cc36fcbe8 100644 --- a/interface/web/admin/lib/lang/se_server_config.lng +++ b/interface/web/admin/lib/lang/se_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng index 422de8eef0..db01b9f0bd 100644 --- a/interface/web/admin/lib/lang/sk_server_config.lng +++ b/interface/web/admin/lib/lang/sk_server_config.lng @@ -345,4 +345,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng index c35f52dd99..9bfad65aaa 100644 --- a/interface/web/admin/lib/lang/tr_server_config.lng +++ b/interface/web/admin/lib/lang/tr_server_config.lng @@ -342,4 +342,4 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; -- GitLab From 8436ed2f481dfab320e90c2bb36eb3f081d2442d Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sat, 31 Dec 2022 20:42:25 +0100 Subject: [PATCH 20/29] Rename translation string --- interface/web/monitor/lib/lang/ar.lng | 2 +- interface/web/monitor/lib/lang/bg.lng | 2 +- interface/web/monitor/lib/lang/br.lng | 2 +- interface/web/monitor/lib/lang/ca.lng | 2 +- interface/web/monitor/lib/lang/cz.lng | 2 +- interface/web/monitor/lib/lang/de.lng | 2 +- interface/web/monitor/lib/lang/dk.lng | 2 +- interface/web/monitor/lib/lang/el.lng | 2 +- interface/web/monitor/lib/lang/en.lng | 2 +- interface/web/monitor/lib/lang/es.lng | 2 +- interface/web/monitor/lib/lang/fi.lng | 2 +- interface/web/monitor/lib/lang/fr.lng | 2 +- interface/web/monitor/lib/lang/hr.lng | 2 +- interface/web/monitor/lib/lang/hu.lng | 2 +- interface/web/monitor/lib/lang/id.lng | 2 +- interface/web/monitor/lib/lang/it.lng | 2 +- interface/web/monitor/lib/lang/ja.lng | 2 +- interface/web/monitor/lib/lang/nl.lng | 2 +- interface/web/monitor/lib/lang/pl.lng | 2 +- interface/web/monitor/lib/lang/pt.lng | 2 +- interface/web/monitor/lib/lang/ro.lng | 2 +- interface/web/monitor/lib/lang/ru.lng | 2 +- interface/web/monitor/lib/lang/se.lng | 2 +- interface/web/monitor/lib/lang/sk.lng | 2 +- interface/web/monitor/lib/lang/tr.lng | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/interface/web/monitor/lib/lang/ar.lng b/interface/web/monitor/lib/lang/ar.lng index d36b230e44..26e7135097 100644 --- a/interface/web/monitor/lib/lang/ar.lng +++ b/interface/web/monitor/lib/lang/ar.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/bg.lng b/interface/web/monitor/lib/lang/bg.lng index 3f8fb1714b..10b16957da 100644 --- a/interface/web/monitor/lib/lang/bg.lng +++ b/interface/web/monitor/lib/lang/bg.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/br.lng b/interface/web/monitor/lib/lang/br.lng index 5cce0782f2..7f9adb77a3 100644 --- a/interface/web/monitor/lib/lang/br.lng +++ b/interface/web/monitor/lib/lang/br.lng @@ -165,7 +165,7 @@ $wb['no_munin_url_defined_txt'] = 'Nenhuma URL do Munin definida.'; $wb['no_permissions_to_view_munin_txt'] = 'Você não tem permissão para acessar o Munin.'; $wb['Database size'] = 'Banco de Dados em uso'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/ca.lng b/interface/web/monitor/lib/lang/ca.lng index f747e43d3d..a6c8151106 100644 --- a/interface/web/monitor/lib/lang/ca.lng +++ b/interface/web/monitor/lib/lang/ca.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/cz.lng b/interface/web/monitor/lib/lang/cz.lng index 80bbfeb76f..82ec295152 100644 --- a/interface/web/monitor/lib/lang/cz.lng +++ b/interface/web/monitor/lib/lang/cz.lng @@ -165,7 +165,7 @@ $wb['Data Log History'] = 'Protokol historie datového logu'; $wb['Database size'] = 'Velikost databáze'; $wb['MySQL Database size'] = 'Velikost databází MySQL'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/de.lng b/interface/web/monitor/lib/lang/de.lng index 6247b76afe..21275b1395 100644 --- a/interface/web/monitor/lib/lang/de.lng +++ b/interface/web/monitor/lib/lang/de.lng @@ -167,7 +167,7 @@ $wb['monitor_database_domain_txt'] = 'Domain'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/dk.lng b/interface/web/monitor/lib/lang/dk.lng index f4f9b8b51a..ed813241ee 100644 --- a/interface/web/monitor/lib/lang/dk.lng +++ b/interface/web/monitor/lib/lang/dk.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/el.lng b/interface/web/monitor/lib/lang/el.lng index 4474dcc1f0..66e3d54344 100644 --- a/interface/web/monitor/lib/lang/el.lng +++ b/interface/web/monitor/lib/lang/el.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/en.lng b/interface/web/monitor/lib/lang/en.lng index e19d358689..7d6eb9a589 100644 --- a/interface/web/monitor/lib/lang/en.lng +++ b/interface/web/monitor/lib/lang/en.lng @@ -167,7 +167,7 @@ $wb['no_permissions_to_view_munin_txt'] = 'You are not allowed to access Munin.' $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/es.lng b/interface/web/monitor/lib/lang/es.lng index 9e589739dd..8feebb6187 100644 --- a/interface/web/monitor/lib/lang/es.lng +++ b/interface/web/monitor/lib/lang/es.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/fi.lng b/interface/web/monitor/lib/lang/fi.lng index 728355c92d..c53e58b713 100644 --- a/interface/web/monitor/lib/lang/fi.lng +++ b/interface/web/monitor/lib/lang/fi.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/fr.lng b/interface/web/monitor/lib/lang/fr.lng index e691ad450e..ec553ef018 100644 --- a/interface/web/monitor/lib/lang/fr.lng +++ b/interface/web/monitor/lib/lang/fr.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/hr.lng b/interface/web/monitor/lib/lang/hr.lng index f41db5ba85..c6f37ef2fa 100644 --- a/interface/web/monitor/lib/lang/hr.lng +++ b/interface/web/monitor/lib/lang/hr.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/hu.lng b/interface/web/monitor/lib/lang/hu.lng index c59dcf943d..6e7c01d05c 100644 --- a/interface/web/monitor/lib/lang/hu.lng +++ b/interface/web/monitor/lib/lang/hu.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/id.lng b/interface/web/monitor/lib/lang/id.lng index 4e209ff1eb..856d68bd23 100644 --- a/interface/web/monitor/lib/lang/id.lng +++ b/interface/web/monitor/lib/lang/id.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/it.lng b/interface/web/monitor/lib/lang/it.lng index cde4171be0..cc618b919e 100644 --- a/interface/web/monitor/lib/lang/it.lng +++ b/interface/web/monitor/lib/lang/it.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/ja.lng b/interface/web/monitor/lib/lang/ja.lng index 52070313c7..7dddd85693 100644 --- a/interface/web/monitor/lib/lang/ja.lng +++ b/interface/web/monitor/lib/lang/ja.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/nl.lng b/interface/web/monitor/lib/lang/nl.lng index fd37a82d4d..6a9e253be7 100644 --- a/interface/web/monitor/lib/lang/nl.lng +++ b/interface/web/monitor/lib/lang/nl.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'Geen MX record controle data beschikbaar'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'Geen MX record controle data beschikbaar'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Niet alle DNS MX records komen overeen met het server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'Alle mail domeinen kloppen met de DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domeinen MX check onbekend.'; diff --git a/interface/web/monitor/lib/lang/pl.lng b/interface/web/monitor/lib/lang/pl.lng index ee8afac132..d8ccbba67b 100644 --- a/interface/web/monitor/lib/lang/pl.lng +++ b/interface/web/monitor/lib/lang/pl.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'Pokaż rozmiar baz danych MySQL'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/pt.lng b/interface/web/monitor/lib/lang/pt.lng index 028a44c73d..7fd71f5cda 100644 --- a/interface/web/monitor/lib/lang/pt.lng +++ b/interface/web/monitor/lib/lang/pt.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/ro.lng b/interface/web/monitor/lib/lang/ro.lng index 4f0e6bf884..dd6d079abd 100644 --- a/interface/web/monitor/lib/lang/ro.lng +++ b/interface/web/monitor/lib/lang/ro.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/ru.lng b/interface/web/monitor/lib/lang/ru.lng index 2dcc7add36..7fdcee2afb 100644 --- a/interface/web/monitor/lib/lang/ru.lng +++ b/interface/web/monitor/lib/lang/ru.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/se.lng b/interface/web/monitor/lib/lang/se.lng index 367a6a4fe1..0da83686ef 100644 --- a/interface/web/monitor/lib/lang/se.lng +++ b/interface/web/monitor/lib/lang/se.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/sk.lng b/interface/web/monitor/lib/lang/sk.lng index b847c9eb5f..158a61077d 100644 --- a/interface/web/monitor/lib/lang/sk.lng +++ b/interface/web/monitor/lib/lang/sk.lng @@ -167,7 +167,7 @@ $wb['Data Log History'] = 'Data Log History'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; diff --git a/interface/web/monitor/lib/lang/tr.lng b/interface/web/monitor/lib/lang/tr.lng index e4bfbf89c5..a472fdb4c6 100644 --- a/interface/web/monitor/lib/lang/tr.lng +++ b/interface/web/monitor/lib/lang/tr.lng @@ -166,7 +166,7 @@ $wb['no_permissions_to_view_munin_txt'] = 'Munin erişimi izniniz yok.'; $wb['Database size'] = 'Database size'; $wb['MySQL Database size'] = 'MySQL Database size'; $wb['monitor_title_mx_ip_match_txt'] = 'MX record to server IP match'; -$wb['no_data_mx_ip_match_txt'] = 'No MX record check data present'; +$wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data present'; $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -- GitLab From a3b0671fa8c8340589e46c3ca8bff4aa845c7404 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sat, 31 Dec 2022 20:46:24 +0100 Subject: [PATCH 21/29] Add a bit of layout and a note --- interface/lib/classes/tools_monitor.inc.php | 8 +++++--- interface/web/monitor/lib/lang/ar.lng | 1 + interface/web/monitor/lib/lang/bg.lng | 1 + interface/web/monitor/lib/lang/br.lng | 1 + interface/web/monitor/lib/lang/ca.lng | 1 + interface/web/monitor/lib/lang/cz.lng | 1 + interface/web/monitor/lib/lang/de.lng | 1 + interface/web/monitor/lib/lang/dk.lng | 1 + interface/web/monitor/lib/lang/el.lng | 1 + interface/web/monitor/lib/lang/en.lng | 1 + interface/web/monitor/lib/lang/es.lng | 1 + interface/web/monitor/lib/lang/fi.lng | 1 + interface/web/monitor/lib/lang/fr.lng | 1 + interface/web/monitor/lib/lang/hr.lng | 1 + interface/web/monitor/lib/lang/hu.lng | 1 + interface/web/monitor/lib/lang/id.lng | 1 + interface/web/monitor/lib/lang/it.lng | 1 + interface/web/monitor/lib/lang/ja.lng | 1 + interface/web/monitor/lib/lang/nl.lng | 1 + interface/web/monitor/lib/lang/pl.lng | 1 + interface/web/monitor/lib/lang/pt.lng | 1 + interface/web/monitor/lib/lang/ro.lng | 1 + interface/web/monitor/lib/lang/ru.lng | 1 + interface/web/monitor/lib/lang/se.lng | 1 + interface/web/monitor/lib/lang/sk.lng | 1 + interface/web/monitor/lib/lang/tr.lng | 1 + 26 files changed, 30 insertions(+), 3 deletions(-) diff --git a/interface/lib/classes/tools_monitor.inc.php b/interface/lib/classes/tools_monitor.inc.php index 07fc5b07be..5f94cab672 100644 --- a/interface/lib/classes/tools_monitor.inc.php +++ b/interface/lib/classes/tools_monitor.inc.php @@ -584,12 +584,14 @@ class tools_monitor { if(isset($record['data'])) { $data = unserialize($record['data']); - $html = ''; + $html = '
    '; foreach ($data as $domain => $text) { - $html .= "$domain: $text
    "; + $html .= "
  • $domain: $text
    • "; } + $html .= '
'; + $html .= '

'.$app->lng("monitor_serverstate_mx_ip_match_note_txt").'

'; } else { - $html = '

'.$app->lng("no_data_mx_ip_match_txt").'

'; + $html = '

'.$app->lng("monitor_serverstate_mx_ip_match_nodata_txt").'

'; } return $html; diff --git a/interface/web/monitor/lib/lang/ar.lng b/interface/web/monitor/lib/lang/ar.lng index 26e7135097..e676902802 100644 --- a/interface/web/monitor/lib/lang/ar.lng +++ b/interface/web/monitor/lib/lang/ar.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/bg.lng b/interface/web/monitor/lib/lang/bg.lng index 10b16957da..bf2e8bacf2 100644 --- a/interface/web/monitor/lib/lang/bg.lng +++ b/interface/web/monitor/lib/lang/bg.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/br.lng b/interface/web/monitor/lib/lang/br.lng index 7f9adb77a3..7c8c08353e 100644 --- a/interface/web/monitor/lib/lang/br.lng +++ b/interface/web/monitor/lib/lang/br.lng @@ -169,3 +169,4 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' diff --git a/interface/web/monitor/lib/lang/ca.lng b/interface/web/monitor/lib/lang/ca.lng index a6c8151106..a9e5902dd1 100644 --- a/interface/web/monitor/lib/lang/ca.lng +++ b/interface/web/monitor/lib/lang/ca.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/cz.lng b/interface/web/monitor/lib/lang/cz.lng index 82ec295152..9aef492e35 100644 --- a/interface/web/monitor/lib/lang/cz.lng +++ b/interface/web/monitor/lib/lang/cz.lng @@ -169,3 +169,4 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' diff --git a/interface/web/monitor/lib/lang/de.lng b/interface/web/monitor/lib/lang/de.lng index 21275b1395..f2cab85a40 100644 --- a/interface/web/monitor/lib/lang/de.lng +++ b/interface/web/monitor/lib/lang/de.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/dk.lng b/interface/web/monitor/lib/lang/dk.lng index ed813241ee..105835065d 100644 --- a/interface/web/monitor/lib/lang/dk.lng +++ b/interface/web/monitor/lib/lang/dk.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/el.lng b/interface/web/monitor/lib/lang/el.lng index 66e3d54344..c481c98477 100644 --- a/interface/web/monitor/lib/lang/el.lng +++ b/interface/web/monitor/lib/lang/el.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/en.lng b/interface/web/monitor/lib/lang/en.lng index 7d6eb9a589..158a44c71c 100644 --- a/interface/web/monitor/lib/lang/en.lng +++ b/interface/web/monitor/lib/lang/en.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/es.lng b/interface/web/monitor/lib/lang/es.lng index 8feebb6187..d8f5bcc44d 100644 --- a/interface/web/monitor/lib/lang/es.lng +++ b/interface/web/monitor/lib/lang/es.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/fi.lng b/interface/web/monitor/lib/lang/fi.lng index c53e58b713..c4dc571592 100644 --- a/interface/web/monitor/lib/lang/fi.lng +++ b/interface/web/monitor/lib/lang/fi.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/fr.lng b/interface/web/monitor/lib/lang/fr.lng index ec553ef018..9e764423b1 100644 --- a/interface/web/monitor/lib/lang/fr.lng +++ b/interface/web/monitor/lib/lang/fr.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/hr.lng b/interface/web/monitor/lib/lang/hr.lng index c6f37ef2fa..cce902047b 100644 --- a/interface/web/monitor/lib/lang/hr.lng +++ b/interface/web/monitor/lib/lang/hr.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/hu.lng b/interface/web/monitor/lib/lang/hu.lng index 6e7c01d05c..97610a7477 100644 --- a/interface/web/monitor/lib/lang/hu.lng +++ b/interface/web/monitor/lib/lang/hu.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/id.lng b/interface/web/monitor/lib/lang/id.lng index 856d68bd23..c26d9a000c 100644 --- a/interface/web/monitor/lib/lang/id.lng +++ b/interface/web/monitor/lib/lang/id.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/it.lng b/interface/web/monitor/lib/lang/it.lng index cc618b919e..e7e3f27b54 100644 --- a/interface/web/monitor/lib/lang/it.lng +++ b/interface/web/monitor/lib/lang/it.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/ja.lng b/interface/web/monitor/lib/lang/ja.lng index 7dddd85693..6a02d86729 100644 --- a/interface/web/monitor/lib/lang/ja.lng +++ b/interface/web/monitor/lib/lang/ja.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/nl.lng b/interface/web/monitor/lib/lang/nl.lng index 6a9e253be7..25f88237f3 100644 --- a/interface/web/monitor/lib/lang/nl.lng +++ b/interface/web/monitor/lib/lang/nl.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'Geen MX record controle dat $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Niet alle DNS MX records komen overeen met het server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'Alle mail domeinen kloppen met de DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domeinen MX check onbekend.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/pl.lng b/interface/web/monitor/lib/lang/pl.lng index d8ccbba67b..64ffc1cfa1 100644 --- a/interface/web/monitor/lib/lang/pl.lng +++ b/interface/web/monitor/lib/lang/pl.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/pt.lng b/interface/web/monitor/lib/lang/pt.lng index 7fd71f5cda..0b3fca4602 100644 --- a/interface/web/monitor/lib/lang/pt.lng +++ b/interface/web/monitor/lib/lang/pt.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/ro.lng b/interface/web/monitor/lib/lang/ro.lng index dd6d079abd..034ff430a6 100644 --- a/interface/web/monitor/lib/lang/ro.lng +++ b/interface/web/monitor/lib/lang/ro.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/ru.lng b/interface/web/monitor/lib/lang/ru.lng index 7fdcee2afb..73ef6622e7 100644 --- a/interface/web/monitor/lib/lang/ru.lng +++ b/interface/web/monitor/lib/lang/ru.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/se.lng b/interface/web/monitor/lib/lang/se.lng index 0da83686ef..47c6c47954 100644 --- a/interface/web/monitor/lib/lang/se.lng +++ b/interface/web/monitor/lib/lang/se.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/sk.lng b/interface/web/monitor/lib/lang/sk.lng index 158a61077d..142474eed2 100644 --- a/interface/web/monitor/lib/lang/sk.lng +++ b/interface/web/monitor/lib/lang/sk.lng @@ -171,4 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> diff --git a/interface/web/monitor/lib/lang/tr.lng b/interface/web/monitor/lib/lang/tr.lng index a472fdb4c6..0b20a9d6d2 100644 --- a/interface/web/monitor/lib/lang/tr.lng +++ b/interface/web/monitor/lib/lang/tr.lng @@ -170,4 +170,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' ?> -- GitLab From b005f4f5e61b1295b80b05cd092a55bd6ebefff9 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Mon, 2 Jan 2023 09:38:37 +0100 Subject: [PATCH 22/29] improve log line --- server/lib/classes/cron.d/100-monitor_domain_mx.inc.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php b/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php index e7e566417d..14d7b2442e 100755 --- a/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php +++ b/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php @@ -126,7 +126,13 @@ class cronjob_monitor_domain_mx extends cronjob { if (empty($mx_ip) || !in_array( $mx_ip, $smtpin_ips)) { if ($maildomain['active'] == 'y') { - $str = 'Domain is active but the DNS does not match our IP. ( points to: ' . ($first_mx ?? 'not found') . ')'; + $str = 'Domain is active but the DNS does not match our IP.'; + if ($first_mx) { + $str .= ' (points to ' . $first_mx . ' on ' . $mx_ip . ')'; + } + else { + $str .= ' (no mx record found)'; + } $app->log('Mail domain[' . $maildomain['domain'] . ']: ' . $str, LOGLEVEL_WARN); $state = 'warning'; $data[$maildomain['domain']] = $str; -- GitLab From a36e18b801ee8f0ee0cdbbe67c3ac83d8bd10e80 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Mon, 2 Jan 2023 19:43:36 +0100 Subject: [PATCH 23/29] syntax error --- interface/web/monitor/lib/lang/ar.lng | 2 +- interface/web/monitor/lib/lang/bg.lng | 2 +- interface/web/monitor/lib/lang/br.lng | 2 +- interface/web/monitor/lib/lang/ca.lng | 2 +- interface/web/monitor/lib/lang/cz.lng | 2 +- interface/web/monitor/lib/lang/de.lng | 2 +- interface/web/monitor/lib/lang/dk.lng | 2 +- interface/web/monitor/lib/lang/el.lng | 2 +- interface/web/monitor/lib/lang/es.lng | 2 +- interface/web/monitor/lib/lang/fi.lng | 2 +- interface/web/monitor/lib/lang/fr.lng | 2 +- interface/web/monitor/lib/lang/hr.lng | 2 +- interface/web/monitor/lib/lang/hu.lng | 2 +- interface/web/monitor/lib/lang/id.lng | 2 +- interface/web/monitor/lib/lang/it.lng | 2 +- interface/web/monitor/lib/lang/ja.lng | 2 +- interface/web/monitor/lib/lang/nl.lng | 2 +- interface/web/monitor/lib/lang/pl.lng | 2 +- interface/web/monitor/lib/lang/pt.lng | 2 +- interface/web/monitor/lib/lang/ro.lng | 2 +- interface/web/monitor/lib/lang/ru.lng | 2 +- interface/web/monitor/lib/lang/se.lng | 2 +- interface/web/monitor/lib/lang/sk.lng | 2 +- interface/web/monitor/lib/lang/tr.lng | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/interface/web/monitor/lib/lang/ar.lng b/interface/web/monitor/lib/lang/ar.lng index e676902802..ea5e546547 100644 --- a/interface/web/monitor/lib/lang/ar.lng +++ b/interface/web/monitor/lib/lang/ar.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/bg.lng b/interface/web/monitor/lib/lang/bg.lng index bf2e8bacf2..0b3719fbf0 100644 --- a/interface/web/monitor/lib/lang/bg.lng +++ b/interface/web/monitor/lib/lang/bg.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/br.lng b/interface/web/monitor/lib/lang/br.lng index 7c8c08353e..c175fe6c79 100644 --- a/interface/web/monitor/lib/lang/br.lng +++ b/interface/web/monitor/lib/lang/br.lng @@ -169,4 +169,4 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; diff --git a/interface/web/monitor/lib/lang/ca.lng b/interface/web/monitor/lib/lang/ca.lng index a9e5902dd1..e63a97873c 100644 --- a/interface/web/monitor/lib/lang/ca.lng +++ b/interface/web/monitor/lib/lang/ca.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/cz.lng b/interface/web/monitor/lib/lang/cz.lng index 9aef492e35..0e3abd7826 100644 --- a/interface/web/monitor/lib/lang/cz.lng +++ b/interface/web/monitor/lib/lang/cz.lng @@ -169,4 +169,4 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; diff --git a/interface/web/monitor/lib/lang/de.lng b/interface/web/monitor/lib/lang/de.lng index f2cab85a40..5305ee3867 100644 --- a/interface/web/monitor/lib/lang/de.lng +++ b/interface/web/monitor/lib/lang/de.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/dk.lng b/interface/web/monitor/lib/lang/dk.lng index 105835065d..11ff849f3c 100644 --- a/interface/web/monitor/lib/lang/dk.lng +++ b/interface/web/monitor/lib/lang/dk.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/el.lng b/interface/web/monitor/lib/lang/el.lng index c481c98477..8de44af4f7 100644 --- a/interface/web/monitor/lib/lang/el.lng +++ b/interface/web/monitor/lib/lang/el.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/es.lng b/interface/web/monitor/lib/lang/es.lng index d8f5bcc44d..422809c279 100644 --- a/interface/web/monitor/lib/lang/es.lng +++ b/interface/web/monitor/lib/lang/es.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/fi.lng b/interface/web/monitor/lib/lang/fi.lng index c4dc571592..8cea3fefa3 100644 --- a/interface/web/monitor/lib/lang/fi.lng +++ b/interface/web/monitor/lib/lang/fi.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/fr.lng b/interface/web/monitor/lib/lang/fr.lng index 9e764423b1..c9e7599393 100644 --- a/interface/web/monitor/lib/lang/fr.lng +++ b/interface/web/monitor/lib/lang/fr.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/hr.lng b/interface/web/monitor/lib/lang/hr.lng index cce902047b..d1fcb74a94 100644 --- a/interface/web/monitor/lib/lang/hr.lng +++ b/interface/web/monitor/lib/lang/hr.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/hu.lng b/interface/web/monitor/lib/lang/hu.lng index 97610a7477..61bd32bf2b 100644 --- a/interface/web/monitor/lib/lang/hu.lng +++ b/interface/web/monitor/lib/lang/hu.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/id.lng b/interface/web/monitor/lib/lang/id.lng index c26d9a000c..b160943867 100644 --- a/interface/web/monitor/lib/lang/id.lng +++ b/interface/web/monitor/lib/lang/id.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/it.lng b/interface/web/monitor/lib/lang/it.lng index e7e3f27b54..354d2b7600 100644 --- a/interface/web/monitor/lib/lang/it.lng +++ b/interface/web/monitor/lib/lang/it.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/ja.lng b/interface/web/monitor/lib/lang/ja.lng index 6a02d86729..a29f7e60f6 100644 --- a/interface/web/monitor/lib/lang/ja.lng +++ b/interface/web/monitor/lib/lang/ja.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/nl.lng b/interface/web/monitor/lib/lang/nl.lng index 25f88237f3..326d1dffc6 100644 --- a/interface/web/monitor/lib/lang/nl.lng +++ b/interface/web/monitor/lib/lang/nl.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'Geen MX record controle dat $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Niet alle DNS MX records komen overeen met het server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'Alle mail domeinen kloppen met de DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domeinen MX check onbekend.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/pl.lng b/interface/web/monitor/lib/lang/pl.lng index 64ffc1cfa1..76c9c1b7de 100644 --- a/interface/web/monitor/lib/lang/pl.lng +++ b/interface/web/monitor/lib/lang/pl.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/pt.lng b/interface/web/monitor/lib/lang/pt.lng index 0b3fca4602..3d0ebdfb0c 100644 --- a/interface/web/monitor/lib/lang/pt.lng +++ b/interface/web/monitor/lib/lang/pt.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/ro.lng b/interface/web/monitor/lib/lang/ro.lng index 034ff430a6..1a74d7b064 100644 --- a/interface/web/monitor/lib/lang/ro.lng +++ b/interface/web/monitor/lib/lang/ro.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/ru.lng b/interface/web/monitor/lib/lang/ru.lng index 73ef6622e7..d0af54b048 100644 --- a/interface/web/monitor/lib/lang/ru.lng +++ b/interface/web/monitor/lib/lang/ru.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/se.lng b/interface/web/monitor/lib/lang/se.lng index 47c6c47954..d7235389a9 100644 --- a/interface/web/monitor/lib/lang/se.lng +++ b/interface/web/monitor/lib/lang/se.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/sk.lng b/interface/web/monitor/lib/lang/sk.lng index 142474eed2..70dd16d325 100644 --- a/interface/web/monitor/lib/lang/sk.lng +++ b/interface/web/monitor/lib/lang/sk.lng @@ -171,5 +171,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> diff --git a/interface/web/monitor/lib/lang/tr.lng b/interface/web/monitor/lib/lang/tr.lng index 0b20a9d6d2..352b349234 100644 --- a/interface/web/monitor/lib/lang/tr.lng +++ b/interface/web/monitor/lib/lang/tr.lng @@ -170,5 +170,5 @@ $wb['monitor_serverstate_mx_ip_match_nodata_txt'] = 'No MX record check data pre $wb['monitor_serverstate_mx_ip_match_warning_txt'] = 'Not all DNS MX records match the server IP'; $wb['monitor_serverstate_mx_ip_match_ok_txt'] = 'All mail domains match up with DNS.'; $wb['monitor_serverstate_mx_ip_match_unknown_txt'] = 'Mail domains MX check unknown.'; -$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.' +$wb['monitor_serverstate_mx_ip_match_note_txt'] = 'note: If your using an external smtp service for e.g. spam filtering then add that name in the Server Config -> Mail -> Additional smtp hostnames to keep them out of this list.'; ?> -- GitLab From 3da8de3148503618d6ac1a54d312ce7879e80d4e Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sat, 28 Oct 2023 23:52:54 +0200 Subject: [PATCH 24/29] Add activation setting for monitor_mx_records --- .../web/admin/form/server_config.tform.php | 6 ++++++ .../web/admin/lib/lang/ar_server_config.lng | 1 + .../web/admin/lib/lang/bg_server_config.lng | 1 + .../web/admin/lib/lang/br_server_config.lng | 1 + .../web/admin/lib/lang/ca_server_config.lng | 1 + .../web/admin/lib/lang/cn_server_config.lng | 3 +++ .../web/admin/lib/lang/cz_server_config.lng | 1 + .../web/admin/lib/lang/de_server_config.lng | 1 + .../web/admin/lib/lang/dk_server_config.lng | 1 + .../web/admin/lib/lang/el_server_config.lng | 1 + .../web/admin/lib/lang/en_server_config.lng | 1 + .../web/admin/lib/lang/es_server_config.lng | 1 + .../web/admin/lib/lang/fi_server_config.lng | 1 + .../web/admin/lib/lang/fr_server_config.lng | 1 + .../web/admin/lib/lang/hr_server_config.lng | 1 + .../web/admin/lib/lang/hu_server_config.lng | 1 + .../web/admin/lib/lang/id_server_config.lng | 1 + .../web/admin/lib/lang/it_server_config.lng | 1 + .../web/admin/lib/lang/ja_server_config.lng | 1 + .../web/admin/lib/lang/nl_server_config.lng | 1 + .../web/admin/lib/lang/pl_server_config.lng | 1 + .../web/admin/lib/lang/pt_server_config.lng | 1 + .../web/admin/lib/lang/ro_server_config.lng | 1 + .../web/admin/lib/lang/ru_server_config.lng | 1 + .../web/admin/lib/lang/se_server_config.lng | 1 + .../web/admin/lib/lang/sk_server_config.lng | 1 + .../web/admin/lib/lang/tr_server_config.lng | 1 + .../templates/server_config_mail_edit.htm | 21 ++++++++++++++++++- .../cron.d/100-monitor_domain_mx.inc.php | 3 +++ 29 files changed, 57 insertions(+), 1 deletion(-) diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index d15ab96cd7..0e1e2f4406 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -802,6 +802,12 @@ $form["tabs"]['mail'] = array( 'width' => '40', 'maxlength' => '255' ), + 'monitor_mx_records' => array( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'n', + 'value' => array(0 => 'n', 1 => 'y') + ), 'additional_smtp_hostnames' => array( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng index 6c4c44d479..48b49b2805 100644 --- a/interface/web/admin/lib/lang/ar_server_config.lng +++ b/interface/web/admin/lib/lang/ar_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng index c10d93402a..4ec907a286 100644 --- a/interface/web/admin/lib/lang/bg_server_config.lng +++ b/interface/web/admin/lib/lang/bg_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng index 0e94237640..459424395f 100644 --- a/interface/web/admin/lib/lang/br_server_config.lng +++ b/interface/web/admin/lib/lang/br_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/ca_server_config.lng b/interface/web/admin/lib/lang/ca_server_config.lng index 0d6b8ec0b2..f09e374470 100644 --- a/interface/web/admin/lib/lang/ca_server_config.lng +++ b/interface/web/admin/lib/lang/ca_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/cn_server_config.lng b/interface/web/admin/lib/lang/cn_server_config.lng index 5d5d6eeb25..9d8a01020a 100644 --- a/interface/web/admin/lib/lang/cn_server_config.lng +++ b/interface/web/admin/lib/lang/cn_server_config.lng @@ -352,3 +352,6 @@ $wb['jailkit_hardlinks_no_txt'] = '不，删除硬链接文件'; $wb['jailkit_hardlinks_yes_txt'] = '是的，如果可能，使用硬链接'; $wb['mailbox_soft_delete_txt'] = '邮箱软删除'; $wb['mailbox_soft_delete_info_txt'] = '默认情况下，7天后清理。'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; +$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng index ea10a7a5f6..606077bb98 100644 --- a/interface/web/admin/lib/lang/cz_server_config.lng +++ b/interface/web/admin/lib/lang/cz_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng index dcc7bf9881..6f24ed0e05 100644 --- a/interface/web/admin/lib/lang/de_server_config.lng +++ b/interface/web/admin/lib/lang/de_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_keyfiles_dir_error_empty'] = 'BIND keyfiles directory is empty.'; $wb['bind_zonefiles_masterprefix_error_regex'] = 'Invalid BIND zonefiles master prefix.'; $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave prefix.'; $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/dk_server_config.lng b/interface/web/admin/lib/lang/dk_server_config.lng index 2d936f81c2..5c39f22ba6 100644 --- a/interface/web/admin/lib/lang/dk_server_config.lng +++ b/interface/web/admin/lib/lang/dk_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng index b52a13727f..4a55adda9b 100644 --- a/interface/web/admin/lib/lang/el_server_config.lng +++ b/interface/web/admin/lib/lang/el_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng index 4e2fe6301a..ad7c053cd2 100644 --- a/interface/web/admin/lib/lang/en_server_config.lng +++ b/interface/web/admin/lib/lang/en_server_config.lng @@ -357,5 +357,6 @@ $wb['jailkit_hardlinks_no_txt'] = 'No, remove hardlinked files'; $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng index d13d50fa3a..a8e411ce38 100644 --- a/interface/web/admin/lib/lang/es_server_config.lng +++ b/interface/web/admin/lib/lang/es_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng index 74a42f0c80..5c2dce9f13 100644 --- a/interface/web/admin/lib/lang/fi_server_config.lng +++ b/interface/web/admin/lib/lang/fi_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng index fac0cd75e5..e1e6bed4f8 100644 --- a/interface/web/admin/lib/lang/fr_server_config.lng +++ b/interface/web/admin/lib/lang/fr_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng index b85eee4353..785567e437 100644 --- a/interface/web/admin/lib/lang/hr_server_config.lng +++ b/interface/web/admin/lib/lang/hr_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng index b5b8cb9dc6..25355f13d8 100644 --- a/interface/web/admin/lib/lang/hu_server_config.lng +++ b/interface/web/admin/lib/lang/hu_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng index 25101ea060..d342827810 100644 --- a/interface/web/admin/lib/lang/id_server_config.lng +++ b/interface/web/admin/lib/lang/id_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng index 263dd70c8e..ef73833eb4 100644 --- a/interface/web/admin/lib/lang/it_server_config.lng +++ b/interface/web/admin/lib/lang/it_server_config.lng @@ -350,5 +350,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng index c3a910deed..30e29d6009 100644 --- a/interface/web/admin/lib/lang/ja_server_config.lng +++ b/interface/web/admin/lib/lang/ja_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng index e0e2b00d89..8f43c743ec 100644 --- a/interface/web/admin/lib/lang/nl_server_config.lng +++ b/interface/web/admin/lib/lang/nl_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Extra smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Extra smtp hostnames'; diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng index cb881134d3..bf8d6e3454 100644 --- a/interface/web/admin/lib/lang/pl_server_config.lng +++ b/interface/web/admin/lib/lang/pl_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng index 56a2409c4e..42c2ec9df4 100644 --- a/interface/web/admin/lib/lang/pt_server_config.lng +++ b/interface/web/admin/lib/lang/pt_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng index 83814b4502..7fcf79ded9 100644 --- a/interface/web/admin/lib/lang/ro_server_config.lng +++ b/interface/web/admin/lib/lang/ro_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng index e641a92d47..754a3440ab 100644 --- a/interface/web/admin/lib/lang/ru_server_config.lng +++ b/interface/web/admin/lib/lang/ru_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng index da489296a5..943bbc4f78 100644 --- a/interface/web/admin/lib/lang/se_server_config.lng +++ b/interface/web/admin/lib/lang/se_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng index 0442577b4f..bfb7bd113d 100644 --- a/interface/web/admin/lib/lang/sk_server_config.lng +++ b/interface/web/admin/lib/lang/sk_server_config.lng @@ -351,5 +351,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng index 7fce304f5e..df6decf67d 100644 --- a/interface/web/admin/lib/lang/tr_server_config.lng +++ b/interface/web/admin/lib/lang/tr_server_config.lng @@ -348,5 +348,6 @@ $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave pr $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; $wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; $wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm index 3b1ad46ca3..8eef5f417d 100644 --- a/interface/web/admin/templates/server_config_mail_edit.htm +++ b/interface/web/admin/templates/server_config_mail_edit.htm @@ -186,9 +186,15 @@
+ +
+ {tmpl_var name='monitor_mx_records'} +
+
+
-
+
@@ -218,4 +224,17 @@ $('.rspamd').hide(); } }); + + if($('#monitor_mx_records').is(':checked')){ + $('.monitor_mx_records').show(); + } else { + $('.monitor_mx_records').hide(); + } + $('#monitor_mx_records').change(function(){ + if($(this).is(':checked')){ + $('.monitor_mx_records').show(); + } else { + $('.monitor_mx_records').hide(); + } + }); diff --git a/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php b/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php index 14d7b2442e..38d7453e97 100755 --- a/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php +++ b/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php @@ -67,6 +67,9 @@ class cronjob_monitor_domain_mx extends cronjob { $app->uses('getconf,functions'); $mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail'); + if ($mail_config['monitor_mx_records'] != 'y') { + return; + } /* used for all monitor cronjobs */ $app->load('monitor_tools'); $this->_tools = new monitor_tools(); -- GitLab From e557fadbfda095dac0bd87b9f576bbdcda588f02 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sat, 28 Oct 2023 23:55:10 +0200 Subject: [PATCH 25/29] default off --- interface/web/admin/form/server_config.tform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index 0e1e2f4406..e972c6cbb1 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -392,7 +392,7 @@ $form["tabs"]['server'] = array( 'monitor_system_updates' => array( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOX', - 'default' => 'y', + 'default' => 'n', 'value' => array(0 => 'n', 1 => 'y') ), 'log_retention' => array ( -- GitLab From f8e1215098bc132f519a4e721a2a85ae153398c2 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sun, 29 Oct 2023 22:06:45 +0100 Subject: [PATCH 26/29] Revert "default off" This reverts commit e557fadbfda095dac0bd87b9f576bbdcda588f02. --- interface/web/admin/form/server_config.tform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index e972c6cbb1..0e1e2f4406 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -392,7 +392,7 @@ $form["tabs"]['server'] = array( 'monitor_system_updates' => array( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOX', - 'default' => 'n', + 'default' => 'y', 'value' => array(0 => 'n', 1 => 'y') ), 'log_retention' => array ( -- GitLab From f99e2f517a1584949b9c93c7fc9020c75ac47a14 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sun, 29 Oct 2023 22:13:46 +0100 Subject: [PATCH 27/29] Rename language strings --- interface/web/admin/lib/lang/ar_server_config.lng | 4 ++-- interface/web/admin/lib/lang/bg_server_config.lng | 4 ++-- interface/web/admin/lib/lang/br_server_config.lng | 4 ++-- interface/web/admin/lib/lang/ca_server_config.lng | 4 ++-- interface/web/admin/lib/lang/cn_server_config.lng | 4 ++-- interface/web/admin/lib/lang/cz_server_config.lng | 4 ++-- interface/web/admin/lib/lang/de_server_config.lng | 4 ++-- interface/web/admin/lib/lang/dk_server_config.lng | 4 ++-- interface/web/admin/lib/lang/el_server_config.lng | 4 ++-- interface/web/admin/lib/lang/en_server_config.lng | 4 ++-- interface/web/admin/lib/lang/es_server_config.lng | 4 ++-- interface/web/admin/lib/lang/fi_server_config.lng | 4 ++-- interface/web/admin/lib/lang/fr_server_config.lng | 4 ++-- interface/web/admin/lib/lang/hr_server_config.lng | 4 ++-- interface/web/admin/lib/lang/hu_server_config.lng | 4 ++-- interface/web/admin/lib/lang/id_server_config.lng | 4 ++-- interface/web/admin/lib/lang/it_server_config.lng | 4 ++-- interface/web/admin/lib/lang/ja_server_config.lng | 4 ++-- interface/web/admin/lib/lang/nl_server_config.lng | 4 ++-- interface/web/admin/lib/lang/pl_server_config.lng | 4 ++-- interface/web/admin/lib/lang/pt_server_config.lng | 4 ++-- interface/web/admin/lib/lang/ro_server_config.lng | 4 ++-- interface/web/admin/lib/lang/ru_server_config.lng | 4 ++-- interface/web/admin/lib/lang/se_server_config.lng | 4 ++-- interface/web/admin/lib/lang/sk_server_config.lng | 4 ++-- interface/web/admin/lib/lang/tr_server_config.lng | 4 ++-- interface/web/admin/templates/server_config_mail_edit.htm | 4 ++-- 27 files changed, 54 insertions(+), 54 deletions(-) diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng index 48b49b2805..eb94e04db7 100644 --- a/interface/web/admin/lib/lang/ar_server_config.lng +++ b/interface/web/admin/lib/lang/ar_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng index 4ec907a286..c68d4e2878 100644 --- a/interface/web/admin/lib/lang/bg_server_config.lng +++ b/interface/web/admin/lib/lang/bg_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng index 459424395f..b26d74911d 100644 --- a/interface/web/admin/lib/lang/br_server_config.lng +++ b/interface/web/admin/lib/lang/br_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/ca_server_config.lng b/interface/web/admin/lib/lang/ca_server_config.lng index f09e374470..003c4330c5 100644 --- a/interface/web/admin/lib/lang/ca_server_config.lng +++ b/interface/web/admin/lib/lang/ca_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/cn_server_config.lng b/interface/web/admin/lib/lang/cn_server_config.lng index 9d8a01020a..cf53f9721e 100644 --- a/interface/web/admin/lib/lang/cn_server_config.lng +++ b/interface/web/admin/lib/lang/cn_server_config.lng @@ -353,5 +353,5 @@ $wb['jailkit_hardlinks_yes_txt'] = '是的，如果可能，使用硬链接'; $wb['mailbox_soft_delete_txt'] = '邮箱软删除'; $wb['mailbox_soft_delete_info_txt'] = '默认情况下，7天后清理。'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng index 606077bb98..c7be68db68 100644 --- a/interface/web/admin/lib/lang/cz_server_config.lng +++ b/interface/web/admin/lib/lang/cz_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng index 6f24ed0e05..f19e6d0829 100644 --- a/interface/web/admin/lib/lang/de_server_config.lng +++ b/interface/web/admin/lib/lang/de_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_zonefiles_masterprefix_error_regex'] = 'Invalid BIND zonefiles master $wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave prefix.'; $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/dk_server_config.lng b/interface/web/admin/lib/lang/dk_server_config.lng index 5c39f22ba6..3143726164 100644 --- a/interface/web/admin/lib/lang/dk_server_config.lng +++ b/interface/web/admin/lib/lang/dk_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng index 4a55adda9b..4c2bf21bad 100644 --- a/interface/web/admin/lib/lang/el_server_config.lng +++ b/interface/web/admin/lib/lang/el_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng index ad7c053cd2..a25605faad 100644 --- a/interface/web/admin/lib/lang/en_server_config.lng +++ b/interface/web/admin/lib/lang/en_server_config.lng @@ -358,5 +358,5 @@ $wb['jailkit_hardlinks_yes_txt'] = 'Yes, use hardlinks if possible'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng index a8e411ce38..3964b7b6ae 100644 --- a/interface/web/admin/lib/lang/es_server_config.lng +++ b/interface/web/admin/lib/lang/es_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng index 5c2dce9f13..783e978a71 100644 --- a/interface/web/admin/lib/lang/fi_server_config.lng +++ b/interface/web/admin/lib/lang/fi_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng index e1e6bed4f8..aeed48c9a1 100644 --- a/interface/web/admin/lib/lang/fr_server_config.lng +++ b/interface/web/admin/lib/lang/fr_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng index 785567e437..6a7a951f6d 100644 --- a/interface/web/admin/lib/lang/hr_server_config.lng +++ b/interface/web/admin/lib/lang/hr_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng index 25355f13d8..1141a40b6e 100644 --- a/interface/web/admin/lib/lang/hu_server_config.lng +++ b/interface/web/admin/lib/lang/hu_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng index d342827810..8acfc39a55 100644 --- a/interface/web/admin/lib/lang/id_server_config.lng +++ b/interface/web/admin/lib/lang/id_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng index ef73833eb4..e30bc67a22 100644 --- a/interface/web/admin/lib/lang/it_server_config.lng +++ b/interface/web/admin/lib/lang/it_server_config.lng @@ -351,5 +351,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng index 30e29d6009..e216c5ee9a 100644 --- a/interface/web/admin/lib/lang/ja_server_config.lng +++ b/interface/web/admin/lib/lang/ja_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng index 8f43c743ec..e5a390f388 100644 --- a/interface/web/admin/lib/lang/nl_server_config.lng +++ b/interface/web/admin/lib/lang/nl_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Extra smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Extra smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Extra MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Extra MX hostnames'; diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng index bf8d6e3454..6fcbd8c0d0 100644 --- a/interface/web/admin/lib/lang/pl_server_config.lng +++ b/interface/web/admin/lib/lang/pl_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng index 42c2ec9df4..c713f4c40a 100644 --- a/interface/web/admin/lib/lang/pt_server_config.lng +++ b/interface/web/admin/lib/lang/pt_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng index 7fcf79ded9..4326ce2ac7 100644 --- a/interface/web/admin/lib/lang/ro_server_config.lng +++ b/interface/web/admin/lib/lang/ro_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng index 754a3440ab..a15f2f697b 100644 --- a/interface/web/admin/lib/lang/ru_server_config.lng +++ b/interface/web/admin/lib/lang/ru_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng index 943bbc4f78..8f9fb22562 100644 --- a/interface/web/admin/lib/lang/se_server_config.lng +++ b/interface/web/admin/lib/lang/se_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng index bfb7bd113d..b8df0f020a 100644 --- a/interface/web/admin/lib/lang/sk_server_config.lng +++ b/interface/web/admin/lib/lang/sk_server_config.lng @@ -352,5 +352,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng index df6decf67d..9f987b6e73 100644 --- a/interface/web/admin/lib/lang/tr_server_config.lng +++ b/interface/web/admin/lib/lang/tr_server_config.lng @@ -349,5 +349,5 @@ $wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.'; $wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete'; $wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.'; $wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; -$wb['additional_smtp_ips_txt'] = 'Additional smtp IP\'s'; -$wb['additional_smtp_hostnames_txt'] = 'Additional smtp hostnames'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm index 8eef5f417d..cce20675ce 100644 --- a/interface/web/admin/templates/server_config_mail_edit.htm +++ b/interface/web/admin/templates/server_config_mail_edit.htm @@ -192,10 +192,10 @@
- +
- +
-- GitLab From f421574edc85c2d31135e347f1dbe89683f1f4c0 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Fri, 3 Nov 2023 21:11:56 +0100 Subject: [PATCH 28/29] Re-add translations after merge conflict --- interface/web/admin/lib/lang/ar_server_config.lng | 3 +++ interface/web/admin/lib/lang/bg_server_config.lng | 3 +++ interface/web/admin/lib/lang/br_server_config.lng | 3 +++ interface/web/admin/lib/lang/ca_server_config.lng | 3 +++ interface/web/admin/lib/lang/cn_server_config.lng | 3 +++ interface/web/admin/lib/lang/cz_server_config.lng | 3 +++ interface/web/admin/lib/lang/de_server_config.lng | 3 +++ interface/web/admin/lib/lang/dk_server_config.lng | 3 +++ interface/web/admin/lib/lang/el_server_config.lng | 3 +++ interface/web/admin/lib/lang/en_server_config.lng | 3 +++ interface/web/admin/lib/lang/es_server_config.lng | 3 +++ interface/web/admin/lib/lang/fi_server_config.lng | 3 +++ interface/web/admin/lib/lang/fr_server_config.lng | 3 +++ interface/web/admin/lib/lang/hr_server_config.lng | 3 +++ interface/web/admin/lib/lang/hu_server_config.lng | 3 +++ interface/web/admin/lib/lang/id_server_config.lng | 3 +++ interface/web/admin/lib/lang/it_server_config.lng | 3 +++ interface/web/admin/lib/lang/ja_server_config.lng | 3 +++ interface/web/admin/lib/lang/nl_server_config.lng | 3 +++ interface/web/admin/lib/lang/pl_server_config.lng | 3 +++ interface/web/admin/lib/lang/pt_server_config.lng | 3 +++ interface/web/admin/lib/lang/ro_server_config.lng | 3 +++ interface/web/admin/lib/lang/ru_server_config.lng | 3 +++ interface/web/admin/lib/lang/se_server_config.lng | 3 +++ interface/web/admin/lib/lang/sk_server_config.lng | 3 +++ interface/web/admin/lib/lang/tr_server_config.lng | 3 +++ 26 files changed, 78 insertions(+) diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng index eff8662079..b8113a4a48 100644 --- a/interface/web/admin/lib/lang/ar_server_config.lng +++ b/interface/web/admin/lib/lang/ar_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng index 94f805fae9..264f75c2bb 100644 --- a/interface/web/admin/lib/lang/bg_server_config.lng +++ b/interface/web/admin/lib/lang/bg_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng index aa83f0dbba..b80a2cb8cf 100644 --- a/interface/web/admin/lib/lang/br_server_config.lng +++ b/interface/web/admin/lib/lang/br_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/ca_server_config.lng b/interface/web/admin/lib/lang/ca_server_config.lng index 39feb97f35..11348af40b 100644 --- a/interface/web/admin/lib/lang/ca_server_config.lng +++ b/interface/web/admin/lib/lang/ca_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/cn_server_config.lng b/interface/web/admin/lib/lang/cn_server_config.lng index bc728bb632..695ea01d58 100644 --- a/interface/web/admin/lib/lang/cn_server_config.lng +++ b/interface/web/admin/lib/lang/cn_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng index 96ea04fb96..b3ab204e68 100644 --- a/interface/web/admin/lib/lang/cz_server_config.lng +++ b/interface/web/admin/lib/lang/cz_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng index 92297bb355..3657ae35d9 100644 --- a/interface/web/admin/lib/lang/de_server_config.lng +++ b/interface/web/admin/lib/lang/de_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/dk_server_config.lng b/interface/web/admin/lib/lang/dk_server_config.lng index 05f5402202..21edd59caa 100644 --- a/interface/web/admin/lib/lang/dk_server_config.lng +++ b/interface/web/admin/lib/lang/dk_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng index ecedc25243..d83c99451d 100644 --- a/interface/web/admin/lib/lang/el_server_config.lng +++ b/interface/web/admin/lib/lang/el_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng index af7beb9a4d..c6e65b2bfc 100644 --- a/interface/web/admin/lib/lang/en_server_config.lng +++ b/interface/web/admin/lib/lang/en_server_config.lng @@ -364,3 +364,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng index 8961010f73..72d9b3f642 100644 --- a/interface/web/admin/lib/lang/es_server_config.lng +++ b/interface/web/admin/lib/lang/es_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng index 68f12468a0..bbd8fa874c 100644 --- a/interface/web/admin/lib/lang/fi_server_config.lng +++ b/interface/web/admin/lib/lang/fi_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng index fb5d1e2f97..3afe90f9cc 100644 --- a/interface/web/admin/lib/lang/fr_server_config.lng +++ b/interface/web/admin/lib/lang/fr_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng index b40c7fd49e..21ddfef8ea 100644 --- a/interface/web/admin/lib/lang/hr_server_config.lng +++ b/interface/web/admin/lib/lang/hr_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng index 526b800cbd..0951a88044 100644 --- a/interface/web/admin/lib/lang/hu_server_config.lng +++ b/interface/web/admin/lib/lang/hu_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng index daaa08c24a..1e61c85cd6 100644 --- a/interface/web/admin/lib/lang/id_server_config.lng +++ b/interface/web/admin/lib/lang/id_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng index 9e7064fe14..23828032c1 100644 --- a/interface/web/admin/lib/lang/it_server_config.lng +++ b/interface/web/admin/lib/lang/it_server_config.lng @@ -357,3 +357,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng index fa9abcaaf1..ac6c96e1f5 100644 --- a/interface/web/admin/lib/lang/ja_server_config.lng +++ b/interface/web/admin/lib/lang/ja_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng index a8a8d47366..f8634b0fec 100644 --- a/interface/web/admin/lib/lang/nl_server_config.lng +++ b/interface/web/admin/lib/lang/nl_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Extra MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Extra MX hostnames'; diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng index 83460000a2..fb7845417a 100644 --- a/interface/web/admin/lib/lang/pl_server_config.lng +++ b/interface/web/admin/lib/lang/pl_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng index f856344b0a..01d76c2bfe 100644 --- a/interface/web/admin/lib/lang/pt_server_config.lng +++ b/interface/web/admin/lib/lang/pt_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng index d69c33ed65..d030dc9424 100644 --- a/interface/web/admin/lib/lang/ro_server_config.lng +++ b/interface/web/admin/lib/lang/ro_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng index 2fdb42393e..1749b7f72e 100644 --- a/interface/web/admin/lib/lang/ru_server_config.lng +++ b/interface/web/admin/lib/lang/ru_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng index 24df537a56..8e8c3124de 100644 --- a/interface/web/admin/lib/lang/se_server_config.lng +++ b/interface/web/admin/lib/lang/se_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng index 965ef09719..7f2353fdd4 100644 --- a/interface/web/admin/lib/lang/sk_server_config.lng +++ b/interface/web/admin/lib/lang/sk_server_config.lng @@ -358,3 +358,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng index fcc26b10fd..a6e429d6ce 100644 --- a/interface/web/admin/lib/lang/tr_server_config.lng +++ b/interface/web/admin/lib/lang/tr_server_config.lng @@ -355,3 +355,6 @@ $wb['soft_delete_keep_7_txt'] = 'Purge after 7 days'; $wb['soft_delete_keep_30_txt'] = 'Purge after 30 days'; $wb['soft_delete_keep_90_txt'] = 'Purge after 90 days'; $wb['soft_delete_keep_365_txt'] = 'Purge after 365 days'; +$wb['monitor_mx_records_txt'] = 'Monitor MX records for mail domains'; +$wb['additional_mx_ips_txt'] = 'Additional MX IP\'s'; +$wb['additional_mx_hostnames_txt'] = 'Additional MX hostnames'; -- GitLab From 093c99cc1d7ddc7280e5cb1901ed745cec78e96d Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Mon, 8 Apr 2024 08:11:11 +0200 Subject: [PATCH 29/29] Initialize var in loop --- server/lib/classes/cron.d/100-monitor_domain_mx.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php b/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php index 38d7453e97..7ea0492547 100755 --- a/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php +++ b/server/lib/classes/cron.d/100-monitor_domain_mx.inc.php @@ -113,6 +113,7 @@ class cronjob_monitor_domain_mx extends cronjob { $found_mx = getmxrr($maildomain['domain'], $mx_records, $mx_weight) ; $mx_sorted = array(); + $mx_ip = ''; // Merge records and weight into a single array to sort on priority. // ignore multiple mx's at the same weight -- GitLab