From 84553b0fd0d507d3e8a963deb5cba12d0d5f0b84 Mon Sep 17 00:00:00 2001 From: ewinslow Date: Tue, 1 Feb 2011 07:47:49 +0000 Subject: Moved deprecated files from sessions.php - xml.php into deprecation files for 1.7 and 1.8 git-svn-id: http://code.elgg.org/elgg/trunk@7981 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/sites.php | 176 --------------------------------------------------- 1 file changed, 176 deletions(-) (limited to 'engine/lib/sites.php') diff --git a/engine/lib/sites.php b/engine/lib/sites.php index 97398d7f2..1df20a5ce 100644 --- a/engine/lib/sites.php +++ b/engine/lib/sites.php @@ -99,15 +99,6 @@ function create_site_entity($guid, $name, $description, $url) { return false; } -/** - * @deprecated 1.6 - * @return 1 - */ -function delete_site_entity($guid) { - elgg_deprecated_notice("delete_site_entity has been deprecated", 1.6); - return 1; // Always return that we have deleted one row in order to not break existing code. -} - /** * Add a user to a site. * @@ -140,55 +131,6 @@ function remove_site_user($site_guid, $user_guid) { return remove_entity_relationship($user_guid, "member_of_site", $site_guid); } -/** - * Get the members of a site. - * - * @param int $site_guid Site GUID - * @param int $limit User GUID - * @param int $offset Offset - * - * @return mixed - * @deprecated 1.8 Use ElggSite::getMembers() - */ -function get_site_members($site_guid, $limit = 10, $offset = 0) { - elgg_deprecated_notice("get_site_members() deprecated. - Use ElggSite::getMembers()", 1.8); - - $site = get_entity($site_guid); - if ($site) { - return $site->getMembers($limit, $offset); - } - - return false; -} - -/** - * Display a list of site members - * - * @param int $site_guid The GUID of the site - * @param int $limit The number of members to display on a page - * @param bool $fullview Whether or not to display the full view (default: true) - * - * @return string A displayable list of members - * @deprecated 1.8 Use ElggSite::listMembers() - */ -function list_site_members($site_guid, $limit = 10, $fullview = true) { - elgg_deprecated_notice("list_site_members() deprecated. - Use ElggSite::listMembers()", 1.8); - - $options = array( - 'limit' => $limit, - 'full_view' => $full_view, - ); - - $site = get_entity($site_guid); - if ($site) { - return $site->listMembers($options); - } - - return ''; -} - /** * Add an object to a site. * @@ -247,72 +189,6 @@ function get_site_objects($site_guid, $subtype = "", $limit = 10, $offset = 0) { )); } -/** - * Add a collection to a site. - * - * @param int $site_guid Site GUID - * @param int $collection_guid Collection GUID - * - * @return mixed - * @deprecated 1.8 - */ -function add_site_collection($site_guid, $collection_guid) { - elgg_deprecated_notice("add_site_collection has been deprecated", 1.8); - global $CONFIG; - - $site_guid = (int)$site_guid; - $collection_guid = (int)$collection_guid; - - return add_entity_relationship($collection_guid, "member_of_site", $site_guid); -} - -/** - * Remove a collection from a site. - * - * @param int $site_guid Site GUID - * @param int $collection_guid Collection GUID - * - * @return mixed - * @deprecated 1.8 - */ -function remove_site_collection($site_guid, $collection_guid) { - elgg_deprecated_notice("remove_site_collection has been deprecated", 1.8); - $site_guid = (int)$site_guid; - $collection_guid = (int)$collection_guid; - - return remove_entity_relationship($collection_guid, "member_of_site", $site_guid); -} - -/** - * Get the collections belonging to a site. - * - * @param int $site_guid Site GUID - * @param string $subtype Subtype - * @param int $limit Limit - * @param int $offset Offset - * - * @return mixed - * @deprecated 1.8 - */ -function get_site_collections($site_guid, $subtype = "", $limit = 10, $offset = 0) { - elgg_deprecated_notice("get_site_collections has been deprecated", 1.8); - $site_guid = (int)$site_guid; - $subtype = sanitise_string($subtype); - $limit = (int)$limit; - $offset = (int)$offset; - - // collection isn't a valid type. This won't work. - return elgg_get_entities_from_relationship(array( - 'relationship' => 'member_of_site', - 'relationship_guid' => $site_guid, - 'inverse_relationship' => TRUE, - 'types' => 'collection', - 'subtypes' => $subtype, - 'limit' => $limit, - 'offset' => $offset - )); -} - /** * Return the site via a url. * @@ -334,58 +210,6 @@ function get_site_by_url($url) { return false; } -/** - * Searches for a site based on a complete or partial name - * or description or url 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. - * @param int $limit Limit of the search. - * @param int $offset Offset. - * @param string $order_by The order. - * @param boolean $count Whether to return the count of results or just the results. - * - * @return mixed - * @deprecated 1.7 - */ -function search_for_site($criteria, $limit = 10, $offset = 0, $order_by = "", $count = false) { - elgg_deprecated_notice('search_for_site() was deprecated by new search plugin.', 1.7); - global $CONFIG; - - $criteria = sanitise_string($criteria); - $limit = (int)$limit; - $offset = (int)$offset; - $order_by = sanitise_string($order_by); - - $access = get_access_sql_suffix("e"); - - if ($order_by == "") { - $order_by = "e.time_created desc"; - } - - if ($count) { - $query = "SELECT count(e.guid) as total "; - } else { - $query = "SELECT e.* "; - } - $query .= "from {$CONFIG->dbprefix}entities e - join {$CONFIG->dbprefix}sites_entity s on e.guid=s.guid - where match(s.name, s.description, s.url) against ('$criteria') and $access"; - - if (!$count) { - $query .= " order by $order_by limit $offset, $limit"; // Add order and limit - return get_data($query, "entity_row_to_elggstar"); - } else { - if ($count = get_data_row($query)) { - return $count->total; - } - } - return false; -} - /** * Retrieve a site and return the domain portion of its url. * -- cgit v1.2.3