Merge branch 'cleanup' of andre/whmcsKerioEmail into master

app/Enums/Kerio.php

@@ -39,12 +39,7 @@ class Kerio
     const STATUS_REJECT     = 'Denied';
 
     const ACC_STATUS_ACTIVE = 'active';
-    const ACC_STATUS_LOCKED = 'locked';
-    const ACC_STATUS_MAINTENANCE = 'maintenance';
     const ACC_STATUS_CLOSED = 'closed';
-    const ACC_STATUS_LOCKOUT = 'lockout';
-    const ACC_STATUS_PENDING = 'pending';
-    const ACC_STATUS_SUSPEND = 'suspended';
 
     const RES_TYPE_LOCATION  = 'Room';
     const RES_TYPE_EQUIPMENT = 'Equipment';

app/UI/Client/DistributionList/Forms/AddListForm.php

@@ -2,12 +2,9 @@
 namespace ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Forms;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Forms\SortedFieldForm;
 use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Providers\AddListDataProvider;
-use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Sections\AddAliasesDistribution;
 use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Sections\AddMembersDistribution;
-use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Sections\AddOwnersDistribution;
 use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Sections\AddPreferencesDistribution;
 use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Sections\AddPropertiesDistribution;
-use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Providers\AccountDataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\FormConstants;
 
@@ -36,8 +33,6 @@ class AddListForm extends SortedFieldForm implements ClientArea
     {
         $this->addSection(new AddMembersDistribution());
         $this->addSection(new AddPropertiesDistribution());
-//        $this->addSection(new AddAliasesDistribution());
-//        $this->addSection(new AddOwnersDistribution());
         $this->addSection(new AddPreferencesDistribution());
 
     }

app/UI/Client/DistributionList/Forms/DeleteListForm.php

@@ -10,9 +10,7 @@
 namespace ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Forms;
 
 
-use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Forms\SortedFieldForm;
 use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Providers\DeleteListDataProvider;
-use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Providers\DeleteAccountDataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\BaseForm;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;

app/UI/Client/DistributionList/Forms/EditListForm.php

@@ -12,11 +12,7 @@ namespace ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Forms;
 
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Forms\SortedFieldForm;
 use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Providers\EditListDataProvider;
-use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Sections\AddAliasesDistribution;
-use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Sections\AddMembersDistribution;
-use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Sections\AddOwnersDistribution;
 use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Sections\AddPreferencesDistribution;
-use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Sections\AddPropertiesDistribution;
 use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Sections\EditMembersDistribution;
 use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Sections\EditPropertiesDistribution;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;

app/UI/Client/DistributionList/Forms/MassDeleteListForm.php

@@ -13,8 +13,6 @@ namespace ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Forms;
 use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Providers\DeleteListDataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\BaseForm;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\FormConstants;
 
 class MassDeleteListForm extends BaseForm implements ClientArea
 {

app/UI/Client/DistributionList/Modals/AddListModal.php

@@ -2,9 +2,7 @@
 namespace ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Modals;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Modals\ModalExtendedTabsEdit;
 use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Forms\AddListForm;
-use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Forms\AddAccountForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseEditModal;
 
 /**
  *

app/UI/Client/DistributionList/Pages/Lists.php

@@ -1,15 +1,9 @@
 <?php
 namespace ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Pages;
-use ThurData\Servers\KerioEmail\App\Helpers\KerioManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Models\DistributionList;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository;
-use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Fields\EnabledField;
 use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Buttons\AddListButton;
 use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Buttons\DeleteListButton;
 use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Buttons\EditListButton;
 use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Buttons\MassDeleteListButton;
-use function ThurData\Servers\KerioEmail\Core\Helper\di;
-use ThurData\Servers\KerioEmail\Core\Models\Whmcs\Hosting;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\DataTable\Column;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\DataTable\DataProviders\DataProvider;
@@ -58,10 +52,7 @@ class Lists extends DataTable implements ClientArea
 
     public function loadData()
     {
-        /**
-         * load hosting
-         */
-        $hosting = Hosting::where('id', $this->getRequestValue('id'))->first();
+        $domain = $this->getWhmcsParamByKey('domain');
         $fields = array(
             "id",
             "name",
@@ -70,7 +61,7 @@ class Lists extends DataTable implements ClientArea
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));
-            $domains = $api->getDomains(['id','name']);
+            $domainID = $api->getDomainId($domain);
         } catch (KerioApiException $error) {
             logModuleCall(
                 'kerioEmail',
@@ -81,14 +72,8 @@ class Lists extends DataTable implements ClientArea
             );
             return ['error' => $error->getMessage()];
         }
-        foreach($domains as $maildomain) {
-            if(($maildomain['name']) === $this->getWhmcsParamByKey('domain')){ 
-                $this->maildomainID = $maildomain['id'];
-                $this->maildomain = $maildomain['name'];
-            }
-        }
         try {
-            $lists = $api->getMailingLists($fields,$this->maildomainID);
+            $lists = $api->getMailingLists($fields,$domainID);
         } catch (KerioApiException $error) {
             logModuleCall(
                 'kerioEmail',
@@ -132,7 +117,7 @@ class Lists extends DataTable implements ClientArea
             }
             $tmp = [
                 'id' => $list['id'],
-                'email' => $list['name'] . '@' . $this->maildomain,
+                'email' => $list['name'] . '@' . $domain,
                 'description' => $list['description'],
                 'members' => $memberCount,
                 'moderator' => $moderator

app/UI/Client/DistributionList/Providers/AddListDataProvider.php

@@ -1,13 +1,7 @@
 <?php
 namespace ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Providers;
 use ThurData\Servers\KerioEmail\App\Enums\Kerio;
-use ThurData\Servers\KerioEmail\App\Helpers\KerioManager;
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Helpers\ServiceFactory;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Services\Create\CreateDistributionList;
 use function ThurData\Servers\KerioEmail\Core\Helper\di;
-use ThurData\Servers\KerioEmail\Core\Models\Whmcs\Hosting;
 use ThurData\Servers\KerioEmail\Core\UI\ResponseTemplates\HtmlDataJsonResponse;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\DataProviders\BaseDataProvider;
 use ThurData\Servers\KerioEmail\Api\KerioWhmcs;
@@ -25,13 +19,13 @@ class AddListDataProvider extends BaseDataProvider
 
     public function read()
     {
-        $hosting = Hosting::where('id', $this->getRequestValue('id'))->first();
-        $this->data['domain'] = $hosting->domain;
+        $domain = $this->getWhmcsParamByKey('domain');
+        $this->data['domain'] = $domain;
 
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));
-            $domains = $api->getDomains(['id','name']);
+            $domainID = $api->getDomainId($domain);
         } catch (KerioApiException $error) {
             logModuleCall(
                 'kerioEmail',
@@ -42,19 +36,11 @@ class AddListDataProvider extends BaseDataProvider
             );
             return ['error' => $error->getMessage()];
         }
-        foreach($domains as $maildomain) {
-            if(($maildomain['name']) === $this->getWhmcsParamByKey('domain')){ 
-                $this->maildomainID = $maildomain['id'];
-                $this->maildomain = $maildomain['name'];
-            }
-        }
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($hosting->id);
         $fields = array(
             "id",
             "loginName");
         try {
-            $accounts = $api->getUsers($fields,$this->maildomainID);
+            $accounts = $api->getUsers($fields,$domainID);
         } catch (KerioApiException $error) {
             logModuleCall(
                 'kerioEmail',
@@ -67,17 +53,13 @@ class AddListDataProvider extends BaseDataProvider
         }
         $api->logout();
 
-        /**
-         *
-         * load lang
-         */
         $lang = di('lang');
 
         $this->availableValues['moderator']['none'] = $lang->absoluteT('none');
         foreach($accounts as $account)
         {
-            $this->availableValues['memberList'][$account['loginName']] = $account['loginName'] . '@' . $this->maildomain;
-            $this->availableValues['moderator'][$account['loginName']] = $account['loginName'] . '@' . $this->maildomain;
+            $this->availableValues['memberList'][$account['loginName']] = $account['loginName'] . '@' . $domain;
+            $this->availableValues['moderator'][$account['loginName']] = $account['loginName'] . '@' . $domain;
         }
 
         /**
@@ -136,9 +118,10 @@ class AddListDataProvider extends BaseDataProvider
     public function create()
     {
         
+        $domain = $this->getWhmcsParamByKey('domain');
         // add domain to members
         foreach($this->formData['memberList'] as $member) {
-            $memberList[] = $member . '@' . $this->getWhmcsParamByKey('domain');
+            $memberList[] = $member . '@' . $domain;
         }
 
         /**
@@ -167,7 +150,7 @@ class AddListDataProvider extends BaseDataProvider
         if($this->formData['moderator'] != 'none') {
             $moderator = array(
                 "hasId" => true,
-                "emailAddress" => $this->formData['moderator'] . '@' . $this->getWhmcsParamByKey('domain'),
+                "emailAddress" => $this->formData['moderator'] . '@' . $domain,
                 "fullName" => '',
                 "kind" => "Moderator"
             );
@@ -194,15 +177,10 @@ class AddListDataProvider extends BaseDataProvider
             array_push($paramsAddMembers, $extMember);
         }
 
-        /**
-         * hosting id
-         */
-        $hid = $this->request->get('id');
-
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));
-            $domainID = $api->getDomainId($this->getWhmcsParamByKey('domain'));
+            $domainID = $api->getDomainId($domain);
         } catch (KerioApiException $error) {
             logModuleCall(
                 'kerioEmail',
@@ -246,7 +224,6 @@ class AddListDataProvider extends BaseDataProvider
 
         $api->logout();
 
-
         return (new HtmlDataJsonResponse())->setMessageAndTranslate('distributionListHasBeenAdded')->setStatusSuccess();
 
     }

app/UI/Client/DistributionList/Providers/DeleteListDataProvider.php

@@ -2,11 +2,6 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Providers;
 
-
-use ThurData\Servers\KerioEmail\App\Helpers\KerioManager;
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Services\Create\CreateDistributionList;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Services\Delete\DeleteDistributionList;
 use ThurData\Servers\KerioEmail\Core\UI\ResponseTemplates\HtmlDataJsonResponse;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\DataProviders\BaseDataProvider;
 use ThurData\Servers\KerioEmail\Api\KerioWhmcs;
@@ -34,11 +29,6 @@ class DeleteListDataProvider extends BaseDataProvider
 
     public function delete()
     {
-        /**
-         * hosting id
-         */
-        $hid = $this->request->get('id');
-                        
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));
@@ -72,11 +62,6 @@ class DeleteListDataProvider extends BaseDataProvider
 
     public function massDelete()
     {
-        /**
-         * hosting id
-         */
-        $hid = $this->request->get('id');
-
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));

app/UI/Client/DistributionList/Providers/EditListDataProvider.php

@@ -2,19 +2,10 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Providers;
 
-
 use ThurData\Servers\KerioEmail\App\Enums\ProductParams;
 use ThurData\Servers\KerioEmail\App\Enums\Kerio;
-use ThurData\Servers\KerioEmail\App\Helpers\KerioManager;
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Models\DistributionList;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Services\Create\CreateDistributionList;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Services\Update\UpdateDistributionList;
 use function ThurData\Servers\KerioEmail\Core\Helper\di;
-use ThurData\Servers\KerioEmail\Core\Models\Whmcs\Hosting;
 use ThurData\Servers\KerioEmail\Core\UI\ResponseTemplates\HtmlDataJsonResponse;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\DataProviders\BaseDataProvider;
 use ThurData\Servers\KerioEmail\Api\KerioWhmcs;
 
 /**
@@ -49,7 +40,7 @@ class EditListDataProvider extends AddListDataProvider
             "emailAddress",
             "kind"
         );
-
+        $domain = $this->getWhmcsParamByKey('domain');
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));
@@ -64,7 +55,7 @@ class EditListDataProvider extends AddListDataProvider
             return ['error' => $error->getMessage()];
         }
         try {
-            $domainID = $api->getDomainId($this->getWhmcsParamByKey('domain'));
+            $domainID = $api->getDomainId($domain);
         } catch (KerioApiException $error) {
             logModuleCall(
                 'kerioEmail',
@@ -130,18 +121,15 @@ class EditListDataProvider extends AddListDataProvider
         }
         $this->data['oldModerator'] = $this->data['moderator'];
         foreach($accounts as $account) {
-            $users[] = $account['loginName'] . '@' . $this->getWhmcsParamByKey('domain');
+            $users[] = $account['loginName'] . '@' . $domain;
         }
 
-        /**
-         * load lang
-         */
         $lang = di('lang');
 
         $this->data['id'] = $list[0]['id'];
 
         $this->data['listmail']     = $list[0]['name'];
-        $this->data['domain']       = $this->getWhmcsParamByKey('domain');
+        $this->data['domain']       = $domain;
         $this->data['description']  = $list[0]['description'];
         $this->data['lang']         = $list[0]['languageId'];
         $this->availableValues['lang'] = [ 'de' => $lang->absoluteT('german'), 'en' => $lang->absoluteT('english') ];

app/UI/Client/DistributionList/Sections/AddAliasesDistribution.php

@@ -1,12 +1,10 @@
 <?php
 namespace ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Sections;
