From bf1e40afcf8da4ea6e9d663531dfe3bc934483dc Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 11 Aug 2008 10:18:29 +0000
Subject: Added a search submenu.

git-svn-id: https://code.elgg.org/elgg/trunk@1819 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/entities.php | 64 +++++++++++++++++++++++++++++++++++++++++++++++++
 engine/lib/group.php    | 12 +++++++++-
 engine/lib/users.php    |  6 ++++-
 3 files changed, 80 insertions(+), 2 deletions(-)

(limited to 'engine/lib')

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index c938727ff..4cbc4eccc 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -1866,6 +1866,70 @@
 		
 			return $url;
 		}
+	}
+	
+	/**
+	 * Registers and entity type and subtype to return in search and other places.
+	 * A description in the elgg_echo languages file of the form item:type:subtype
+	 * is also expected.
+	 *
+	 * @param string $type The type of entity (object, site, user, group)
+	 * @param string $subtype The subtype to register (may be blank)
+	 * @return true|false Depending on success
+	 */
+	function register_entity_type($type, $subtype) {
+		
+		global $CONFIG;
+		
+		$type = strtolower($type);
+		if (!in_array($type,array('object','site','group','user'))) return false;
+		
+		if (!isset($CONFIG->registered_entities)) $CONFIG->registered_entities = array();
+		$CONFIG->registered_entities[$type][] = $subtype;
+		
+		return true;
+		
+	}
+	
+	/**
+	 * Returns registered entity types and subtypes
+	 * 
+	 * @see register_entity_type
+	 *
+	 * @param string $type The type of entity (object, site, user, group) or blank for all
+	 * @return array|false Depending on whether entities have been registered
+	 */
+	function get_registered_entity_types($type = '') {
+		
+		global $CONFIG;
+		
+		if (!isset($CONFIG->registered_entities)) return false;
+		if (!empty($type)) $type = strtolower($type);
+		if (!empty($type) && empty($CONFIG->registered_entities[$type])) return false;
+		
+		if (empty($type))
+			return $CONFIG->registered_entities;
+			
+		return $CONFIG->registered_entities[$type];
+		
+	}
+	
+	/**
+	 * Determines whether or not the specified entity type and subtype have been registered in the system
+	 *
+	 * @param string $type The type of entity (object, site, user, group)
+	 * @param string $subtype The subtype (may be blank)
+	 * @return true|false Depending on whether or not the type has been registered
+	 */
+	function is_registered_entity_type($type, $subtype) {
+		
+		global $CONFIG;
+		
+		if (!isset($CONFIG->registered_entities)) return false;
+		$type = strtolower($type);
+		if (empty($CONFIG->registered_entities[$type])) return false;
+		if (in_array($subtype, $CONFIG->registered_entities[$type])) return true;
+		
 	}
 	
 	/**
diff --git a/engine/lib/group.php b/engine/lib/group.php
index da6876be9..f9bcd4b32 100644
--- a/engine/lib/group.php
+++ b/engine/lib/group.php
@@ -774,6 +774,16 @@
 	function get_users_membership($user_guid)
 	{
 		return get_entities_from_relationship('member', $user_guid, true);
-	}
+	}
+	
+	/**
+	 * Performs initialisation functions for groups
+	 *
+	 */
+	function group_init() {
+		register_entity_type('group','');
+	}
+	
+	register_elgg_event_handler('init','system','group_init');
 	
 ?>
\ No newline at end of file
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 80e9286fb..4939cc7fb 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1161,6 +1161,8 @@
 		extend_elgg_settings_page('user/settings/language', 'usersettings/user', 1);
 		//register_action("user/language");
 		
+		// Register the user type
+		register_entity_type('user','');
 		
 		register_plugin_hook('usersettings:save','user','users_settings_save');
 		register_plugin_hook('search','all','search_list_users_by_name');
@@ -1176,7 +1178,9 @@
 		// Change this to set the number of users that display on the search page
 		$threshold = 4;
 
-		if (!get_input('offset'))
+		$object = get_input('object');
+		
+		if (!get_input('offset') && (empty($object) || $object == 'user'))
 		if ($users = search_for_user($tag,$threshold)) {
 			
 			$countusers = search_for_user($tag,0,0,"",true);
-- 
cgit v1.2.3