From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 23 May 2014 14:18:49 +0000 (+0200)
Subject: Added max length permission for about me
X-Git-Tag: 2.1.0_Alpha_1~804
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=258172f6d673c3659e623ce80ef9213c19761b4e;p=GitHub%2FWoltLab%2FWCF.git

Added max length permission for about me
---

diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index ac5ac5cc0f..3579938f2d 100644
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -508,6 +508,14 @@ pdf]]></defaultvalue>
 				<defaultvalue>0</defaultvalue>
 				<admindefaultvalue>1</admindefaultvalue>
 			</option>
+			<option name="user.profile.aboutMeMaxLength">
+				<categoryname>user.profile</categoryname>
+				<optiontype>integer</optiontype>
+				<defaultvalue>1000</defaultvalue>
+				<admindefaultvalue>10000</admindefaultvalue>
+				<minvalue>100</minvalue>
+				<maxvalue>65535</maxvalue>
+			</option>
 			
 			<option name="user.profile.avatar.canSeeAvatars">
 				<categoryname>user.profile.avatar</categoryname>
diff --git a/com.woltlab.wcf/userOption.xml b/com.woltlab.wcf/userOption.xml
index 331acd191e..1edad995a0 100644
--- a/com.woltlab.wcf/userOption.xml
+++ b/com.woltlab.wcf/userOption.xml
@@ -57,11 +57,10 @@
 			<!-- profile -->
 			<option name="aboutMe">
 				<categoryname>profile.aboutMe</categoryname>
-				<optiontype>message</optiontype>
+				<optiontype>aboutMe</optiontype>
 				<outputclass>wcf\system\option\user\MessageUserOptionOutput</outputclass>
 				<visible>15</visible>
 				<editable>3</editable>
-				<maxlength>1000</maxlength>
 			</option>
 			<option name="birthday">
 				<categoryname>profile.personal</categoryname>
diff --git a/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php
index d1823c14b7..153d737358 100644
--- a/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php
@@ -124,7 +124,7 @@ class UserOptionAddForm extends AbstractForm {
 	 * available option types
 	 * @var	array<string>
 	 */
-	public static $availableOptionTypes = array('birthday', 'boolean', 'date', 'integer', 'float', 'password', 'multiSelect', 'radioButton', 'select', 'text', 'textarea', 'message', 'URL');
+	public static $availableOptionTypes = array('aboutMe', 'birthday', 'boolean', 'date', 'integer', 'float', 'password', 'multiSelect', 'radioButton', 'select', 'text', 'textarea', 'message', 'URL');
 	
 	/**
 	 * list of option type that require select options
diff --git a/wcfsetup/install/files/lib/system/option/AboutMeOptionType.class.php b/wcfsetup/install/files/lib/system/option/AboutMeOptionType.class.php
new file mode 100644
index 0000000000..34e74a4cdf
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/option/AboutMeOptionType.class.php
@@ -0,0 +1,28 @@
+<?php
+namespace wcf\system\option;
+use wcf\data\option\Option;
+use wcf\system\exception\UserInputException;
+use wcf\system\WCF;
+
+/**
+ * Option type implementation for the 'about me' text field.
+ *
+ * @author	Marcel Werk
+ * @copyright	2001-2014 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @subpackage	system.option
+ * @category	Community Framework
+ */
+class AboutMeOptionType extends MessageOptionType {
+	/**
+	 * @see	\wcf\system\option\IOptionType::validate()
+	 */
+	public function validate(Option $option, $newValue) {
+		parent::validate($option, $newValue);
+	
+		if (WCF::getSession()->getPermission('user.profile.aboutMeMaxLength') < mb_strlen($newValue)) {
+			throw new UserInputException($option->optionName, 'tooLong');
+		}
+	}
+}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 5e2b6d8ad9..4ce0f8686f 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -386,6 +386,7 @@
 		<item name="wcf.acp.group.assignment.list"><![CDATA[Automatische Benutzergruppen-Zuordnungen]]></item>
 		<item name="wcf.acp.group.assignment.userGroup"><![CDATA[Benutzergruppe]]></item>
 		<item name="wcf.acp.group.assignment.isDisabled"><![CDATA[Automatische Zuordnung deaktivieren]]></item>
+		<item name="wcf.acp.group.option.user.profile.aboutMeMaxLength"><![CDATA[Maximallänge „Über mich“]]></item>
 	</category>
 	
 	<category name="wcf.acp.index">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index eb778f0ca5..4fa346547a 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -385,6 +385,7 @@ Examples for medium ID detection:
 		<item name="wcf.acp.group.assignment.list"><![CDATA[Automatic User Group Assignments]]></item>
 		<item name="wcf.acp.group.assignment.userGroup"><![CDATA[User Group]]></item>
 		<item name="wcf.acp.group.assignment.isDisabled"><![CDATA[Disable Automatic Assignment]]></item>
+		<item name="wcf.acp.group.option.user.profile.aboutMeMaxLength"><![CDATA[TODO: Maximallänge „Über mich“]]></item>
 	</category>
 	
 	<category name="wcf.acp.index">