+
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Sections\FreeFieldsSection;
-use ThurData\Servers\KerioEmail\App\Validators\EmailValidator;
 use ThurData\Servers\KerioEmail\App\Validators\TaggerEmailValidator;
 use function ThurData\Servers\KerioEmail\Core\Helper\di;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Select;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Tagger;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Text;
 /**
  * Class AddAliasesDistribution
  * User: ThurData

app/UI/Client/DistributionList/Sections/AddMembersDistribution.php

@@ -1,13 +1,10 @@
 <?php
 namespace ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Sections;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Sections\FreeFieldsSection;
-use ThurData\Servers\KerioEmail\App\Validators\EmailValidator;
 use ThurData\Servers\KerioEmail\App\Validators\TaggerEmailValidator;
 use function ThurData\Servers\KerioEmail\Core\Helper\di;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Select;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Tagger;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Text;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Textarea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Sections\InputGroup;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\InputGroupElements\Text as InputText;

app/UI/Client/DistributionList/Sections/AddOwnersDistribution.php

@@ -1,12 +1,9 @@
 <?php
 namespace ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Sections;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Sections\FreeFieldsSection;
-use ThurData\Servers\KerioEmail\App\Validators\EmailValidator;
 use ThurData\Servers\KerioEmail\App\Validators\TaggerEmailValidator;
 use function ThurData\Servers\KerioEmail\Core\Helper\di;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Select;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Tagger;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Text;
 
 /**
  * Class AddOwnersDistribuition

app/UI/Client/DistributionList/Sections/AddPreferencesDistribution.php

@@ -9,12 +9,9 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Sections;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Sections\FreeFieldsSection;
-use function ThurData\Servers\KerioEmail\Core\Helper\di;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Select;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Switcher;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Text;
 
 class AddPreferencesDistribution extends FreeFieldsSection
 {

app/UI/Client/DistributionList/Sections/EditMembersDistribution.php

@@ -2,17 +2,14 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Sections;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Fields\ExtendedSelect;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Sections\FreeFieldsSection;
-use ThurData\Servers\KerioEmail\App\Validators\EmailValidator;
 use ThurData\Servers\KerioEmail\App\Validators\TaggerEmailValidator;
 use function ThurData\Servers\KerioEmail\Core\Helper\di;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\InputGroupElements\Text as InputText;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Select;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Tagger;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Text;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Textarea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Sections\InputGroup;
 
@@ -33,7 +30,6 @@ class EditMembersDistribution extends FreeFieldsSection
     {
         $email = new InputGroup('usernameGroup');
 
-        //$email->addTextField('listmail', false, true);
         $email->addInputComponent((new InputText('listmail'))->addHtmlAttribute('readonly','true'));
         $email->addInputAddon('emailSign', false, '@');
         $email->addInputComponent((new InputText('domain'))->addHtmlAttribute('readonly','true'));

app/UI/Client/DomainAlias/Forms/AddDomainAliasForm.php

@@ -1,12 +1,11 @@
 <?php
 namespace ThurData\Servers\KerioEmail\App\UI\Client\DomainAlias\Forms;
+
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Forms\SortedFieldForm;
 use ThurData\Servers\KerioEmail\App\UI\Client\DomainAlias\Providers\AddDomainAliasDataProvider;
-use ThurData\Servers\KerioEmail\App\UI\Client\DomainAlias\Providers\AddListDataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\InputGroupElements\Text as InputText;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Text;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\FormConstants;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Sections\InputGroup;
 

app/UI/Client/DomainAlias/Forms/DeleteDomainAliasForm.php

@@ -2,8 +2,6 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\DomainAlias\Forms;
 
-
-use ThurData\Servers\KerioEmail\App\UI\Client\DomainAlias\Providers\AddDomainAliasDataProvider;
 use ThurData\Servers\KerioEmail\App\UI\Client\DomainAlias\Providers\DeleteDomainAliasProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\BaseForm;

app/UI/Client/DomainAlias/Forms/MassDeleteDomainAliasForm.php

@@ -9,13 +9,9 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\DomainAlias\Forms;
 
-
-use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Providers\DeleteListDataProvider;
 use ThurData\Servers\KerioEmail\App\UI\Client\DomainAlias\Providers\DeleteDomainAliasProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\BaseForm;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\FormConstants;
 
 class MassDeleteDomainAliasForm extends BaseForm implements ClientArea
 {

app/UI/Client/DomainAlias/Modals/DeleteDomainAliasModal.php

@@ -2,7 +2,6 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\DomainAlias\Modals;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Client\DomainAlias\Forms\DeleteDomainAliasForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseModal;

app/UI/Client/DomainAlias/Modals/MassDeleteDomainAliasModal.php

@@ -9,7 +9,6 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\DomainAlias\Modals;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Client\DomainAlias\Forms\MassDeleteDomainAliasForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseModal;

app/UI/Client/DomainAlias/Pages/DomainAliases.php

@@ -1,14 +1,9 @@
 <?php
 namespace ThurData\Servers\KerioEmail\App\UI\Client\DomainAlias\Pages;
 
-use ThurData\Servers\KerioEmail\App\Helpers\KerioManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Models\Domain;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository;
 use ThurData\Servers\KerioEmail\App\UI\Client\DomainAlias\Buttons\AddDomainAliasButton;
-use ThurData\Servers\KerioEmail\App\UI\Client\DomainAlias\Buttons\AddListButton;
 use ThurData\Servers\KerioEmail\App\UI\Client\DomainAlias\Buttons\DeleteDomainAliasButton;
 use ThurData\Servers\KerioEmail\App\UI\Client\DomainAlias\Buttons\MassDeleteDomainAliasButton;
-use ThurData\Servers\KerioEmail\Core\Models\Whmcs\Hosting;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\DataTable\Column;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\DataTable\DataProviders\DataProvider;
@@ -50,6 +45,7 @@ class DomainAliases extends DataTable implements ClientArea
     public function loadData()
     {
 
+        $maildomain = $this->getWhmcsParamByKey('domain');
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));
@@ -65,10 +61,8 @@ class DomainAliases extends DataTable implements ClientArea
             return ['error' => $error->getMessage()];
         }
         foreach($domains as $domain) {
-            if(($domain['name']) === $this->getWhmcsParamByKey('domain')){ 
-                $this->domainID = $domain['id'];
-                $this->domainName = $domain['name'];
-                $this->aliasList = $domain['aliasList'];
+            if(($domain['name']) === $maildomain){ 
+                $aliasList = $domain['aliasList'];
             }
         }
 
@@ -81,7 +75,7 @@ class DomainAliases extends DataTable implements ClientArea
         /**
          * parse aliases
          */
-        foreach ($this->aliasList as $alias)
+        foreach ($aliasList as $alias)
         {
             /* @var $alias Alias */
             $tmp = [

app/UI/Client/DomainAlias/Providers/AddDomainAliasDataProvider.php

@@ -1,12 +1,6 @@
 <?php
 namespace ThurData\Servers\KerioEmail\App\UI\Client\DomainAlias\Providers;
-use ThurData\Servers\KerioEmail\App\Helpers\KerioManager;
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Services\Create\CreateDistributionList;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Services\Create\CreateDomainAlias;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Services\Delete\DeleteDomainAlias;
-use ThurData\Servers\KerioEmail\Core\Models\Whmcs\Hosting;
+
 use ThurData\Servers\KerioEmail\Core\UI\ResponseTemplates\HtmlDataJsonResponse;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\DataProviders\BaseDataProvider;
 use ThurData\Servers\KerioEmail\Api\KerioWhmcs;
@@ -24,12 +18,11 @@ class AddDomainAliasDataProvider extends BaseDataProvider
 
     public function read()
     {
-        $hosting = Hosting::where('id', $this->getRequestValue('id'))->first();
-
+        $domain = $this->getWhmcsParamByKey('domain');
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));
-            $domainID = $api->getDomainId($this->getWhmcsParamByKey('domain'));
+            $domainID = $api->getDomainId($domain);
         } catch (KerioApiException $error) {
             logModuleCall(
                 'kerioEmail',
@@ -42,7 +35,7 @@ class AddDomainAliasDataProvider extends BaseDataProvider
         }
         $api->logout();
         $this->data['domainId'] = $domainID;
-        $this->data['domain']   = $this->getWhmcsParamByKey('domain');
+        $this->data['domain']   = $domain;
 
     }
 
@@ -54,6 +47,7 @@ class AddDomainAliasDataProvider extends BaseDataProvider
     public function create()
     {
 
+        $maildomain = $this->getWhmcsParamByKey('domain');
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));
@@ -69,7 +63,7 @@ class AddDomainAliasDataProvider extends BaseDataProvider
             return ['error' => $error->getMessage()];
         }
         foreach($domains as $domain) {
-            if(($domain['name']) === $this->getWhmcsParamByKey('domain')){ 
+            if($domain['name'] === $maildomain){ 
                 $domainID = $domain['id'];
                 $aliasList = $domain['aliasList'];
             }

app/UI/Client/DomainAlias/Providers/DeleteDomainAliasProvider.php

@@ -2,10 +2,6 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\DomainAlias\Providers;
 
-
-use ThurData\Servers\KerioEmail\App\Helpers\KerioManager;
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Services\Delete\DeleteDomainAlias;
 use ThurData\Servers\KerioEmail\Core\UI\ResponseTemplates\HtmlDataJsonResponse;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\DataProviders\BaseDataProvider;
 use ThurData\Servers\KerioEmail\Api\KerioWhmcs;
@@ -42,11 +38,7 @@ class DeleteDomainAliasProvider extends BaseDataProvider
      */
     public function delete()
     {
-        /**
-         * hosting id
-         */
-        $hid = $this->request->get('id');
-
+        $maildomain = $this->getWhmcsParamByKey('domain');
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));
@@ -62,9 +54,8 @@ class DeleteDomainAliasProvider extends BaseDataProvider
             return ['error' => $error->getMessage()];
         }
         foreach($domains as $domain) {
-            if(($domain['name']) === $this->getWhmcsParamByKey('domain')){ 
+            if($domain['name'] === $maildomain){ 
                 $domainID = $domain['id'];
-                $domainName = $domain['name'];
                 $aliasList = $domain['aliasList'];
             }
         }
@@ -91,9 +82,7 @@ class DeleteDomainAliasProvider extends BaseDataProvider
     public function massDelete()
     {
 
-        /**
-         *
-         */
+        $maildomain = $this->getWhmcsParamByKey('domain');
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));
@@ -109,9 +98,8 @@ class DeleteDomainAliasProvider extends BaseDataProvider
             return ['error' => $error->getMessage()];
         }
         foreach($domains as $domain) {
-            if(($domain['name']) === $this->getWhmcsParamByKey('domain')){ 
+            if($domain['name'] === $maildomain){ 
                 $domainID = $domain['id'];
-                $domainName = $domain['name'];
                 $aliasList = $domain['aliasList'];
             }
         }

app/UI/Client/EmailAccount/Forms/AddAccountForm.php

@@ -1,28 +1,13 @@
 <?php
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Forms;
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Models\ClassOfService;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository\ClassOfServices;
+
 use ThurData\Servers\KerioEmail\App\Traits\FormExtendedTrait;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Forms\SortedFieldForm;
-use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Sections\RowSection;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Providers\AccountDataProvider;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Sections\AdditionalSection;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Sections\GeneralSection;
-use ThurData\Servers\KerioEmail\App\Validators\PasswordsValidator;
-use ThurData\Servers\KerioEmail\App\Validators\RepeatPasswordValidator;
-use function ThurData\Servers\KerioEmail\Core\Helper\di;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\BaseForm;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Password;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Select;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Text;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\FormConstants;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Sections\HalfPageSection;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Sections\InputGroup;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\InputGroupElements;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Sections\RawSection;
 
 /**
  *

app/UI/Client/EmailAccount/Forms/ChangePasswordForm.php

@@ -2,7 +2,6 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Forms;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Providers\EditAccountDataProvider;
 use ThurData\Servers\KerioEmail\App\Validators\PasswordsValidator;
 use ThurData\Servers\KerioEmail\App\Validators\RepeatPasswordValidator;
@@ -10,7 +9,6 @@ use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\BaseForm;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Password;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Select;
 
 /**
  *

app/UI/Client/EmailAccount/Forms/ChangeStatusForm.php

@@ -2,14 +2,11 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Forms;
 
-
-use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Providers\AccountDataProvider;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Providers\EditAccountDataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\BaseForm;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Select;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\FormConstants;
 
 /**
  *

app/UI/Client/EmailAccount/Forms/DeleteAccountForm.php

@@ -2,7 +2,6 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Forms;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Providers\DeleteAccountDataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\BaseForm;

app/UI/Client/EmailAccount/Forms/EditAccountForm.php

@@ -2,25 +2,13 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Forms;
 
-
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository\ClassOfServices;
 use ThurData\Servers\KerioEmail\App\Traits\FormExtendedTrait;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Forms\SortedFieldForm;
-use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Sections\RowSection;
-use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Providers\AccountDataProvider;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Providers\EditAccountDataProvider;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Sections\EditAdditionalSection;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Sections\EditGeneralSection;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Select;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Text;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\FormConstants;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Sections\HalfPageSection;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Sections\InputGroup;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseEditModal;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\InputGroupElements;
 
 /**
  *

app/UI/Client/EmailAccount/Forms/MassChangeStatusForm.php

@@ -9,12 +9,9 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Forms;
 
-
-use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Providers\DeleteListDataProvider;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Providers\AccountDataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\BaseForm;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Select;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\FormConstants;
 

app/UI/Client/EmailAccount/Forms/MassDeleteAccountForm.php

@@ -9,13 +9,9 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Forms;
 
-
-use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Providers\DeleteListDataProvider;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Providers\DeleteAccountDataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\BaseForm;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\FormConstants;
 
 class MassDeleteAccountForm extends BaseForm implements ClientArea
 {

app/UI/Client/EmailAccount/Modals/AddAccountModal.php

@@ -1,9 +1,9 @@
 <?php
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Modals;
+
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Modals\ModalExtendedTabsEdit;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Forms\AddAccountForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseEditModal;
 
 /**
  *

app/UI/Client/EmailAccount/Modals/ChangePasswordModal.php

@@ -2,9 +2,7 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Modals;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Forms\ChangePasswordForm;
-use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Forms\EditAccountForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseEditModal;
 

app/UI/Client/EmailAccount/Modals/ChangeStatusModal.php

@@ -9,11 +9,8 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Modals;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Forms\ChangeStatusForm;
-use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Forms\EditAccountForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Buttons\ButtonDataTableModalAction;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseEditModal;
 
 class ChangeStatusModal extends BaseEditModal implements ClientArea

app/UI/Client/EmailAccount/Modals/DeleteAccountModal.php

@@ -2,9 +2,7 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Modals;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Forms\DeleteAccountForm;
-use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Forms\EditAccountForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseModal;
 

app/UI/Client/EmailAccount/Modals/EditAccountModal.php

@@ -2,12 +2,9 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Modals;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Modals\ModalExtendedTabsEdit;
-use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Forms\AddAccountForm;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Forms\EditAccountForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseEditModal;
 
 /**
  *

app/UI/Client/EmailAccount/Modals/MassChangeStatusModal.php

@@ -9,11 +9,9 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Modals;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Forms\MassChangeStatusForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseEditModal;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseModal;
 
 class MassChangeStatusModal extends BaseEditModal implements ClientArea
 {

app/UI/Client/EmailAccount/Modals/MassDeleteAccountModal.php

@@ -9,7 +9,6 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Modals;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Forms\MassDeleteAccountForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseModal;

app/UI/Client/EmailAccount/Pages/Accounts.php

@@ -2,27 +2,17 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Pages;
 
-use ThurData\Servers\KerioEmail\App\Helpers\BuildUrlExtended;
-use ThurData\Servers\KerioEmail\App\Helpers\KerioManager;
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Connection;
 use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Helpers\AccountHelper;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Models\Account;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository\ClassOfServices;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Filters\EmailAccounts\FilterByCosId;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Fields\EnabledField;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Buttons\AddAccountButton;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Buttons\ChangePasswordButton;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Buttons\ChangeStatusButton;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Buttons\DeleteAccountButton;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Buttons\EditAccountButton;
-use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Buttons\LoginToPanelButton;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Buttons\MassChangeStatusButton;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Buttons\MassDeleteAccountButton;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Buttons\SpanDropdownButton;
 use function ThurData\Servers\KerioEmail\Core\Helper\di;
-use ThurData\Servers\KerioEmail\Core\Models\Whmcs\Hosting;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Buttons\DropdawnButtonWrappers\ButtonDropdown;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\DataTable\Column;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\DataTable\DataProviders\DataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
@@ -46,11 +36,7 @@ class Accounts extends DataTable implements ClientArea
      */
     const STATUS_LABEL = [
         'active'        => 'success',
-        'locked'        => 'default',
-        'maintenance'   => 'warning',
         'closed'        => 'default',
-        'lockout'       => 'info',
-        'pending'       => 'warning',
         'default'       => 'default'
     ];
 
@@ -114,9 +100,6 @@ class Accounts extends DataTable implements ClientArea
     public function initContent()
     {
 
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($this->getRequestValue('id'));
-
         $this->addMassActionButton(new MassChangeStatusButton());
         $this->addMassActionButton(new MassDeleteAccountButton());
 
@@ -139,14 +122,11 @@ class Accounts extends DataTable implements ClientArea
      */
     public function loadData()
     {
-        /**
-         * load hosting
-         */
-        $hosting = Hosting::where('id', $this->getRequestValue('id'))->first();
+        $domain = $this->getWhmcsParamByKey('domain');
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));
-            $domains = $api->getDomains(['id','name']);
+            $domainID = $api->getDomainId($domain);
         } catch (KerioApiException $error) {
             logModuleCall(
                 'kerioEmail',
@@ -157,14 +137,13 @@ class Accounts extends DataTable implements ClientArea
             );
             return ['error' => $error->getMessage()];
         }
