From 4dc423aa49a2a74b1352871668d66d238a010d10 Mon Sep 17 00:00:00 2001
From: Sascha Greuel <sascha@softcreatr.de>
Date: Fri, 18 Oct 2013 01:48:22 +0200
Subject: [PATCH] Added further usergroup options

- Added option to (dis)allow adding invisible participants
- Added option to (dis)allow setting "participantCanInvite"
---
 files/lib/form/ConversationAddForm.class.php | 10 ++++++++++
 language/de.xml                              |  2 ++
 language/en.xml                              |  2 ++
 templates/conversationAdd.tpl                |  4 ++++
 userGroupOption.xml                          | 12 +++++++++++-
 5 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/files/lib/form/ConversationAddForm.class.php b/files/lib/form/ConversationAddForm.class.php
index 2b1920a..09cdd88 100644
--- a/files/lib/form/ConversationAddForm.class.php
+++ b/files/lib/form/ConversationAddForm.class.php
@@ -147,6 +147,16 @@ class ConversationAddForm extends MessageForm {
 			throw new UserInputException('participants');
 		}
 		
+		// check, if user is allowed to set invisible participants
+		if (!WCF::getSession()->getPermission('user.conversation.canAddInvisibleParticipants') && !empty($this->invisibleParticipants)) {
+			throw new UserInputException('participants', 'invisibleParticipantsNoPermission');
+		}
+		
+		// check, if user is allowed to set participantCanInvite
+		if (!WCF::getSession()->getPermission('user.conversation.canAddInvisibleParticipants') && $this->participantCanInvite) {
+			throw new UserInputException('participantCanInvite', 'participantCanInviteNoPermission');
+		}
+		
 		$this->participantIDs = Conversation::validateParticipants($this->participants);
 		$this->invisibleParticipantIDs = Conversation::validateParticipants($this->invisibleParticipants, 'invisibleParticipants');
 		
diff --git a/language/de.xml b/language/de.xml
index 1879dde..ccee843 100644
--- a/language/de.xml
+++ b/language/de.xml
@@ -85,6 +85,8 @@
 		<item name="wcf.conversation.participants.error.doesNotAcceptConversation"><![CDATA[„{$errorData[username]}“ möchte nicht an Konversationen teilnehmen.]]></item>
 		<item name="wcf.conversation.participants.error.ignoresYou"><![CDATA[„{$errorData[username]}“ hat Sie blockiert.]]></item>
 		<item name="wcf.conversation.participants.error.tooManyParticipants"><![CDATA[Sie haben zu viele Teilnehmer angegeben. Das Maximum liegt bei {#$__wcf->getSession()->getPermission('user.conversation.maxParticipants')} Teilnehmern.]]></item>
+		<item name="wcf.conversation.participants.error.invisibleParticipantsNoPermission"><![CDATA[Sie haben keine Berechtigung, unsichtbare Teilnehmer hinzuzufügen.]]></item>
+		<item name="wcf.conversation.participants.error.participantCanInviteNoPermission"><![CDATA[Sie haben keine Berechtigung, Teilnehmern das Hinzufügen weiterer Teilnehmer zu erlauben.]]></item>
 		<item name="wcf.conversation.participants.removeParticipant"><![CDATA[Teilnehmer entfernen]]></item>
 		<item name="wcf.conversation.participants.removeParticipant.confirmMessage"><![CDATA[Wollen Sie „{$participant->username}“ wirklich aus dieser Konversation entfernen?]]></item>
 		<item name="wcf.conversation.quota"><![CDATA[Speicherplatz]]></item>
diff --git a/language/en.xml b/language/en.xml
index 6a40967..e064a5b 100644
--- a/language/en.xml
+++ b/language/en.xml
@@ -85,6 +85,8 @@
 		<item name="wcf.conversation.participants.error.doesNotAcceptConversation"><![CDATA[“{$errorData[username]}” does not want to be added to conversations.]]></item>
 		<item name="wcf.conversation.participants.error.ignoresYou"><![CDATA[“{$errorData[username]}” is blocking you.]]></item>
 		<item name="wcf.conversation.participants.error.tooManyParticipants"><![CDATA[You have added too many participants. You may add up to {#$__wcf->getSession()->getPermission('user.conversation.maxParticipants')} participants.]]></item>
+		<item name="wcf.conversation.participants.error.invisibleParticipantsNoPermission"><![CDATA[You don't have the permission to add invisible participants.]]></item>
+		<item name="wcf.conversation.participants.error.participantCanInviteNoPermission"><![CDATA[You don't have the permission to allow participants to add new participants.]]></item>
 		<item name="wcf.conversation.participants.removeParticipant"><![CDATA[Remove Participant]]></item>
 		<item name="wcf.conversation.participants.removeParticipant.confirmMessage"><![CDATA[Do you really want to remove “{$participant->username}” from this conversation?]]></item>
 		<item name="wcf.conversation.quota"><![CDATA[Quota]]></item>
diff --git a/templates/conversationAdd.tpl b/templates/conversationAdd.tpl
index 75f8283..198e579 100644
--- a/templates/conversationAdd.tpl
+++ b/templates/conversationAdd.tpl
@@ -83,6 +83,7 @@
 				</dd>
 			</dl>
 			
+			{if $__wcf->session->getPermission('user.conversation.canAddInvisibleParticipants')}
 			<dl{if $errorField == 'invisibleParticipants'} class="formError"{/if}>
 				<dt><label for="invisibleParticipants">{lang}wcf.conversation.invisibleParticipants{/lang}</label></dt>
 				<dd>
@@ -103,13 +104,16 @@
 					<small>{lang}wcf.conversation.invisibleParticipants.description{/lang}</small>
 				</dd>
 			</dl>
+			{/if}
 			
+			{if $__wcf->session->getPermission('user.conversation.canSetCanInvite')}
 			<dl>
 				<dt></dt>
 				<dd>
 					<label><input type="checkbox" name="participantCanInvite" id="participantCanInvite" value="1"{if $participantCanInvite} checked="checked"{/if} /> {lang}wcf.conversation.participantCanInvite{/lang}</label>
 				</dd>
 			</dl>
+			{/if}
 			
 			{event name='participantFields'}
 		</fieldset>
diff --git a/userGroupOption.xml b/userGroupOption.xml
index 4e98fbe..6094653 100644
--- a/userGroupOption.xml
+++ b/userGroupOption.xml
@@ -24,7 +24,17 @@
 				<categoryname>user.conversation</categoryname>
 				<optiontype>boolean</optiontype>
 				<defaultvalue>1</defaultvalue>
-				<enableoptions>user.conversation.maxParticipants,user.conversation.maxConversations,user.conversation.maxLabels,user.conversation.maxLength,user.conversation.canUploadAttachment</enableoptions>
+				<enableoptions>user.conversation.canSetCanInvite,user.conversation.canAddInvisibleParticipants,user.conversation.maxParticipants,user.conversation.maxConversations,user.conversation.maxLabels,user.conversation.maxLength,user.conversation.canUploadAttachment</enableoptions>
+			</option>
+			<option name="user.conversation.canSetCanInvite">
+				<categoryname>user.conversation</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>1</defaultvalue>
+			</option>
+			<option name="user.conversation.canAddInvisibleParticipants">
+				<categoryname>user.conversation</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>1</defaultvalue>
 			</option>
 			<option name="user.conversation.maxParticipants">
 				<categoryname>user.conversation</categoryname>
-- 
2.20.1