editsettingsform

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

@@ -122,10 +122,9 @@ class EditSettingDataProvider extends BaseDataProvider
             'Debug Formdata',
             $this->params
         );
-        return (new HtmlDataJsonResponse())->setMessageAndTranslate('settingHasBeenUpdated')->setStatusSuccess();
 
         $fieldToProtection = [
-            'maildomain',
+            'editmaildomain',
             'mxthurdata',
             'spfthurdata',
             'dmarcthurdata',
@@ -139,8 +138,8 @@ class EditSettingDataProvider extends BaseDataProvider
             $value = in_array($field, $fieldToProtection) ? htmlentities($value) : $value;
         }
 
-        $attr = array(
-            'description' => $this->formData['description'],
+        $dnsParams = array(
+            'mxthurdata' => $this->formData['mxthurdata'],
             'type' => $this->formData['type'],
             'isEnabled' => $this->formData['status'] === 'active' ? true : false,
             'manager' => array(

app/UI/Client/Templates/assets/js/setting/index.js

@@ -10,7 +10,7 @@ mgEventHandler.on('ModalLoaded', null,function(){
     if($('[index="infoModal"]' ).length){
         var mxactive = $('input[name="mxactive"]');
         var mxthurdata = $('input[name="mxthurdata"]');
-        var maildomain = $('input[name="maildomain"]');
+        var maildomain = $('input[name="editmaildomain"]');
         $("#alertmaildomain").text(maildomain.val());
         if(mxthurdata.val() == mxactive.val()){
             mxactive.addClass('lu-alert--success lu-alert--outline');

core/Helper/DnsHelper.php

@@ -157,6 +157,7 @@ class DnsHelper
             'class' => 'IN',
             'data' => $dnsparams['dmarcthurdata']
         );
+        array_push($zoneRecords, $dmarcRecord);
         $dkimRecord = array(
             'line' => $maildomain.'.|TXT|0',
             'name' => $dnsparams['dkimname'],
@@ -164,7 +165,7 @@ class DnsHelper
             'class' => 'IN',
             'data' => $dnsparams['dkimthurdata']
         );
-        array_push($zoneRecords, $dmarcRecord);
+        array_push($zoneRecords, $dkimRecord);
         foreach($dnsZone['data']->records as $record) {
             if($record->type == 'MX') continue;
             if(!$record->type === 'TXT') {
@@ -200,11 +201,11 @@ class DnsHelper
         return 'success';
     }
     
-    function KerioEmailunsetMX()
+    function KerioEmailunsetMX($maildomain)
     {
         $zoneIDcollection = Capsule::table('dns_manager2_zone')
             ->select('id')
-            ->where('name', '=', $this->params['domain'])
+            ->where('name', '=', $maildomain)
             ->get();
         $zoneIDobj = $zoneIDcollection[0];
         $zoneID = $zoneIDobj->{'id'};