diff options
68 files changed, 152 insertions, 152 deletions
diff --git a/engine/classes/ElggBatch.php b/engine/classes/ElggBatch.php index a5051d16a..5c2172ae7 100644 --- a/engine/classes/ElggBatch.php +++ b/engine/classes/ElggBatch.php @@ -164,8 +164,8 @@ class ElggBatch } // store these so we can compare later - $this->offset = elgg_get_array_value('offset', $options, 0); - $this->limit = elgg_get_array_value('limit', $options, 10); + $this->offset = elgg_extract('offset', $options, 0); + $this->limit = elgg_extract('limit', $options, 10); // if passed a callback, create a new ElggBatch with the same options // and pass each to the callback. diff --git a/engine/classes/ElggPluginManifest.php b/engine/classes/ElggPluginManifest.php index e230cd3f2..fae12de10 100644 --- a/engine/classes/ElggPluginManifest.php +++ b/engine/classes/ElggPluginManifest.php @@ -659,7 +659,7 @@ class ElggPluginManifest { $return = array(); foreach ($struct as $index => $default) { - $return[$index] = elgg_get_array_value($index, $array, $default); + $return[$index] = elgg_extract($index, $array, $default); } return $return; diff --git a/engine/lib/admin.php b/engine/lib/admin.php index 6d0b60101..854a978b5 100644 --- a/engine/lib/admin.php +++ b/engine/lib/admin.php @@ -345,9 +345,9 @@ function admin_settings_page_handler($page) { function admin_plugin_screenshot_page_handler($pages) { admin_gatekeeper(); - $plugin_id = elgg_get_array_value(0, $pages); + $plugin_id = elgg_extract(0, $pages); // only thumbnail or full. - $size = elgg_get_array_value(1, $pages, 'thumbnail'); + $size = elgg_extract(1, $pages, 'thumbnail'); // the rest of the string is the filename $filename_parts = array_slice($pages, 2); diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php index 0235476f2..d2f2c6386 100644 --- a/engine/lib/annotations.php +++ b/engine/lib/annotations.php @@ -405,7 +405,7 @@ function elgg_get_entities_from_annotation_calculation($options) { $options = array_merge($defaults, $options); - $function = sanitize_string(elgg_get_array_value('calculation', $options, 'sum', false)); + $function = sanitize_string(elgg_extract('calculation', $options, 'sum', false)); // you must cast this as an int or it sorts wrong. $options['selects'][] = "$function(cast(msv.string as signed)) as calculated"; diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index fbd33b219..e9ae8b0ad 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -1432,7 +1432,7 @@ function elgg_http_url_is_identical($url1, $url2, $ignore_params = array('offset * @return void * @since 1.8.0 */ -function elgg_get_array_value($key, array $array, $default = NULL, $strict = true) { +function elgg_extract($key, array $array, $default = NULL, $strict = true) { if ($strict) { return (isset($array[$key])) ? $array[$key] : $default; } else { diff --git a/engine/lib/metastrings.php b/engine/lib/metastrings.php index 8c702239b..8f9debcc0 100644 --- a/engine/lib/metastrings.php +++ b/engine/lib/metastrings.php @@ -580,8 +580,8 @@ function elgg_normalize_metastrings_options(array $options = array()) { // support either metastrings_type or metastring_type // because I've made this mistake many times and hunting it down is a pain... - $type = elgg_get_array_value('metastring_type', $options, null); - $type = elgg_get_array_value('metastrings_type', $options, $type); + $type = elgg_extract('metastring_type', $options, null); + $type = elgg_extract('metastrings_type', $options, $type); $options['metastring_type'] = $type; diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php index b8fd321a8..872984751 100644 --- a/engine/lib/plugins.php +++ b/engine/lib/plugins.php @@ -657,9 +657,9 @@ function elgg_check_plugins_provides($type, $name, $version = null, $comparison * @return array */ function elgg_get_plugin_dependency_strings($dep) { - $dep_system = elgg_get_array_value('type', $dep); - $info = elgg_get_array_value('dep', $dep); - $type = elgg_get_array_value('type', $info); + $dep_system = elgg_extract('type', $dep); + $info = elgg_extract('dep', $dep); + $type = elgg_extract('type', $info); if (!$dep_system || !$info || !$type) { return false; diff --git a/engine/lib/river.php b/engine/lib/river.php index 43a1c38d5..4cb9c30f4 100644 --- a/engine/lib/river.php +++ b/engine/lib/river.php @@ -515,7 +515,7 @@ function elgg_river_page_handler($page) { elgg_set_page_owner_guid(elgg_get_logged_in_user_guid()); - $page_type = elgg_get_array_value(0, $page, 'all'); + $page_type = elgg_extract(0, $page, 'all'); if ($page_type == 'owner') { $page_type = 'mine'; } diff --git a/engine/lib/views.php b/engine/lib/views.php index 1e0ce3764..865212a06 100644 --- a/engine/lib/views.php +++ b/engine/lib/views.php @@ -681,7 +681,7 @@ function elgg_view_menu($menu_name, array $vars = array()) { $vars['name'] = $menu_name; - $sort_by = elgg_get_array_value('sort_by', $vars, 'title'); + $sort_by = elgg_extract('sort_by', $vars, 'title'); $menu = $CONFIG->menus[$menu_name]; diff --git a/engine/lib/xml.php b/engine/lib/xml.php index 55ea1b5ad..813bc4ee0 100644 --- a/engine/lib/xml.php +++ b/engine/lib/xml.php @@ -127,8 +127,8 @@ function xml_to_object($xml) { if ($tag['type'] == "complete" || $tag['type'] == "open") { $elements[$index] = new XmlElement; $elements[$index]->name = $tag['tag']; - $elements[$index]->attributes = elgg_get_array_value('attributes', $tag, ''); - $elements[$index]->content = elgg_get_array_value('value', $tag, ''); + $elements[$index]->attributes = elgg_extract('attributes', $tag, ''); + $elements[$index]->content = elgg_extract('value', $tag, ''); if ($tag['type'] == "open") { $elements[$index]->children = array(); 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( diff --git a/views/default/admin/components/invalid_plugin.php b/views/default/admin/components/invalid_plugin.php index 516e2db6c..97c1bacf4 100644 --- a/views/default/admin/components/invalid_plugin.php +++ b/views/default/admin/components/invalid_plugin.php @@ -10,7 +10,7 @@ * @subpackage Plugins */ -$plugin = elgg_get_array_value('plugin', $vars); +$plugin = elgg_extract('plugin', $vars); $id = $plugin->getID(); $path = htmlspecialchars($plugin->getPath()); $message = elgg_echo('admin:plugins:warning:invalid', array($id)); diff --git a/views/default/admin/components/plugin_dependencies.php b/views/default/admin/components/plugin_dependencies.php index eea4cd287..ea2b3a188 100644 --- a/views/default/admin/components/plugin_dependencies.php +++ b/views/default/admin/components/plugin_dependencies.php @@ -8,7 +8,7 @@ * @subpackage Admin.Plugins */ -$plugin = elgg_get_array_value('plugin', $vars, false); +$plugin = elgg_extract('plugin', $vars, false); $deps = $plugin->package->checkDependencies(true); $columns = array('type', 'name', 'expected_value', 'local_value', 'comment'); diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php index 040d24552..d5eb7492c 100644 --- a/views/default/annotation/generic_comment.php +++ b/views/default/annotation/generic_comment.php @@ -10,7 +10,7 @@ if (!isset($vars['annotation'])) { return true; } -$full_view = elgg_get_array_value('full', $vars, true); +$full_view = elgg_extract('full', $vars, true); $comment = $vars['annotation']; diff --git a/views/default/forms/plugins/settings/save.php b/views/default/forms/plugins/settings/save.php index 8cd05471f..744133c79 100644 --- a/views/default/forms/plugins/settings/save.php +++ b/views/default/forms/plugins/settings/save.php @@ -8,10 +8,10 @@ $plugin = $vars['plugin']; $plugin_id = $plugin->getID(); -$user_guid = elgg_get_array_value('user_guid', $vars, elgg_get_logged_in_user_guid()); +$user_guid = elgg_extract('user_guid', $vars, elgg_get_logged_in_user_guid()); // Do we want to show admin settings or user settings -$type = elgg_get_array_value('type', $vars, ''); +$type = elgg_extract('type', $vars, ''); if ($type != 'user') { $type = ''; diff --git a/views/default/forms/widgets/save.php b/views/default/forms/widgets/save.php index c044e245f..b8d6017f5 100644 --- a/views/default/forms/widgets/save.php +++ b/views/default/forms/widgets/save.php @@ -7,7 +7,7 @@ */ $widget = $vars['widget']; -$show_access = elgg_get_array_value('show_access', $vars, true); +$show_access = elgg_extract('show_access', $vars, true); $edit_view = "widgets/$widget->handler/edit"; $custom_form_section = elgg_view($edit_view, array('entity' => $widget)); diff --git a/views/default/icon/user/default.php b/views/default/icon/user/default.php index 9d5a862d8..a288358a2 100644 --- a/views/default/icon/user/default.php +++ b/views/default/icon/user/default.php @@ -10,8 +10,8 @@ * @uses $vars['hover'] Display the hover menu? (true) */ -$user = elgg_get_array_value('entity', $vars, elgg_get_logged_in_user_entity()); -$size = elgg_get_array_value('size', $vars, 'medium'); +$user = elgg_extract('entity', $vars, elgg_get_logged_in_user_entity()); +$size = elgg_extract('size', $vars, 'medium'); if (!in_array($size, array('topbar', 'tiny', 'small', 'medium', 'large', 'master'))) { $size = 'medium'; } @@ -28,9 +28,9 @@ if (!$icontime) { $icontime = "default"; } -$js = elgg_get_array_value('js', $vars, ''); +$js = elgg_extract('js', $vars, ''); -$hover = elgg_get_array_value('hover', $vars, true); +$hover = elgg_extract('hover', $vars, true); $spacer_url = elgg_get_site_url() . '_graphics/spacer.gif'; diff --git a/views/default/input/checkboxes.php b/views/default/input/checkboxes.php index f501ea36e..17c8ab8bd 100644 --- a/views/default/input/checkboxes.php +++ b/views/default/input/checkboxes.php @@ -30,8 +30,8 @@ * */ -$additional_class = elgg_get_array_value('class', $vars); -$align = elgg_get_array_value('align', $vars, 'vertical'); +$additional_class = elgg_extract('class', $vars); +$align = elgg_extract('align', $vars, 'vertical'); $value = (isset($vars['value'])) ? $vars['value'] : NULL; $value_array = (is_array($value)) ? array_map('elgg_strtolower', $value) : array(elgg_strtolower($value)); $internalname = (isset($vars['internalname'])) ? $vars['internalname'] : ''; diff --git a/views/default/input/radio.php b/views/default/input/radio.php index 93db2f637..fbfc9c5a1 100644 --- a/views/default/input/radio.php +++ b/views/default/input/radio.php @@ -18,8 +18,8 @@ * @uses $vars['align'] 'horizontal' or 'vertical' Default: 'vertical' */ -$additional_class = elgg_get_array_value('class', $vars); -$align = elgg_get_array_value('align', $vars, 'vertical'); +$additional_class = elgg_extract('class', $vars); +$align = elgg_extract('align', $vars, 'vertical'); $class = "elgg-input-radio elgg-$align"; if ($additional_class) { $class = " $additional_class"; diff --git a/views/default/layout/elements/comments.php b/views/default/layout/elements/comments.php index 2d727b8b5..c27a146ab 100644 --- a/views/default/layout/elements/comments.php +++ b/views/default/layout/elements/comments.php @@ -7,7 +7,7 @@ * @uses $vars['id'] Optional id for the div */ -$show_add_form = elgg_get_array_value('show_add_form', $vars, true); +$show_add_form = elgg_extract('show_add_form', $vars, true); $id = ''; if (isset($vars['id'])) { diff --git a/views/default/layout/objects/gallery.php b/views/default/layout/objects/gallery.php index 4135de9df..f57cc99ba 100644 --- a/views/default/layout/objects/gallery.php +++ b/views/default/layout/objects/gallery.php @@ -17,10 +17,10 @@ elgg_push_context('gallery'); $offset = $vars['offset']; $limit = $vars['limit']; $count = $vars['count']; -$pagination = elgg_get_array_value('pagination', $vars, true); -$full_view = elgg_get_array_value('full_view', $vars, false); -$offset_key = elgg_get_array_value('offset_key', $vars, 'offset'); -$position = elgg_get_array_value('position', $vars, 'after'); +$pagination = elgg_extract('pagination', $vars, true); +$full_view = elgg_extract('full_view', $vars, false); +$offset_key = elgg_extract('offset_key', $vars, 'offset'); +$position = elgg_extract('position', $vars, 'after'); $num_columns = 4; diff --git a/views/default/layout/objects/image_block.php b/views/default/layout/objects/image_block.php index 1aecccf28..a7f480aef 100644 --- a/views/default/layout/objects/image_block.php +++ b/views/default/layout/objects/image_block.php @@ -19,12 +19,12 @@ * @uses $vars['id'] Optional id for the media element */ -$body = elgg_get_array_value('body', $vars, ''); -$image = elgg_get_array_value('image', $vars, ''); -$alt_image = elgg_get_array_value('image_alt', $vars, ''); +$body = elgg_extract('body', $vars, ''); +$image = elgg_extract('image', $vars, ''); +$alt_image = elgg_extract('image_alt', $vars, ''); $class = 'elgg-image-block'; -$additional_class = elgg_get_array_value('class', $vars, ''); +$additional_class = elgg_extract('class', $vars, ''); if ($additional_class) { $class = "$class $additional_class"; } diff --git a/views/default/layout/objects/list.php b/views/default/layout/objects/list.php index 6d12c5e55..374922ecd 100644 --- a/views/default/layout/objects/list.php +++ b/views/default/layout/objects/list.php @@ -21,10 +21,10 @@ $offset = $vars['offset']; $limit = $vars['limit']; $count = $vars['count']; $base_url = $vars['base_url']; -$pagination = elgg_get_array_value('pagination', $vars, true); -$full_view = elgg_get_array_value('full_view', $vars, false); -$offset_key = elgg_get_array_value('offset_key', $vars, 'offset'); -$position = elgg_get_array_value('position', $vars, 'after'); +$pagination = elgg_extract('pagination', $vars, true); +$full_view = elgg_extract('full_view', $vars, false); +$offset_key = elgg_extract('offset_key', $vars, 'offset'); +$position = elgg_extract('position', $vars, 'after'); $list_class = 'elgg-list'; if (isset($vars['list_class'])) { diff --git a/views/default/layout/objects/list/body.php b/views/default/layout/objects/list/body.php index 6cbaa2c20..187cc9690 100644 --- a/views/default/layout/objects/list/body.php +++ b/views/default/layout/objects/list/body.php @@ -19,7 +19,7 @@ $entity = $vars['entity']; -$title_link = elgg_get_array_value('title', $vars, ''); +$title_link = elgg_extract('title', $vars, ''); if ($title_link === '') { if (isset($entity->title)) { $text = $entity->title; @@ -33,11 +33,11 @@ if ($title_link === '') { $title_link = elgg_view('output/url', $params); } -$metadata = elgg_get_array_value('metadata', $vars, ''); -$subtitle = elgg_get_array_value('subtitle', $vars, ''); -$content = elgg_get_array_value('content', $vars, ''); +$metadata = elgg_extract('metadata', $vars, ''); +$subtitle = elgg_extract('subtitle', $vars, ''); +$content = elgg_extract('content', $vars, ''); -$tags = elgg_get_array_value('tags', $vars, ''); +$tags = elgg_extract('tags', $vars, ''); if ($tags !== false) { $tag_text = elgg_view('output/tags', array('tags' => $entity->tags)); if ($tag_text) { diff --git a/views/default/layout/objects/list/metadata.php b/views/default/layout/objects/list/metadata.php index bb708b5ee..3ce3573b9 100644 --- a/views/default/layout/objects/list/metadata.php +++ b/views/default/layout/objects/list/metadata.php @@ -8,7 +8,7 @@ */ $entity = $vars['entity']; -$handler = elgg_get_array_value('handler', $vars, ''); +$handler = elgg_extract('handler', $vars, ''); ?> <ul class="elgg-list-metadata"> diff --git a/views/default/layout/objects/module.php b/views/default/layout/objects/module.php index 5f1273ddd..f7b9da59c 100644 --- a/views/default/layout/objects/module.php +++ b/views/default/layout/objects/module.php @@ -11,14 +11,14 @@ * @uses $vars['show_inner'] Optional flag to leave out inner div (default: false) */ -$title = elgg_get_array_value('title', $vars, ''); -$header = elgg_get_array_value('header', $vars, ''); -$body = elgg_get_array_value('body', $vars, ''); -$footer = elgg_get_array_value('footer', $vars, ''); -$show_inner = elgg_get_array_value('show_inner', $vars, false); +$title = elgg_extract('title', $vars, ''); +$header = elgg_extract('header', $vars, ''); +$body = elgg_extract('body', $vars, ''); +$footer = elgg_extract('footer', $vars, ''); +$show_inner = elgg_extract('show_inner', $vars, false); $class = 'elgg-module'; -$additional_class = elgg_get_array_value('class', $vars, ''); +$additional_class = elgg_extract('class', $vars, ''); if ($additional_class) { $class = "$class $additional_class"; } diff --git a/views/default/layout/objects/widget.php b/views/default/layout/objects/widget.php index 727b04533..d5e2c4ca2 100644 --- a/views/default/layout/objects/widget.php +++ b/views/default/layout/objects/widget.php @@ -11,7 +11,7 @@ if (!elgg_instanceof($widget, 'object', 'widget')) { return true; } -$show_access = elgg_get_array_value('show_access', $vars, true); +$show_access = elgg_extract('show_access', $vars, true); // @todo catch for disabled plugins $widget_types = elgg_get_widget_types('all'); diff --git a/views/default/layout/objects/widget/controls.php b/views/default/layout/objects/widget/controls.php index bd1e96ea7..be7a10083 100644 --- a/views/default/layout/objects/widget/controls.php +++ b/views/default/layout/objects/widget/controls.php @@ -7,7 +7,7 @@ */ $widget = $vars['widget']; -$show_edit = elgg_get_array_value('show_edit', $vars, true); +$show_edit = elgg_extract('show_edit', $vars, true); $params = array( 'text' => ' ', diff --git a/views/default/layout/shells/content.php b/views/default/layout/shells/content.php index 87d314b2c..69772985a 100644 --- a/views/default/layout/shells/content.php +++ b/views/default/layout/shells/content.php @@ -16,13 +16,13 @@ */ // give plugins an opportunity to add to content sidebars -$sidebar_content = elgg_get_array_value('sidebar', $vars, ''); +$sidebar_content = elgg_extract('sidebar', $vars, ''); $params = $vars; $params['content'] = $sidebar_content; $sidebar = elgg_view('layout/shells/content/sidebar', $params); // navigation defaults to breadcrumbs -$nav = elgg_get_array_value('nav', $vars, elgg_view('navigation/breadcrumbs')); +$nav = elgg_extract('nav', $vars, elgg_view('navigation/breadcrumbs')); // allow page handlers to override the default header if (isset($vars['header'])) { @@ -37,10 +37,10 @@ if (isset($vars['filter'])) { $filter = elgg_view('layout/shells/content/filter', $vars); // the all important content -$content = elgg_get_array_value('content', $vars, ''); +$content = elgg_extract('content', $vars, ''); // optional footer for main content area -$footer_content = elgg_get_array_value('footer', $vars, ''); +$footer_content = elgg_extract('footer', $vars, ''); $params = $vars; $params['content'] = $footer_content; $footer = elgg_view('layout/shells/content/footer', $params); diff --git a/views/default/layout/shells/content/filter.php b/views/default/layout/shells/content/filter.php index c9f774e72..6bd91dc1a 100644 --- a/views/default/layout/shells/content/filter.php +++ b/views/default/layout/shells/content/filter.php @@ -14,11 +14,11 @@ if (isset($vars['filter_override'])) { return true; } -$context = elgg_get_array_value('context', $vars, elgg_get_context()); +$context = elgg_extract('context', $vars, elgg_get_context()); if (elgg_is_logged_in() && $context) { $username = elgg_get_logged_in_user_entity()->username; - $filter_context = elgg_get_array_value('filter_context', $vars, 'everyone'); + $filter_context = elgg_extract('filter_context', $vars, 'everyone'); // generate a list of default tabs $tabs = array( diff --git a/views/default/layout/shells/content/header.php b/views/default/layout/shells/content/header.php index 92456bac4..7a3ab1ae9 100644 --- a/views/default/layout/shells/content/header.php +++ b/views/default/layout/shells/content/header.php @@ -15,9 +15,9 @@ if (isset($vars['header_override'])) { return true; } -$context = elgg_get_array_value('context', $vars, elgg_get_context()); +$context = elgg_extract('context', $vars, elgg_get_context()); if ($context) { - $title = elgg_get_array_value('title', $vars, ''); + $title = elgg_extract('title', $vars, ''); if (!$title) { $title = elgg_echo($context); } @@ -32,7 +32,7 @@ if ($context) { } else { $guid = elgg_get_logged_in_user_guid(); } - $new_link = elgg_get_array_value('new_link', $vars, "pg/$context/add/$guid/"); + $new_link = elgg_extract('new_link', $vars, "pg/$context/add/$guid/"); $params = array( 'href' => $new_link = elgg_normalize_url($new_link), 'text' => elgg_echo("$context:add"), diff --git a/views/default/layout/shells/widgets.php b/views/default/layout/shells/widgets.php index aa9fa2393..e551f288f 100644 --- a/views/default/layout/shells/widgets.php +++ b/views/default/layout/shells/widgets.php @@ -9,11 +9,11 @@ * @uses $vars['show_access'] Show the access control (true) */ -$box = elgg_get_array_value('box', $vars, ''); -$num_columns = elgg_get_array_value('num_columns', $vars, 3); -$show_add_widgets = elgg_get_array_value('show_add_widgets', $vars, true); -$exact_match = elgg_get_array_value('exact_match', $vars, false); -$show_access = elgg_get_array_value('show_access', $vars, true); +$box = elgg_extract('box', $vars, ''); +$num_columns = elgg_extract('num_columns', $vars, 3); +$show_add_widgets = elgg_extract('show_add_widgets', $vars, true); +$exact_match = elgg_extract('exact_match', $vars, false); +$show_access = elgg_extract('show_access', $vars, true); $owner = elgg_get_page_owner_entity(); $context = elgg_get_context(); diff --git a/views/default/layout/shells/widgets/add_panel.php b/views/default/layout/shells/widgets/add_panel.php index ff789cbd3..e6b13d573 100644 --- a/views/default/layout/shells/widgets/add_panel.php +++ b/views/default/layout/shells/widgets/add_panel.php @@ -9,7 +9,7 @@ $widgets = $vars['widgets']; $context = $vars['context']; -$exact = elgg_get_array_value('exact_match', $vars, false); +$exact = elgg_extract('exact_match', $vars, false); $widget_types = elgg_get_widget_types($context, $exact); diff --git a/views/default/navigation/breadcrumbs.php b/views/default/navigation/breadcrumbs.php index 67e985bed..53d1ffaaf 100644 --- a/views/default/navigation/breadcrumbs.php +++ b/views/default/navigation/breadcrumbs.php @@ -18,7 +18,7 @@ if (isset($vars['breadcrumbs'])) { } $class = 'elgg-breadcrumbs'; -$additional_class = elgg_get_array_value('class', $vars, ''); +$additional_class = elgg_extract('class', $vars, ''); if ($additional_class) { $class = "$class $additional_class"; } diff --git a/views/default/navigation/menu/elements/group.php b/views/default/navigation/menu/elements/group.php index 09474ea67..b0c0f54d4 100644 --- a/views/default/navigation/menu/elements/group.php +++ b/views/default/navigation/menu/elements/group.php @@ -7,7 +7,7 @@ * @uses $vars['section'] */ -$class = elgg_get_array_value('class', $vars, ''); +$class = elgg_extract('class', $vars, ''); if (isset($vars['section'])) { $class = "$class elgg-section-{$vars['section']}"; } diff --git a/views/default/navigation/menu/user_hover.php b/views/default/navigation/menu/user_hover.php index 9ceda38e5..bbca41e21 100644 --- a/views/default/navigation/menu/user_hover.php +++ b/views/default/navigation/menu/user_hover.php @@ -9,9 +9,9 @@ */ $user = $vars['entity']; -$actions = elgg_get_array_value('action', $vars['menu'], null); -$main = elgg_get_array_value('default', $vars['menu'], null); -$admin = elgg_get_array_value('admin', $vars['menu'], null); +$actions = elgg_extract('action', $vars['menu'], null); +$main = elgg_extract('default', $vars['menu'], null); +$admin = elgg_extract('admin', $vars['menu'], null); echo '<ul class="elgg-menu elgg-menu-hover">'; diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php index 98b85201e..c0cb801dd 100644 --- a/views/default/navigation/pagination.php +++ b/views/default/navigation/pagination.php @@ -17,17 +17,17 @@ if (elgg_in_context('widget')) { return true; } -$offset = abs((int) elgg_get_array_value('offset', $vars, 0)); +$offset = abs((int) elgg_extract('offset', $vars, 0)); // because you can say $vars['limit'] = 0 -if (!$limit = (int) elgg_get_array_value('limit', $vars, 10)) { +if (!$limit = (int) elgg_extract('limit', $vars, 10)) { $limit = 10; } -$count = (int) elgg_get_array_value('count', $vars, 0); -$offset_key = elgg_get_array_value('offset_key', $vars, 'offset'); -$base_url = elgg_get_array_value('baseurl', $vars, current_page_url()); +$count = (int) elgg_extract('count', $vars, 0); +$offset_key = elgg_extract('offset_key', $vars, 'offset'); +$base_url = elgg_extract('baseurl', $vars, current_page_url()); -$num_pages = elgg_get_array_value('num_pages', $vars, 10); +$num_pages = elgg_extract('num_pages', $vars, 10); $delta = ceil($num_pages / 2); if ($count <= $limit && $offset == 0) { diff --git a/views/default/navigation/tabs.php b/views/default/navigation/tabs.php index 4a5a5e7a9..376464ee5 100644 --- a/views/default/navigation/tabs.php +++ b/views/default/navigation/tabs.php @@ -15,7 +15,7 @@ * ) */ -$type = elgg_get_array_value('type', $vars, 'horizontal'); +$type = elgg_extract('type', $vars, 'horizontal'); if ($type == 'horizontal') { $type_class = "elgg-tabs elgg-htabs"; } else { @@ -31,10 +31,10 @@ if (isset($vars['tabs']) && is_array($vars['tabs']) && !empty($vars['tabs'])) { <ul class="<?php echo $type_class; ?>"> <?php foreach ($vars['tabs'] as $info) { - $class = elgg_get_array_value('class', $info, ''); - $id = elgg_get_array_value('id', $info, ''); + $class = elgg_extract('class', $info, ''); + $id = elgg_extract('id', $info, ''); - $selected = elgg_get_array_value('selected', $info, FALSE); + $selected = elgg_extract('selected', $info, FALSE); if ($selected) { $class .= ' elgg-state-selected'; } diff --git a/views/default/object/plugin.php b/views/default/object/plugin.php index 68171424b..befd61018 100644 --- a/views/default/object/plugin.php +++ b/views/default/object/plugin.php @@ -10,7 +10,7 @@ */ // Do we want to show admin settings or user settings -$type = elgg_get_array_value('type', $vars, ''); +$type = elgg_extract('type', $vars, ''); if ($type != 'user') { $type = ''; diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php index 9325f0eb6..aef33ab1f 100644 --- a/views/default/output/confirmlink.php +++ b/views/default/output/confirmlink.php @@ -12,14 +12,14 @@ * @uses $vars['text_encode'] Encode special characters? */ -$confirm = elgg_get_array_value('confirm', $vars, elgg_echo('question:areyousure')); +$confirm = elgg_extract('confirm', $vars, elgg_echo('question:areyousure')); -$encode = elgg_get_array_value('text_encode', $vars, true); +$encode = elgg_extract('text_encode', $vars, true); // always generate missing action tokens $vars['href'] = elgg_add_action_tokens_to_url(elgg_normalize_url($vars['href']), true); -$text = elgg_get_array_value('text', $vars, ''); +$text = elgg_extract('text', $vars, ''); if ($encode) { $text = htmlspecialchars($text, ENT_QUOTES, 'UTF-8', false); } diff --git a/views/default/output/longtext.php b/views/default/output/longtext.php index ea91fe424..703bb0868 100644 --- a/views/default/output/longtext.php +++ b/views/default/output/longtext.php @@ -12,12 +12,12 @@ */ $class = 'elgg-text'; -$additional_class = elgg_get_array_value('class', $vars, ''); +$additional_class = elgg_extract('class', $vars, ''); if ($additional_class) { $class = "$class $additional_class"; } -$parse_urls = elgg_get_array_value('parse_urls', $vars, true); +$parse_urls = elgg_extract('parse_urls', $vars, true); $text = $vars['value']; diff --git a/views/default/output/url.php b/views/default/output/url.php index 19277f08f..fdeb94ac3 100644 --- a/views/default/output/url.php +++ b/views/default/output/url.php @@ -13,7 +13,7 @@ * */ -$url = elgg_get_array_value('href', $vars, null); +$url = elgg_extract('href', $vars, null); if (!$url and isset($vars['value'])) { $url = trim($vars['value']); unset($vars['value']); diff --git a/views/default/page/elements/body.php b/views/default/page/elements/body.php index 31fe24ab4..14c3978d3 100644 --- a/views/default/page/elements/body.php +++ b/views/default/page/elements/body.php @@ -5,4 +5,4 @@ * @uses $vars['body'] The HTML of the page body */ -echo elgg_get_array_value('body', $vars, '');
\ No newline at end of file +echo elgg_extract('body', $vars, '');
\ No newline at end of file diff --git a/views/default/profile/icon.php b/views/default/profile/icon.php index 1a36ca3cd..dfbea45a0 100644 --- a/views/default/profile/icon.php +++ b/views/default/profile/icon.php @@ -10,7 +10,7 @@ * @uses $vars['js'] */ -$override = elgg_get_array_value('override', $vars, false); +$override = elgg_extract('override', $vars, false); $vars['hover'] = !$override; echo elgg_view('icon/user/default', $vars); diff --git a/views/rss/layout/objects/list.php b/views/rss/layout/objects/list.php index 352725239..9892d2779 100644 --- a/views/rss/layout/objects/list.php +++ b/views/rss/layout/objects/list.php @@ -6,7 +6,7 @@ */ $items = $vars['items']; -$full_view = elgg_get_array_value('full_view', $vars, false); +$full_view = elgg_extract('full_view', $vars, false); if (is_array($items) && sizeof($items) > 0) { foreach ($items as $item) { |