From 567b90a35c9f8b3cef35fc311c24463fab514d4b Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 3 May 2014 20:14:47 +0200
Subject: [PATCH] Improve user option search

Searching certain user options can be enabled/disabled making it possible to search for "empty" user options.
---
 .../multiSelectSearchableOptionType.tpl       | 21 ++++++++++++++++++
 .../radioButtonSearchableOptionType.tpl       | 19 ++++++++++++++++
 .../templates/selectSearchableOptionType.tpl  | 22 +++++++++++++++++++
 .../templates/textSearchableOptionType.tpl    | 17 ++++++++++++++
 com.woltlab.wcf/userOption.xml                |  2 +-
 .../multiSelectSearchableOptionType.tpl       | 21 ++++++++++++++++++
 .../radioButtonSearchableOptionType.tpl       | 19 ++++++++++++++++
 .../templates/selectSearchableOptionType.tpl  | 22 +++++++++++++++++++
 .../templates/textSearchableOptionType.tpl    | 17 ++++++++++++++
 .../files/lib/form/UserSearchForm.class.php   |  5 +++++
 .../option/BirthdayOptionType.class.php       | 19 +++++++++++-----
 .../option/MultiSelectOptionType.class.php    | 16 +++++++++++++-
 .../option/RadioButtonOptionType.class.php    |  8 ++++---
 .../system/option/SelectOptionType.class.php  | 14 +++++++++---
 .../system/option/TextOptionType.class.php    | 21 ++++++++++++++----
 wcfsetup/install/lang/de.xml                  |  3 +++
 wcfsetup/install/lang/en.xml                  |  3 +++
 17 files changed, 232 insertions(+), 17 deletions(-)
 create mode 100644 com.woltlab.wcf/templates/multiSelectSearchableOptionType.tpl
 create mode 100644 com.woltlab.wcf/templates/radioButtonSearchableOptionType.tpl
 create mode 100644 com.woltlab.wcf/templates/selectSearchableOptionType.tpl
 create mode 100644 com.woltlab.wcf/templates/textSearchableOptionType.tpl
 create mode 100644 wcfsetup/install/files/acp/templates/multiSelectSearchableOptionType.tpl
 create mode 100644 wcfsetup/install/files/acp/templates/radioButtonSearchableOptionType.tpl
 create mode 100644 wcfsetup/install/files/acp/templates/selectSearchableOptionType.tpl
 create mode 100644 wcfsetup/install/files/acp/templates/textSearchableOptionType.tpl

