diff options
Diffstat (limited to 'views/default')
33 files changed, 80 insertions, 80 deletions
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); |