From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 20 Jul 2016 11:01:11 +0000 (+0200)
Subject: Added support for disallowed bbcodes
X-Git-Tag: 3.0.0_Beta_1~1034
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=efa3d4eea526e29277183f4e02a78a487fa01a59;p=GitHub%2FWoltLab%2FWCF.git

Added support for disallowed bbcodes
---

diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index 292309df29..11c87f89fb 100644
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -540,26 +540,9 @@ pdf]]></defaultvalue>
 			</option>
 			
 			<!-- user.message -->
-			<option name="user.message.canUseSmilies">
-				<categoryname>user.message</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>1</defaultvalue>
-			</option>
-			<option name="user.message.canUseHtml">
-				<categoryname>user.message</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-			</option>
-			<option name="user.message.canUseBBCodes">
-				<categoryname>user.message</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>1</defaultvalue>
-			</option>
-			<option name="user.message.allowedBBCodes">
+			<option name="user.message.disallowedBBCodes">
 				<categoryname>user.message</categoryname>
 				<optiontype>BBCodeSelect</optiontype>
-				<defaultvalue>all</defaultvalue>
 			</option>
 			<!-- /user.message -->
 			
@@ -574,28 +557,6 @@ pdf]]></defaultvalue>
 			<!-- /user.message.comment -->
 			
 			<!-- user.signature -->
-			<option name="user.signature.canUseSmilies">
-				<categoryname>user.signature</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>1</defaultvalue>
-				<usersonly>1</usersonly>
-				<options>module_user_signature</options>
-			</option>
-			<option name="user.signature.canUseHtml">
-				<categoryname>user.signature</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-				<usersonly>1</usersonly>
-				<options>module_user_signature</options>
-			</option>
-			<option name="user.signature.canUseBBCodes">
-				<categoryname>user.signature</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>1</defaultvalue>
-				<usersonly>1</usersonly>
-				<options>module_user_signature</options>
-			</option>
 			<option name="user.signature.maxLength">
 				<categoryname>user.signature</categoryname>
 				<optiontype>integer</optiontype>
@@ -606,10 +567,9 @@ pdf]]></defaultvalue>
 				<usersonly>1</usersonly>
 				<options>module_user_signature</options>
 			</option>
-			<option name="user.signature.allowedBBCodes">
+			<option name="user.signature.disallowedBBCodes">
 				<categoryname>user.signature</categoryname>
 				<optiontype>BBCodeSelect</optiontype>
-				<defaultvalue>all</defaultvalue>
 				<usersonly>1</usersonly>
 				<options>module_user_signature</options>
 			</option>