-        foreach($domains as $maildomain) {
-            if(($maildomain['name']) === $this->getWhmcsParamByKey('domain')){ 
-                $this->maildomainID = $maildomain['id'];
-                $this->maildomain = $maildomain['name'];
-            }
-        }
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($hosting->id);
+        logModuleCall(
+            'kerioEmail',
+            __FUNCTION__,
+            $domain,
+            'Debug Error',
+            $domainID
+        );
         $fields = array(
             "id",
             "loginName",
@@ -173,7 +152,7 @@ class Accounts extends DataTable implements ClientArea
             "consumedSize",
             "lastLoginInfo");
         try {
-            $accounts = $api->getUsers($fields,$this->maildomainID);
+            $accounts = $api->getUsers($fields,$domainID);
         } catch (KerioApiException $error) {
             logModuleCall(
                 'kerioEmail',
@@ -192,7 +171,7 @@ class Accounts extends DataTable implements ClientArea
 
             $accountArray = [
                 'id'           => $account['id'],
-                'mailbox'      => $account['loginName'] . '@' . $this->maildomain,
+                'mailbox'      => $account['loginName'] . '@' . $domain,
                 'last_login'   => AccountHelper::getFormattedData($account['lastLoginInfo']['dateTime'], 'd/m/Y H:i'),
                 'size'         => AccountHelper::getQuotaAsMb($account['consumedSize']['value'],$account['consumedSize']['unit']),
                 'quota'        => $account['diskSizeLimit']['isActive'] ?  AccountHelper::getQuotaAsMb($account['diskSizeLimit']['limit']['value'],$account['diskSizeLimit']['limit']['units']) : '∞',

app/UI/Client/EmailAccount/Providers/AccountDataProvider.php

@@ -1,19 +1,8 @@
 <?php
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Providers;
-use ThurData\Servers\KerioEmail\App\Enums\ProductParams;
-use ThurData\Servers\KerioEmail\App\Enums\Size;
+
 use ThurData\Servers\KerioEmail\App\Enums\Kerio;
-use ThurData\Servers\KerioEmail\App\Helpers\KerioManager;
-use ThurData\Servers\KerioEmail\App\Http\Admin\ProductConfiguration;
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Helpers\ServiceFactory;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Models\Account;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Models\ClassOfService;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository\ClassOfServices;
-use ThurData\Servers\KerioEmail\App\Services\ConfigurableOptions\Strategy\Types\ClassOfServicesOptions;
 use function ThurData\Servers\KerioEmail\Core\Helper\di;
-use ThurData\Servers\KerioEmail\Core\Http\JsonResponse;
-use ThurData\Servers\KerioEmail\Core\Models\Whmcs\Hosting;
 use ThurData\Servers\KerioEmail\Core\UI\ResponseTemplates\HtmlDataJsonResponse;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\DataProviders\BaseDataProvider;
 use ThurData\Servers\KerioEmail\Api\KerioWhmcs;
@@ -31,12 +20,8 @@ class AccountDataProvider extends BaseDataProvider
 
     public function read()
     {
-        /**
-         * hosting id
-         */
-        $hid = $this->request->get('id');
-        $hosting = Hosting::where('id', $hid)->first();
-        $this->data['domain'] = $this->getWhmcsParamByKey('customfields')['maildomain'];
+
+        $this->data['domain'] = $this->getWhmcsParamByKey('domain');
         $this->data['quota'] = 0;
         $lang = di('lang');
         $this->availableValues['status'] = [
@@ -52,25 +37,13 @@ class AccountDataProvider extends BaseDataProvider
 
     public function create()
     {
-        /**
-         * hosting id
-         */
-        $hid = $this->request->get('id');
-
         $fieldToProtection = ['firstname', 'lastname', 'display_name', 'office', 'title', 'department', 'profession'];
-
         foreach ($this->formData as $field => &$value)
         {
             $value = in_array($field, $fieldToProtection) ? htmlentities($value) : $value;
         }
 
-        /**
-         * product manager allow to check product settings
-         */
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($hid);
-
-        $maildomain = $this->getWhmcsParamByKey('customfields')['maildomain'];
+        $maildomain = $this->getWhmcsParamByKey('domain');
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));
@@ -108,7 +81,7 @@ class AccountDataProvider extends BaseDataProvider
             $account['diskSizeLimit']['limit']['units'] = $this->formData['unit'];
         }
         try {
-            $result1 = $api->modifyUser($userID, $account);
+            $result = $api->modifyUser($userID, $account);
         } catch (KerioApiException $error) {
             logModuleCall(
                 'kerioEmail',
@@ -129,7 +102,7 @@ class AccountDataProvider extends BaseDataProvider
         $fields['departmentName'] = $this->formData['department'];
         $fields['profession'] = $this->formData['profession'];
         try {
-            $result2 = $api->setAddress($userID, $fields);
+            $result = $api->setAddress($userID, $fields);
         } catch (KerioApiException $error) {
             logModuleCall(
                 'kerioEmail',
@@ -148,22 +121,10 @@ class AccountDataProvider extends BaseDataProvider
     public function updateStatus()
     {
 
-
     }
 
     public function update()
     {
-        /**
-         * hosting id
-         */
-        $hid = $this->request->get('id');
-
-        /**
-         * product manager allow to check product settings
-         */
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($hid);
-
         $status['isEnabled'] = $this->formData['status'] === 'active' ? TRUE : FALSE;
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
@@ -205,145 +166,4 @@ class AccountDataProvider extends BaseDataProvider
         return (new HtmlDataJsonResponse())->setMessageAndTranslate('massEmailAccountStatusHasBeenUpdated')->setStatusSuccess();
     }
 
-    /**
-     *
-     * read data per cos_name
-     */
-    protected function readCosParams()
-    {
-        $hid = $this->request->get('id');
-
-
-        /**
-         *
-         * load product manager
-         */
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($hid);
-
-        /**
-         *
-         * check if class of services should be selectable
-         */
-        if($productManager->get('cos_name') === ClassOfServices::CLASS_OF_SERVICE_QUOTA)
-        {
-            /**
-             *
-             * get soap create domain  service
-             */
-            $api =(new KerioManager())
-                ->getApiByHosting($hid)
-                ->soap;
-
-            /**
-             *
-             * get cos from API
-             */
-            $classOfServices = $api->repository()->cos->all();
-
-            /**
-             *
-             * load configurable options coses
-             */
-            $supportedCos = $productManager->getSettingCos();
-
-            /**
-             *
-             * add COS to array
-             */
-            $configoptions = $this->getFilteredCosConfigurableOptions();
-
-            foreach($classOfServices as $cos)
-            {
-                /**
-                 *
-                 *
-                 * skip COS which is not used in configurable options
-                 */
-                if(!($supportedCos && array_key_exists($cos->getId(), $supportedCos)))
-                {
-                    continue;
-                }
-
-                /**
-                 * 1. check if config opts are available
-                 * 2. skip if class of services doesnt exists in config option list
-                 */
-                if($configoptions && !array_key_exists('cosQuota_'.$cos->getId(), $configoptions))
-                {
-                    continue;
-                }
-
-                /**
-                 * 1. check if config opts are available
-                 * 2. skip not purchased as CO
-                 */
-                if ($configoptions && $configoptions['cosQuota_'.$cos->getId()] == 0)
-                {
-                    continue;
-                }
-
-                /**
-                 * 1. check if config opts are not available
-                 * 2. skip if quantity === 0
-                 */
-                if(!$configoptions && $supportedCos[$cos->getId()] == 0)
-                {
-                    continue;
-                }
-
-                /* @var $cos ClassOfService*/
-                $this->availableValues['cosId'][$cos->getId()] = $cos->getMbMailQuote().' MB';
-            }
-
-
-            return $this;
-        }
-
-
-        /**
-         *
-         * check if class of service is choosen by config opt
-         */
-        if($productManager->get('cos_name') === ClassOfServices::KERIO_CONFIG_OPTIONS)
-        {
-
-            $this->data['cosId'] = key($productManager->getSettingCos());
-            return $this;
-        }
-
-        /**
-         *
-         * if cos_name is dedicated (loaded from API)
-         */
-        if($productManager->get('cos_name') !== ClassOfServices::CUSTOM_KERIO)
-        {
-            /**
-             * if dedicated class of service has been selected
-             */
-            $this->data['cosId'] = $productManager->get('cos_name');
-            return $this;
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return bool|mixed
-     */
-    protected function getFilteredCosConfigurableOptions()
-    {
-        $configoptions = $this->getWhmcsParamByKey('configoptions');
-
-        foreach($configoptions as $key => $value)
-        {
-            if(strpos($key, ClassOfServicesOptions::COS_CONFIG_OPT_PREFIX) === false)
-            {
-                unset($configoptions[$key]);
-            }
-
-        }
-
-        return $configoptions;
-    }
 }

app/UI/Client/EmailAccount/Providers/DeleteAccountDataProvider.php

@@ -2,10 +2,6 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Providers;
 
-
-use ThurData\Servers\KerioEmail\App\Helpers\KerioManager;
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Services\Delete\DeleteAccount;
 use ThurData\Servers\KerioEmail\Core\UI\ResponseTemplates\HtmlDataJsonResponse;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\DataProviders\BaseDataProvider;
 use ThurData\Servers\KerioEmail\Api\KerioWhmcs;
@@ -33,18 +29,6 @@ class DeleteAccountDataProvider extends BaseDataProvider
 
     public function delete()
     {
-
-        /**
-         * hosting id
-         */
-        $hid = $this->request->get('id');
-
-        /**
-         * product manager allow to check product settings
-         */
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($hid);
-
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));
@@ -78,17 +62,6 @@ class DeleteAccountDataProvider extends BaseDataProvider
 
     public function massDelete()
     {
-        /**
-         * hosting id
-         */
-        $hid = $this->request->get('id');
-
-        /**
-         * product manager allow to check product settings
-         */
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($hid);
-
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));
@@ -103,9 +76,6 @@ class DeleteAccountDataProvider extends BaseDataProvider
             return ['error' => $error->getMessage()];
         }
 
-        /**
-         *
-         */
         foreach($this->request->get('massActions') as $id)
         {
             try {

app/UI/Client/EmailAccount/Providers/EditAccountDataProvider.php

@@ -2,19 +2,8 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Providers;
 
-
 use ThurData\Servers\KerioEmail\App\Enums\Kerio;
-use ThurData\Servers\KerioEmail\App\Helpers\KerioManager;
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Models\Account;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Models\ClassOfService;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository\ClassOfServices;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Response;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Services\Update\UpdateAccount;
-use ThurData\Servers\KerioEmail\App\Services\ConfigurableOptions\Strategy\Types\ClassOfServicesOptions;
 use function ThurData\Servers\KerioEmail\Core\Helper\di;
-use ThurData\Servers\KerioEmail\Core\Models\Whmcs\Hosting;
 use ThurData\Servers\KerioEmail\Core\UI\ResponseTemplates\HtmlDataJsonResponse;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\DataProviders\BaseDataProvider;
 use ThurData\Servers\KerioEmail\Api\KerioWhmcs;
@@ -35,17 +24,7 @@ class EditAccountDataProvider extends BaseDataProvider
      */
     public function read()
     {
-        /**
-         * hosting id
-         */
-        $hid = $this->getRequestValue('id');
-        /**
-         * load hosting
-         */
-        $hosting = Hosting::where('id', $hid)->first();
-        /**
-         * load api
-         */
+        $domain = $this->getWhmcsParamByKey('domain');
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         $fields =array(
             'id',
@@ -78,7 +57,7 @@ class EditAccountDataProvider extends BaseDataProvider
             return ['error' => $error->getMessage()];
         }
         try {
-            $domainID = $api->getDomainId($this->getWhmcsParamByKey('customfields')['maildomain']);
+            $domainID = $api->getDomainId($domain);
         } catch (KerioApiException $error) {
             logModuleCall(
                 'kerioEmail',
@@ -116,7 +95,7 @@ class EditAccountDataProvider extends BaseDataProvider
         $api->logout();
         $this->data['id']           = $account[0]['id'];
         $this->data['username']     = $account[0]['loginName'];
-        $this->data['domain']       = $this->getWhmcsParamByKey('customfields')['maildomain'];
+        $this->data['domain']       = $domain;
         $this->data['firstname']    = $address['contacts'][0]['firstName'];
         $this->data['lastname']     = $address['contacts'][0]['surName'];
         $this->data['display_name'] = $address['contacts'][0]['commonName'];
@@ -151,12 +130,6 @@ class EditAccountDataProvider extends BaseDataProvider
      */
     public function update()
     {
-        /**
-         * hosting id
-         */
-        $hid = $this->request->get('id');
-
-
         $fieldToProtection = ['firstname', 'lastname', 'display_name', 'office', 'title', 'department', 'profession'];
 
         foreach ($this->formData as $field => &$value)
@@ -164,12 +137,6 @@ class EditAccountDataProvider extends BaseDataProvider
             $value = in_array($field, $fieldToProtection) ? htmlentities($value) : $value;
         }
 
-        /**
-         * product manager allow to check product settings
-         */
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($hid);
-
         $account['isEnabled'] = $this->formData['status'] === 'active' ? TRUE : FALSE;
         if ($this->formData['quota'] > 0) {
             $account['diskSizeLimit']['isActive'] = TRUE;
@@ -234,17 +201,6 @@ class EditAccountDataProvider extends BaseDataProvider
      */
     public function updateStatus()
     {
-        /**
-         * hosting id
-         */
-        $hid = $this->request->get('id');
-
-        /**
-         * product manager allow to check product settings
-         */
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($hid);
-
         $status['isEnabled'] = $this->formData['status'] === 'active' ? TRUE : FALSE;
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
@@ -272,9 +228,7 @@ class EditAccountDataProvider extends BaseDataProvider
             return ['error' => $error->getMessage()];
         }
         $api->logout();
-        /**
-         * return success
-         */
+
         return (new HtmlDataJsonResponse())->setMessageAndTranslate('emailAccountStatusHasBeenUpdated')->setStatusSuccess();
 
     }
@@ -284,16 +238,6 @@ class EditAccountDataProvider extends BaseDataProvider
      */
     public function changePassword()
     {
-        /**
-         * hosting id
-         */
-        $hid = $this->request->get('id');
-
-        /**
-         * product manager allow to check product settings
-         */
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($hid);
         $fields['password'] = $this->formData['password'];
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
@@ -325,107 +269,4 @@ class EditAccountDataProvider extends BaseDataProvider
         return (new HtmlDataJsonResponse())->setMessageAndTranslate('passwordChangedSuccessfully')->setStatusSuccess();
     }
 
-    /**
-     *
-     */
-    public function readCosParams()
-    {
-        $hid = $this->getRequestValue('id');
-        /**
-         * product manager allow to check product settings
-         */
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($hid);
-        if($productManager->get('cos_name') === ClassOfServices::CLASS_OF_SERVICE_QUOTA)
-        {
-            /**
-             *
-             * get soap create domain  service
-             */
-            $api =(new KerioManager())
-                ->getApiByHosting($hid)
-                ->soap;
-
-            /**
-             *
-             * get cos from API
-             */
-            $classOfServices = $api->repository()->cos->all();
-
-            /**
-             *
-             * load configurable options coses
-             */
-            $supportedCos = $productManager->getSettingCos();
-
-            /**
-             *
-             * add COS to array
-             */
-            $configoptions = $this->getFilteredCosConfigurableOptions();
-            foreach($classOfServices as $cos)
-            {
-                /**
-                 *
-                 *
-                 * skip COS which is not used in configurable options
-                 */
-                if(!($supportedCos && array_key_exists($cos->getId(), $supportedCos)))
-                {
-                    continue;
-                }
-
-                /**
-                 *
-                 * skip if class of services doesnt exists in config option list
-                 */
-                if($configoptions && !array_key_exists('cosQuota_'.$cos->getId(), $configoptions))
-                {
-                    continue;
-                }
-
-                /**
-                 * skip not purchased as CO
-                 */
-                if ($configoptions && $configoptions['cosQuota_'.$cos->getId()] == 0)
-                {
-                    continue;
-                }
-
-                /**
-                 * 1. check if config opts are not available
-                 * 2. skip if quantity === 0
-                 */
-                if(!$configoptions && $supportedCos[$cos->getId()] == 0)
-                {
-                    continue;
-                }
-
-
-                /* @var $cos ClassOfService*/
-                $this->availableValues['cosId'][$cos->getId()] = $cos->getMbMailQuote().' MB';
-            }
-        }
-
-    }
-
-    /**
-     * @return bool|mixed
-     */
-    protected function getFilteredCosConfigurableOptions()
-    {
-        $configoptions = $this->getWhmcsParamByKey('configoptions');
-
-        foreach($configoptions as $key => $value)
-        {
-            if(strpos($key, ClassOfServicesOptions::COS_CONFIG_OPT_PREFIX) === false)
-            {
-                unset($configoptions[$key]);
-            }
-
-        }
-
-        return $configoptions;
-    }
-
 }

app/UI/Client/EmailAccount/Sections/AdditionalSection.php

@@ -5,7 +5,6 @@ namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Sections;
 
 use ThurData\Servers\KerioEmail\App\Traits\FormExtendedTrait;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Sections\FreeFieldsSection;
-use function ThurData\Servers\KerioEmail\Core\Helper\di;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Text;
 
 /**

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

@@ -2,9 +2,6 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Sections;
 
-
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository\ClassOfServices;
 use ThurData\Servers\KerioEmail\App\Traits\FormExtendedTrait;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Sections\FreeFieldsSection;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
@@ -31,17 +28,6 @@ class EditGeneralSection extends FreeFieldsSection
 
     public function initContent()
     {
-        /**
-         * hosting id
-         */
-        $hid = $this->getRequestValue('id');
-
-        /**
-         * product manager allow to check product settings
-         */
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($hid);
-
         /**
          * add fields
          */
@@ -63,13 +49,5 @@ class EditGeneralSection extends FreeFieldsSection
         $quota->addValidator(new Decimal(0));
         $this->generateDoubleSection([$quota, new Select('unit')]);
 
-        if($productManager->get('cos_name') === ClassOfServices::CLASS_OF_SERVICE_QUOTA)
-        {
-            $field = new Hidden('currentCosId');
-            $this->addField($field);
-
-            $field = new Select('cosId');
-            $this->addField($field);
-        }
     }
 }

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

@@ -1,17 +1,14 @@
 <?php
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Sections;
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository\ClassOfServices;
+
 use ThurData\Servers\KerioEmail\App\Traits\FormExtendedTrait;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Sections\FreeFieldsSection;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Validators\Decimal;
 use ThurData\Servers\KerioEmail\App\Validators\PasswordsValidator;
 use ThurData\Servers\KerioEmail\App\Validators\RepeatPasswordValidator;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Password;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Select;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Text;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Number;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Sections\InputGroup;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\InputGroupElements;
 
@@ -32,17 +29,6 @@ class GeneralSection extends FreeFieldsSection
 
     public function initContent()
     {
-        /**
-         * hosting id
-         */
-        $hid = $this->getRequestValue('id');
-
-        /**
-         * product manager allow to check product settings
-         */
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($hid);
-
         $this->generateDoubleSection([new Text('firstname'), new Text('lastname')]);
 
         $email = new InputGroup('usernameGroup');

app/UI/Client/EmailAlias/Forms/AddEmailAliasForm.php

@@ -1,7 +1,7 @@
 <?php
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAlias\Forms;
+
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Forms\SortedFieldForm;
-use ThurData\Servers\KerioEmail\App\UI\Client\EmailAccount\Providers\AccountDataProvider;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAlias\Providers\AddEmailAliasDataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Select;

app/UI/Client/EmailAlias/Forms/DeleteEmailAliasForm.php

@@ -2,7 +2,6 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAlias\Forms;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAlias\Providers\DeleteEmailAliasDataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\BaseForm;

app/UI/Client/EmailAlias/Forms/MassDeleteEmailAliasForm.php

@@ -9,13 +9,9 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAlias\Forms;
 
-
-use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Providers\DeleteListDataProvider;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAlias\Providers\DeleteEmailAliasDataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\BaseForm;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\FormConstants;
 
 class MassDeleteEmailAliasForm extends BaseForm implements ClientArea
 {

app/UI/Client/EmailAlias/Modals/DeleteEmailAliasModal.php

@@ -2,7 +2,6 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAlias\Modals;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAlias\Forms\DeleteEmailAliasForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseModal;

app/UI/Client/EmailAlias/Modals/MassDeleteEmailAliasModal.php

@@ -9,7 +9,6 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAlias\Modals;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAlias\Forms\MassDeleteEmailAliasForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseModal;

app/UI/Client/EmailAlias/Pages/Aliases.php

@@ -1,22 +1,14 @@
 <?php
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAlias\Pages;
 
-
-use ThurData\Servers\KerioEmail\App\Helpers\KerioManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Helpers\AccountHelper;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Models\Account;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Models\AccountAlias;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAlias\Buttons\AddEmailAliasButton;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAlias\Buttons\DeleteEmailAliasButton;
 use ThurData\Servers\KerioEmail\App\UI\Client\EmailAlias\Buttons\MassDeleteEmailAliasButton;
-use ThurData\Servers\KerioEmail\Core\Models\Whmcs\Hosting;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\DataTable\Column;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\DataTable\DataProviders\DataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\DataTable\DataProviders\Providers\ArrayDataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\DataTable\DataTable;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Others\Label;
 use ThurData\Servers\KerioEmail\Api\KerioWhmcs;
 
 /**
@@ -62,11 +54,6 @@ class Aliases extends DataTable implements ClientArea
 
     public function loadData()
     {
-        /**
-         * load hosting
-         */
-        $hosting = Hosting::where('id', $this->getRequestValue('id'))->first();
-
         $fields = array(
             "id",
             "name",
@@ -135,16 +122,11 @@ class Aliases extends DataTable implements ClientArea
      */
     private function isCreateButtonDisabled()
     {
-        $hid = $this->getRequestValue('id');
-
-        /**
-         * hosting model
-         */
-        $hosting = Hosting::where('id', $hid)->first();
+        $domain = $this->getWhmcsParamByKey('domain');
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));
-            $domains = $api->getDomains(['id','name']);
+            $domainID = $api->getDomainId($domain);
         } catch (KerioApiException $error) {
             logModuleCall(
                 'kerioEmail',
@@ -155,14 +137,8 @@ class Aliases extends DataTable implements ClientArea
             );
             return ['error' => $error->getMessage()];
         }
-        foreach($domains as $maildomain) {
-            if(($maildomain['name']) === $this->getWhmcsParamByKey('domain')){ 
-                $this->maildomainID = $maildomain['id'];
-                $this->maildomain = $maildomain['name'];
-            }
-        }
         try {
-            $accCount = $api->countUser($this->maildomainID);
+            $accCount = $api->countUser($domainID);
         } catch (KerioApiException $error) {
             logModuleCall(
                 'kerioEmail',

app/UI/Client/EmailAlias/Providers/AddEmailAliasDataProvider.php

@@ -1,10 +1,6 @@
 <?php
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAlias\Providers;
-use ThurData\Servers\KerioEmail\App\Helpers\KerioManager;
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Models\AccountAlias;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository;
-use ThurData\Servers\KerioEmail\Core\Models\Whmcs\Hosting;
+
 use ThurData\Servers\KerioEmail\Core\UI\ResponseTemplates\HtmlDataJsonResponse;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\DataProviders\BaseDataProvider;
 use ThurData\Servers\KerioEmail\Api\KerioWhmcs;
@@ -22,24 +18,11 @@ class AddEmailAliasDataProvider extends BaseDataProvider
 
     public function read()
     {
-        /**
-         * hosting id
-         */
-        $hid = $this->getRequestValue('id');
-
-        /**
-         * hosting model
-         */
-        $hosting = Hosting::where('id', $hid)->first();
-
-        /**
-         * hosting domain
-         */
-        $this->data['domain'] = $hosting->domain;
+        $this->data['domain'] = $this->getWhmcsParamByKey('domain');
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));
-            $domains = $api->getDomains(['id','name']);
+            $domainID = $api->getDomainId($this->data['domain']);
         } catch (KerioApiException $error) {
             logModuleCall(
                 'kerioEmail',
@@ -50,19 +33,12 @@ class AddEmailAliasDataProvider extends BaseDataProvider
             );
             return ['error' => $error->getMessage()];
         }
-        foreach($domains as $maildomain) {
-            if(($maildomain['name']) === $this->data['domain']){ 
-                $this->maildomainID = $maildomain['id'];
-                $this->maildomain = $maildomain['name'];
-            }
-        }
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($hosting->id);
+
         $fields = array(
             "id",
             "loginName"
         );
-        $accounts = $api->getUsers($fields,$this->maildomainID);
+        $accounts = $api->getUsers($fields,$domainID);
         $api->logout();
 
         /**
@@ -70,28 +46,18 @@ class AddEmailAliasDataProvider extends BaseDataProvider
          */
         foreach($accounts as $account)
         {
-            $this->availableValues['mailbox'][$account['loginName']] = $account['loginName'] . '@' . $this->maildomain;
+            $this->availableValues['mailbox'][$account['loginName']] = $account['loginName'] . '@' . $this->data['domain'];
         }
 
     }
 
     public function create()
     {
-        /**
-         * hosting id
-         */
-        $hid = $this->request->get('id');
-
-        /**
-         * product manager allow to check product settings
-         */
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($hid);
-
+        $domain = $this->getWhmcsParamByKey('domain');
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));
-            $domains = $api->getDomains(['id','name']);
+            $domainID = $api->getDomainId($domain);
         } catch (KerioApiException $error) {
             logModuleCall(
                 'kerioEmail',
@@ -102,14 +68,8 @@ class AddEmailAliasDataProvider extends BaseDataProvider
             );
             return ['error' => $error->getMessage()];
         }
-        foreach($domains as $maildomain) {
-            if(($maildomain['name']) === $this->formData['domain']){ 
-                $this->maildomainID = $maildomain['id'];
-                $this->maildomain = $maildomain['name'];
-            }
-        }
         try {
-            $result = $api->createAlias($this->maildomainID, $this->formData['aliasName'], $this->formData['mailbox'] . '@' . $this->maildomain);
+            $result = $api->createAlias($domainID, $this->formData['aliasName'], $this->formData['mailbox'] . '@' . $domain);
         } catch (KerioApiException $error) {
             logModuleCall(
                 'kerioEmail',

app/UI/Client/EmailAlias/Providers/DeleteEmailAliasDataProvider.php

@@ -2,11 +2,6 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\EmailAlias\Providers;
 
-
-use ThurData\Servers\KerioEmail\App\Helpers\KerioManager;
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Models\AccountAlias;
-use ThurData\Servers\KerioEmail\Core\Models\Whmcs\Hosting;
 use ThurData\Servers\KerioEmail\Core\UI\ResponseTemplates\HtmlDataJsonResponse;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\DataProviders\BaseDataProvider;
 use ThurData\Servers\KerioEmail\Api\KerioWhmcs;
@@ -34,11 +29,6 @@ class DeleteEmailAliasDataProvider extends BaseDataProvider
 
     public function delete()
     {
-        /**
-         * hosting id
-         */
-        $hid = $this->request->get('id');
-
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));
@@ -66,25 +56,11 @@ class DeleteEmailAliasDataProvider extends BaseDataProvider
         }
         $api->logout();
 
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($hid);
-
         return (new HtmlDataJsonResponse())->setMessageAndTranslate('emailAliasHasBeenDeleted')->setStatusSuccess();
     }
 
     public function massDelete()
     {
-        /**
-         * hosting id
-         */
-        $hid = $this->request->get('id');
-
-        /**
-         * product manager allow to check product settings
-         */
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($hid);
-
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));

app/UI/Client/Ressource/Forms/AddRessourceForm.php

@@ -1,28 +1,15 @@
 <?php
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Forms;
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Models\ClassOfService;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository\ClassOfServices;
+
 use ThurData\Servers\KerioEmail\App\Traits\FormExtendedTrait;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Forms\SortedFieldForm;
-use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Sections\RowSection;
 use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Providers\RessourceDataProvider;
-use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Sections\AdditionalSection;
-use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Sections\GeneralSection;
-use ThurData\Servers\KerioEmail\App\Validators\PasswordsValidator;
-use ThurData\Servers\KerioEmail\App\Validators\RepeatPasswordValidator;
-use function ThurData\Servers\KerioEmail\Core\Helper\di;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\BaseForm;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Password;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Select;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Text;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\FormConstants;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Sections\HalfPageSection;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Sections\InputGroup;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\InputGroupElements;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Sections\RawSection;
 
 /**
  *

app/UI/Client/Ressource/Forms/ChangePasswordForm.php

@@ -2,7 +2,6 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Forms;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Providers\EditRessourceDataProvider;
 use ThurData\Servers\KerioEmail\App\Validators\PasswordsValidator;
 use ThurData\Servers\KerioEmail\App\Validators\RepeatPasswordValidator;
@@ -10,7 +9,6 @@ use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\BaseForm;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Password;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Select;
 
 /**
  *

app/UI/Client/Ressource/Forms/ChangeStatusForm.php

@@ -2,14 +2,11 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Forms;
 
-
-use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Providers\RessourceDataProvider;
 use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Providers\EditRessourceDataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\BaseForm;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Select;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\FormConstants;
 
 /**
  *

app/UI/Client/Ressource/Forms/EditRessourceForm.php

@@ -2,24 +2,15 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Forms;
 
-
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository\ClassOfServices;
 use ThurData\Servers\KerioEmail\App\Traits\FormExtendedTrait;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Forms\SortedFieldForm;
-use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Sections\RowSection;
-use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Providers\RessourceDataProvider;
 use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Providers\EditRessourceDataProvider;
-use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Sections\EditAdditionalSection;
-use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Sections\EditGeneralSection;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Select;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Text;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\FormConstants;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Sections\HalfPageSection;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Sections\InputGroup;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseEditModal;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\InputGroupElements;
 
 /**

app/UI/Client/Ressource/Forms/MassChangeStatusForm.php

@@ -9,12 +9,9 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Forms;
 
-
-use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Providers\DeleteListDataProvider;
 use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Providers\RessourceDataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\BaseForm;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Select;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\FormConstants;
 

app/UI/Client/Ressource/Forms/MassDeleteRessourceForm.php

@@ -9,13 +9,9 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Forms;
 
-
-use ThurData\Servers\KerioEmail\App\UI\Client\DistributionList\Providers\DeleteListDataProvider;
 use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Providers\DeleteRessourceDataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\BaseForm;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\FormConstants;
 
 class MassDeleteRessourceForm extends BaseForm implements ClientArea
 {

app/UI/Client/Ressource/Modals/AddRessourceModal.php

@@ -1,6 +1,6 @@
 <?php
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Modals;
-use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Modals\ModalExtendedTabsEdit;
+
 use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Forms\AddRessourceForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseEditModal;

app/UI/Client/Ressource/Modals/ChangePasswordModal.php

@@ -2,9 +2,7 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Modals;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Forms\ChangePasswordForm;
-use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Forms\EditRessourceForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseEditModal;
 

app/UI/Client/Ressource/Modals/ChangeStatusModal.php

@@ -9,11 +9,8 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Modals;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Forms\ChangeStatusForm;
-use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Forms\EditRessourceForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Buttons\ButtonDataTableModalAction;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseEditModal;
 
 class ChangeStatusModal extends BaseEditModal implements ClientArea

app/UI/Client/Ressource/Modals/DeleteRessourceModal.php

@@ -2,9 +2,7 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Modals;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Forms\DeleteRessourceForm;
-use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Forms\EditRessourceForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseModal;
 

app/UI/Client/Ressource/Modals/EditRessourceModal.php

@@ -2,9 +2,6 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Modals;
 
-
-use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Modals\ModalExtendedTabsEdit;
-use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Forms\AddRessourceForm;
 use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Forms\EditRessourceForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseEditModal;

app/UI/Client/Ressource/Modals/MassChangeStatusModal.php

@@ -9,11 +9,9 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Modals;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Forms\MassChangeStatusForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseEditModal;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseModal;
 
 class MassChangeStatusModal extends BaseEditModal implements ClientArea
 {

app/UI/Client/Ressource/Modals/MassDeleteRessourceModal.php

@@ -9,7 +9,6 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Modals;
 
-
 use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Forms\MassDeleteRessourceForm;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Modals\BaseModal;

app/UI/Client/Ressource/Pages/Ressources.php

@@ -2,27 +2,15 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Pages;
 
-use ThurData\Servers\KerioEmail\App\Helpers\BuildUrlExtended;
-use ThurData\Servers\KerioEmail\App\Helpers\KerioManager;
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Connection;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Helpers\RessourceHelper;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Models\Ressource;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository\ClassOfServices;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Filters\Ressources\FilterByCosId;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Fields\EnabledField;
 use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Buttons\AddRessourceButton;
-use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Buttons\ChangePasswordButton;
 use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Buttons\ChangeStatusButton;
 use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Buttons\DeleteRessourceButton;
 use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Buttons\EditRessourceButton;
-use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Buttons\LoginToPanelButton;
 use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Buttons\MassChangeStatusButton;
 use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Buttons\MassDeleteRessourceButton;
 use ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Buttons\SpanDropdownButton;
 use function ThurData\Servers\KerioEmail\Core\Helper\di;
-use ThurData\Servers\KerioEmail\Core\Models\Whmcs\Hosting;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Buttons\DropdawnButtonWrappers\ButtonDropdown;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\DataTable\Column;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\DataTable\DataProviders\DataProvider;
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
@@ -46,11 +34,7 @@ class Ressources extends DataTable implements ClientArea
      */
     const STATUS_LABEL = [
         'active'        => 'success',
-        'locked'        => 'default',
-        'maintenance'   => 'warning',
         'closed'        => 'default',
-        'lockout'       => 'info',
-        'pending'       => 'warning',
         'default'       => 'default'
     ];
 
@@ -123,9 +107,6 @@ class Ressources extends DataTable implements ClientArea
      */
     public function initContent()
     {
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($this->getRequestValue('id'));
-
         $this->addMassActionButton(new MassChangeStatusButton());
         $this->addMassActionButton(new MassDeleteRessourceButton());
 
@@ -147,11 +128,6 @@ class Ressources extends DataTable implements ClientArea
      */
     public function loadData()
     {
-        /**
-         * load hosting
-         */
-        $hosting = Hosting::where('id', $this->getRequestValue('id'))->first();
-
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {
             $api->login($this->getWhmcsParamByKey('serverhostname'), $this->getWhmcsParamByKey('serverusername'), $this->getWhmcsParamByKey('serverpassword'));

app/UI/Client/Ressource/Providers/DeleteRessourceDataProvider.php

@@ -2,10 +2,6 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Providers;
 
-
-use ThurData\Servers\KerioEmail\App\Helpers\KerioManager;
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Services\Delete\DeleteRessource;
 use ThurData\Servers\KerioEmail\Core\UI\ResponseTemplates\HtmlDataJsonResponse;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\DataProviders\BaseDataProvider;
 use ThurData\Servers\KerioEmail\Api\KerioWhmcs;

app/UI/Client/Ressource/Providers/EditRessourceDataProvider.php

@@ -2,19 +2,8 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Providers;
 
-
 use ThurData\Servers\KerioEmail\App\Enums\Kerio;
-use ThurData\Servers\KerioEmail\App\Helpers\KerioManager;
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Models\Ressource;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Models\ClassOfService;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository\ClassOfServices;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Response;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Services\Update\UpdateRessource;
-use ThurData\Servers\KerioEmail\App\Services\ConfigurableOptions\Strategy\Types\ClassOfServicesOptions;
 use function ThurData\Servers\KerioEmail\Core\Helper\di;
-use ThurData\Servers\KerioEmail\Core\Models\Whmcs\Hosting;
 use ThurData\Servers\KerioEmail\Core\UI\ResponseTemplates\HtmlDataJsonResponse;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\DataProviders\BaseDataProvider;
 use ThurData\Servers\KerioEmail\Api\KerioWhmcs;

app/UI/Client/Ressource/Providers/RessourceDataProvider.php

@@ -1,19 +1,8 @@
 <?php
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Providers;
-use ThurData\Servers\KerioEmail\App\Enums\ProductParams;
-use ThurData\Servers\KerioEmail\App\Enums\Size;
+
 use ThurData\Servers\KerioEmail\App\Enums\Kerio;
-use ThurData\Servers\KerioEmail\App\Helpers\KerioManager;
-use ThurData\Servers\KerioEmail\App\Http\Admin\ProductConfiguration;
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Helpers\ServiceFactory;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Models\Ressource;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Models\ClassOfService;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository\ClassOfServices;
-use ThurData\Servers\KerioEmail\App\Services\ConfigurableOptions\Strategy\Types\ClassOfServicesOptions;
 use function ThurData\Servers\KerioEmail\Core\Helper\di;
-use ThurData\Servers\KerioEmail\Core\Http\JsonResponse;
-use ThurData\Servers\KerioEmail\Core\Models\Whmcs\Hosting;
 use ThurData\Servers\KerioEmail\Core\UI\ResponseTemplates\HtmlDataJsonResponse;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\DataProviders\BaseDataProvider;
 use ThurData\Servers\KerioEmail\Api\KerioWhmcs;
@@ -31,14 +20,7 @@ class RessourceDataProvider extends BaseDataProvider
 
     public function read()
     {
-        /**
-         * hosting id
-         */
-        $hid = $this->request->get('id');
-
-        $hosting = Hosting::where('id', $hid)->first();
-        //todo refactor
-        $this->data['domain'] = $hosting->domain;
+        $this->data['domain'] = $this->getWhmcsParamByKey('domain');
 
         $api = new KerioWhmcs('whmcsKerioEmail', 'Thurdata', '1.0');
         try {

app/UI/Client/Ressource/Sections/AdditionalSection.php

@@ -2,13 +2,9 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Sections;
 
-
 use ThurData\Servers\KerioEmail\App\Traits\FormExtendedTrait;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Sections\FreeFieldsSection;
-use function ThurData\Servers\KerioEmail\Core\Helper\di;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Text;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Sections\InputGroup;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\InputGroupElements;
 
 /**
  *

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

@@ -2,7 +2,6 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Sections;
 
-
 use ThurData\Servers\KerioEmail\App\Traits\FormExtendedTrait;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Sections\FreeFieldsSection;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Text;

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

@@ -2,9 +2,6 @@
 
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Sections;
 
-
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository\ClassOfServices;
 use ThurData\Servers\KerioEmail\App\Traits\FormExtendedTrait;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Sections\FreeFieldsSection;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
@@ -31,17 +28,6 @@ class EditGeneralSection extends FreeFieldsSection
 
     public function initContent()
     {
-        /**
-         * hosting id
-         */
-        $hid = $this->getRequestValue('id');
-
-        /**
-         * product manager allow to check product settings
-         */
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($hid);
-
         /**
          * add fields
          */

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

@@ -1,17 +1,10 @@
 <?php
 namespace ThurData\Servers\KerioEmail\App\UI\Client\Ressource\Sections;
-use ThurData\Servers\KerioEmail\App\Libs\Product\ProductManager;
-use ThurData\Servers\KerioEmail\App\Libs\Kerio\Components\Api\Soap\Repository\ClassOfServices;
+
 use ThurData\Servers\KerioEmail\App\Traits\FormExtendedTrait;
 use ThurData\Servers\KerioEmail\App\UI\Admin\Custom\Sections\FreeFieldsSection;
-use ThurData\Servers\KerioEmail\App\Validators\PasswordsValidator;
-use ThurData\Servers\KerioEmail\App\Validators\RepeatPasswordValidator;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Password;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Select;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Text;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Switcher;
-use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Number;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Sections\InputGroup;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\InputGroupElements;
 
@@ -32,17 +25,6 @@ class GeneralSection extends FreeFieldsSection
 
     public function initContent()
     {
-        /**
-         * hosting id
-         */
-        $hid = $this->getRequestValue('id');
-
-        /**
-         * product manager allow to check product settings
-         */
-        $productManager = new ProductManager();
-        $productManager->loadByHostingId($hid);
-
         $email = new InputGroup('usernameGroup');
 
         $email->addTextField('name', false, true);

langs/english.php

@@ -292,9 +292,7 @@ $_LANG['addonCA']['ressource']['mainContainer']['ressource']['ressourcePageDescr
 
 $_LANG['addonCA']['ressource']['mainContainer']['ressources']['addRessourceButton']['button']['addRessourceButton'] = 'Add Resource';
 $_LANG['addonCA']['ressource']['mainContainer']['ressources']['table']['ressource'] = 'Resource';
-$_LANG['addonCA']['ressource']['mainContainer']['ressources']['table']['date_created'] = 'Date Created';
-$_LANG['addonCA']['ressource']['mainContainer']['ressources']['table']['last_login'] = 'Last Login';
-$_LANG['addonCA']['ressource']['mainContainer']['ressources']['table']['capacity'] = 'Capacity';
+$_LANG['addonCA']['ressource']['mainContainer']['ressources']['table']['description'] = 'Description';
 $_LANG['addonCA']['ressource']['mainContainer']['ressources']['table']['type'] = 'Type';
 $_LANG['addonCA']['ressource']['mainContainer']['ressources']['table']['status'] = 'Status';
 $_LANG['addonCA']['ressource']['mainContainer']['ressources']['editRessourceButton']['button']['editRessourceButton'] = 'Edit';
@@ -312,80 +310,36 @@ $_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated
 $_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['usernameGroup']['usernameGroup'] = 'Username *';
 $_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated_row_section_1']['generated_1_0']['display_name']['display_name'] = 'Display Name';
 $_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated_row_section_1']['generated_1_1']['status']['status'] = 'Status';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated_row_section_2']['generated_2_0']['password']['password'] = 'Password *';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated_row_section_2']['generated_2_1']['repeat_password']['repeat_password'] = 'Repeat Password *';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_0']['generated_0_0']['company']['company'] = 'Company';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_0']['generated_0_1']['title']['title'] = 'Title';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['phone']['phone'] = 'Phone';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_1']['generated_1_0']['home_phone']['home_phone'] = 'Home Phone';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_1']['generated_1_1']['mobile_phone']['mobile_phone'] = 'Mobile Phone';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_2']['generated_2_0']['fax']['fax'] = 'Fax';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_2']['generated_2_1']['pager']['pager'] = 'Pager';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_3']['generated_3_0']['country']['country'] = 'Country';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_3']['generated_3_1']['state']['state'] = 'State';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_4']['generated_4_0']['city']['city'] = 'City';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_4']['generated_4_1']['street']['street'] = 'Street';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['post_code']['post_code'] = 'Postal Code';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated_row_section_2']['generated_2_0']['quota']['quota'] = 'Quota';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated_row_section_2']['generated_2_0']['quota']['description'] = '0 = unlimited';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated_row_section_2']['generated_2_1']['unit']['unit'] = 'Unit';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated_row_section_3']['generated_3_0']['password']['password'] = 'Password *';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated_row_section_3']['generated_3_0']['password']['description'] = 'Use 8 characters at least';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated_row_section_3']['generated_3_1']['repeat_password']['repeat_password'] = 'Repeat Password *';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_0']['generated_0_0']['title']['title'] = 'Title';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_0']['generated_0_1']['profession']['profession'] = 'Profession';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_1']['generated_1_0']['department']['department'] = 'Department';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_1']['generated_1_1']['office']['office'] = 'Office';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_2']['generated_2_0']['work_phone']['work_phone'] = 'Phone';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_2']['generated_2_1']['mobile_phone']['mobile_phone'] = 'Mobile';
 $_LANG['addonCA']['emailAccount']['addAccountModal']['baseAcceptButton']['title'] = 'Confirm';
 $_LANG['addonCA']['emailAccount']['addAccountModal']['baseCancelButton']['title'] = 'Cancel';
 
 $_LANG['addonCA']['ressource']['addRessourceModal']['modal']['addRessourceModal'] = 'Add new Resource';
