aboutsummaryrefslogtreecommitdiff
path: root/engine/lib
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-02-04 04:36:34 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-02-04 04:36:34 +0000
commit8ee1e41a3d6a1c11e6e93c086210864012364013 (patch)
tree7501174b555d29985125edbd1542a44ff8e01f79 /engine/lib
parent77882dbadc7782e5d1269a075ea1f0e64ae2daa5 (diff)
downloadelgg-8ee1e41a3d6a1c11e6e93c086210864012364013.tar.gz
elgg-8ee1e41a3d6a1c11e6e93c086210864012364013.tar.bz2
Refs #1200: Changed logic in elgg_get_entity_type_subtype_where_sql() to return FALSE if there are no valid subtypes passed. Ignores all invalid subtypes. Added (partial) tests for elgg_get_entities() types and subtypes.
git-svn-id: http://code.elgg.org/elgg/trunk@3901 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib')
-rw-r--r--engine/lib/elgglib.php10
-rw-r--r--engine/lib/entities.php98
2 files changed, 79 insertions, 29 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index ce383ed8c..357141baa 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -2687,6 +2687,15 @@ function elgg_boot() {
}
/**
+ * Runs unit tests for the API.
+ */
+function elgg_api_test($hook, $type, $value, $params) {
+ global $CONFIG;
+ $value[] = $CONFIG->path . 'engine/tests/api/entity_getter_functions.php';
+ return $value;
+}
+
+/**
* Some useful constant definitions
*/
define('ACCESS_DEFAULT',-1);
@@ -2697,3 +2706,4 @@ define('ACCESS_FRIENDS',-2);
register_elgg_event_handler('init','system','elgg_init');
register_elgg_event_handler('boot','system','elgg_boot',1000);
+register_plugin_hook('unit_test', 'system', 'elgg_api_test'); \ No newline at end of file
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 7bc1d4cda..930772943 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -1954,67 +1954,106 @@ function elgg_get_entity_type_subtype_where_sql($table, $types, $subtypes, $pair
$subtypes = array($subtypes);
}
- // subtypes are based upon types, so we need to look at each
- // type individually to get the right subtype id.
+ // decrementer for valid types. Return FALSE if no valid types
+ $valid_types_count = count($types);
+ $valid_subtypes_count = 0;
+ // remove invalid types to get an accurate count of
+ // valid types for the invalid subtype detection to use
+ // below.
+ // also grab the count of ALL subtypes on valid types to decrement later on
+ // and check against.
+ //
+ // yes this is duplicating a foreach on $types.
foreach ($types as $type) {
if (!in_array($type, $valid_types)) {
- return FALSE;
+ $valid_types_count--;
+ unset ($types[array_search($type, $types)]);
+ } else {
+ // do the checking (and decrementing) in the subtype section.
+ $valid_subtypes_count += count($subtypes);
}
+ }
+ // return false if nothing is valid.
+ if (!$valid_types_count) {
+ return FALSE;
+ }
+
+ // subtypes are based upon types, so we need to look at each
+ // type individually to get the right subtype id.
+ foreach ($types as $type) {
$subtype_ids = array();
if ($subtypes) {
- // if there is only one subtype and it is is not 0 and it invalid return false.
- // if the type is 0 or null, let it through.
- // if the type is set but the subtype is FALSE, return false.
- if (count($subtypes) === 1) {
- if ($subtypes[0] && !get_subtype_id($type, $subtypes[0])) {
- return FALSE;
- }
- }
-
// subtypes can be NULL or '' or 0, which means "no subtype"
foreach ($subtypes as $subtype) {
// if a subtype is sent that doesn't exist
if (0 === $subtype || $subtype_id = get_subtype_id($type, $subtype)) {
$subtype_ids[] = (0 === $subtype) ? 0 : $subtype_id;
} else {
- // @todo should return false.
- //return FALSE;
-
+ $valid_subtypes_count--;
elgg_log("Type-subtype $type:$subtype' does not exist!", 'WARNING');
+ // return false if we're all invalid subtypes in the only valid type
continue;
}
}
+
+ if ($valid_subtypes_count <= 0) {
+ return FALSE;
+ }
}
- }
- //if ($subtype_ids_str = implode(',', $subtype_ids)) {
- if (is_array($subtype_ids) && count($subtype_ids)) {
- $subtype_ids_str = implode(',', $subtype_ids);
- $wheres[] = "({$table}.type = '$type' AND {$table}.subtype IN ($subtype_ids_str))";
- } else {
- $wheres[] = "({$table}.type = '$type')";
- }
+ if (is_array($subtype_ids) && count($subtype_ids)) {
+ $subtype_ids_str = implode(',', $subtype_ids);
+ $wheres[] = "({$table}.type = '$type' AND {$table}.subtype IN ($subtype_ids_str))";
+ } else {
+ $wheres[] = "({$table}.type = '$type')";
+ }
+ }
} else {
// using type/subtype pairs
+ $valid_pairs_count = count($pairs);
+ $valid_pairs_subtypes_count = 0;
+
+ // same deal as above--we need to know how many valid types
+ // and subtypes we have before hitting the subtype section.
+ // also normalize the subtypes into arrays here.
foreach ($pairs as $paired_type => $paired_subtypes) {
- if ($paired_subtypes && !is_array($paired_subtypes)) {
- $paired_subtypes = array($paired_subtypes);
+ if (!in_array($paired_type, $valid_types)) {
+ $valid_pairs_count--;
+ unset ($pairs[array_search($paired_type, $pairs)]);
+ } else {
+ if ($paired_subtypes && !is_array($paired_subtypes)) {
+ $pairs[$paired_type] = array($paired_subtypes);
+ }
+ $valid_pairs_subtypes_count += count($paired_subtypes);
}
+ }
- if (is_array($paired_subtypes) && count($paired_subtypes)) {
+ if ($valid_pairs_count <= 0) {
+ return FALSE;
+ }
+ foreach ($pairs as $paired_type => $paired_subtypes) {
+ // this will always be an array because of line 2027, right?
+ // no...some overly clever person can say pair => array('object' => null)
+ if (is_array($paired_subtypes)) {
$paired_subtype_ids = array();
foreach ($paired_subtypes as $paired_subtype) {
if ($paired_subtype && ($paired_subtype_id = get_subtype_id($paired_type, $paired_subtype))) {
$paired_subtype_ids[] = $paired_subtype_id;
} else {
- // @todo should return false.
- //return FALSE;
- elgg_log("Paired type-subtype $paired_type:$paired_subtype' does not exist!", 'WARNING');
+ $valid_pairs_subtypes_count--;
+ elgg_log("Type-subtype $paired_type:$paired_subtype' does not exist!", 'WARNING');
+ // return false if we're all invalid subtypes in the only valid type
continue;
}
}
+ // return false if there are no valid subtypes.
+ if ($valid_pairs_subtypes_count <= 0) {
+ return FALSE;
+ }
+
+
if ($paired_subtype_ids_str = implode(',', $paired_subtype_ids)) {
$wheres[] = "({$table}.type = '$paired_type' AND {$table}.subtype IN ($paired_subtype_ids_str))";
}
@@ -2034,6 +2073,7 @@ function elgg_get_entity_type_subtype_where_sql($table, $types, $subtypes, $pair
}
+
/**
* Returns SQL for owner and containers.
*