diff --git a/com.woltlab.wcf/templates/multiSelectSearchableOptionType.tpl b/com.woltlab.wcf/templates/multiSelectSearchableOptionType.tpl
new file mode 100644
index 0000000000..67531cfdb2
--- /dev/null
+++ b/com.woltlab.wcf/templates/multiSelectSearchableOptionType.tpl
@@ -0,0 +1,21 @@
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+<select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple="multiple" size="{if $selectOptions|count > 10}10{else}{@$selectOptions|count}{/if}"{if !$searchOption} disabled="disabled"{/if}>
+	{foreach from=$selectOptions key=key item=selectOption}
+		<option value="{$key}"{if $key|in_array:$value} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
+	{/foreach}
+</select>
+
+<script data-relocate="true">
+//<![CDATA[
+$(function() {
+	$('#search_{$option->optionName}').change(function(event) {
+		if ($(event.currentTarget).prop('checked')) {
+			$('#{$option->optionName}').enable();
+		}
+		else {
+			$('#{$option->optionName}').disable();
+		}
+	});
+});
+//]]>
+</script>
diff --git a/com.woltlab.wcf/templates/radioButtonSearchableOptionType.tpl b/com.woltlab.wcf/templates/radioButtonSearchableOptionType.tpl
new file mode 100644
index 0000000000..b52bcd6d84
--- /dev/null
+++ b/com.woltlab.wcf/templates/radioButtonSearchableOptionType.tpl
@@ -0,0 +1,19 @@
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+{foreach from=$selectOptions key=key item=selectOption}
+	<label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if} /> {lang}{@$selectOption}{/lang}</label>
+{/foreach}
+
+<script data-relocate="true">
+//<![CDATA[
+$(function() {
+	$('#search_{$option->optionName}').change(function(event) {
+		if ($(event.currentTarget).prop('checked')) {
+			$('input[name="values[{$option->optionName}]"]').enable();
+		}
+		else {
+			$('input[name="values[{$option->optionName}]"]').disable();
+		}
+	});
+});
+//]]>
+</script>
diff --git a/com.woltlab.wcf/templates/selectSearchableOptionType.tpl b/com.woltlab.wcf/templates/selectSearchableOptionType.tpl
new file mode 100644
index 0000000000..cb54c0476f
--- /dev/null
+++ b/com.woltlab.wcf/templates/selectSearchableOptionType.tpl
@@ -0,0 +1,22 @@
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+<select id="{$option->optionName}" name="values[{$option->optionName}]"{if !$searchOption} disabled="disabled"{/if}>
+	{if !$allowEmptyValue|empty}<option value="">{lang}wcf.global.noSelection{/lang}</option>{/if}
+	{foreach from=$selectOptions key=key item=selectOption}
+		<option value="{$key}"{if $value == $key} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
+	{/foreach}
+</select>
+
+<script data-relocate="true">
+//<![CDATA[
+$(function() {
+	$('#search_{$option->optionName}').change(function(event) {
+		if ($(event.currentTarget).prop('checked')) {
+			$('#{$option->optionName}').enable();
+		}
+		else {
+			$('#{$option->optionName}').disable();
+		}
+	});
+});
+//]]>
+</script>
diff --git a/com.woltlab.wcf/templates/textSearchableOptionType.tpl b/com.woltlab.wcf/templates/textSearchableOptionType.tpl
new file mode 100644
index 0000000000..945e8366e7
--- /dev/null
+++ b/com.woltlab.wcf/templates/textSearchableOptionType.tpl
@@ -0,0 +1,17 @@
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchTextOption{/lang}</label>
+<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $inputClass} class="{@$inputClass}"{/if}{if !$searchOption} disabled="disabled"{/if} />
+
+<script data-relocate="true">
+//<![CDATA[
+$(function() {
+	$('#search_{$option->optionName}').change(function(event) {
+		if ($(event.currentTarget).prop('checked')) {
+			$('#{$option->optionName}').enable();
+		}
+		else {
+			$('#{$option->optionName}').disable();
+		}
+	});
+});
+//]]>
+</script>
diff --git a/com.woltlab.wcf/userOption.xml b/com.woltlab.wcf/userOption.xml
index 08a21e0feb..331acd191e 100644
--- a/com.woltlab.wcf/userOption.xml
+++ b/com.woltlab.wcf/userOption.xml
@@ -81,7 +81,7 @@
 			
 			<option name="gender">
 				<categoryname>profile.personal</categoryname>
