andre 4 сар өмнө
parent
commit
6a93e003fb

+ 18 - 6
app/UI/Client/Setting/Providers/EditSettingDataProvider.php

@@ -67,25 +67,33 @@ class EditSettingDataProvider extends BaseDataProvider
         $this->mxthurdata = $this->getWhmcsParamByKey('serverhostname');
         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 {
-            $spf = implode('',$dnsRecords['spf']);
+            count($dnsRecords['spf']) > 1 ? $spfmulti = true : $spfmulti = false;
+            $spf = implode(' ',$dnsRecords['spf']);
         }
         if(empty($dnsRecords['dmarc'])) {
             $dmarc = 'unset';
+            $dmarcmulti = false;
         } else {
-            $dmarc = implode('',$dnsRecords['dmarc']);
+            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 {
@@ -106,7 +114,11 @@ class EditSettingDataProvider extends BaseDataProvider
             'editdmarcthurdata' => $this->dmarcConfig,
             'editdkimthurdata' => $this->domainKey,
             'zoneid' => $selfDns,
-            'dnsok' => $dnsok
+            'dnsok' => $dnsok,
+            'mxmulti' => $mxmulti,
+            'dkimmulti' => $dkimmulti,
+            'dmarcmulti' => $dmarcmulti,
+            'spfmulti' => $spfmulti
         ];
     }