Răsfoiți Sursa

new info form

andre 5 luni în urmă
părinte
comite
6c0d434f49

+ 14 - 2
app/UI/Client/Setting/Forms/InfoForm.php

@@ -37,10 +37,22 @@ class InfoForm extends BaseForm implements ClientArea
         $this->addField(new Hidden("id"));
         $this->addField(new Hidden("selfdns"));
         $this->addField(new Hidden("selfdomain"));
+        $field = new Text("mxthurdata");
+        $field->setRawTitle('MX Eintrag ThurData Vorgabe');
+        $field->setHtmlAttributes(['disabled']);
+        $this->addField($field);
         $field = new Text("mxactive");
-        $field->setRawTitle('Das ist ein Test');
-
+        $field->setRawTitle('Aktueller MX Eintrag');
+        $this->addField($field);
+        $field = new Text("spfthurdata");
+        $field->setRawTitle('SPF ThurData Vorgabe');
+        $this->addField($field);
+        $field = new Text("spf");
+        $field->setRawTitle('Aktueller SPF Eintrag');
         $this->addField($field);
+
+
+
         $this->addField(new Text("spf"));
         $this->addField(new Text("dmarc"));
         $this->addField(new Text("dkim"));

+ 5 - 4
app/UI/Client/Setting/Providers/InfoSettingDataProvider.php

@@ -63,7 +63,7 @@ class InfoSettingDataProvider extends BaseDataProvider
         if(empty($dnsRecords['mx'])){
             $mx = 'unset';
         } else {
-            in_array($params['serverhostname'],$dnsRecords['mx']) ? $mx = 'set' : $mx = 'wrong';
+            in_array($params['serverhostname'],$dnsRecords['mx']) ? $mx = $dnsRecords['mx'] : $mx = 'wrong';
         }
         if(empty($dnsRecords['spf'])) {
             $spf = 'unset';
@@ -72,7 +72,7 @@ class InfoSettingDataProvider extends BaseDataProvider
                 $spf = 'multi';
             } else {
                 if($dnsRecords['spf'][0] === $this->spfConfig){
-                    $spf = 'set';
+                    $dnsRecords['spf'][0];
                 } else {
                     $spf = 'wrong';
                 }
@@ -85,7 +85,7 @@ class InfoSettingDataProvider extends BaseDataProvider
                 $dmarc = 'multi';
             } else {
                 if($dnsRecords['dmarc'][0] === $this->dmarcConfig){
-                    $dmarc = 'set';
+                    $dmarc = $dnsRecords['dmarc'][0];
                 } else {
                     $dmarc = 'wrong';
                 }
@@ -101,7 +101,8 @@ class InfoSettingDataProvider extends BaseDataProvider
             'dkim' => $dkim,
             'selfdns' => $selfDns,
             'selfdomain' => $selfdomain,
-            'message' => 'Blubb'
+            'mxthurdata' => $params['serverhostname'],
+            'spfthurdata' => $this->spfConfig,
         ];
         $this->availableValues['dnsrecords'] = $dnsRecords;
         logModuleCall(