|
|
@@ -72,25 +72,33 @@ class InfoSettingDataProvider extends BaseDataProvider
|
|
|
|
|
|
if(empty($dnsRecords['mx'])){
|
|
|
$mx = 'unset';
|
|
|
+ $mxmulti = false;
|
|
|
} else {
|
|
|
- $mx = implode('',$dnsRecords['mx']);
|
|
|
+ count($dnsRecords['mx']) > 1 ? $mxmulti = true : $mxmulti = false;
|
|
|
+ $mx = implode(' ',$dnsRecords['mx']);
|
|
|
}
|
|
|
if(empty($dnsRecords['spf'])) {
|
|
|
$spf = 'unset';
|
|
|
+ $spfmulti = false;
|
|
|
} else {
|
|
|
+ count($dnsRecords['spf']) > 1 ? $spfmulti = true : $spfmulti = false;
|
|
|
$spf = implode('',$dnsRecords['spf']);
|
|
|
}
|
|
|
if(empty($dnsRecords['dmarc'])) {
|
|
|
$dmarc = 'unset';
|
|
|
+ $dmarcmulti = false;
|
|
|
} else {
|
|
|
+ count($dnsRecords['dmarc']) > 1 ? $dmarcmulti = true : $dmarcmulti = false;
|
|
|
$dmarc = implode('',$dnsRecords['dmarc']);
|
|
|
}
|
|
|
if(empty($dnsRecords['dkim'])) {
|
|
|
$dkim = 'unset';
|
|
|
+ $dkimmulti = false;
|
|
|
} else {
|
|
|
- $dkim = implode('',$dnsRecords['dkim']);
|
|
|
+ count($dnsRecords['dkim']) > 1 ? $dkimmulti = true : $dkimmulti = false;
|
|
|
+ $dkim = implode(' ',$dnsRecords['dkim']);
|
|
|
}
|
|
|
- if($this->mxthurdata == $mx){
|
|
|
+ if(in_array($this->mxthurdata, $dnsRecords['mx'])){
|
|
|
if($this->spfConfig == $spf && $this->dmarcConfig == $dmarc && in_array($this->domainKey, $dnsRecords['dkim'])){
|
|
|
$dnsok = 'success';
|
|
|
} else {
|
|
|
@@ -111,7 +119,11 @@ class InfoSettingDataProvider extends BaseDataProvider
|
|
|
'dmarcthurdata' => $this->dmarcConfig,
|
|
|
'dkimthurdata' => $this->domainKey,
|
|
|
'selfdns' => $selfDns,
|
|
|
- 'dnsok' => $dnsok
|
|
|
+ 'dnsok' => $dnsok,
|
|
|
+ 'mxmulti' => $mxmulti,
|
|
|
+ 'dkimmulti' => $dkimmulti,
|
|
|
+ 'dmarcmulti' => $dmarcmulti,
|
|
|
+ 'spfmulti' => $spfmulti
|
|
|
];
|
|
|
}
|
|
|
|