Check whether groups add any members to a conversation in ConversationActioN::addPart...

Resolves #137

diff --git a/files/lib/data/conversation/ConversationAction.class.php b/files/lib/data/conversation/ConversationAction.class.php
index c7d8f595c7ea1d51f25e6df2afd4262dd93a946e..155142a460710e0bf69ec11048c24ac9be385cd4 100644 (file)
--- a/files/lib/data/conversation/ConversationAction.class.php
+++ b/files/lib/data/conversation/ConversationAction.class.php
@@ -836,10 +836,15 @@ class ConversationAction extends AbstractDatabaseObjectAction implements IClipbo
         */
        public function addParticipants() {
                try {
-                       $participantIDs = Conversation::validateParticipants($this->parameters['participants'], 'participants', $this->conversation->getParticipantIDs(true));
+                       $existingParticipants = $this->conversation->getParticipantIDs(true);
+                       $participantIDs = Conversation::validateParticipants($this->parameters['participants'], 'participants', $existingParticipants);
                        if (!empty($this->parameters['participantsGroupIDs']) && WCF::getSession()->getPermission('user.conversation.canAddGroupParticipants')) {
-                               $participantIDs = array_merge($participantIDs, Conversation::validateGroupParticipants($this->parameters['participantsGroupIDs'], 'participants', $this->conversation->getParticipantIDs(true)));
-                               $participantIDs = array_unique($participantIDs);
+                               $validGroupParticipants = Conversation::validateGroupParticipants($this->parameters['participantsGroupIDs'], 'participants', $existingParticipants);
+                               $validGroupParticipants = array_diff($validGroupParticipants, $participantIDs);
+                               if (empty($validGroupParticipants)) {
+                                       throw new UserInputException('participants', 'emptyGroup');
+                               }
+                               $participantIDs = array_merge($participantIDs, $validGroupParticipants);
                        }
                        
                        $parameters = [
@@ -850,9 +855,10 @@ class ConversationAction extends AbstractDatabaseObjectAction implements IClipbo
                }
                catch (UserInputException $e) {
                        $errorMessage = '';
-                       foreach ($e->getType() as $type) {
+                       $errors = is_array($e->getType()) ? $e->getType() : [['type' => $e->getType()]];
+                       foreach ($errors as $type) {
                                if (!empty($errorMessage)) $errorMessage .= ' ';
-                               $errorMessage .= WCF::getLanguage()->getDynamicVariable('wcf.conversation.participants.error.'.$type['type'], ['errorData' => ['username' => $type['username']]]);
+                               $errorMessage .= WCF::getLanguage()->getDynamicVariable('wcf.conversation.participants.error.'.$type['type'], ['errorData' => $type]);
                        }
                        
                        return [