Fixes #2808: elgg_get_array_value => elgg_extract

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

24 files changed, 55 insertions, 55 deletions

diff --git a/mod/blog/views/default/blog/sidebar/revisions.php b/mod/blog/views/default/blog/sidebar/revisions.php
index b78eb6816..b8f07b336 100644
--- a/mod/blog/views/default/blog/sidebar/revisions.php
+++ b/mod/blog/views/default/blog/sidebar/revisions.php
@@ -6,7 +6,7 @@
  */
 
 //If editing a post, show the previous revisions and drafts.
-$blog = elgg_get_array_value('entity', $vars, FALSE);
+$blog = elgg_extract('entity', $vars, FALSE);
 
 if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
 	$owner = $blog->getOwnerEntity();
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 78470d6be..776db379b 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -5,8 +5,8 @@
  * @package Blog
  */
 
-$full = elgg_get_array_value('full', $vars, FALSE);
-$blog = elgg_get_array_value('entity', $vars, FALSE);
+$full = elgg_extract('full', $vars, FALSE);
+$blog = elgg_extract('entity', $vars, FALSE);
 
 if (!$blog) {
 	return TRUE;
diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index 7d2370c19..aa7694fb6 100644
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -5,8 +5,8 @@
  * @package ElggBookmarks
  */
 
-$full = elgg_get_array_value('full', $vars, FALSE);
-$bookmark = elgg_get_array_value('entity', $vars, FALSE);
+$full = elgg_extract('full', $vars, FALSE);
+$bookmark = elgg_extract('entity', $vars, FALSE);
 
 if (!$bookmark) {
 	return;
diff --git a/mod/embed/views/default/embed/embed.php b/mod/embed/views/default/embed/embed.php
index 9b875fdeb..8f4ee4cb2 100644
--- a/mod/embed/views/default/embed/embed.php
+++ b/mod/embed/views/default/embed/embed.php
@@ -9,10 +9,10 @@
  * @uses string $vars['active_section'] Currently selected section_id
  */
 
-$sections = elgg_get_array_value('sections', $vars, array());
-$active_section = elgg_get_array_value('active_section', $vars, array_shift(array_keys($sections)));
-$upload_sections = elgg_get_array_value('upload_sections', $vars, array());
-$internal_name = elgg_get_array_value('internal_name', $vars);
+$sections = elgg_extract('sections', $vars, array());
+$active_section = elgg_extract('active_section', $vars, array_shift(array_keys($sections)));
+$upload_sections = elgg_extract('upload_sections', $vars, array());
+$internal_name = elgg_extract('internal_name', $vars);
 
 if (!$sections) {
 	$content = elgg_echo('embed:no_sections');
@@ -100,7 +100,7 @@ if (!$sections) {
 						'item' => $item,
 						'ecml_enabled' => $ecml_enabled,
 						'ecml_keyword' => ($ecml_valid_keyword) ? $active_section : 'entity',
-						'icon_size' => elgg_get_array_value('icon_size', $section_info, 'tiny'),
+						'icon_size' => elgg_extract('icon_size', $section_info, 'tiny'),
 					);
 	
 					$items_content .= elgg_view($view, $item_params);
diff --git a/mod/embed/views/default/embed/layouts/gallery.php b/mod/embed/views/default/embed/layouts/gallery.php
index b24fcec24..5ef564017 100644
--- a/mod/embed/views/default/embed/layouts/gallery.php
+++ b/mod/embed/views/default/embed/layouts/gallery.php
@@ -5,8 +5,8 @@
  * @uses string $vars['content'] Pre-formatted content.
  *
  */
-$active_section = elgg_get_array_value('section', $vars, array());
+$active_section = elgg_extract('section', $vars, array());
 
-$content = "<div class='embed_modal_".$active_section."'>" . elgg_get_array_value('content', $vars, '') . "</div>";
+$content = "<div class='embed_modal_".$active_section."'>" . elgg_extract('content', $vars, '') . "</div>";
 
 echo $content;
\ No newline at end of file
diff --git a/mod/embed/views/default/embed/layouts/list.php b/mod/embed/views/default/embed/layouts/list.php
index 76e7e88ea..1a98ece5c 100644
--- a/mod/embed/views/default/embed/layouts/list.php
+++ b/mod/embed/views/default/embed/layouts/list.php
@@ -5,8 +5,8 @@
  * @uses string $vars['content'] Pre-formatted content.
  *
  */
-$active_section = elgg_get_array_value('section', $vars, array());
+$active_section = elgg_extract('section', $vars, array());
 
-$content = "<div class='embed_modal_" . $active_section . "'>" . elgg_get_array_value('content', $vars, '') . "</div>";
+$content = "<div class='embed_modal_" . $active_section . "'>" . elgg_extract('content', $vars, '') . "</div>";
 
 echo $content;
\ No newline at end of file
diff --git a/mod/embed/views/default/embed/upload/content.php b/mod/embed/views/default/embed/upload/content.php
index 874ed44b1..a8330bce0 100644
--- a/mod/embed/views/default/embed/upload/content.php
+++ b/mod/embed/views/default/embed/upload/content.php
@@ -2,7 +2,7 @@
 /**
  * Special upload form
  */
-$upload_sections = elgg_get_array_value('upload_sections', $vars, array());
+$upload_sections = elgg_extract('upload_sections', $vars, array());
 $active_section = get_input('active_upload_section', array_shift(array_keys($upload_sections)));
 
 $options = array();
diff --git a/mod/file/views/default/file/typecloud.php b/mod/file/views/default/file/typecloud.php
index 4a59d8a7c..0552f7e8e 100644
--- a/mod/file/views/default/file/typecloud.php
+++ b/mod/file/views/default/file/typecloud.php
@@ -26,12 +26,12 @@ function file_type_cloud_get_url($type, $friends) {
 }
 
 
-$types = elgg_get_array_value('types', $vars, array());
+$types = elgg_extract('types', $vars, array());
 if (!$types) {
 	return true;
 }
 
-$friends = elgg_get_array_value('friends', $vars, false);
+$friends = elgg_extract('friends', $vars, false);
 
 $all = new stdClass;
 $all->tag = "all";
diff --git a/mod/file/views/default/forms/file/upload.php b/mod/file/views/default/forms/file/upload.php
index 06b97388b..a96cbaef6 100644
--- a/mod/file/views/default/forms/file/upload.php
+++ b/mod/file/views/default/forms/file/upload.php
@@ -6,13 +6,13 @@
  */
 
 // once elgg_view stops throwing all sorts of junk into $vars, we can use 
-$title = elgg_get_array_value('title', $vars, '');
-$desc = elgg_get_array_value('description', $vars, '');
-$tags = elgg_get_array_value('tags', $vars, '');
-$access_id = elgg_get_array_value('access_id', $vars, ACCESS_DEFAULT);
-$container_guid = elgg_get_array_value('container_guid', $vars);
-$guid = elgg_get_array_value('guid', $vars, null);
-$ajax = elgg_get_array_value('ajax', $vars, FALSE);
+$title = elgg_extract('title', $vars, '');
+$desc = elgg_extract('description', $vars, '');
+$tags = elgg_extract('tags', $vars, '');
+$access_id = elgg_extract('access_id', $vars, ACCESS_DEFAULT);
+$container_guid = elgg_extract('container_guid', $vars);
+$guid = elgg_extract('guid', $vars, null);
+$ajax = elgg_extract('ajax', $vars, FALSE);
 
 if ($guid) {
 	$file_label = elgg_echo("file:replace");
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index 00c777b39..4c38784fc 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -5,8 +5,8 @@
  * @package ElggFile
  */
 
-$full = elgg_get_array_value('full', $vars, FALSE);
-$file = elgg_get_array_value('entity', $vars, FALSE);
+$full = elgg_extract('full', $vars, FALSE);
+$file = elgg_extract('entity', $vars, FALSE);
 
 if (!$file) {
 	return TRUE;
diff --git a/mod/groups/views/default/forms/discussion/save.php b/mod/groups/views/default/forms/discussion/save.php
index 751cd521d..af8d730d5 100644
--- a/mod/groups/views/default/forms/discussion/save.php
+++ b/mod/groups/views/default/forms/discussion/save.php
@@ -4,13 +4,13 @@
  * 
  */
 
-$title = elgg_get_array_value('title', $vars, '');
-$desc = elgg_get_array_value('description', $vars, '');
-$status = elgg_get_array_value('status', $vars, '');
-$tags = elgg_get_array_value('tags', $vars, '');
-$access_id = elgg_get_array_value('access_id', $vars, ACCESS_DEFAULT);
-$container_guid = elgg_get_array_value('container_guid', $vars);
-$guid = elgg_get_array_value('guid', $vars, null);
+$title = elgg_extract('title', $vars, '');
+$desc = elgg_extract('description', $vars, '');
+$status = elgg_extract('status', $vars, '');
+$tags = elgg_extract('tags', $vars, '');
+$access_id = elgg_extract('access_id', $vars, ACCESS_DEFAULT);
+$container_guid = elgg_extract('container_guid', $vars);
+$guid = elgg_extract('guid', $vars, null);
 
 ?>
 <div>
diff --git a/mod/groups/views/default/groups/edit.php b/mod/groups/views/default/groups/edit.php
index 0634f3ac5..87fbaa182 100644
--- a/mod/groups/views/default/groups/edit.php
+++ b/mod/groups/views/default/groups/edit.php
@@ -3,7 +3,7 @@
  * Edit/create a group
  */
 
-$entity = elgg_get_array_value('entity', $vars, null);
+$entity = elgg_extract('entity', $vars, null);
 
 $form_vars = array('enctype' => 'multipart/form-data');
 $body_vars = array('entity' => $entity);
diff --git a/mod/groups/views/default/groups/group_sort_menu.php b/mod/groups/views/default/groups/group_sort_menu.php
index 7018b614f..78a9e72cd 100644
--- a/mod/groups/views/default/groups/group_sort_menu.php
+++ b/mod/groups/views/default/groups/group_sort_menu.php
@@ -5,7 +5,7 @@
 
 $group_count = (int)elgg_get_entities(array('types' => 'group', 'count' => true));
 
-$selected = elgg_get_array_value('selected', $vars);
+$selected = elgg_extract('selected', $vars);
 	 
 	 //url
 	 $url = elgg_get_site_url() . "pg/groups/all/";
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index 6d4902c87..6ac6d5eda 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -5,8 +5,8 @@
  * @package ElggGroups
 */
 
-$full = elgg_get_array_value('full', $vars, FALSE);
-$topic = elgg_get_array_value('entity', $vars, FALSE);
+$full = elgg_extract('full', $vars, FALSE);
+$topic = elgg_extract('entity', $vars, FALSE);
 
 if (!$topic) {
 	return true;
diff --git a/mod/messages/views/default/forms/messages/send.php b/mod/messages/views/default/forms/messages/send.php
index 3ddb25fd9..31918b314 100644
--- a/mod/messages/views/default/forms/messages/send.php
+++ b/mod/messages/views/default/forms/messages/send.php
@@ -6,9 +6,9 @@
  * @uses $vars['friends']
  */
 
-$recipient_guid = elgg_get_array_value('recipient_guid', $vars, 0);
-$subject = elgg_get_array_value('subject', $vars, '');
-$body = elgg_get_array_value('body', $vars, '');
+$recipient_guid = elgg_extract('recipient_guid', $vars, 0);
+$subject = elgg_extract('subject', $vars, '');
+$body = elgg_extract('body', $vars, '');
 
 $recipients_options = array();
 foreach ($vars['friends'] as $friend) {
diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php
index 9aae6b7a8..e000601f9 100644
--- a/mod/messages/views/default/object/messages.php
+++ b/mod/messages/views/default/object/messages.php
@@ -5,8 +5,8 @@
  * @package ElggFile
  */
 
-$full = elgg_get_array_value('full', $vars, false);
-$message = elgg_get_array_value('entity', $vars, false);
+$full = elgg_extract('full', $vars, false);
+$message = elgg_extract('entity', $vars, false);
 
 if (!$message) {
 	return true;
diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php
index 89ef25572..1e1e5251d 100644
--- a/mod/pages/views/default/object/page_top.php
+++ b/mod/pages/views/default/object/page_top.php
@@ -10,9 +10,9 @@
  */
 
 
-$full = elgg_get_array_value('full', $vars, FALSE);
-$page = elgg_get_array_value('entity', $vars, FALSE);
-$revision = elgg_get_array_value('revision', $vars, FALSE);
+$full = elgg_extract('full', $vars, FALSE);
+$page = elgg_extract('entity', $vars, FALSE);
+$revision = elgg_extract('revision', $vars, FALSE);
 
 if (!$page) {
 	return TRUE;
diff --git a/mod/pages/views/default/pages/sidebar/navigation.php b/mod/pages/views/default/pages/sidebar/navigation.php
index 43790a976..fe017b1a7 100644
--- a/mod/pages/views/default/pages/sidebar/navigation.php
+++ b/mod/pages/views/default/pages/sidebar/navigation.php
@@ -5,7 +5,7 @@
  * @uses $vars['page'] Page object if manually setting selected item
  */
 
-$selected_page = elgg_get_array_value('page', $vars, false);
+$selected_page = elgg_extract('page', $vars, false);
 if ($selected_page) {
 	$url = $selected_page->getURL();
 }
diff --git a/mod/profile/views/default/profile/owner_block.php b/mod/profile/views/default/profile/owner_block.php
index a51db87ef..0172a2e1d 100755
--- a/mod/profile/views/default/profile/owner_block.php
+++ b/mod/profile/views/default/profile/owner_block.php
@@ -21,8 +21,8 @@ $icon = elgg_view("profile/icon", array(
 $menu = elgg_trigger_plugin_hook('register', "menu:user_hover", array('entity' => $user), array());
 $builder = new ElggMenuBuilder($menu);
 $menu = $builder->getMenu();
-$actions = elgg_get_array_value('action', $menu, array());
-$admin = elgg_get_array_value('admin', $menu, array());
+$actions = elgg_extract('action', $menu, array());
+$admin = elgg_extract('admin', $menu, array());
 
 $profile_actions = '';
 if (elgg_is_logged_in() && $actions) {
diff --git a/mod/thewire/views/default/forms/thewire/add.php b/mod/thewire/views/default/forms/thewire/add.php
index e34a8c0e5..9a72e4109 100644
--- a/mod/thewire/views/default/forms/thewire/add.php
+++ b/mod/thewire/views/default/forms/thewire/add.php
@@ -5,7 +5,7 @@
  * @uses $vars['post']
  */
 
-$post = elgg_get_array_value('post', $vars);
+$post = elgg_extract('post', $vars);
 
 $text = elgg_echo('post');
 if ($post) {
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index 603870153..6be137dff 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -6,8 +6,8 @@
  */
 
 
-$full = elgg_get_array_value('full', $vars, FALSE);
-$post = elgg_get_array_value('entity', $vars, FALSE);
+$full = elgg_extract('full', $vars, FALSE);
+$post = elgg_extract('entity', $vars, FALSE);
 
 if (!$post) {
 	return true;
diff --git a/mod/thewire/views/default/thewire/metadata.php b/mod/thewire/views/default/thewire/metadata.php
index f04345ed2..da749c97f 100644
--- a/mod/thewire/views/default/thewire/metadata.php
+++ b/mod/thewire/views/default/thewire/metadata.php
@@ -4,7 +4,7 @@
  */
 
 $entity = $vars['entity'];
-$handler = elgg_get_array_value('handler', $vars, '');
+$handler = elgg_extract('handler', $vars, '');
 
 ?>
 <ul class="elgg-list-metadata">
diff --git a/mod/uservalidationbyemail/start.php b/mod/uservalidationbyemail/start.php
index e895d3e6a..7cd97c1e5 100644
--- a/mod/uservalidationbyemail/start.php
+++ b/mod/uservalidationbyemail/start.php
@@ -59,7 +59,7 @@ function uservalidationbyemail_init() {
  * @return bool
  */
 function uservalidationbyemail_disable_new_user($hook, $type, $value, $params) {
-	$user = elgg_get_array_value('user', $params);
+	$user = elgg_extract('user', $params);
 
 	// no clue what's going on, so don't react.
 	if (!$user instanceof ElggUser) {
@@ -100,7 +100,7 @@ function uservalidationbyemail_disable_new_user($hook, $type, $value, $params) {
 function uservalidationbyemail_allow_new_user_can_edit($hook, $type, $value, $params) {
 	// $params['user'] is the user to check permissions for.
 	// we want the entity to check, which is a user.
-	$user = elgg_get_array_value('entity', $params);
+	$user = elgg_extract('entity', $params);
 
 	if (!($user instanceof ElggUser)) {
 		return;
diff --git a/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php b/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php
index d219f1076..7babd5e87 100644
--- a/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php
+++ b/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php
@@ -6,7 +6,7 @@
  * @subpackage UserValidationByEmail.Administration
  */
 
-$user = elgg_get_array_value('theuser', $vars);
+$user = elgg_extract('theuser', $vars);
 
 // doesn't work.
 //$checkbox = elgg_view('input/checkboxes', array(