diff --git a/interface/web/dns/dns_dmarc_edit.php b/interface/web/dns/dns_dmarc_edit.php index 4c6402a0d46ffd16b7c09d36837a88f586935a58..c4bc2b3fa9ecf8945ec4176ae1690e6a1d724628 100644 --- a/interface/web/dns/dns_dmarc_edit.php +++ b/interface/web/dns/dns_dmarc_edit.php @@ -104,9 +104,15 @@ class page_action extends tform_actions { $temp = explode('; ', $old_data); foreach ($temp as $part) { if (preg_match("/^p=/", $part)) $dmarc_policy = str_replace('p=', '', $part); - if (preg_match("/^rua=/", $part)) $dmarc_rua = str_replace('rua=mailto:', '', $part).' '; - if (preg_match("/^ruf=/", $part)) $dmarc_ruf = str_replace('ruf=mailto:', '', $part).' '; - if (preg_match("/^fo:/", $part)) $dmarc_fo = str_replace('fo:', '', $part); + if (preg_match("/^rua=/", $part)) { + $dmarc_rua = str_replace(array('rua=','mailto:'), '', $part).' '; + $dmarc_rua = str_replace(',', ' ', $dmarc_rua); + } + if (preg_match("/^ruf=/", $part)) { + $dmarc_ruf = str_replace(array('ruf=','mailto:'), '', $part).' '; + $dmarc_ruf = str_replace(',', ' ', $dmarc_ruf); + } + if (preg_match("/^fo=/", $part)) $dmarc_fo = str_replace('fo=', '', $part); if (preg_match("/^adkim=/", $part)) $dmarc_adkim = str_replace('adkim=', '', $part); if (preg_match("/^aspf=/", $part)) $dmarc_aspf = str_replace('aspf=', '', $part); if (preg_match("/^rf=/", $part)) $dmarc_rf = str_replace('rf=', '', $part); @@ -137,10 +143,10 @@ class page_action extends tform_actions { if (!empty($dmarc_ruf)) $app->tpl->setVar("dmarc_ruf", $dmarc_ruf); //set dmarc-fo-options - $temp = explode(':', $dmarc_fo); - if (is_array($temp)) + if (isset($dmarc_fo)) { + $temp = explode(':', $dmarc_fo); foreach ($temp as $fo => $value) $app->tpl->setVar("dmarc_fo".$value, 'CHECKED'); - else + } else $app->tpl->setVar("dmarc_fo0", 'CHECKED'); unset($temp); @@ -277,63 +283,53 @@ class page_action extends tform_actions { //create dmarc-record $dmarc_record[] = 'p='.$this->dataRecord['dmarc_policy']; - /* TODO: - draft-kucherawy-dmarc-base-07 allows multiple rua and ruf-entries - */ - $dmarc_rua = trim($this->dataRecord['dmarc_rua']); - if (!empty($dmarc_rua)) { - if (!filter_var($dmarc_rua, FILTER_VALIDATE_EMAIL)) { - if (isset($app->tform->errorMessage )) $app->tform->errorMessage = '<br/>' . $app->tform->errorMessage; - $app->tform->errorMessage .= $app->tform->wordbook['dmarc_invalid_email_txt'].$dmarc_rua; - } else { - /* TODO: - allow an external report-address. this requieres changes in a remote zone. - */ - $mail_domain = explode('@', $dmarc_rua); - if ($mail_domain[1] != $domain_name) { + if (!empty($this->dataRecord['dmarc_rua'])) { + $dmarc_rua = explode(' ', $this->dataRecord['dmarc_rua']); + $dmarc_rua = array_filter($dmarc_rua); + foreach ($dmarc_rua as $rec) { + if (!filter_var($rec, FILTER_VALIDATE_EMAIL)) { if (isset($app->tform->errorMessage )) $app->tform->errorMessage = '<br/>' . $app->tform->errorMessage; - $app->tform->errorMessage .= $app->tform->wordbook['dmarc_invalid_domain_txt'].$dmarc_ruf.' in '.$dmarc_ruf; + $app->tform->errorMessage .= $app->tform->wordbook['dmarc_invalid_email_txt'].$dmarc_rua; } else { - $dmarc_record[] = 'rua=mailto:'.$dmarc_rua; + $temp .= 'mailto:'.$rec.','; } } + $dmarc_record[] = 'rua='.rtrim($temp, ','); + unset ($dmarc_rua); + unset($temp); } - unset ($dmarc_rua); - unset ($mail_domain); - - $dmarc_ruf = trim($this->dataRecord['dmarc_ruf']); - if (!empty($dmarc_ruf)) { - if (!filter_var($dmarc_ruf, FILTER_VALIDATE_EMAIL)) { - if (isset($app->tform->errorMessage )) $app->tform->errorMessage = '<br/>' . $app->tform->errorMessage; - $app->tform->errorMessage .= $app->tform->wordbook['dmarc_invalid_email_txt'].$dmarc_ruf; - } else { - /* TODO: - allow an external report-address. this requieres changes in a remote zone. - */ - $mail_domain[1] = explode('@', $dmarc_ruf); - if ($mail_domain != $domain_name) { + + if (!empty($this->dataRecord['dmarc_ruf'])) { + $dmarc_ruf = explode(' ', $this->dataRecord['dmarc_ruf']); + $dmarc_ruf = array_filter($dmarc_ruf); + foreach ($dmarc_ruf as $rec) { + if (!filter_var($rec, FILTER_VALIDATE_EMAIL)) { if (isset($app->tform->errorMessage )) $app->tform->errorMessage = '<br/>' . $app->tform->errorMessage; - $app->tform->errorMessage .= $app->tform->wordbook['dmarc_invalid_domain_txt'].$dmarc_ruf.' in '.$dmarc_ruf; + $app->tform->errorMessage .= $app->tform->wordbook['dmarc_invalid_email_txt'].$dmarc_rua; } else { - $dmarc_record[] = 'ruf=mailto:'.$dmarc_ruf; + $temp .= 'mailto:'.$rec.','; } } + $dmarc_record[] = 'ruf='.rtrim($temp, ','); + unset ($dmarc_ruf); + unset($temp); } - unset ($dmarc_ruf); - unset ($mail_domain); $fo_rec = ''; if (isset($this->dataRecord['dmarc_fo0'])) $fo_rec[] = '0'; if (isset($this->dataRecord['dmarc_fo1'])) $fo_rec[] = '1'; if (isset($this->dataRecord['dmarc_fod'])) $fo_rec[] = 'd'; if (isset($this->dataRecord['dmarc_fos'])) $fo_rec[] = 's'; - if (is_array($fo_rec) && !empty($fo_rec)) - $dmarc_record[] = 'fo:'.implode(':', $fo_rec); + if (is_array($fo_rec) && !empty($fo_rec)) { + $rec = 'fo='.implode(':', $fo_rec); + if ($rec != 'fo=0') $dmarc_record[] = 'fo='.implode(':', $fo_rec); + unset($rec); + } - if (!empty($this->dataRecord['dmarc_adkim']) && $this->dataRecord['dmarc_adkim'] != 'r' ) + if ($this->dataRecord['dmarc_adkim'] != 'r' ) $dmarc_record[] = 'adkim='.$this->dataRecord['dmarc_adkim']; - if (!empty($this->dataRecord['dmarc_aspf']) && $this->dataRecord['dmarc_aspf'] != 'r' ) + if ($this->dataRecord['dmarc_aspf'] != 'r' ) $dmarc_record[] = 'aspf='.$this->dataRecord['dmarc_aspf']; if (isset($this->dataRecord['dmarc_rf_afrf']) && isset($this->dataRecord['dmarc_rf_iodef'])) diff --git a/interface/web/dns/lib/lang/ar_dns_dmarc.lng b/interface/web/dns/lib/lang/ar_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/ar_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/ar_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/bg_dns_dmarc.lng b/interface/web/dns/lib/lang/bg_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/bg_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/bg_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/br_dns_dmarc.lng b/interface/web/dns/lib/lang/br_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/br_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/br_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/cz_dns_dmarc.lng b/interface/web/dns/lib/lang/cz_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/cz_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/cz_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/de_dns_dmarc.lng b/interface/web/dns/lib/lang/de_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/de_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/de_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/el_dns_dmarc.lng b/interface/web/dns/lib/lang/el_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/el_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/el_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/en_dns_dmarc.lng b/interface/web/dns/lib/lang/en_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/en_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/en_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/es_dns_dmarc.lng b/interface/web/dns/lib/lang/es_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/es_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/es_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/fi_dns_dmarc.lng b/interface/web/dns/lib/lang/fi_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/fi_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/fi_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/fr_dns_dmarc.lng b/interface/web/dns/lib/lang/fr_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/fr_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/fr_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/hr_dns_dmarc.lng b/interface/web/dns/lib/lang/hr_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/hr_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/hr_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/hu_dns_dmarc.lng b/interface/web/dns/lib/lang/hu_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/hu_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/hu_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/id_dns_dmarc.lng b/interface/web/dns/lib/lang/id_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/id_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/id_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/it_dns_dmarc.lng b/interface/web/dns/lib/lang/it_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/it_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/it_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/ja_dns_dmarc.lng b/interface/web/dns/lib/lang/ja_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/ja_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/ja_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/nl_dns_dmarc.lng b/interface/web/dns/lib/lang/nl_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/nl_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/nl_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/pl_dns_dmarc.lng b/interface/web/dns/lib/lang/pl_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/pl_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/pl_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/pt_dns_dmarc.lng b/interface/web/dns/lib/lang/pt_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/pt_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/pt_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/ro_dns_dmarc.lng b/interface/web/dns/lib/lang/ro_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/ro_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/ro_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/ru_dns_dmarc.lng b/interface/web/dns/lib/lang/ru_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/ru_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/ru_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/se_dns_dmarc.lng b/interface/web/dns/lib/lang/se_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/se_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/se_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/sk_dns_dmarc.lng b/interface/web/dns/lib/lang/sk_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/sk_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/sk_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/lib/lang/tr_dns_dmarc.lng b/interface/web/dns/lib/lang/tr_dns_dmarc.lng index ac7526663d224fef3f80507a0ed2bf242e1bb8b7..8da5d353503b32b3d102df08c3035fb449b4eabe 100644 --- a/interface/web/dns/lib/lang/tr_dns_dmarc.lng +++ b/interface/web/dns/lib/lang/tr_dns_dmarc.lng @@ -2,14 +2,14 @@ $wb['data_txt'] = 'DMARC Record'; $wb['domain_txt'] = 'Domain'; $wb['dmarc_policy_txt'] = 'Mail Receiver Policy'; -$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF and DKIM.'; +$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).'; $wb['dmarc_policy_none_txt'] = 'none'; $wb['dmarc_policy_quarantine_txt'] = 'quarantine'; $wb['dmarc_policy_reject_txt'] = 'reject'; $wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address'; -$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address'; -$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing SPF and DKIM checks (DMARC) for the domain.'; +$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).'; $wb['dmarc_fo_txt'] = 'Forensic reporting options'; $wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result."; $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.'; @@ -37,8 +37,10 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine'; $wb['dmarc_sp_reject_txt'] = 'reject'; $wb['ttl_txt'] = 'TTL'; $wb['active_txt'] = 'Active'; +$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails."; +$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.'; +$wb['dmarc_no_spf_txt'] = 'No active SPF Record.'; $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record'; -$wb['dmarc_no_dkim_spf_txt'] = 'No active DKIM or SPF Record.'; $wb['dmarc_invalid_email_txt'] = 'Invalid Email'; $wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option'; $wb['record_exists_txt'] = 'DNS-Record already exists'; diff --git a/interface/web/dns/templates/dns_dmarc_edit.htm b/interface/web/dns/templates/dns_dmarc_edit.htm index 0f1f5b49e910d29c74fb31c54587a1bef785ab89..373ec4b03ec1bde8e06c3545474db36f85f2fd7b 100644 --- a/interface/web/dns/templates/dns_dmarc_edit.htm +++ b/interface/web/dns/templates/dns_dmarc_edit.htm @@ -79,7 +79,7 @@ <div class="ctrlHolder"> <p class="label">{tmpl_var name='active_txt'}</p> <div class="multiField"> - <input type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'}/> + <input type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'} /> </div> </div> </fieldset>