From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 23 Jun 2013 18:13:45 +0000 (+0200)
Subject: Added wildcard support
X-Git-Tag: 2.0.0_Beta_4~4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2dd14c7cc8ee29ecfc5f19435edac1fffe689434;p=GitHub%2FWoltLab%2FWCF.git

Added wildcard support
---

diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index 221283e850..46add8db97 100644
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -284,6 +284,7 @@ bmp
 zip
 txt
 pdf]]></defaultvalue>
+				<wildcard><![CDATA[*]]></wildcard>
 			</option>
 			<option name="user.attachment.maxCount">
 				<categoryname>user.message.attachment</categoryname>
diff --git a/wcfsetup/install/files/lib/system/option/TextareaOptionType.class.php b/wcfsetup/install/files/lib/system/option/TextareaOptionType.class.php
index 47d6d167e2..7b5036f2d8 100644
--- a/wcfsetup/install/files/lib/system/option/TextareaOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/TextareaOptionType.class.php
@@ -8,7 +8,7 @@ use wcf\util\StringUtil;
  * Option type implementation for textareas.
  * 
  * @author	Marcel Werk
- * @copyright	2001-2012 WoltLab GmbH
+ * @copyright	2001-2013 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package	com.woltlab.wcf
  * @subpackage	system.option
@@ -30,6 +30,16 @@ class TextareaOptionType extends TextOptionType {
 	 * @see	wcf\system\option\IOptionType::getData()
 	 */
 	public function getData(Option $option, $newValue) {
-		return StringUtil::unifyNewlines(parent::getData($option, $newValue));
+		$newValue = StringUtil::unifyNewlines(parent::getData($option, $newValue));
+		
+		// check for wildcard
+		if ($option->wildcard) {
+			$values = explode("\n", $newValue);
+			if (in_array($option->wildcard, $values)) {
+				$newValue = $option->wildcard;
+			}
+		}
+		
+		return $newValue;
 	}
 }