test use sections

app/UI/Client/Setting/Forms/EditSettingForm.php

@@ -24,7 +24,7 @@ use function ThurData\Servers\KerioEmail\Core\Helper\di;
  * Time: 09:29
  * Class EditSettingForm
  */
-class EditSettingForm extends BaseForm implements ClientArea
+class EditSettingForm extends SortedFieldForm implements ClientArea
 {
     use FormExtendedTrait;
     
@@ -43,70 +43,7 @@ class EditSettingForm extends BaseForm implements ClientArea
 
     public function initFields()
     {
-        di('lang')->absoluteT('dnseditmessage') ? $message = di('lang')->absoluteT('dnseditmessage') :
-        $message  = 'Settings for <b id="editalertmaildomain" class="lu-alert--lg"></b><br><br>
-            <i class="fas fa-info fa-fw"></i> Incorrect DNS entries lead to difficulties sending and receiving emails. 
-            To ensure that your mail server is functioning properly, it\'s best to follow our recommendations.';
-        $this->addInternalAlert($message, 'warning', 100);
-
-        $field = new Hidden();
-        $field->setId('id');
-        $field->setName('id');
-        $this->addField($field);
-        $field = new Hidden();
-        $field->setId('editmaildomain');
-        $field->setName('editmaildomain');
-        $this->addField($field);
-        $field = new Hidden();
-        $field->setId('zoneid');
-        $field->setName('zoneid');
-        $this->addField($field);
-        $field = new Hidden();
-        $field->setId('dnsok');
-        $field->setName('dnsok');
-        $this->addField($field);
-        $field = new Hidden();
-        $field->setId('editmxthurdata');
-        $field->setName('editmxthurdata');
-        $this->addField($field);
-        $field = new Hidden();
-        $field->setId('editspfthurdata');
-        $field->setName('editspfthurdata');
-        $this->addField($field);
-        $field = new Hidden();
-        $field->setId('editdmarcthurdata');
-        $field->setName('editdmarcthurdata');
-        $this->addField($field);
-        $field = new Hidden();
-        $field->setId('editdkimthurdata');
-        $field->setName('editdkimthurdata');
-        $this->addField($field);
-        $field = new Hidden();
-        $field->setId('dkimname');
-        $field->setName('dkimname');
-        $this->addField($field);
-
-        $field = new Text('editmxactive');
-        $field->setId('editmxactive');
-        $field->setName('editmxactive');
-        $this->addField($field);
-        $field = new Text('editspf');
-        $field->setId('editspf');
-        $field->setName('editspf');
-        $this->addField($field);
-        $field = new Text('editdmarc');
-        $field->setId('editdmarc');
-        $field->setName('editdmarc');
-        $this->addField($field);
-        $field = new Text('editdkim');
-        $field->setId('editdkim');
-        $field->setName('editdkim');
-        $this->addField($field);
-
-        $defaults = new Switcher('setDefaults');
-        $this->addField($defaults);
-//  todo: additional section containing Kerio Domain settings like AD integration
-//        $this->addSection(new EditGeneralSection());
-//        $this->addSection(new EditAdditionalSection());
+        $this->addSection(new EditGeneralSection());
+        $this->addSection(new EditAdditionalSection());
     }
 }

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

@@ -23,10 +23,10 @@ class EditAdditionalSection extends FreeFieldsSection
 
     public function initContent()
     {
-        $field = new Text('2FA');
-        $this->addField($field);
-        $field = new Text('AD');
-        $this->addField($field);
+        $dkimsigenabled = new Switcher('dkimsigenabled');
+        $this->generateDoubleSection([$dkimsigenabled]);
+        $tfaenabled = new Switcher('tfaenabled');
+        $this->generateDoubleSection([$tfaenabled]);
     }
 
 }

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

@@ -28,17 +28,61 @@ class EditGeneralSection extends FreeFieldsSection
 
     public function initContent()
     {
-        /**
-         * add fields
-         */
-        $field = new Hidden('domain');
+        $field = new Hidden();
+        $field->setId('id');
+        $field->setName('id');
         $this->addField($field);
-
-        $field = new Text('test');
+        $field = new Hidden();
+        $field->setId('editmaildomain');
+        $field->setName('editmaildomain');
+        $this->addField($field);
+        $field = new Hidden();
+        $field->setId('zoneid');
+        $field->setName('zoneid');
+        $this->addField($field);
+        $field = new Hidden();
+        $field->setId('dnsok');
+        $field->setName('dnsok');
+        $this->addField($field);
+        $field = new Hidden();
+        $field->setId('editmxthurdata');
+        $field->setName('editmxthurdata');
+        $this->addField($field);
+        $field = new Hidden();
+        $field->setId('editspfthurdata');
+        $field->setName('editspfthurdata');
+        $this->addField($field);
+        $field = new Hidden();
+        $field->setId('editdmarcthurdata');
+        $field->setName('editdmarcthurdata');
+        $this->addField($field);
+        $field = new Hidden();
+        $field->setId('editdkimthurdata');
+        $field->setName('editdkimthurdata');
+        $this->addField($field);
+        $field = new Hidden();
+        $field->setId('dkimname');
+        $field->setName('dkimname');
         $this->addField($field);
 
-        $field = new Text('notes');
+        $field = new Text('editmxactive');
+        $field->setId('editmxactive');
+        $field->setName('editmxactive');
+        $this->addField($field);
+        $field = new Text('editspf');
+        $field->setId('editspf');
+        $field->setName('editspf');
+        $this->addField($field);
+        $field = new Text('editdmarc');
+        $field->setId('editdmarc');
+        $field->setName('editdmarc');
+        $this->addField($field);
+        $field = new Text('editdkim');
+        $field->setId('editdkim');
+        $field->setName('editdkim');
         $this->addField($field);
 
+        $defaults = new Switcher('setDefaults');
+        $this->addField($defaults);
     }
 }