Merge branch '5.3'

[GitHub/WoltLab/com.woltlab.wcf.conversation.git] / userGroupOption.xml

diff --git a/userGroupOption.xml b/userGroupOption.xml
index fc7b4455e758483e655192794ff7cf9a01cccbbc..355eba556d0a493283e05006c562cf6d1f80a03b 100644 (file)
--- a/userGroupOption.xml
+++ b/userGroupOption.xml
@@ -35,9 +35,16 @@
                                <categoryname>user.conversation</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>1</defaultvalue>
-                               <enableoptions>user.conversation.canStartConversation,user.conversation.canSetCanInvite,user.conversation.canEditMessage,user.conversation.canAddInvisibleParticipants,user.conversation.maxParticipants,user.conversation.maxConversations,user.conversation.maxLabels,user.conversation.maxLength,user.conversation.canUploadAttachment,user.conversation.maxAttachmentSize,user.conversation.allowedAttachmentExtensions,user.conversation.maxAttachmentCount</enableoptions>
+                               <enableoptions>user.conversation.canReplyToConversation,user.conversation.canSetCanInvite,user.conversation.canEditMessage,user.conversation.canAddInvisibleParticipants,user.conversation.maxParticipants,user.conversation.maxConversations,user.conversation.maxLabels,user.conversation.maxLength,user.conversation.canUploadAttachment,user.conversation.maxAttachmentSize,user.conversation.allowedAttachmentExtensions,user.conversation.maxAttachmentCount</enableoptions>
                                <usersonly>1</usersonly>
                        </option>
+                       <option name="user.conversation.canReplyToConversation">
+                               <categoryname>user.conversation</categoryname>
+                               <optiontype>boolean</optiontype>
+                               <defaultvalue>1</defaultvalue>
+                               <usersonly>1</usersonly>
+                               <enableoptions>user.conversation.canStartConversation</enableoptions>
+                       </option>
                        <option name="user.conversation.canStartConversation">
                                <categoryname>user.conversation</categoryname>
                                <optiontype>boolean</optiontype>
@@ -69,7 +76,6 @@
                                <usersonly>1</usersonly>
                                <admindefaultvalue>1</admindefaultvalue>
                        </option>
-                       
                        <option name="user.conversation.maxParticipants">
                                <categoryname>user.conversation</categoryname>
                                <optiontype>integer</optiontype>
@@ -86,6 +92,15 @@
                                <maxvalue>100000</maxvalue>
                                <usersonly>1</usersonly>
                        </option>
+                       <option name="user.conversation.floodControlTime">
+                               <categoryname>user.conversation</categoryname>
+                               <optiontype>inverseInteger</optiontype>
+                               <defaultvalue>60</defaultvalue>
+                               <minvalue>0</minvalue>
+                               <suffix>seconds</suffix>
+                               <admindefaultvalue>0</admindefaultvalue>
+                               <usersonly>1</usersonly>
+                       </option>
                        <option name="user.conversation.maxStartedConversationsPer24Hours">
                                <categoryname>user.conversation</categoryname>
                                <optiontype>infiniteInteger</optiontype>
@@ -114,14 +129,12 @@
                                <categoryname>user.conversation</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>1</defaultvalue>
-                               <options>module_attachment</options>
                                <usersonly>1</usersonly>
                        </option>
                        <option name="user.conversation.maxAttachmentSize">
                                <categoryname>user.conversation</categoryname>
                                <optiontype>fileSize</optiontype>
-                               <defaultvalue>1000000</defaultvalue>
-                               <options>module_attachment</options>
+                               <defaultvalue>2000000</defaultvalue>
                                <minvalue>10000</minvalue>
                                <usersonly>1</usersonly>
                        </option>
@@ -132,11 +145,11 @@
 jpg
 jpeg
 png
+webp
 bmp
 zip
 txt
 pdf</defaultvalue>
-                               <options>module_attachment</options>
                                <usersonly>1</usersonly>
                                <wildcard>*</wildcard>
                        </option>
@@ -144,7 +157,6 @@ pdf</defaultvalue>
                                <categoryname>user.conversation</categoryname>
                                <optiontype>integer</optiontype>
                                <defaultvalue>5</defaultvalue>
-                               <options>module_attachment</options>
                                <minvalue>1</minvalue>
                                <maxvalue>100</maxvalue>
                                <usersonly>1</usersonly>