|
|
@@ -76,8 +76,8 @@ class AddListDataProvider extends BaseDataProvider
|
|
|
$this->availableValues['moderator']['none'] = $lang->absoluteT('none');
|
|
|
foreach($accounts as $account)
|
|
|
{
|
|
|
- $this->availableValues['memberList'][$account['loginName' . '@' . $this->maildomain]] = $account['loginName'] . '@' . $this->maildomain;
|
|
|
- $this->availableValues['moderator'][$account['loginName' . '@' . $this->maildomain]] = $account['loginName'] . '@' . $this->maildomain;
|
|
|
+ $this->availableValues['memberList'][$account['loginName']] = $account['loginName'] . '@' . $this->maildomain;
|
|
|
+ $this->availableValues['moderator'][$account['loginName']] = $account['loginName'] . '@' . $this->maildomain;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -126,6 +126,10 @@ class AddListDataProvider extends BaseDataProvider
|
|
|
*/
|
|
|
$customMembers = explode(',',$this->formData['customMember']);
|
|
|
|
|
|
+ foreach($this->formData['memberList'] as $member) {
|
|
|
+ $member = $member . '@' . $this->maildomain;
|
|
|
+ }
|
|
|
+
|
|
|
foreach($customMembers as $customMember)
|
|
|
{
|
|
|
if($customMember !== '' && !in_array($customMember, $this->formData['memberList']))
|