andre 2 лет назад
Родитель
Сommit
679f704049

+ 20 - 1
api/KerioWhmcs.php

@@ -322,7 +322,7 @@ class KerioWhmcs extends KerioConnectApi {
 	 * @param	array	fields to set
 	 * @return	array	Result of delete action
 	 */
-	public function modifyMailinglist($mlId,$fields) {
+	public function modifyMailinglist($fields,$mlId) {
 		$method = 'MailingLists.set';
 		$params['mlIds'] = array($mlId);
 		$params['pattern'] = $fields;
@@ -387,6 +387,25 @@ class KerioWhmcs extends KerioConnectApi {
 		return $result;
 	}
 
+	/**
+	 * Remove users from mailing list
+	 *
+	 * @param   array   List of fields of users to ba added
+	 * @param	string  Mailing list Id
+	 *
+	 * @return	array	List of mailing lists
+	 */
+	public function delMlUserList($members, $mlId) {
+		$method = 'MailingLists.removeMlUserList';
+
+		$params['members'] = $members;
+		$params['mlId'] = $mlId;
+
+		$result = $this->sendRequest($method, $params);
+
+		return $result;
+	}
+
 	/**
 	 * Get list of resources from a domain
 	 *

+ 2 - 2
app/UI/Client/DistributionList/Providers/EditListDataProvider.php

@@ -128,7 +128,7 @@ class EditListDataProvider extends AddListDataProvider
                 $allMembers[] = $member['emailAddress'];
             }
         }
-
+        $this->data['oldModerator'] = $this->data['moderator'];
         foreach($accounts as $account) {
             $users[] = $account['loginName'] . '@' . $this->getWhmcsParamByKey('domain');
         }
@@ -253,7 +253,7 @@ class EditListDataProvider extends AddListDataProvider
         }
         // change settings
         try {
-            $api->modifyMailinglist($this->formData['id'], $paramsSet);
+            $api->modifyMailinglist($paramsSet,$this->formData['id']);
         } catch (KerioApiException $error) {
             logModuleCall(
                 'kerioEmail',