-$_LANG['addonCA']['ressource']['addRessourceModal']['generalSection'] = 'General';
-$_LANG['addonCA']['ressource']['addRessourceModal']['additionalSection'] = 'Additional Informations';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['usernameGroup']['usernameGroup'] = 'E-Mail Address';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['display_name']['display_name'] = 'Display Name';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['status']['status'] = 'Status';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['password']['password'] = 'Password';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['repeat_password']['repeat_password'] = 'Repeat Password';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['password']['description'] = 'A password must contain at least 8 characters';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['type']['type'] = 'Type';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['capacity']['capacity'] = 'Number';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['auto_accept']['auto_accept'] = 'Accept automatically';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['auto_busy']['auto_busy'] = 'Automatically reject when busy';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['description']['description'] = 'Description';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['notes']['notes'] = 'Notes';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['contact']['contact'] = 'Contact';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['site']['site'] = 'Site';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['contact_mail']['contact_mail'] = 'Contact E-Mail';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['contact_phone']['contact_phone'] = 'Contact Phone';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['street']['street'] = 'Street';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['building']['building'] = 'Building';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['floor']['floor'] = 'Floor';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['room']['room'] = 'Room';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['post_code']['post_code'] = 'Postcode';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['town']['town'] = 'Town';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['state']['state'] = 'State';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['county']['county'] = 'County';
+$_LANG['addonCA']['ressource']['addRessourceModal']['usernameGroup']['usernameGroup'] = 'E-Mail Address';
+$_LANG['addonCA']['ressource']['addRessourceModal']['description']['description'] = 'Description';
+$_LANG['addonCA']['ressource']['addRessourceModal']['type']['type'] = 'Type';
+$_LANG['addonCA']['ressource']['addRessourceModal']['manager']['manager'] = 'Manager';
+$_LANG['addonCA']['ressource']['addRessourceModal']['status']['status'] = 'Status';
 $_LANG['addonCA']['ressource']['addRessourceModal']['baseAcceptButton']['title'] = 'Confirm';
 $_LANG['addonCA']['ressource']['addRessourceModal']['baseCancelButton']['title'] = 'Cancel';
 
