Refs #2839: moved deprecated functions from access.php - private_settings.php to deprecated.php. Still have to do relationships.php - xml.php. Deleted documentation for these functions since 1) it was using up precious bytes, and 2) documentation should not be needed since people should not be trying to use these if they are using 1.8, and 3) I assume the documentation will exist as archived 1.7 docs.

git-svn-id: http://code.elgg.org/elgg/trunk@7975 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 0 insertions, 350 deletions

diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
index f069e1d05..035c5e705 100644
--- a/engine/lib/annotations.php
+++ b/engine/lib/annotations.php
@@ -408,160 +408,6 @@ function elgg_get_entities_from_annotations(array $options = array()) {
 }
 
 /**
- * Get entities from annotations
- *
- * No longer used.
- *
- * @deprecated 1.7 Use elgg_get_entities_from_annotations()
- *
- * @param mixed  $entity_type    Type of entity
- * @param mixed  $entity_subtype Subtype of entity
- * @param string $name           Name of annotation
- * @param string $value          Value of annotation
- * @param int    $owner_guid     Guid of owner of annotation
- * @param int    $group_guid     Guid of group
- * @param int    $limit          Limit
- * @param int    $offset         Offset
- * @param string $order_by       SQL order by string
- * @param bool   $count          Count or return entities
- * @param int    $timelower      Lower time limit
- * @param int    $timeupper      Upper time limit
- *
- * @return unknown_type
- */
-function get_entities_from_annotations($entity_type = "", $entity_subtype = "", $name = "",
-$value = "", $owner_guid = 0, $group_guid = 0, $limit = 10, $offset = 0, $order_by = "asc",
-$count = false, $timelower = 0, $timeupper = 0) {
-	$msg = 'get_entities_from_annotations() is deprecated by elgg_get_entities_from_annotations().';
-	elgg_deprecated_notice($msg, 1.7);
-
-	$options = array();
-
-	if ($entity_type) {
-		$options['types'] = $entity_type;
-	}
-
-	if ($entity_subtype) {
-		$options['subtypes'] = $entity_subtype;
-	}
-
-	$options['annotation_names'] = $name;
-
-	if ($value) {
-		$options['annotation_values'] = $value;
-	}
-
-	if ($owner_guid) {
-		if (is_array($owner_guid)) {
-			$options['annotation_owner_guids'] = $owner_guid;
-		} else {
-			$options['annotation_owner_guid'] = $owner_guid;
-		}
-	}
-
-	if ($group_guid) {
-		$options['container_guid'] = $group_guid;
-	}
-
-	if ($limit) {
-		$options['limit'] = $limit;
-	}
-
-	if ($offset) {
-		$options['offset'] = $offset;
-	}
-
-	if ($order_by) {
-		$options['order_by'] = "maxtime $order_by";
-	}
-
-	if ($count) {
-		$options['count'] = $count;
-	}
-
-	if ($timelower) {
-		$options['annotation_created_time_lower'] = $timelower;
-	}
-
-	if ($timeupper) {
-		$options['annotation_created_time_upper'] = $timeupper;
-	}
-
-	return elgg_get_entities_from_annotations($options);
-}
-
-/**
- * Lists entities
- *
- * @see elgg_view_entity_list
- *
- * @param string  $entity_type    Type of entity.
- * @param string  $entity_subtype Subtype of entity.
- * @param string  $name           Name of annotation.
- * @param string  $value          Value of annotation.
- * @param int     $limit          Maximum number of results to return.
- * @param int     $owner_guid     Owner.
- * @param int     $group_guid     Group container. Currently only supported if entity_type is object
- * @param boolean $asc            Whether to list in ascending or descending order (default: desc)
- * @param boolean $fullview       Whether to display the entities in full
- * @param boolean $listtypetoggle Can 'gallery' view can be displayed (default: no)
- *
- * @deprecated 1.7 Use elgg_list_entities_from_annotations()
- * @return string Formatted entity list
- */
-function list_entities_from_annotations($entity_type = "", $entity_subtype = "", $name = "",
-$value = "", $limit = 10, $owner_guid = 0, $group_guid = 0, $asc = false, $fullview = true,
-$listtypetoggle = false) {
-
-	$msg = 'list_entities_from_annotations is deprecated by elgg_list_entities_from_annotations';
-	elgg_deprecated_notice($msg, 1.8);
-
-	$options = array();
-
-	if ($entity_type) {
-		$options['types'] = $entity_type;
-	}
-
-	if ($entity_subtype) {
-		$options['subtypes'] = $entity_subtype;
-	}
-
-	if ($name) {
-		$options['annotation_names'] = $name;
-	}
-
-	if ($value) {
-		$options['annotation_values'] = $value;
-	}
-
-	if ($limit) {
-		$options['limit'] = $limit;
-	}
-
-	if ($owner_guid) {
-		$options['annotation_owner_guid'] = $owner_guid;
-	}
-
-	if ($group_guid) {
-		$options['container_guid'] = $group_guid;
-	}
-
-	if ($asc) {
-		$options['order_by'] = 'maxtime desc';
-	}
-
-	if ($offset = sanitise_int(get_input('offset', null))) {
-		$options['offset'] = $offset;
-	}
-
-	$options['full_view'] = $fullview;
-	$options['list_type_toggle'] = $listtypetoggle;
-	$options['pagination'] = $pagination;
-
-	return elgg_list_entities_from_annotations($options);
-}
-
-/**
  * Returns a viewable list of entities from annotations.
  *
  * @param array $options Options array
@@ -850,140 +696,6 @@ function elgg_get_entities_from_annotation_calculation($options) {
 }
 
 /**
- * Get entities ordered by a mathematical calculation
- *
- * @deprecated 1.8 Use elgg_get_entities_from_annotation_calculation()
- *
- * @param string $sum            What sort of calculation to perform
- * @param string $entity_type    Type of Entity
- * @param string $entity_subtype Subtype of Entity
- * @param string $name           Name of annotation
- * @param string $mdname         Metadata name
- * @param string $mdvalue        Metadata value
- * @param int    $owner_guid     GUID of owner of annotation
- * @param int    $limit          Limit of results
- * @param int    $offset         Offset of results
- * @param string $orderdir       Order of results
- * @param bool   $count          Return count or entities
- *
- * @return mixed
- */
-function get_entities_from_annotations_calculate_x($sum = "sum", $entity_type = "",
-$entity_subtype = "", $name = "", $mdname = '', $mdvalue = '', $owner_guid = 0,
-$limit = 10, $offset = 0, $orderdir = 'desc', $count = false) {
-
-	$msg = 'get_entities_from_annotations_calculate_x() is deprecated by elgg_get_entities_from_annotation_calculation().';
-
-	elgg_deprecated_notice($msg, 1.8);
-
-	$options = array();
-
-	$options['calculation'] = $sum;
-
-	if ($entity_type) {
-		$options['types'] = $entity_type;
-	}
-
-	if ($entity_subtype) {
-		$options['subtypes'] = $entity_subtype;
-	}
-
-	$options['annotation_names'] = $name;
-
-	if ($mdname) {
-		$options['metadata_names'] = $mdname;
-	}
-
-	if ($mdvalue) {
-		$options['metadata_values'] = $mdvalue;
-	}
-
-	// original function rewrote this to container guid.
-	if ($owner_guid) {
-		if (is_array($owner_guid)) {
-			$options['container_guids'] = $owner_guid;
-		} else {
-			$options['container_guid'] = $owner_guid;
-		}
-	}
-
-	$options['limit'] = $limit;
-	$options['offset'] = $offset;
-
-	$options['order_by'] = "calculated $orderdir";
-
-	$options['count'] = $count;
-
-	return elgg_get_entities_from_annotation_calculation($options);
-}
-
-/**
- * Returns entities ordered by the sum of an annotation
- *
- * @deprecated 1.8 Use elgg_get_entities_from_annotation_calculation()
- *
- * @param string $entity_type    Type of Entity
- * @param string $entity_subtype Subtype of Entity
- * @param string $name           Name of annotation
- * @param string $mdname         Metadata name
- * @param string $mdvalue        Metadata value
- * @param int    $owner_guid     GUID of owner of annotation
- * @param int    $limit          Limit of results
- * @param int    $offset         Offset of results
- * @param string $orderdir       Order of results
- * @param bool   $count          Return count or entities
- *
- * @return unknown
- */
-function get_entities_from_annotation_count($entity_type = "", $entity_subtype = "", $name = "",
-$mdname = '', $mdvalue = '', $owner_guid = 0, $limit = 10, $offset = 0, $orderdir = 'desc',
-$count = false) {
-
-	$msg = 'get_entities_from_annotation_count() is deprecated by elgg_get_entities_from_annotation_calculation().';
-
-	elgg_deprecated_notice($msg, 1.8);
-
-	$options = array();
-
-	$options['calculation'] = 'sum';
-
-	if ($entity_type) {
-		$options['types'] = $entity_type;
-	}
-
-	if ($entity_subtype) {
-		$options['subtypes'] = $entity_subtype;
-	}
-
-	$options['annotation_names'] = $name;
-
-	if ($mdname) {
-		$options['metadata_names'] = $mdname;
-	}
-
-	if ($mdvalue) {
-		$options['metadata_values'] = $mdvalue;
-	}
-
-	if ($owner_guid) {
-		if (is_array($owner_guid)) {
-			$options['owner_guids'] = $owner_guid;
-		} else {
-			$options['owner_guid'] = $owner_guid;
-		}
-	}
-
-	$options['limit'] = $limit;
-	$options['offset'] = $offset;
-
-	$options['order_by'] = "calculated $orderdir";
-
-	$options['count'] = $count;
-
-	return elgg_get_entities_from_annotation_calculation($options);
-}
-
-/**
  * List entities from an annotation calculation.
  *
  * @see elgg_get_entities_from_annotation_calculation()
@@ -997,68 +709,6 @@ function elgg_list_entities_from_annotation_calculation($options) {
 }
 
 /**
- * Lists entities by the totals of a particular kind of annotation
- *
- * @deprecated 1.8 Use elgg_list_entities_from_annotation_calculation()
- *
- * @param string  $entity_type    Type of entity.
- * @param string  $entity_subtype Subtype of entity.
- * @param string  $name           Name of annotation.
- * @param int     $limit          Maximum number of results to return.
- * @param int     $owner_guid     Owner.
- * @param int     $group_guid     Group container. Currently only supported if entity_type is object
- * @param boolean $asc            Whether to list in ascending or descending order (default: desc)
- * @param boolean $fullview       Whether to display the entities in full
- * @param boolean $listtypetoggle Can the 'gallery' view can be displayed (default: no)
- * @param boolean $pagination     Add pagination
- * @param string  $orderdir       Order desc or asc
- *
- * @return string Formatted entity list
- */
-function list_entities_from_annotation_count($entity_type = "", $entity_subtype = "", $name = "",
-$limit = 10, $owner_guid = 0, $group_guid = 0, $asc = false, $fullview = true,
-$listtypetoggle = false, $pagination = true, $orderdir = 'desc') {
-
-	$msg = 'list_entities_from_annotation_count() is deprecated by elgg_list_entities_from_annotation_calculation().';
-
-	elgg_deprecated_notice($msg, 1.8);
-
-	$options = array();
-
-	$options['calculation'] = 'sum';
-
-	if ($entity_type) {
-		$options['types'] = $entity_type;
-	}
-
-	if ($entity_subtype) {
-		$options['subtypes'] = $entity_subtype;
-	}
-
-	$options['annotation_names'] = $name;
-
-	if ($owner_guid) {
-		if (is_array($owner_guid)) {
-			$options['owner_guids'] = $owner_guid;
-		} else {
-			$options['owner_guid'] = $owner_guid;
-		}
-	}
-
-	$options['full_view'] = $fullview;
-
-	$options['list_type_toggle'] = $listtypetoggle;
-
-	$options['pagination'] = $pagination;
-
-	$options['limit'] = $limit;
-
-	$options['order_by'] = "calculated $orderdir";
-
-	return elgg_get_entities_from_annotation_calculation($options);
-}
-
-/**
  * Lists entities by the totals of a particular kind of annotation AND
  * the value of a piece of metadata
  *