test use sections

app/UI/Client/Setting/Providers/InfoSettingDataProvider.php

@@ -91,12 +91,16 @@ class InfoSettingDataProvider extends BaseDataProvider
             count($dnsRecords['dmarc']) > 1 ? $dmarcmulti = true : $dmarcmulti = false;
             $dmarc = implode(' ',$dnsRecords['dmarc']);
         }
+        $dkim = 'unset';
         if(empty($dnsRecords['dkim'])) {
-            $dkim = 'unset';
             $dkimmulti = false;
         } else {
             count($dnsRecords['dkim']) > 1 ? $dkimmulti = true : $dkimmulti = false;
-            $dkim = implode(' ',$dnsRecords['dkim']);
+            foreach($dnsRecords['dkim'] as $dkimRecord) {
+                if(key($dkimRecord) == $this->dkimName) {
+                    $dkim = $dkimRecord;
+                }
+            }
         }
         if(in_array($this->mxthurdata, $dnsRecords['mx'])){
             if($this->spfConfig == $spf && $this->dmarcConfig == $dmarc && in_array($this->domainKey, $dnsRecords['dkim'])){
@@ -118,6 +122,7 @@ class InfoSettingDataProvider extends BaseDataProvider
             'spfthurdata' => $this->spfConfig,
             'dmarcthurdata' => $this->dmarcConfig,
             'dkimthurdata' => $this->domainKey,
+            'dkimname' => $this->dkimName,
             'selfdns' => $selfDns,
             'dnsok' => $dnsok,
             'mxmulti' => $mxmulti,

app/UI/Client/Setting/Sections/GeneralSection.php

@@ -63,7 +63,7 @@ class GeneralSection extends FreeFieldsSection
 
         $dkim = new Text('dkim');
         $dkim->addHtmlAttribute('readonly','true');
-        $dkim->setDescription('description');
+        $dkim->setDescription('dkimname');
 
         $this->generateDoubleSection([$dkimthurdata, $dkim]);
 

core/Helper/DnsHelper.php

@@ -71,15 +71,15 @@ class DnsHelper
             array_push($vars['mx'], $mxRecord->exchange);
         }
         foreach($domainTXT as $txtRecord) {
-            foreach($txtRecord->text as $txtData) {
-                if(strstr($txtData,'v=spf')) {
-                    array_push($vars['spf'],$txtData);
+            foreach($txtRecord as $txtData) {
+                if(strstr($txtData->text,'v=spf')) {
+                    array_push($vars['spf'],$txtData->text);
                 }
-                if(strstr($txtData,'v=DMARC')) {
-                    array_push($vars['dmarc'],$txtData);
+                if(strstr($txtData->text,'v=DMARC')) {
+                    array_push($vars['dmarc'],$txtData->text);
                 }
-                if(strstr($txtData,'v=DKIM')) {
-                    array_push($vars['dkim'],$txtData);
+                if(strstr($txtData->text,'v=DKIM')) {
+                    array_push($vars['dkim'],[$txtData->name,$txtData->text]);
                 }
             }
         }
@@ -108,7 +108,7 @@ class DnsHelper
                     array_push($vars['dmarc'], trim($localRecord->rdata->txtdata, '"'));
                 }
                 if(strstr($localRecord->rdata->txtdata,'v=DKIM')) {
-                    array_push($vars['dkim'], trim($localRecord->rdata->txtdata, '"'));
+                    array_push($vars['dkim'], [$localRecord->name,trim($localRecord->rdata->txtdata, '"')]);
                 }
             }
         }