-$_LANG['addonCA']['ressource']['editRessourceModal']['modal']['editRessourceModal'] = 'Ressource bearbeiten';
-$_LANG['addonCA']['ressource']['editRessourceModal']['editGeneralSection'] = 'General';
-$_LANG['addonCA']['ressource']['editRessourceModal']['editAdditionalSection'] = 'Additional Informations';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['usernameGroup']['usernameGroup'] = 'E-Mail Address';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['display_name']['display_name'] = 'Display Name';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['status']['status'] = 'Status';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['password']['password'] = 'Password';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['repeat_password']['repeat_password'] = 'Repeat Password';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['password']['description'] = 'A password must contain at least 8 characters';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['type']['type'] = 'Type';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['capacity']['capacity'] = 'Number';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['auto_accept']['auto_accept'] = 'Accept automatically';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['auto_busy']['auto_busy'] = 'Automatically reject when busy';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['description']['description'] = 'Description';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['notes']['notes'] = 'Notes';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['contact']['contact'] = 'Contact';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['site']['site'] = 'Site';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['contact_mail']['contact_mail'] = 'Contact E-Mail';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['contact_phone']['contact_phone'] = 'Contact Phone';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['street']['street'] = 'Street';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['building']['building'] = 'Building';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['floor']['floor'] = 'Floor';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['room']['room'] = 'Room';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['post_code']['post_code'] = 'Postcode';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['town']['town'] = 'Town';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['state']['state'] = 'State';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['county']['county'] = 'County';
+$_LANG['addonCA']['ressource']['editRessourceModal']['modal']['addRessourceModal'] = 'Edit resource';
+$_LANG['addonCA']['ressource']['editRessourceModal']['usernameGroup']['usernameGroup'] = 'E-Mail Address';
+$_LANG['addonCA']['ressource']['editRessourceModal']['description']['description'] = 'Description';
+$_LANG['addonCA']['ressource']['editRessourceModal']['type']['type'] = 'Type';
+$_LANG['addonCA']['ressource']['editRessourceModal']['manager']['manager'] = 'Manager';
+$_LANG['addonCA']['ressource']['editRessourceModal']['status']['status'] = 'Status';
 $_LANG['addonCA']['ressource']['editRessourceModal']['baseAcceptButton']['title'] = 'Confirm';
 $_LANG['addonCA']['ressource']['editRessourceModal']['baseCancelButton']['title'] = 'Cancel';
 
