2 files changed, 27 insertions, 3 deletions
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 16e7a2c5f..50e9d11ea 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -682,6 +682,27 @@
 		
 		return false;
 	}
+	
+	/**
+	 * Searches for a user based on a complete or partial name or username using full text searching.
+	 * 
+	 * IMPORTANT NOTE: With MySQL's default setup:
+	 * 1) $criteria must be 4 or more characters long
+	 * 2) If $criteria matches greater than 50% of results NO RESULTS ARE RETURNED!
+	 *
+	 * @param string $criteria The partial or full name or username.
+	 */
+	function search_for_user($criteria)
+	{
+		global $CONFIG;
+		
+		$criteria = sanitise_string($criteria);
+		$access = get_access_sql_suffix("e");
+		
+		$query = "select e.* from {$CONFIG->dbprefix}entities e join {$CONFIG->dbprefix}users_entity u on e.guid=u.guid where match(u.name,u.username) against ('$criteria') and $access";
+		
+		return get_data($query, "entity_row_to_elggstar");
+	}
 	
 	/**
 	 * Registers a user, returning false if the username already exists
diff --git a/engine/schema/mysql.sql b/engine/schema/mysql.sql
index c981b0a56..749ee5bcf 100644
--- a/engine/schema/mysql.sql
+++ b/engine/schema/mysql.sql
@@ -104,7 +104,8 @@ CREATE TABLE `prefix_objects_entity` (
   `title` text NOT NULL,
   `description` text NOT NULL,
 
-  PRIMARY KEY  (`guid`)
+  PRIMARY KEY  (`guid`),
+  FULLTEXT KEY (`title`,`description`)
 )  ;
 
 -- Extra information relating to "sites"
@@ -116,7 +117,8 @@ CREATE TABLE `prefix_sites_entity` (
   `url` varchar(255) NOT NULL, 
    
   PRIMARY KEY  (`guid`),
-  UNIQUE KEY (`url`)
+  UNIQUE KEY (`url`),
+  FULLTEXT KEY (`name`,`description`, `url`)
 )  ;
 
 -- Extra information relating to "users"
@@ -138,7 +140,8 @@ CREATE TABLE `prefix_users_entity` (
   
   PRIMARY KEY  (`guid`),
   KEY `password` (`password`),
-  FULLTEXT KEY `name` (`name`)
+  FULLTEXT KEY `name` (`name`),
+  FULLTEXT KEY (`name`,`username`)
 ) ENGINE=MyISAM;