From c000b08aa464656ee2628745d69c3d322e97d61a Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 2 Jan 2012 16:43:12 +0100
Subject: [PATCH] Adds the possibility to exclude certain values from search

---
 wcfsetup/install/files/js/WCF.js              | 36 ++++++++++++++++++-
 .../files/lib/data/user/UserAction.class.php  | 30 +++++++++++-----
 2 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index f10e9e1938..901b187b14 100644
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -3070,6 +3070,12 @@ WCF.Search.Base = Class.extend({
 	 * @var	string
 	 */
 	_className: '',
+	
+	/**
+	 * list with values that are excluded from seaching
+	 * @var	array
+	 */
+	_excludedSearchValues: [],
 
 	/**
 	 * result list
@@ -3100,14 +3106,18 @@ WCF.Search.Base = Class.extend({
 	 * 
 	 * @param	jQuery		searchInput
 	 * @param	object		callback
+	 * @param	array		excludedSearchValues
 	 */
-	init: function(searchInput, callback) {
+	init: function(searchInput, callback, excludedSearchValues) {
 		if (!$.isFunction(callback)) {
 			console.debug("[WCF.Search.Base] Given callback is invalid, aborting.");
 			return;
 		}
 
 		this._callback = callback;
+		if (excludedSearchValues) {
+			this._excludedSearchValues = excludedSearchValues;
+		}
 		this._searchInput = $(searchInput).keyup($.proxy(this._keyUp, this));
 		this._searchInput.wrap('<div class="preInput" />');
 		this._list = $('<ul class="dropdown" />').insertAfter(this._searchInput);
@@ -3128,6 +3138,7 @@ WCF.Search.Base = Class.extend({
 		else if ($content.length >= this._triggerLength) {
 			var $parameters = {
 				data: {
+					excludedSearchValues: this._excludedSearchValues,
 					searchString: $content
 				}		
 			};
@@ -3219,6 +3230,29 @@ WCF.Search.Base = Class.extend({
 		}
 
 		this._list.removeClass('open').empty();
+	},
+	
+	/**
+	 * Adds an excluded search value.
+	 * 
+	 * @param	string		value
+	 */
+	addExcludedSearchValue: function(value) {
+		if (!WCF.inArray(value, this._excludedSearchValues)) {
+			this._excludedSearchValues.push(value);
+		}
+	},
+	
+	/**
+	 * Adds an excluded search value.
+	 * 
+	 * @param	string		value
+	 */
+	removeExcludedSearchValue: function(value) {
+		var index = $.inArray(value, this._excludedSearchValues);
+		if (index != -1) {
+			this._excludedSearchValues.splice(index, 1);
+		}
 	}
 });
 
diff --git a/wcfsetup/install/files/lib/data/user/UserAction.class.php b/wcfsetup/install/files/lib/data/user/UserAction.class.php
index 9bbfa4b76c..52e6ad9480 100644
--- a/wcfsetup/install/files/lib/data/user/UserAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/UserAction.class.php
@@ -155,29 +155,41 @@ class UserAction extends AbstractDatabaseObjectAction {
 	
 	public function getList() {
 		$searchString = $this->parameters['data']['searchString'];
+		$excludedSearchValues = array();
+		if (isset($this->parameters['data']['excludedSearchValues'])) {
+			$excludedSearchValues = $this->parameters['data']['excludedSearchValues'];
+		}
 		$list = array();
 	
 		if ($this->parameters['data']['includeUserGroups']) {
 			$accessibleGroups = UserGroup::getAccessibleGroups();
 			foreach ($accessibleGroups as $group) {
 				$groupName = WCF::getLanguage()->get($group->groupName);
-				$pos = StringUtil::indexOfIgnoreCase($groupName, $searchString);
-				if ($pos !== false && $pos == 0) {
-					$list[] = array(
-						'label' => $groupName,
-						'objectID' => $group->groupID,
-						'type' => 'group'
-					);
+				if (!in_array($groupName, $excludedSearchValues)) {
+					$pos = StringUtil::indexOfIgnoreCase($groupName, $searchString);
+					if ($pos !== false && $pos == 0) {
+						$list[] = array(
+							'label' => $groupName,
+							'objectID' => $group->groupID,
+							'type' => 'group'
+						);
+					}
 				}
 			}
 		}
+		
+		$conditionBuilder = new PreparedStatementConditionBuilder();
+		$conditionBuilder->add("username LIKE ?", array($searchString.'%'));
+		if (count($excludedSearchValues)) {
+			$conditionBuilder->add("username NOT IN (?)", array($excludedSearchValues));
+		}
 	
 		// find users
 		$sql = "SELECT	userID, username
 			FROM	wcf".WCF_N."_user
-			WHERE	username LIKE ?";
+			".$conditionBuilder;
 		$statement = WCF::getDB()->prepareStatement($sql);
-		$statement->execute(array($searchString.'%'));
+		$statement->execute($conditionBuilder->getParameters());
 		while ($row = $statement->fetchArray()) {
 			$list[] = array(
 				'label' => $row['username'],
-- 
2.20.1