@@ -431,18 +385,18 @@ $_LANG['addonCA']['emailAccount']['editAccountForm']['editGeneralSection']['gene
 $_LANG['addonCA']['emailAccount']['editAccountForm']['editGeneralSection']['usernameGroup']['usernameGroup'] = 'Username';
 $_LANG['addonCA']['emailAccount']['editAccountForm']['editGeneralSection']['generated_row_section_1']['generated_1_0']['display_name']['display_name'] = 'Display Name';
 $_LANG['addonCA']['emailAccount']['editAccountForm']['editGeneralSection']['generated_row_section_1']['generated_1_1']['status']['status'] = 'Status';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_0']['generated_0_0']['company']['company'] = 'Company';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_0']['generated_0_1']['title']['title'] = 'Title';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['phone']['phone'] = 'Phone';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_1']['generated_1_0']['home_phone']['home_phone'] = 'Home Phone';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_1']['generated_1_1']['mobile_phone']['mobile_phone'] = 'Mobile Phone';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_2']['generated_2_0']['fax']['fax'] = 'Fax';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_2']['generated_2_1']['pager']['pager'] = 'Pager';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_3']['generated_3_0']['country']['country'] = 'Country';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_3']['generated_3_1']['state']['state'] = 'State';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_4']['generated_4_0']['city']['city'] = 'City';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_4']['generated_4_1']['street']['street'] = 'Street';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['post_code']['post_code'] = 'Postal Code';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editGeneralSection']['generated_row_section_2']['generated_2_0']['quota']['quota'] = 'Quota';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editGeneralSection']['generated_row_section_2']['generated_2_0']['quota']['description'] = '0 = unlimited';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editGeneralSection']['generated_row_section_2']['generated_2_1']['unit']['unit'] = 'Unit';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editGeneralSection']['generated_row_section_3']['generated_3_0']['password']['password'] = 'Password *';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editGeneralSection']['generated_row_section_3']['generated_3_0']['password']['description'] = 'Use 8 characters at least';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editGeneralSection']['generated_row_section_3']['generated_3_1']['repeat_password']['repeat_password'] = 'Password repeat *';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_0']['generated_0_0']['title']['title'] = 'Title';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_0']['generated_0_1']['profession']['profession'] = 'Profession';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_1']['generated_1_0']['department']['department'] = 'Department';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_1']['generated_1_1']['office']['office'] = 'Office';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_2']['generated_2_0']['work_phone']['work_phone'] = 'Phone';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_2']['generated_2_1']['mobile_phone']['mobile_phone'] = 'Mobile';
 $_LANG['addonCA']['emailAccount']['editAccountModal']['baseAcceptButton']['title'] = 'Confirm';
 $_LANG['addonCA']['emailAccount']['editAccountModal']['baseCancelButton']['title'] = 'Cancel';
 
@@ -498,8 +452,9 @@ $_LANG['addonCA']['distributionList']['mainContainer']['distributionList']['dist
 $_LANG['addonCA']['distributionList']['mainContainer']['distributionList']['distributionListPageDescription'] = 'A distribution list, also known as a mailing list, is a group of email addresses contained in a list with a common email address. When users send to a distribution list, they are sending the message to everyone whose address is included in the list.';
 $_LANG['addonCA']['distributionList']['mainContainer']['lists']['addListButton']['button']['addListButton'] = 'Add Distribution List';
 $_LANG['addonCA']['distributionList']['mainContainer']['lists']['table']['email'] = 'Email';
-$_LANG['addonCA']['distributionList']['mainContainer']['lists']['table']['name'] = 'Display Name';
-$_LANG['addonCA']['distributionList']['mainContainer']['lists']['table']['status'] = 'Status';
+$_LANG['addonCA']['distributionList']['mainContainer']['lists']['table']['description'] = 'Description';
+$_LANG['addonCA']['distributionList']['mainContainer']['lists']['table']['members'] = 'Receivers';
+$_LANG['addonCA']['distributionList']['mainContainer']['lists']['table']['moderator'] = 'Moderator';
 $_LANG['addonCA']['distributionList']['mainContainer']['lists']['editListButton']['button']['editListButton'] = 'Edit';
 $_LANG['addonCA']['distributionList']['mainContainer']['lists']['deleteListButton']['button']['deleteListButton'] = 'Delete';
 
@@ -508,19 +463,15 @@ $_LANG['addonCA']['distributionList']['addListForm']['addMembersDistribution']['
 $_LANG['addonCA']['distributionList']['addListForm']['addMembersDistribution']['description']['description'] = 'Description';
 $_LANG['addonCA']['distributionList']['addListForm']['addMembersDistribution']['memberList']['memberList'] = 'Members List';
 $_LANG['addonCA']['distributionList']['addListForm']['addMembersDistribution']['customMember']['customMember'] = 'Add Member';
-$_LANG['addonCA']['distributionList']['addListForm']['addPropertiesDistribution']['receiveMail']['receiveMail'] = 'Can Receive Mail';
-$_LANG['addonCA']['distributionList']['addListForm']['addPropertiesDistribution']['hideGal']['hideGal'] = 'Hide In GAL';
-$_LANG['addonCA']['distributionList']['addListForm']['addPropertiesDistribution']['dynamicGroup']['dynamicGroup'] = 'Dynamic Group';
-$_LANG['addonCA']['distributionList']['addListForm']['addPropertiesDistribution']['subscriptionRequest']['subscriptionRequest'] = 'Subscription Request';
-$_LANG['addonCA']['distributionList']['addListForm']['addPropertiesDistribution']['unsubscriptionRequest']['unsubscriptionRequest'] = 'Unsubscription Request';
-$_LANG['addonCA']['distributionList']['addListForm']['addPropertiesDistribution']['sharesNotify']['sharesNotify'] = 'Notify About Shares';
-$_LANG['addonCA']['distributionList']['addListForm']['addAliasesDistribution']['emailAliases']['emailAliases'] = 'Email Aliases';
-$_LANG['addonCA']['distributionList']['addListForm']['addAliasesDistribution']['newAlias']['newAlias'] = 'Add Email Alias';
-$_LANG['addonCA']['distributionList']['addListForm']['addOwnersDistribution']['owners']['owners'] = 'Owners';
-$_LANG['addonCA']['distributionList']['addListForm']['addOwnersDistribution']['newOwner']['newOwner'] = 'Add Owner';
-$_LANG['addonCA']['distributionList']['addListForm']['addPreferencesDistribution']['replyEmail']['replyEmail'] = 'Set Reply To Field';
-$_LANG['addonCA']['distributionList']['addListForm']['addPreferencesDistribution']['replyDisplayName']['replyDisplayName'] = '\'Reply To\' Display Name';
-$_LANG['addonCA']['distributionList']['addListForm']['addPreferencesDistribution']['replyEmailAddress']['replyEmailAddress'] = '\'Reply To\' Address';
+$_LANG['addonCA']['distributionList']['addListForm']['addPropertiesDistribution']['lang']['lang'] = 'Language';
+$_LANG['addonCA']['distributionList']['addListForm']['addPropertiesDistribution']['moderator']['moderator'] = 'Moderator';
+$_LANG['addonCA']['distributionList']['addListForm']['addPropertiesDistribution']['subscriptionRequest']['subscriptionRequest'] = 'Subscription request';
+$_LANG['addonCA']['distributionList']['addListForm']['addPropertiesDistribution']['subscriptionNotify']['subscriptionNotify'] = 'Subscription notify';
+$_LANG['addonCA']['distributionList']['addListForm']['addPreferencesDistribution']['memberPosting']['memberPosting'] = 'Member posting';
+$_LANG['addonCA']['distributionList']['addListForm']['addPreferencesDistribution']['nonMemberPosting']['nonMemberPosting'] = 'Non member posting';
+$_LANG['addonCA']['distributionList']['addListForm']['addPreferencesDistribution']['sendErrorsToModerator']['sendErrorsToModerator'] = 'Send delivery errors to moderator';
+$_LANG['addonCA']['distributionList']['addListForm']['addPreferencesDistribution']['replyDisplayName']['replyDisplayName'] = '\'Reply to\' Displayname';
+$_LANG['addonCA']['distributionList']['addListForm']['addPreferencesDistribution']['replyEmailAddress']['replyEmailAddress'] = '\'Reply to\' Email address';
 $_LANG['addonCA']['distributionList']['addListModal']['modal']['addListModal'] = 'Add Distribution List';
 $_LANG['addonCA']['distributionList']['addListModal']['baseAcceptButton']['title'] = 'Confirm';
 $_LANG['addonCA']['distributionList']['addListModal']['baseCancelButton']['title'] = 'Cancel';
@@ -543,19 +494,15 @@ $_LANG['addonCA']['distributionList']['editListForm']['editMembersDistribution']
 $_LANG['addonCA']['distributionList']['editListForm']['editMembersDistribution']['emailAliasesActually']['emailAliasesActually'] = 'Email Aliases';
 $_LANG['addonCA']['distributionList']['editListForm']['editMembersDistribution']['memberListActually']['memberListActually'] = 'Members List';
 $_LANG['addonCA']['distributionList']['editListForm']['editMembersDistribution']['ownersActually']['ownersActually'] = 'Owners';
-$_LANG['addonCA']['distributionList']['editListForm']['addPropertiesDistribution']['receiveMail']['receiveMail'] = 'Can Receive Mail';
-$_LANG['addonCA']['distributionList']['editListForm']['addPropertiesDistribution']['hideGal']['hideGal'] = 'Hide In GAL';
-$_LANG['addonCA']['distributionList']['editListForm']['addPropertiesDistribution']['dynamicGroup']['dynamicGroup'] = 'Dynamic Group';
-$_LANG['addonCA']['distributionList']['editListForm']['addPropertiesDistribution']['subscriptionRequest']['subscriptionRequest'] = 'Subscription Request';
-$_LANG['addonCA']['distributionList']['editListForm']['addPropertiesDistribution']['unsubscriptionRequest']['unsubscriptionRequest'] = 'Unsubscription Request';
-$_LANG['addonCA']['distributionList']['editListForm']['addPropertiesDistribution']['sharesNotify']['sharesNotify'] = 'Notify About Shares';
-$_LANG['addonCA']['distributionList']['editListForm']['addAliasesDistribution']['emailAliases']['emailAliases'] = 'Email Aliases';
-$_LANG['addonCA']['distributionList']['editListForm']['addAliasesDistribution']['newAlias']['newAlias'] = 'Add Email Alias';
-$_LANG['addonCA']['distributionList']['editListForm']['addOwnersDistribution']['owners']['owners'] = 'Owners';
-$_LANG['addonCA']['distributionList']['editListForm']['addOwnersDistribution']['newOwner']['newOwner'] = 'Add Owner';
-$_LANG['addonCA']['distributionList']['editListForm']['addPreferencesDistribution']['replyEmail']['replyEmail'] = 'Set Reply To Field';
-$_LANG['addonCA']['distributionList']['editListForm']['addPreferencesDistribution']['replyDisplayName']['replyDisplayName'] = '\'Reply To\' Display Name';
-$_LANG['addonCA']['distributionList']['editListForm']['addPreferencesDistribution']['replyEmailAddress']['replyEmailAddress'] = '\'Reply To\' Address';
+$_LANG['addonCA']['distributionList']['editListForm']['addPropertiesDistribution']['lang']['lang'] = 'Language';
+$_LANG['addonCA']['distributionList']['editListForm']['addPropertiesDistribution']['moderator']['moderator'] = 'Moderator';
+$_LANG['addonCA']['distributionList']['editListForm']['addPropertiesDistribution']['subscriptionRequest']['subscriptionRequest'] = 'Subscription request';
+$_LANG['addonCA']['distributionList']['editListForm']['addPropertiesDistribution']['subscriptionNotify']['subscriptionNotify'] = 'Subscription notify';
+$_LANG['addonCA']['distributionList']['editListForm']['addPreferencesDistribution']['memberPosting']['memberPosting'] = 'Member posting';
+$_LANG['addonCA']['distributionList']['editListForm']['addPreferencesDistribution']['nonMemberPosting']['nonMemberPosting'] = 'Non member posting';
+$_LANG['addonCA']['distributionList']['editListForm']['addPreferencesDistribution']['sendErrorsToModerator']['sendErrorsToModerator'] = 'Send delivery errors to moderator';
+$_LANG['addonCA']['distributionList']['editListForm']['addPreferencesDistribution']['replyDisplayName']['replyDisplayName'] = '\'Reply to\' Displayname';
+$_LANG['addonCA']['distributionList']['editListForm']['addPreferencesDistribution']['replyEmailAddress']['replyEmailAddress'] = '\'Reply to\' Email address';
 $_LANG['addonCA']['distributionList']['editListModal']['modal']['editListModal'] = 'Edit Distribution List';
 $_LANG['addonCA']['distributionList']['editListModal']['editMembersDistribution'] = 'Members';
 $_LANG['addonCA']['distributionList']['editListModal']['addPropertiesDistribution'] = 'Properties';
@@ -687,10 +634,16 @@ $_LANG['addonCA']['ressource']['changePasswordModal']['baseCancelButton']['title
 $_LANG['Automatically accept'] = 'Automatically accept';
 $_LANG['Require list owner approval'] = 'Require list owner approval';
 $_LANG['Automatically reject'] = 'Automatically reject';
+$_LANG['Require moderator approval'] = 'Require moderator approval';
 $_LANG['mail@example.com'] = 'mail@example.com';
 $_LANG['phoneNumberPlaceholder'] = '201 555 0123';
 $_LANG['kerio']['account']['status']['disabled']  = 'Disabled';
 $_LANG['kerio']['account']['status']['enabled'] = 'Enabled';
+$_LANG['Sender'] = 'Sender';
+$_LANG['ThisList'] = 'This List';
+$_LANG['SenderThisList'] = 'Sender and this List';
+$_LANG['german'] = 'german';
+$_LANG['english'] = 'english';
 
 $_LANG['addonCA']['emailAccount']['mainContainer']['accounts']['actions']['More Actions'] = 'More Actions';
 $_LANG['addonCA']['emailAccount']['accounts']['actions']['More Actions'] = 'More Actions';

langs/german.php

@@ -292,10 +292,8 @@ $_LANG['addonCA']['ressource']['mainContainer']['ressource']['ressourcePageDescr
 
 $_LANG['addonCA']['ressource']['mainContainer']['ressources']['addRessourceButton']['button']['addRessourceButton'] = 'Neue Ressource';
 $_LANG['addonCA']['ressource']['mainContainer']['ressources']['table']['ressource'] = 'Name';
-$_LANG['addonCA']['ressource']['mainContainer']['ressources']['table']['date_created'] = 'Erstellungsdatum';
-$_LANG['addonCA']['ressource']['mainContainer']['ressources']['table']['capacity'] = 'Anzahl';
-$_LANG['addonCA']['ressource']['mainContainer']['ressources']['table']['last_login'] = 'Letztes Login';
-$_LANG['addonCA']['ressource']['mainContainer']['ressources']['table']['type'] = 'Type';
+$_LANG['addonCA']['ressource']['mainContainer']['ressources']['table']['description'] = 'Beschreibung';
+$_LANG['addonCA']['ressource']['mainContainer']['ressources']['table']['type'] = 'Typ';
 $_LANG['addonCA']['ressource']['mainContainer']['ressources']['table']['status'] = 'Status';
 $_LANG['addonCA']['ressource']['mainContainer']['ressources']['editRessourceButton']['button']['editRessourceButton'] = 'Editieren';
 $_LANG['addonCA']['ressource']['mainContainer']['ressources']['deleteRessourceButton']['button']['deleteRessourceButton'] = 'Löschen';
@@ -312,80 +310,36 @@ $_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated
 $_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['usernameGroup']['usernameGroup'] = 'Benutzername *';
 $_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated_row_section_1']['generated_1_0']['display_name']['display_name'] = 'Anzeigename';
 $_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated_row_section_1']['generated_1_1']['status']['status'] = 'Status';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated_row_section_2']['generated_2_0']['password']['password'] = 'Passwort *';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated_row_section_2']['generated_2_1']['repeat_password']['repeat_password'] = 'Passwort wiederholen *';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_0']['generated_0_0']['company']['company'] = 'Firma';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_0']['generated_0_1']['title']['title'] = 'Titel';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['phone']['phone'] = 'Telefon';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_1']['generated_1_0']['home_phone']['home_phone'] = 'Tel Privat';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_1']['generated_1_1']['mobile_phone']['mobile_phone'] = 'Handy';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_2']['generated_2_0']['fax']['fax'] = 'Fax';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_2']['generated_2_1']['pager']['pager'] = 'Pager';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_3']['generated_3_0']['country']['country'] = 'Land';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_3']['generated_3_1']['state']['state'] = 'Kanton/State';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_4']['generated_4_0']['city']['city'] = 'Stadt';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_4']['generated_4_1']['street']['street'] = 'Strasse';