-				<optiontype>radioButton</optiontype>
+				<optiontype>select</optiontype>
 				<outputclass>wcf\system\option\user\SelectOptionsUserOptionOutput</outputclass>
 				<selectoptions>
 					<![CDATA[0:wcf.global.noDeclaration
diff --git a/wcfsetup/install/files/acp/templates/multiSelectSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/multiSelectSearchableOptionType.tpl
new file mode 100644
index 0000000000..67531cfdb2
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/multiSelectSearchableOptionType.tpl
@@ -0,0 +1,21 @@
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+<select id="{$option->optionName}" name="values[{$option->optionName}][]" multiple="multiple" size="{if $selectOptions|count > 10}10{else}{@$selectOptions|count}{/if}"{if !$searchOption} disabled="disabled"{/if}>
+	{foreach from=$selectOptions key=key item=selectOption}
+		<option value="{$key}"{if $key|in_array:$value} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
+	{/foreach}
+</select>
+
+<script data-relocate="true">
+//<![CDATA[
+$(function() {
+	$('#search_{$option->optionName}').change(function(event) {
+		if ($(event.currentTarget).prop('checked')) {
+			$('#{$option->optionName}').enable();
+		}
+		else {
+			$('#{$option->optionName}').disable();
+		}
+	});
+});
+//]]>
+</script>
diff --git a/wcfsetup/install/files/acp/templates/radioButtonSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/radioButtonSearchableOptionType.tpl
new file mode 100644
index 0000000000..b52bcd6d84
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/radioButtonSearchableOptionType.tpl
@@ -0,0 +1,19 @@
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+{foreach from=$selectOptions key=key item=selectOption}
+	<label><input type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked="checked"{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {@$disableOptions[$key]}]" data-enable-options="[ {@$enableOptions[$key]}]"{/if} /> {lang}{@$selectOption}{/lang}</label>
+{/foreach}
+
+<script data-relocate="true">
+//<![CDATA[
+$(function() {
+	$('#search_{$option->optionName}').change(function(event) {
+		if ($(event.currentTarget).prop('checked')) {
+			$('input[name="values[{$option->optionName}]"]').enable();
+		}
+		else {
+			$('input[name="values[{$option->optionName}]"]').disable();
+		}
+	});
+});
+//]]>
+</script>
diff --git a/wcfsetup/install/files/acp/templates/selectSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/selectSearchableOptionType.tpl
new file mode 100644
index 0000000000..cb54c0476f
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/selectSearchableOptionType.tpl
@@ -0,0 +1,22 @@
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchRadioButtonOption{/lang}</label>
+<select id="{$option->optionName}" name="values[{$option->optionName}]"{if !$searchOption} disabled="disabled"{/if}>
+	{if !$allowEmptyValue|empty}<option value="">{lang}wcf.global.noSelection{/lang}</option>{/if}
+	{foreach from=$selectOptions key=key item=selectOption}
+		<option value="{$key}"{if $value == $key} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
+	{/foreach}
+</select>
+
+<script data-relocate="true">
+//<![CDATA[
+$(function() {
+	$('#search_{$option->optionName}').change(function(event) {
+		if ($(event.currentTarget).prop('checked')) {
+			$('#{$option->optionName}').enable();
+		}
+		else {
+			$('#{$option->optionName}').disable();
+		}
+	});
+});
+//]]>
+</script>
diff --git a/wcfsetup/install/files/acp/templates/textSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/textSearchableOptionType.tpl
new file mode 100644
index 0000000000..945e8366e7
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/textSearchableOptionType.tpl
@@ -0,0 +1,17 @@
+<label><input type="checkbox" id="search_{$option->optionName}" name="searchOptions[{$option->optionName}]"{if $searchOption} checked="checked"{/if} /> {lang}wcf.user.option.searchTextOption{/lang}</label>
+<input type="{@$inputType}" id="{$option->optionName}" name="values[{$option->optionName}]" value="{$value}"{if $inputClass} class="{@$inputClass}"{/if}{if !$searchOption} disabled="disabled"{/if} />
+
+<script data-relocate="true">
+//<![CDATA[
+$(function() {
+	$('#search_{$option->optionName}').change(function(event) {
+		if ($(event.currentTarget).prop('checked')) {
+			$('#{$option->optionName}').enable();
+		}
+		else {
+			$('#{$option->optionName}').disable();
+		}
+	});
+});
+//]]>
+</script>
diff --git a/wcfsetup/install/files/lib/form/UserSearchForm.class.php b/wcfsetup/install/files/lib/form/UserSearchForm.class.php
index 4a36780351..7e9ebc6abb 100644
--- a/wcfsetup/install/files/lib/form/UserSearchForm.class.php
+++ b/wcfsetup/install/files/lib/form/UserSearchForm.class.php
@@ -172,6 +172,11 @@ class UserSearchForm extends UserOptionListForm {
 		// dynamic fields
 		$this->buildDynamicConditions();
 		
+		// if no conditions exists, no need to send query
+		if (!count($this->conditions->getParameters())) {
+			return;
+		}
+		
 		// do search
 		$statement = WCF::getDB()->prepareStatement($sql.$this->conditions, $this->maxResults);
 		$statement->execute($this->conditions->getParameters());
diff --git a/wcfsetup/install/files/lib/system/option/BirthdayOptionType.class.php b/wcfsetup/install/files/lib/system/option/BirthdayOptionType.class.php
index b751a59c02..ebb982a1ee 100644
--- a/wcfsetup/install/files/lib/system/option/BirthdayOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/BirthdayOptionType.class.php
@@ -19,8 +19,7 @@ use wcf\util\DateUtil;
  */
 class BirthdayOptionType extends DateOptionType {
 	/**
-	 * input css class
-	 * @var	string
+	 * @see	\wcf\system\option\TextOptionType::$inputClass
 	 */
 	protected $inputClass = 'birthday';
 	
@@ -67,18 +66,28 @@ class BirthdayOptionType extends DateOptionType {
 	 * @see	\wcf\system\option\ISearchableUserOption::getCondition()
 	 */
 	public function getCondition(PreparedStatementConditionBuilder &$conditions, Option $option, $value) {
-		if (empty($value['ageFrom']) || empty($value['ageTo'])) return false;
+		if (empty($value['ageFrom']) && empty($value['ageTo'])) return false;
 		
 		$ageFrom = intval($value['ageFrom']);
 		$ageTo = intval($value['ageTo']);
 		if ($ageFrom < 0 || $ageFrom > 120) return false;
 		if ($ageTo < 0 || $ageTo > 120) return false;
-		if (!$ageFrom || !$ageTo) return false;
 		
 		$dateFrom = DateUtil::getDateTimeByTimestamp(TIME_NOW)->sub(new \DateInterval('P'.($ageTo + 1).'Y'))->add(new \DateInterval('P1D'));
 		$dateTo = DateUtil::getDateTimeByTimestamp(TIME_NOW)->sub(new \DateInterval('P'.$ageFrom.'Y'));
 		
-		$conditions->add("option_value.userOption".User::getUserOptionID('birthdayShowYear')." = ? AND option_value.userOption".$option->optionID." BETWEEN DATE(?) AND DATE(?)", array(1, $dateFrom->format('Y-m-d'), $dateTo->format('Y-m-d')));
+		$conditions->add('option_value.userOption'.User::getUserOptionID('birthdayShowYear').' = ?', array(1));
+		
+		if ($ageFrom && $ageTo) {
+			$conditions->add('option_value.userOption'.$option->optionID.' BETWEEN DATE(?) AND DATE(?)', array($dateFrom->format('Y-m-d'), $dateTo->format('Y-m-d')));
+		}
+		else if ($ageFrom) {
+			$conditions->add('option_value.userOption'.$option->optionID.' BETWEEN DATE(?) AND DATE(?)', array('1893-01-01', $dateTo->format('Y-m-d')));
+		}
+		else {
+			$conditions->add('option_value.userOption'.$option->optionID.' BETWEEN DATE(?) AND DATE(?)', array($dateFrom->format('Y-m-d'), DateUtil::getDateTimeByTimestamp(TIME_NOW)->add(new \DateInterval('P1D'))->format('Y-m-d')));
+		}
+		
 		return true;
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php b/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php
index 5b265baeac..99d749c8ef 100644
--- a/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php
@@ -29,6 +29,19 @@ class MultiSelectOptionType extends SelectOptionType {
 		return WCF::getTPL()->fetch('multiSelectOptionType');
 	}
 	
+	/**
+	 * @see	\wcf\system\option\ISearchableUserOption::getSearchFormElement()
+	 */
+	public function getSearchFormElement(Option $option, $value) {
+		WCF::getTPL()->assign(array(
+			'option' => $option,
+			'searchOption' => isset($_POST['searchOptions'][$option->optionName]),
+			'selectOptions' => $option->parseSelectOptions(),
+			'value' => (!is_array($value) ? explode("\n", $value) : $value)
+		));
+		return WCF::getTPL()->fetch('multiSelectSearchableOptionType');
+	}
+	
 	/**
 	 * @see	\wcf\system\option\IOptionType::validate()
 	 */
@@ -54,9 +67,10 @@ class MultiSelectOptionType extends SelectOptionType {
 	 * @see	\wcf\system\option\ISearchableUserOption::getCondition()
 	 */
 	public function getCondition(PreparedStatementConditionBuilder &$conditions, Option $option, $value) {
+		if (!isset($_POST['searchOptions'][$option->optionName])) return false;
+		
 		if (!is_array($value) || empty($value)) return false;
 		$value = ArrayUtil::trim($value);
-		if (empty($value)) return false;
 		
 		$conditions->add("option_value.userOption".$option->optionID." REGEXP '".'(^|\n)'.implode('\n([^\n]*\n)*', array_map('escapeString', $value)).'($|\n)'."'");
 		return true;
diff --git a/wcfsetup/install/files/lib/system/option/RadioButtonOptionType.class.php b/wcfsetup/install/files/lib/system/option/RadioButtonOptionType.class.php
index b8ed825495..149689b248 100644
--- a/wcfsetup/install/files/lib/system/option/RadioButtonOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/RadioButtonOptionType.class.php
@@ -69,6 +69,9 @@ class RadioButtonOptionType extends AbstractOptionType implements ISearchableUse
 	 * @see	\wcf\system\option\ISearchableUserOption::getSearchFormElement()
 	 */
 	public function getSearchFormElement(Option $option, $value) {
+		$this->templateName = 'radioButtonSearchableOptionType';
+		WCF::getTPL()->assign('searchOption', empty($_POST) || isset($_POST['searchOptions'][$option->optionName]));
+		
 		return $this->getFormElement($option, $value);
 	}
 	
@@ -76,10 +79,9 @@ class RadioButtonOptionType extends AbstractOptionType implements ISearchableUse
 	 * @see	\wcf\system\option\ISearchableUserOption::getCondition()
 	 */
 	public function getCondition(PreparedStatementConditionBuilder &$conditions, Option $option, $value) {
-		$value = StringUtil::trim($value);
-		if (!$value) return false;
+		if (!isset($_POST['searchOptions'][$option->optionName])) return false;
 		
-		$conditions->add("option_value.userOption".$option->optionID." = ?", array($value));
+		$conditions->add("option_value.userOption".$option->optionID." = ?", array(StringUtil::trim($value)));
 		return true;
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php b/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php
index 8b92366114..4bc8140797 100644
--- a/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/SelectOptionType.class.php
@@ -20,7 +20,6 @@ class SelectOptionType extends RadioButtonOptionType {
 	 * @see	\wcf\system\option\IOptionType::getFormElement()
 	 */
 	public function getFormElement(Option $option, $value) {
-		// get options
 		$options = $this->parseEnableOptions($option);
 		
 		WCF::getTPL()->assign(array(
@@ -38,8 +37,17 @@ class SelectOptionType extends RadioButtonOptionType {
 	 * @see	\wcf\system\option\ISearchableUserOption::getSearchFormElement()
 	 */
 	public function getSearchFormElement(Option $option, $value) {
-		$this->allowEmptyValue = true;
-		return $this->getFormElement($option, $value);
+		$options = $this->parseEnableOptions($option);
+		
+		WCF::getTPL()->assign(array(
+			'disableOptions' => $options['disableOptions'],
+			'enableOptions' => $options['enableOptions'],
+			'option' => $option,
+			'searchOption' => isset($_POST['searchOptions'][$option->optionName]),
+			'selectOptions' => $option->parseSelectOptions(),
+			'value' => $value
+		));
+		return WCF::getTPL()->fetch('selectSearchableOptionType');
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/option/TextOptionType.class.php b/wcfsetup/install/files/lib/system/option/TextOptionType.class.php
index 1c6cd31bf6..71f4d6988a 100644
--- a/wcfsetup/install/files/lib/system/option/TextOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/TextOptionType.class.php
@@ -46,17 +46,30 @@ class TextOptionType extends AbstractOptionType implements ISearchableUserOption
 	 * @see	\wcf\system\option\ISearchableUserOption::getSearchFormElement()
 	 */
 	public function getSearchFormElement(Option $option, $value) {
-		return $this->getFormElement($option, $value);
+		WCF::getTPL()->assign(array(
+			'option' => $option,
+			'inputType' => $this->inputType,
+			'inputClass' => $this->inputClass,
+			'searchOption' => isset($_POST['searchOptions'][$option->optionName]),
+			'value' => $value
+		));
+		return WCF::getTPL()->fetch('textSearchableOptionType');
 	}
 	
 	/**
 	 * @see	\wcf\system\option\ISearchableUserOption::getCondition()
 	 */
 	public function getCondition(PreparedStatementConditionBuilder &$conditions, Option $option, $value) {
+		if (!isset($_POST['searchOptions'][$option->optionName])) return false;
+		
 		$value = StringUtil::trim($value);
-		if (empty($value)) return false;
+		if ($value == '') {
+			$conditions->add("option_value.userOption".$option->optionID." = ?", array(''));
+		}
+		else {
+			$conditions->add("option_value.userOption".$option->optionID." LIKE ?", array('%'.addcslashes($value, '_%').'%'));
+		}
 		
-		$conditions->add("option_value.userOption".$option->optionID." LIKE ?", array('%'.addcslashes($value, '_%').'%'));
 		return true;
 	}
 	
@@ -86,7 +99,7 @@ class TextOptionType extends AbstractOptionType implements ISearchableUserOption
 	 * 
 	 * @param	\wcf\data\option\Option		$option
 	 * @param	string				$newValue
-	 * @return					string
+	 * @return	string
 	 */
 	protected function getContent(Option $option, $newValue) {
 		if ($option->contentpattern) {
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 3e3f1fb53d..977a5e05d3 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2602,6 +2602,9 @@ Möchten Sie diese E-Mail-Benachrichtigung in Zukunft nicht mehr erhalten, könn
 		<item name="wcf.user.option.googlePlus"><![CDATA[Google+]]></item>
 		<item name="wcf.user.option.googlePlus.description"><![CDATA[21-stellige Google-Plus-ID]]></item>
 		<item name="wcf.user.option.canWriteProfileComments"><![CDATA[Kann Pinnwand-Kommentare schreiben]]></item>
+		
+		<item name="wcf.user.option.searchRadioButtonOption"><![CDATA[Auswahl des Benutzers bei „{lang}wcf.user.option.{$option->optionName}{/lang}“:]]></item>
+		<item name="wcf.user.option.searchTextOption"><![CDATA[„{lang}wcf.user.option.{$option->optionName}{/lang}“ enthält:]]></item>
 	</category>
 	
 	<category name="wcf.user.mail">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index c0d791bcc2..b79060a608 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2575,6 +2575,9 @@ If you do not want to receive further email notifications for this event, you ca
 		<item name="wcf.user.option.googlePlus"><![CDATA[Google+]]></item>
 		<item name="wcf.user.option.googlePlus.description"><![CDATA[21 digits Google Plus user ID]]></item>
 		<item name="wcf.user.option.canWriteProfileComments"><![CDATA[Can Write Comments on My Wall]]></item>
+		
+		<item name="wcf.user.option.searchRadioButtonOption"><![CDATA[User's selection for “{lang}wcf.user.option.{$option->optionName}{/lang}”:]]></item>
+		<item name="wcf.user.option.searchTextOption"><![CDATA[“{lang}wcf.user.option.{$option->optionName}{/lang}” contains:]]></item>
 	</category>
 	
 	<category name="wcf.user.mail">
-- 
2.20.1