-$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['post_code']['post_code'] = 'PLZ';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated_row_section_2']['generated_2_0']['quota']['quota'] = 'Quota';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated_row_section_2']['generated_2_0']['quota']['description'] = '0 = unlimitiert';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated_row_section_2']['generated_2_1']['unit']['unit'] = 'Einheit';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated_row_section_3']['generated_3_0']['password']['password'] = 'Passwort *';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated_row_section_3']['generated_3_0']['password']['description'] = 'Mindestlänge 8 Zeichen';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['generalSection']['generated_row_section_3']['generated_3_1']['repeat_password']['repeat_password'] = 'Passwort wiederholen *';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_0']['generated_0_0']['title']['title'] = 'Titel';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_0']['generated_0_1']['profession']['profession'] = 'Beruf';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_1']['generated_1_0']['department']['department'] = 'Abteilung';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_1']['generated_1_1']['office']['office'] = 'Büro';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_2']['generated_2_0']['work_phone']['work_phone'] = 'Telefon';
+$_LANG['addonCA']['emailAccount']['addAccountForm']['additionalSection']['generated_row_section_2']['generated_2_1']['mobile_phone']['mobile_phone'] = 'Mobil';
 $_LANG['addonCA']['emailAccount']['addAccountModal']['baseAcceptButton']['title'] = 'Bestätigen';
 $_LANG['addonCA']['emailAccount']['addAccountModal']['baseCancelButton']['title'] = 'Abbrechen';
 
 $_LANG['addonCA']['ressource']['addRessourceModal']['modal']['addRessourceModal'] = 'Neue Ressource hinzufügen';
-$_LANG['addonCA']['ressource']['addRessourceModal']['generalSection'] = 'Allgemein';
-$_LANG['addonCA']['ressource']['addRessourceModal']['additionalSection'] = 'Zusätzliche Informationen';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['usernameGroup']['usernameGroup'] = 'E-Mail Adresse';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['display_name']['display_name'] = 'Anzeigename';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['status']['status'] = 'Status';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['password']['password'] = 'Passwort';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['repeat_password']['repeat_password'] = 'Passwort wiederholen';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['password']['description'] = 'Das Passwort muss mindestens 8 Zeichen enthalten';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['type']['type'] = 'Typ';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['capacity']['capacity'] = 'Anzahl';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['auto_accept']['auto_accept'] = 'Automatisch akzeptieren';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['auto_busy']['auto_busy'] = 'Automatisch ablehnen wenn belegt';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['description']['description'] = 'Beschreibung';
-$_LANG['addonCA']['ressource']['addRessourceForm']['generalSection']['notes']['notes'] = 'Notizen';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['contact']['contact'] = 'Kontakt';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['site']['site'] = 'Abteilung';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['contact_mail']['contact_mail'] = 'Kontakt E-Mail';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['contact_phone']['contact_phone'] = 'Kontakt Telefon';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['street']['street'] = 'Strasse';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['building']['building'] = 'Gebäude';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['floor']['floor'] = 'Etage';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['room']['room'] = 'Raum';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['post_code']['post_code'] = 'Postleitzahl';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['town']['town'] = 'Stadt/Gemeinde';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['state']['state'] = 'Land';
-$_LANG['addonCA']['ressource']['addRessourceForm']['additionalSection']['county']['county'] = 'Bundesland';
+$_LANG['addonCA']['ressource']['addRessourceModal']['usernameGroup']['usernameGroup'] = 'E-Mail Adresse';
+$_LANG['addonCA']['ressource']['addRessourceModal']['description']['description'] = 'Beschreibung';
+$_LANG['addonCA']['ressource']['addRessourceModal']['type']['type'] = 'Typ';
+$_LANG['addonCA']['ressource']['addRessourceModal']['manager']['manager'] = 'Manager';
+$_LANG['addonCA']['ressource']['addRessourceModal']['status']['status'] = 'Status';
 $_LANG['addonCA']['ressource']['addRessourceModal']['baseAcceptButton']['title'] = 'Bestätigen';
 $_LANG['addonCA']['ressource']['addRessourceModal']['baseCancelButton']['title'] = 'Abbrechen';
 
-$_LANG['addonCA']['ressource']['editRessourceModal']['modal']['editRessourceModal'] = 'Ressource bearbeiten';
-$_LANG['addonCA']['ressource']['editRessourceModal']['editGeneralSection'] = 'Allgemein';
-$_LANG['addonCA']['ressource']['editRessourceModal']['editAdditionalSection'] = 'Zusätzliche Informationen';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['usernameGroup']['usernameGroup'] = 'E-Mail Adresse';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['display_name']['display_name'] = 'Anzeigename';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['status']['status'] = 'Status';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['password']['password'] = 'Passwort';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['repeat_password']['repeat_password'] = 'Passwort wiederholen';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['password']['description'] = 'Das Passwort muss mindestens 8 Zeichen enthalten';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['type']['type'] = 'Typ';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['capacity']['capacity'] = 'Anzahl';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['auto_accept']['auto_accept'] = 'Automatisch akzeptieren';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['auto_busy']['auto_busy'] = 'Automatisch ablehnen wenn belegt';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['description']['description'] = 'Beschreibung';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editGeneralSection']['notes']['notes'] = 'Notizen';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['contact']['contact'] = 'Kontakt';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['site']['site'] = 'Abteilung';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['contact_mail']['contact_mail'] = 'Kontakt E-Mail';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['contact_phone']['contact_phone'] = 'Kontakt Telefon';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['street']['street'] = 'Strasse';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['building']['building'] = 'Gebäude';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['floor']['floor'] = 'Etage';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['room']['room'] = 'Raum';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['post_code']['post_code'] = 'Postleitzahl';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['town']['town'] = 'Stadt/Gemeinde';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['state']['state'] = 'Land';
-$_LANG['addonCA']['ressource']['editRessourceForm']['editAdditionalSection']['county']['county'] = 'Bundesland';
+$_LANG['addonCA']['ressource']['editRessourceModal']['modal']['addRessourceModal'] = 'Ressource bearbeiten';
+$_LANG['addonCA']['ressource']['editRessourceModal']['usernameGroup']['usernameGroup'] = 'E-Mail Adresse';
+$_LANG['addonCA']['ressource']['editRessourceModal']['description']['description'] = 'Beschreibung';
+$_LANG['addonCA']['ressource']['editRessourceModal']['type']['type'] = 'Typ';
+$_LANG['addonCA']['ressource']['editRessourceModal']['manager']['manager'] = 'Manager';
+$_LANG['addonCA']['ressource']['editRessourceModal']['status']['status'] = 'Status';
 $_LANG['addonCA']['ressource']['editRessourceModal']['baseAcceptButton']['title'] = 'Bestätigen';
 $_LANG['addonCA']['ressource']['editRessourceModal']['baseCancelButton']['title'] = 'Abbrechen';
 
@@ -431,18 +385,18 @@ $_LANG['addonCA']['emailAccount']['editAccountForm']['editGeneralSection']['gene
 $_LANG['addonCA']['emailAccount']['editAccountForm']['editGeneralSection']['usernameGroup']['usernameGroup'] = 'Benutzername';
 $_LANG['addonCA']['emailAccount']['editAccountForm']['editGeneralSection']['generated_row_section_1']['generated_1_0']['display_name']['display_name'] = 'Anzeigename';
 $_LANG['addonCA']['emailAccount']['editAccountForm']['editGeneralSection']['generated_row_section_1']['generated_1_1']['status']['status'] = 'Status';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_0']['generated_0_0']['company']['company'] = 'Firma';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_0']['generated_0_1']['title']['title'] = 'Titel';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['phone']['phone'] = 'Telefon';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_1']['generated_1_0']['home_phone']['home_phone'] = 'Tel Privat';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_1']['generated_1_1']['mobile_phone']['mobile_phone'] = 'Handy';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_2']['generated_2_0']['fax']['fax'] = 'Fax';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_2']['generated_2_1']['pager']['pager'] = 'Pager';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_3']['generated_3_0']['country']['country'] = 'Land';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_3']['generated_3_1']['state']['state'] = 'Kanton/State';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_4']['generated_4_0']['city']['city'] = 'Stadt';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_4']['generated_4_1']['street']['street'] = 'Strasse';
-$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['post_code']['post_code'] = 'PLZ';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editGeneralSection']['generated_row_section_2']['generated_2_0']['quota']['quota'] = 'Quota';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editGeneralSection']['generated_row_section_2']['generated_2_0']['quota']['description'] = '0 = unlimitiert';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editGeneralSection']['generated_row_section_2']['generated_2_1']['unit']['unit'] = 'Einheit';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editGeneralSection']['generated_row_section_3']['generated_3_0']['password']['password'] = 'Passwort *';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editGeneralSection']['generated_row_section_3']['generated_3_0']['password']['description'] = 'Mindestlänge 8 Zeichen';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editGeneralSection']['generated_row_section_3']['generated_3_1']['repeat_password']['repeat_password'] = 'Passwort wiederholen *';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_0']['generated_0_0']['title']['title'] = 'Titel';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_0']['generated_0_1']['profession']['profession'] = 'Beruf';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_1']['generated_1_0']['department']['department'] = 'Abteilung';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_1']['generated_1_1']['office']['office'] = 'Büro';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_2']['generated_2_0']['work_phone']['work_phone'] = 'Telefon';
+$_LANG['addonCA']['emailAccount']['editAccountForm']['editAdditionalSection']['generated_row_section_2']['generated_2_1']['mobile_phone']['mobile_phone'] = 'Mobil';
 $_LANG['addonCA']['emailAccount']['editAccountModal']['baseAcceptButton']['title'] = 'Bestätigen';
 $_LANG['addonCA']['emailAccount']['editAccountModal']['baseCancelButton']['title'] = 'Abbrechen';
 
@@ -459,7 +413,7 @@ $_LANG['addonCA']['emailAlias']['mainContainer']['emailAliases']['table']['accou
 $_LANG['addonCA']['emailAlias']['mainContainer']['emailAliases']['table']['email_alias'] = 'Email Alias';
 $_LANG['addonCA']['emailAlias']['mainContainer']['emailAliases']['deleteEmailAliasButton']['button']['deleteEmailAliasButton'] = 'Löschen';
 
-$_LANG['addonCA']['emailAlias']['addEmailAliasModal']['modal']['addEmailAliasModal'] = 'Add Email Alias';
+$_LANG['addonCA']['emailAlias']['addEmailAliasModal']['modal']['addEmailAliasModal'] = 'Email Alias hinzufügen';
 $_LANG['addonCA']['emailAlias']['addEmailAliasModal']['addEmailAliasForm']['usernameGroup']['usernameGroup'] = 'Email Alias';
 $_LANG['addonCA']['emailAlias']['addEmailAliasModal']['addEmailAliasForm']['mailbox']['mailbox'] = 'Account';
 $_LANG['addonCA']['emailAlias']['addEmailAliasModal']['baseAcceptButton']['title'] = 'Bestätigen';
@@ -471,7 +425,7 @@ $_LANG['emailAliasHasBeenDeleted'] = 'Der Email Alias wurde erfolgreich gelösch
 $_LANG['addonCA']['emailAlias']['deleteEmailAliasModal']['modal']['deleteEmailAliasModal'] = 'Email Alias löschen';
 $_LANG['addonCA']['emailAlias']['deleteEmailAliasModal']['deleteAccountForm']['confirmDeleteAccountAlias'] = 'Sind Sie sicher, dass dieser Email Alias gelöscht werden soll?';
 $_LANG['addonCA']['emailAlias']['deleteEmailAliasModal']['baseAcceptButton']['title'] = 'Bestätigen';
-$_LANG['addonCA']['emailAlias']['deleteEmailAliasModal']['baseAbbrechenButton']['title'] = 'Abbrechen';
+$_LANG['addonCA']['emailAlias']['deleteEmailAliasModal']['baseCancelButton']['title'] = 'Abbrechen';
 
 $_LANG['addonCA']['domainAlias']['mainContainer']['domainAlias']['domainAliasPageTitle'] = 'Verwaltung der Domain Aliases';
 $_LANG['addonCA']['domainAlias']['mainContainer']['domainAlias']['domainAliasPageDescription'] = 'Domain aliases erlauben den Empfang von Email von einer anderen Email Domain. Dazu muss aber ein MX-Record entsprechend eingerichtet sein.';
@@ -498,8 +452,9 @@ $_LANG['addonCA']['distributionList']['mainContainer']['distributionList']['dist
 $_LANG['addonCA']['distributionList']['mainContainer']['distributionList']['distributionListPageDescription'] = 'Ein Email Verteiler eine virtuelle Email Adresse welche mit einer Gruppe von Postfächern verbunden ist. Wenn ein Mail an einen Email Verteiler geschickt wird, erhalten alle angeschlossenen Postfächer (Mitglieder) dieses Verteilers eine Kopie dieser Email.';
 $_LANG['addonCA']['distributionList']['mainContainer']['lists']['addListButton']['button']['addListButton'] = 'Verteiler hinzufügen';
 $_LANG['addonCA']['distributionList']['mainContainer']['lists']['table']['email'] = 'Email';
-$_LANG['addonCA']['distributionList']['mainContainer']['lists']['table']['name'] = 'Anzeigename';
-$_LANG['addonCA']['distributionList']['mainContainer']['lists']['table']['status'] = 'Status';
+$_LANG['addonCA']['distributionList']['mainContainer']['lists']['table']['description'] = 'Beschreibung';
+$_LANG['addonCA']['distributionList']['mainContainer']['lists']['table']['members'] = 'Empfänger';
+$_LANG['addonCA']['distributionList']['mainContainer']['lists']['table']['moderator'] = 'Moderator';
 $_LANG['addonCA']['distributionList']['mainContainer']['lists']['editListButton']['button']['editListButton'] = 'Bearbeiten';
 $_LANG['addonCA']['distributionList']['mainContainer']['lists']['deleteListButton']['button']['deleteListButton'] = 'Löschen';
 
@@ -508,17 +463,13 @@ $_LANG['addonCA']['distributionList']['addListForm']['addMembersDistribution']['
 $_LANG['addonCA']['distributionList']['addListForm']['addMembersDistribution']['description']['description'] = 'Beschreibung';
 $_LANG['addonCA']['distributionList']['addListForm']['addMembersDistribution']['memberList']['memberList'] = 'Mitglieder';
 $_LANG['addonCA']['distributionList']['addListForm']['addMembersDistribution']['customMember']['customMember'] = 'Mitglied hinzufügen';
-$_LANG['addonCA']['distributionList']['addListForm']['addPropertiesDistribution']['receiveMail']['receiveMail'] = 'Kann Email empfangen';
-$_LANG['addonCA']['distributionList']['addListForm']['addPropertiesDistribution']['hideGal']['hideGal'] = 'In GAL verbergen';
-$_LANG['addonCA']['distributionList']['addListForm']['addPropertiesDistribution']['dynamicGroup']['dynamicGroup'] = 'Dynamische Gruppe';
-$_LANG['addonCA']['distributionList']['addListForm']['addPropertiesDistribution']['subscriptionRequest']['subscriptionRequest'] = 'Subscription Request';
-$_LANG['addonCA']['distributionList']['addListForm']['addPropertiesDistribution']['unsubscriptionRequest']['unsubscriptionRequest'] = 'Unsubscription Request';
-$_LANG['addonCA']['distributionList']['addListForm']['addPropertiesDistribution']['sharesNotify']['sharesNotify'] = 'Freigabe-Benachrichtigung';
-$_LANG['addonCA']['distributionList']['addListForm']['addAliasesDistribution']['emailAliases']['emailAliases'] = 'Email Aliase';
-$_LANG['addonCA']['distributionList']['addListForm']['addAliasesDistribution']['newAlias']['newAlias'] = 'Email Alias hinzufügen';
-$_LANG['addonCA']['distributionList']['addListForm']['addOwnersDistribution']['owners']['owners'] = 'Besitzer';
-$_LANG['addonCA']['distributionList']['addListForm']['addOwnersDistribution']['newOwner']['newOwner'] = 'Besitzer hinzfügen';
-$_LANG['addonCA']['distributionList']['addListForm']['addPreferencesDistribution']['replyEmail']['replyEmail'] = 'Antwort an';
+$_LANG['addonCA']['distributionList']['addListForm']['addPropertiesDistribution']['lang']['lang'] = 'Sprache';
+$_LANG['addonCA']['distributionList']['addListForm']['addPropertiesDistribution']['moderator']['moderator'] = 'Moderator';
+$_LANG['addonCA']['distributionList']['addListForm']['addPropertiesDistribution']['subscriptionRequest']['subscriptionRequest'] = 'Abonnementanfrage';
+$_LANG['addonCA']['distributionList']['addListForm']['addPropertiesDistribution']['subscriptionNotify']['subscriptionNotify'] = 'Abonnement-Benachrichtigung';
+$_LANG['addonCA']['distributionList']['addListForm']['addPreferencesDistribution']['memberPosting']['memberPosting'] = 'Senden von Mitgliedern';
+$_LANG['addonCA']['distributionList']['addListForm']['addPreferencesDistribution']['nonMemberPosting']['nonMemberPosting'] = 'Senden von nicht Mitgliedern';
+$_LANG['addonCA']['distributionList']['addListForm']['addPreferencesDistribution']['sendErrorsToModerator']['sendErrorsToModerator'] = 'Zustellungsfehler an Moderator senden';
 $_LANG['addonCA']['distributionList']['addListForm']['addPreferencesDistribution']['replyDisplayName']['replyDisplayName'] = '\'Antwort an\' Anzeigename';
 $_LANG['addonCA']['distributionList']['addListForm']['addPreferencesDistribution']['replyEmailAddress']['replyEmailAddress'] = '\'Antwort an\' Adresse';
 $_LANG['addonCA']['distributionList']['addListModal']['modal']['addListModal'] = 'Verteiler hinzufügen';
@@ -543,19 +494,15 @@ $_LANG['addonCA']['distributionList']['editListForm']['editMembersDistribution']
 $_LANG['addonCA']['distributionList']['editListForm']['editMembersDistribution']['emailAliasesActually']['emailAliasesActually'] = 'Email Aliases';
 $_LANG['addonCA']['distributionList']['editListForm']['editMembersDistribution']['memberListActually']['memberListActually'] = 'Mitglieder';
 $_LANG['addonCA']['distributionList']['editListForm']['editMembersDistribution']['ownersActually']['ownersActually'] = 'Eigentümer';
-$_LANG['addonCA']['distributionList']['editListForm']['addPropertiesDistribution']['receiveMail']['receiveMail'] = 'Kann Email empfangen';
-$_LANG['addonCA']['distributionList']['editListForm']['addPropertiesDistribution']['hideGal']['hideGal'] = 'In GAL verbergen';
-$_LANG['addonCA']['distributionList']['editListForm']['addPropertiesDistribution']['dynamicGroup']['dynamicGroup'] = 'Dynamische Gruppe';
-$_LANG['addonCA']['distributionList']['editListForm']['addPropertiesDistribution']['subscriptionRequest']['subscriptionRequest'] = 'Subscription Request';
-$_LANG['addonCA']['distributionList']['editListForm']['addPropertiesDistribution']['unsubscriptionRequest']['unsubscriptionRequest'] = 'Unsubscription Request';
-$_LANG['addonCA']['distributionList']['editListForm']['addPropertiesDistribution']['sharesNotify']['sharesNotify'] = 'Freigabe-Benachrichtigung';
-$_LANG['addonCA']['distributionList']['editListForm']['addAliasesDistribution']['emailAliases']['emailAliases'] = 'Email Aliases';
-$_LANG['addonCA']['distributionList']['editListForm']['addAliasesDistribution']['newAlias']['newAlias'] = 'Email Alias hinzufügen';
-$_LANG['addonCA']['distributionList']['editListForm']['addOwnersDistribution']['owners']['owners'] = 'Besitzer';
-$_LANG['addonCA']['distributionList']['editListForm']['addOwnersDistribution']['newOwner']['newOwner'] = 'Besitzer hinzufügen';
-$_LANG['addonCA']['distributionList']['editListForm']['addPreferencesDistribution']['replyEmail']['replyEmail'] = 'Antwort an';
-$_LANG['addonCA']['distributionList']['editListForm']['addPreferencesDistribution']['replyDisplayName']['replyDisplayName'] = '\'Reply To\' Anzeigename';
-$_LANG['addonCA']['distributionList']['editListForm']['addPreferencesDistribution']['replyEmailAddress']['replyEmailAddress'] = '\'Reply To\' Address';
+$_LANG['addonCA']['distributionList']['editListForm']['addPropertiesDistribution']['lang']['lang'] = 'Sprache';
+$_LANG['addonCA']['distributionList']['editListForm']['addPropertiesDistribution']['moderator']['moderator'] = 'Moderator';
+$_LANG['addonCA']['distributionList']['editListForm']['addPropertiesDistribution']['subscriptionRequest']['subscriptionRequest'] = 'Abonnementanfrage';
+$_LANG['addonCA']['distributionList']['editListForm']['addPropertiesDistribution']['subscriptionNotify']['subscriptionNotify'] = 'Abonnement-Benachrichtigung';
+$_LANG['addonCA']['distributionList']['editListForm']['addPreferencesDistribution']['memberPosting']['memberPosting'] = 'Senden von Mitgliedern';
+$_LANG['addonCA']['distributionList']['editListForm']['addPreferencesDistribution']['nonMemberPosting']['nonMemberPosting'] = 'Senden von nicht Mitgliedern';
+$_LANG['addonCA']['distributionList']['editListForm']['addPreferencesDistribution']['sendErrorsToModerator']['sendErrorsToModerator'] = 'Zustellungsfehler an Moderator senden';
+$_LANG['addonCA']['distributionList']['editListForm']['addPreferencesDistribution']['replyDisplayName']['replyDisplayName'] = '\'Antwort an\' Anzeigename';
+$_LANG['addonCA']['distributionList']['editListForm']['addPreferencesDistribution']['replyEmailAddress']['replyEmailAddress'] = '\'Antwort an\' Adresse';
 $_LANG['addonCA']['distributionList']['editListModal']['modal']['editListModal'] = 'Email Verteiler editieren';
 $_LANG['addonCA']['distributionList']['editListModal']['editMembersDistribution'] = 'Mitglieder';
 $_LANG['addonCA']['distributionList']['editListModal']['addPropertiesDistribution'] = 'Eigenschaften';
@@ -687,10 +634,16 @@ $_LANG['addonCA']['ressource']['changePasswordModal']['baseCancelButton']['title
 $_LANG['Automatically accept'] = 'Automatisch akzeptieren';
 $_LANG['Require list owner approval'] = 'Benötigt die Bestätigung des Eigentümers';
 $_LANG['Automatically reject'] = 'Automatisch zurückweisen';
+$_LANG['Require moderator approval'] = 'Benötigt die Bestätigung des Moderators';
 $_LANG['mail@example.com'] = 'mail@example.com';
 $_LANG['phoneNumberPlaceholder'] = '071 111 22 33';
 $_LANG['kerio']['account']['status']['disabled']  = 'Deaktiviert';
 $_LANG['kerio']['account']['status']['enabled'] = 'Aktiviert';
+$_LANG['Sender'] = 'Sender';
+$_LANG['ThisList'] = 'Dieser Verteiler';
+$_LANG['SenderThisList'] = 'Sender und dieser Verteiler';
+$_LANG['german'] = 'deutsch';
+$_LANG['english'] = 'englisch';
 
 $_LANG['addonCA']['emailAccount']['mainContainer']['accounts']['actions']['More Actions'] = 'Mehr Aktionen';
 $_LANG['addonCA']['emailAccount']['accounts']['actions']['More Actions'] = 'Mehr Aktionen';