diff options
Diffstat (limited to 'mod')
43 files changed, 147 insertions, 147 deletions
diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php index ede87386c..6ab51ccbd 100644 --- a/mod/blog/lib/blog.php +++ b/mod/blog/lib/blog.php @@ -281,8 +281,8 @@ function blog_get_page_content_edit($page, $guid = 0, $revision = NULL) { ); $vars = array(); - $vars['internalid'] = 'blog-post-edit'; - $vars['internalname'] = 'blog_post'; + $vars['id'] = 'blog-post-edit'; + $vars['name'] = 'blog_post'; if ($page == 'edit') { $blog = get_entity((int)$guid); diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php index 47f306ba1..6020ad4b0 100644 --- a/mod/blog/views/default/forms/blog/save.php +++ b/mod/blog/views/default/forms/blog/save.php @@ -28,22 +28,22 @@ $action_buttons = $save_button . $delete_link; $title_label = elgg_echo('title'); $title_input = elgg_view('input/text', array( - 'internalname' => 'title', - 'internalid' => 'blog_title', + 'name' => 'title', + 'id' => 'blog_title', 'value' => $vars['title'] )); $excerpt_label = elgg_echo('blog:excerpt'); $excerpt_input = elgg_view('input/text', array( - 'internalname' => 'excerpt', - 'internalid' => 'blog_excerpt', + 'name' => 'excerpt', + 'id' => 'blog_excerpt', 'value' => html_entity_decode($vars['excerpt'], ENT_COMPAT, 'UTF-8') )); $body_label = elgg_echo('blog:body'); $body_input = elgg_view('input/longtext', array( - 'internalname' => 'description', - 'internalid' => 'blog_description', + 'name' => 'description', + 'id' => 'blog_description', 'value' => $vars['description'] )); @@ -56,8 +56,8 @@ if ($vars['publish_date']) { $status_label = elgg_echo('blog:status'); $status_input = elgg_view('input/dropdown', array( - 'internalname' => 'status', - 'internalid' => 'blog_status', + 'name' => 'status', + 'id' => 'blog_status', 'value' => $vars['status'], 'options_values' => array( 'draft' => elgg_echo('blog:status:draft'), @@ -67,39 +67,39 @@ $status_input = elgg_view('input/dropdown', array( $comments_label = elgg_echo('comments'); $comments_input = elgg_view('input/dropdown', array( - 'internalname' => 'comments_on', - 'internalid' => 'blog_comments_on', + 'name' => 'comments_on', + 'id' => 'blog_comments_on', 'value' => $vars['comments_on'], 'options_values' => array('On' => elgg_echo('on'), 'Off' => elgg_echo('off')) )); $tags_label = elgg_echo('tags'); $tags_input = elgg_view('input/tags', array( - 'internalname' => 'tags', - 'internalid' => 'blog_tags', + 'name' => 'tags', + 'id' => 'blog_tags', 'value' => $vars['tags'] )); $access_label = elgg_echo('access'); $access_input = elgg_view('input/access', array( - 'internalname' => 'access_id', - 'internalid' => 'blog_access_id', + 'name' => 'access_id', + 'id' => 'blog_access_id', 'value' => $vars['access_id'] )); // not being used $publish_date_label = elgg_echo('blog:publish_date'); $publish_date_input = elgg_view('input/datetime', array( - 'internalname' => 'publish_date', - 'internalid' => 'blog_publish_date', + 'name' => 'publish_date', + 'id' => 'blog_publish_date', 'value' => $vars['publish_date'] )); $categories_input = elgg_view('categories', $vars); // hidden inputs -$container_guid_input = elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => elgg_get_page_owner_guid())); -$guid_input = elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $vars['guid'])); +$container_guid_input = elgg_view('input/hidden', array('name' => 'container_guid', 'value' => elgg_get_page_owner_guid())); +$guid_input = elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['guid'])); echo <<<___HTML diff --git a/mod/blog/views/default/input/datetime.php b/mod/blog/views/default/input/datetime.php index 7933c7bd7..3a7244b88 100644 --- a/mod/blog/views/default/input/datetime.php +++ b/mod/blog/views/default/input/datetime.php @@ -15,32 +15,32 @@ for ($i=1; $i <= 12; $i++) { } $month = elgg_view('input/dropdown', array( - 'internalname' => 'publish_month', + 'name' => 'publish_month', 'value' => date('m', $publish_date), 'options_values' => $months, 'class' => 'blog_publish_month', )); $day = elgg_view('input/text', array( - 'internalname' => 'publish_day', + 'name' => 'publish_day', 'value' => date('d', $publish_date), 'class' => 'blog_publish_day', )); $year = elgg_view('input/text', array( - 'internalname' => 'publish_year', + 'name' => 'publish_year', 'value' => date('Y', $publish_date), 'class' => 'blog_publish_year', )); $hour = elgg_view('input/text', array( - 'internalname' => 'publish_hour', + 'name' => 'publish_hour', 'value' => date('H', $publish_date), 'class' => 'blog_publish_hour', )); $minute = elgg_view('input/text', array( - 'internalname' => 'publish_minute', + 'name' => 'publish_minute', 'value' => date('i', $publish_date), 'class' => 'blog_publish_minute', )); diff --git a/mod/blog/views/default/widgets/blog/edit.php b/mod/blog/views/default/widgets/blog/edit.php index 4c3b1d4e2..30c3b2e73 100644 --- a/mod/blog/views/default/widgets/blog/edit.php +++ b/mod/blog/views/default/widgets/blog/edit.php @@ -9,7 +9,7 @@ if (!isset($vars['entity']->num_display)) { } $params = array( - 'internalname' => 'params[num_display]', + 'name' => 'params[num_display]', 'value' => $vars['entity']->num_display, 'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10), ); diff --git a/mod/bookmarks/views/default/bookmarks/form.php b/mod/bookmarks/views/default/bookmarks/form.php index 2131f7cd8..ef8a18dc3 100644 --- a/mod/bookmarks/views/default/bookmarks/form.php +++ b/mod/bookmarks/views/default/bookmarks/form.php @@ -48,7 +48,7 @@ if(isset($vars['entity'])){ <?php echo elgg_view('input/text',array( - 'internalname' => 'title', + 'name' => 'title', 'value' => $title, )); @@ -61,7 +61,7 @@ if(isset($vars['entity'])){ <?php echo elgg_view('input/url',array( - 'internalname' => 'address', + 'name' => 'address', 'value' => $address, )); @@ -75,7 +75,7 @@ if(isset($vars['entity'])){ <?php echo elgg_view('input/longtext',array( - 'internalname' => 'description', + 'name' => 'description', 'value' => $description, )); @@ -88,7 +88,7 @@ if(isset($vars['entity'])){ <?php echo elgg_view('input/tags',array( - 'internalname' => 'tags', + 'name' => 'tags', 'value' => $tags, )); @@ -103,7 +103,7 @@ if(isset($vars['entity'])){ <p> <label><?php echo elgg_echo("bookmarks:with"); ?></label><br /> <?php - echo elgg_view('friends/picker',array('entities' => $friends, 'internalname' => 'shares', 'highlight' => $highlight)); + echo elgg_view('friends/picker',array('entities' => $friends, 'name' => 'shares', 'highlight' => $highlight)); ?> </p> <?php @@ -116,7 +116,7 @@ if(isset($vars['entity'])){ <?php echo elgg_view('input/access',array( - 'internalname' => 'access', + 'name' => 'access', 'value' => $access_id, )); @@ -124,7 +124,7 @@ if(isset($vars['entity'])){ </label> </p> <p> - <?php echo $vars['container_guid'] ? elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => $vars['container_guid'])) : ""; ?> + <?php echo $vars['container_guid'] ? elgg_view('input/hidden', array('name' => 'container_guid', 'value' => $vars['container_guid'])) : ""; ?> <input type="hidden" name="bookmark_guid" value="<?php echo $guid; ?>" /> <input type="submit" value="<?php echo elgg_echo('save'); ?>" /> </p> diff --git a/mod/bookmarks/views/default/bookmarks/sharing.php b/mod/bookmarks/views/default/bookmarks/sharing.php index 63738d94d..779af4de2 100644 --- a/mod/bookmarks/views/default/bookmarks/sharing.php +++ b/mod/bookmarks/views/default/bookmarks/sharing.php @@ -69,7 +69,7 @@ /*echo elgg_view('input/checkboxes',array( - 'internalname' => 'shares', + 'name' => 'shares', 'options' => $options, 'value' => $vars['shares'], diff --git a/mod/categories/views/default/input/categories.php b/mod/categories/views/default/input/categories.php index dfb8b117f..1f71dc0b4 100644 --- a/mod/categories/views/default/input/categories.php +++ b/mod/categories/views/default/input/categories.php @@ -31,7 +31,7 @@ if (!empty($categories)) { echo elgg_view('input/checkboxes', array( 'options' => $categories, 'value' => $selected_categories, - 'internalname' => 'universal_categories_list', + 'name' => 'universal_categories_list', 'align' => 'horizontal', )); diff --git a/mod/categories/views/default/settings/categories/edit.php b/mod/categories/views/default/settings/categories/edit.php index e4750f02f..583292e72 100644 --- a/mod/categories/views/default/settings/categories/edit.php +++ b/mod/categories/views/default/settings/categories/edit.php @@ -18,4 +18,4 @@ if (empty($categories)) { <?php echo elgg_echo('categories:explanation'); ?> </p> <?php -echo elgg_view('input/tags', array('value' => $categories, 'internalname' => 'categories')); +echo elgg_view('input/tags', array('value' => $categories, 'name' => 'categories')); diff --git a/mod/defaultwidgets/views/default/defaultwidgets/editor.php b/mod/defaultwidgets/views/default/defaultwidgets/editor.php index 439f36ce4..b03023b35 100644 --- a/mod/defaultwidgets/views/default/defaultwidgets/editor.php +++ b/mod/defaultwidgets/views/default/defaultwidgets/editor.php @@ -252,8 +252,8 @@ <textarea type="textarea" value="Middle widgets" style="display:none" name="debugField2" id="debugField2" /><?php echo $middlecolumn_widgets; ?></textarea> <textarea type="textarea" value="Right widgets" style="display:none" name="debugField3" id="debugField3" /><?php echo $rightcolumn_widgets; ?></textarea> <?php - echo elgg_view('input/hidden',array('internalname' => '__elgg_token', 'value' => $vars['token'])); - echo elgg_view('input/hidden',array('internalname' => '__elgg_ts', 'value' => $vars['ts'])); + echo elgg_view('input/hidden',array('name' => '__elgg_token', 'value' => $vars['token'])); + echo elgg_view('input/hidden',array('name' => '__elgg_ts', 'value' => $vars['ts'])); ?> <input type="hidden" name="context" value="<?php echo $context; ?>" /> <input type="hidden" name="owner" value="<?php echo elgg_get_page_owner_guid(); ?>" /> diff --git a/mod/developers/views/default/theme_preview/forms.php b/mod/developers/views/default/theme_preview/forms.php index 5550e51d4..5915678c6 100644 --- a/mod/developers/views/default/theme_preview/forms.php +++ b/mod/developers/views/default/theme_preview/forms.php @@ -17,8 +17,8 @@ $ipsum = elgg_get_config('tp_ipsum'); <div> <label for="f1">Text input:</label> <?php echo elgg_view('input/text', array( - 'internalname' => 'f1', - 'internalid' => 'f1', + 'name' => 'f1', + 'id' => 'f1', 'value' => 'input text', )); ?> @@ -26,8 +26,8 @@ $ipsum = elgg_get_config('tp_ipsum'); <div> <label for="f2">Password input:</label> <?php echo elgg_view('input/password', array( - 'internalname' => 'f2', - 'internalid' => 'f2', + 'name' => 'f2', + 'id' => 'f2', 'value' => 'password', )); ?> @@ -35,8 +35,8 @@ $ipsum = elgg_get_config('tp_ipsum'); <div> <label for="f3">Radio input:</label><br /> <?php echo elgg_view('input/radio', array( - 'internalname' => 'f3', - 'internalid' => 'f3', + 'name' => 'f3', + 'id' => 'f3', 'options' => array('a' => 1, 'b' => 2), )); ?> @@ -44,8 +44,8 @@ $ipsum = elgg_get_config('tp_ipsum'); <div> <label for="f4">Checkboxes input:</label><br /> <?php echo elgg_view('input/checkboxes', array( - 'internalname' => 'f4', - 'internalid' => 'f4', + 'name' => 'f4', + 'id' => 'f4', 'options' => array('a' => 1, 'b' => 2), )); ?> @@ -53,8 +53,8 @@ $ipsum = elgg_get_config('tp_ipsum'); <div> <label for="f5">Dropdown input:</label><br /> <?php echo elgg_view('input/dropdown', array( - 'internalname' => 'f5', - 'internalid' => 'f5', + 'name' => 'f5', + 'id' => 'f5', 'options' => array('option 1', 'option 2'), )); ?> @@ -62,8 +62,8 @@ $ipsum = elgg_get_config('tp_ipsum'); <div> <label for="f6">Access input:</label> <?php echo elgg_view('input/access', array( - 'internalname' => 'f6', - 'internalid' => 'f6', + 'name' => 'f6', + 'id' => 'f6', 'value' => ACCESS_PUBLIC, )); ?> @@ -71,16 +71,16 @@ $ipsum = elgg_get_config('tp_ipsum'); <div> <label for="f7">File input:</label> <?php echo elgg_view('input/file', array( - 'internalname' => 'f7', - 'internalid' => 'f7', + 'name' => 'f7', + 'id' => 'f7', )); ?> </div> <div> <label for="f8">URL input:</label> <?php echo elgg_view('input/url', array( - 'internalname' => 'f8', - 'internalid' => 'f8', + 'name' => 'f8', + 'id' => 'f8', 'value' => 'http://elgg.org/', )); ?> @@ -88,8 +88,8 @@ $ipsum = elgg_get_config('tp_ipsum'); <div> <label for="f9">Tags input:</label> <?php echo elgg_view('input/tags', array( - 'internalname' => 'f9', - 'internalid' => 'f9', + 'name' => 'f9', + 'id' => 'f9', 'value' => 'one, two, three', )); ?> @@ -97,8 +97,8 @@ $ipsum = elgg_get_config('tp_ipsum'); <div> <label for="f10">Email input:</label> <?php echo elgg_view('input/email', array( - 'internalname' => 'f10', - 'internalid' => 'f10', + 'name' => 'f10', + 'id' => 'f10', 'value' => 'noone@elgg.org', )); ?> @@ -106,8 +106,8 @@ $ipsum = elgg_get_config('tp_ipsum'); <div> <label for="f11">Autocomplete input:</label> <?php echo elgg_view('input/autocomplete', array( - 'internalname' => 'f11', - 'internalid' => 'f11', + 'name' => 'f11', + 'id' => 'f11', 'match_on' => 'users', )); ?> @@ -115,24 +115,24 @@ $ipsum = elgg_get_config('tp_ipsum'); <div> <label for="f12">Date picker input:</label> <?php echo elgg_view('input/datepicker', array( - 'internalname' => 'f12', - 'internalid' => 'f12', + 'name' => 'f12', + 'id' => 'f12', )); ?> </div> <div> <label for="f13">User picker input:</label> <?php echo elgg_view('input/userpicker', array( - 'internalname' => 'f13', - 'internalid' => 'f13', + 'name' => 'f13', + 'id' => 'f13', )); ?> </div> <div> <label for="f14">Long text input:</label> <?php echo elgg_view('input/longtext', array( - 'internalname' => 'f14', - 'internalid' => 'f14', + 'name' => 'f14', + 'id' => 'f14', 'value' => $ipsum, )); ?> @@ -140,8 +140,8 @@ $ipsum = elgg_get_config('tp_ipsum'); <div> <label for="f15">Plain text input:</label> <?php echo elgg_view('input/plaintext', array( - 'internalname' => 'f15', - 'internalid' => 'f15', + 'name' => 'f15', + 'id' => 'f15', 'value' => $ipsum, )); ?> diff --git a/mod/embed/views/default/embed/link.php b/mod/embed/views/default/embed/link.php index 4ed193047..2bcf48300 100644 --- a/mod/embed/views/default/embed/link.php +++ b/mod/embed/views/default/embed/link.php @@ -10,7 +10,7 @@ if (elgg_is_active_plugin('ecml')) { $active_section = ''; } -$url = "pg/embed/?{$active_section}internal_name={$vars['internalname']}"; +$url = "pg/embed/?{$active_section}internal_name={$vars['name']}"; $url = elgg_normalize_url($url); ?> diff --git a/mod/embed/views/default/embed/upload/content.php b/mod/embed/views/default/embed/upload/content.php index a8330bce0..f314c26d2 100644 --- a/mod/embed/views/default/embed/upload/content.php +++ b/mod/embed/views/default/embed/upload/content.php @@ -15,7 +15,7 @@ if ($upload_sections) { $input = elgg_view('input/dropdown', array( 'name' => 'download_section', 'options_values' => $options, - 'internalid' => 'embed_upload', + 'id' => 'embed_upload', 'value' => $active_section )); diff --git a/mod/externalpages/views/default/forms/expages/edit.php b/mod/externalpages/views/default/forms/expages/edit.php index afe091337..58c174d6e 100644 --- a/mod/externalpages/views/default/forms/expages/edit.php +++ b/mod/externalpages/views/default/forms/expages/edit.php @@ -25,19 +25,19 @@ if ($page_contents) { // set the required form variables $input_area = elgg_view('input/longtext', array( - 'internalname' => 'expagescontent', + 'name' => 'expagescontent', 'value' => $description, )); $submit_input = elgg_view('input/submit', array( - 'internalname' => 'submit', + 'name' => 'submit', 'value' => elgg_echo('save'), )); $hidden_type = elgg_view('input/hidden', array( - 'internalname' => 'content_type', + 'name' => 'content_type', 'value' => $type, )); $hidden_guid = elgg_view('input/hidden', array( - 'internalname' => 'guid', + 'name' => 'guid', 'value' => $guid, )); diff --git a/mod/file/views/default/file/embed_upload.php b/mod/file/views/default/file/embed_upload.php index a5cf7ee59..8536acd77 100644 --- a/mod/file/views/default/file/embed_upload.php +++ b/mod/file/views/default/file/embed_upload.php @@ -3,7 +3,7 @@ * Files upload form for embed */ -echo elgg_view_form('file/upload', array('internalid' => 'file_embed_upload'), array('ajax' => TRUE)); +echo elgg_view_form('file/upload', array('id' => 'file_embed_upload'), array('ajax' => TRUE)); ?> diff --git a/mod/file/views/default/forms/file/upload.php b/mod/file/views/default/forms/file/upload.php index a96cbaef6..001e66674 100644 --- a/mod/file/views/default/forms/file/upload.php +++ b/mod/file/views/default/forms/file/upload.php @@ -23,19 +23,19 @@ if ($guid) { ?> <div> <label><?php echo $file_label; ?></label><br /> - <?php echo elgg_view('input/file', array('internalname' => 'upload')); ?> + <?php echo elgg_view('input/file', array('name' => 'upload')); ?> </div> <div> <label><?php echo elgg_echo('title'); ?></label><br /> - <?php echo elgg_view('input/text', array('internalname' => 'title', 'value' => $title)); ?> + <?php echo elgg_view('input/text', array('name' => 'title', 'value' => $title)); ?> </div> <div> <label><?php echo elgg_echo('description'); ?></label> - <?php echo elgg_view('input/longtext', array('internalname' => 'description', 'value' => $desc)); ?> + <?php echo elgg_view('input/longtext', array('name' => 'description', 'value' => $desc)); ?> </div> <div> <label><?php echo elgg_echo('tags'); ?></label> - <?php echo elgg_view('input/tags', array('internalname' => 'tags', 'value' => $tags)); ?> + <?php echo elgg_view('input/tags', array('name' => 'tags', 'value' => $tags)); ?> </div> <?php @@ -47,20 +47,20 @@ if ($categories) { ?> <div> <label><?php echo elgg_echo('access'); ?></label><br /> - <?php echo elgg_view('input/access', array('internalname' => 'access_id', 'value' => $access_id)); ?> + <?php echo elgg_view('input/access', array('name' => 'access_id', 'value' => $access_id)); ?> </div> <div> <?php -echo elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => $container_guid)); +echo elgg_view('input/hidden', array('name' => 'container_guid', 'value' => $container_guid)); //@todo this should not be necessary in 1.8... -- ajax actions can be auto-detected if ($ajax) { - echo elgg_view('input/hidden', array('internalname' => 'ajax', 'value' => 1)); + echo elgg_view('input/hidden', array('name' => 'ajax', 'value' => 1)); } if ($guid) { - echo elgg_view('input/hidden', array('internalname' => 'file_guid', 'value' => $guid)); + echo elgg_view('input/hidden', array('name' => 'file_guid', 'value' => $guid)); } echo elgg_view('input/submit', array('value' => elgg_echo("save"))); diff --git a/mod/file/views/default/widgets/filerepo/edit.php b/mod/file/views/default/widgets/filerepo/edit.php index 6de77fc78..cab35b6ef 100644 --- a/mod/file/views/default/widgets/filerepo/edit.php +++ b/mod/file/views/default/widgets/filerepo/edit.php @@ -12,7 +12,7 @@ if (!isset($vars['entity']->num_display)) { } $params = array( - 'internalname' => 'params[num_display]', + 'name' => 'params[num_display]', 'value' => $vars['entity']->num_display, 'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20), ); diff --git a/mod/garbagecollector/views/default/settings/garbagecollector/edit.php b/mod/garbagecollector/views/default/settings/garbagecollector/edit.php index e736f9f9f..a0f9677a0 100644 --- a/mod/garbagecollector/views/default/settings/garbagecollector/edit.php +++ b/mod/garbagecollector/views/default/settings/garbagecollector/edit.php @@ -16,7 +16,7 @@ if (!$period) { <?php echo elgg_view('input/dropdown', array( - 'internalname' => 'params[period]', + 'name' => 'params[period]', 'options_values' => array( 'weekly' => elgg_echo('garbagecollector:weekly'), 'monthly' => elgg_echo('garbagecollector:monthly'), diff --git a/mod/groups/views/default/forms/discussion/save.php b/mod/groups/views/default/forms/discussion/save.php index af8d730d5..5d50d5c91 100644 --- a/mod/groups/views/default/forms/discussion/save.php +++ b/mod/groups/views/default/forms/discussion/save.php @@ -15,21 +15,21 @@ $guid = elgg_extract('guid', $vars, null); ?> <div> <label><?php echo elgg_echo('title'); ?></label><br /> - <?php echo elgg_view('input/text', array('internalname' => 'title', 'value' => $title)); ?> + <?php echo elgg_view('input/text', array('name' => 'title', 'value' => $title)); ?> </div> <div> <label><?php echo elgg_echo('groups:topicmessage'); ?></label> - <?php echo elgg_view('input/longtext', array('internalname' => 'description', 'value' => $desc)); ?> + <?php echo elgg_view('input/longtext', array('name' => 'description', 'value' => $desc)); ?> </div> <div> <label><?php echo elgg_echo('tags'); ?></label> - <?php echo elgg_view('input/tags', array('internalname' => 'tags', 'value' => $tags)); ?> + <?php echo elgg_view('input/tags', array('name' => 'tags', 'value' => $tags)); ?> </div> <div> <label><?php echo elgg_echo("groups:topicstatus"); ?></label><br /> <?php echo elgg_view('input/dropdown', array( - 'internalname' => 'status', + 'name' => 'status', 'value' => $status, 'options_values' => array( 'open' => elgg_echo('groups:topicopen'), @@ -40,15 +40,15 @@ $guid = elgg_extract('guid', $vars, null); </div> <div> <label><?php echo elgg_echo('access'); ?></label><br /> - <?php echo elgg_view('input/access', array('internalname' => 'access_id', 'value' => $access_id)); ?> + <?php echo elgg_view('input/access', array('name' => 'access_id', 'value' => $access_id)); ?> </div> <div> <?php -echo elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => $container_guid)); +echo elgg_view('input/hidden', array('name' => 'container_guid', 'value' => $container_guid)); if ($guid) { - echo elgg_view('input/hidden', array('internalname' => 'topic_guid', 'value' => $guid)); + echo elgg_view('input/hidden', array('name' => 'topic_guid', 'value' => $guid)); } echo elgg_view('input/submit', array('value' => elgg_echo("save"))); diff --git a/mod/groups/views/default/forms/groups/delete.php b/mod/groups/views/default/forms/groups/delete.php index 67a4bcd85..4c380718a 100644 --- a/mod/groups/views/default/forms/groups/delete.php +++ b/mod/groups/views/default/forms/groups/delete.php @@ -6,7 +6,7 @@ $warning = elgg_echo("groups:deletewarning"); echo elgg_view('input/hidden', array( - 'internalname' => 'group_guid', + 'name' => 'group_guid', 'value' => $vars['entity']->getGUID(), )); diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php index d4a2754ca..f9ef86296 100644 --- a/mod/groups/views/default/forms/groups/edit.php +++ b/mod/groups/views/default/forms/groups/edit.php @@ -15,12 +15,12 @@ if (isset($vars['entity'])) { ?> <div> <label><?php echo elgg_echo("groups:icon"); ?></label><br /> - <?php echo elgg_view("input/file", array('internalname' => 'icon')); ?> + <?php echo elgg_view("input/file", array('name' => 'icon')); ?> </div> <div> <label><?php echo elgg_echo("groups:name"); ?></label><br /> <?php echo elgg_view("input/text", array( - 'internalname' => 'name', + 'name' => 'name', 'value' => $vars['entity']->name, )); ?> @@ -38,7 +38,7 @@ if ($group_profile_fields > 0) { echo elgg_echo("groups:{$shortname}"); echo "</label>$line_break"; echo elgg_view("input/{$valtype}", array( - 'internalname' => $shortname, + 'name' => $shortname, 'value' => $vars['entity']->$shortname, )); echo '</div>'; @@ -50,7 +50,7 @@ if ($group_profile_fields > 0) { <label> <?php echo elgg_echo('groups:membership'); ?><br /> <?php echo elgg_view('input/access', array( - 'internalname' => 'membership', + 'name' => 'membership', 'value' => $membership, 'options' => array( ACCESS_PRIVATE => elgg_echo('groups:access:private'), @@ -87,7 +87,7 @@ if (elgg_get_plugin_setting('hidden_groups', 'groups') == 'yes') { <label> <?php echo elgg_echo('groups:visibility'); ?><br /> <?php echo elgg_view('input/access', array( - 'internalname' => 'vis', + 'name' => 'vis', 'value' => $current_access, 'options' => $access, )); @@ -115,7 +115,7 @@ if ($tools) { <?php echo $group_option->label; ?><br /> </label> <?php echo elgg_view("input/radio", array( - "internalname" => $group_option_toggle_name, + "name" => $group_option_toggle_name, "value" => $value, 'options' => array( elgg_echo('groups:yes') => 'yes', @@ -133,7 +133,7 @@ if ($tools) { if (isset($vars['entity'])) { echo elgg_view('input/hidden', array( - 'internalname' => 'group_guid', + 'name' => 'group_guid', 'value' => $vars['entity']->getGUID(), )); } diff --git a/mod/groups/views/default/forms/groups/invite.php b/mod/groups/views/default/forms/groups/invite.php index 2c89db384..73eadb024 100644 --- a/mod/groups/views/default/forms/groups/invite.php +++ b/mod/groups/views/default/forms/groups/invite.php @@ -17,7 +17,7 @@ if ($friends) { <?php echo elgg_view('input/securitytoken'); - echo elgg_view('core/friends/picker',array('entities' => $friends, 'internalname' => 'user_guid', 'highlight' => 'all')); + echo elgg_view('core/friends/picker',array('entities' => $friends, 'name' => 'user_guid', 'highlight' => 'all')); ?> <input type="hidden" name="forward_url" value="<?php echo $forward_url; ?>" /> <input type="hidden" name="group_guid" value="<?php echo $group->guid; ?>" /> diff --git a/mod/groups/views/default/forms/groups/search.php b/mod/groups/views/default/forms/groups/search.php index fbb01513d..8912b245c 100644 --- a/mod/groups/views/default/forms/groups/search.php +++ b/mod/groups/views/default/forms/groups/search.php @@ -3,7 +3,7 @@ $tag_string = elgg_echo('groups:search:tags'); $params = array( - 'internalname' => 'tag', + 'name' => 'tag', 'class' => 'search-input', 'value' => $tag_string, 'onclick' => "if (this.value=='$tag_string') { this.value='' }", diff --git a/mod/groups/views/default/settings/groups/edit.php b/mod/groups/views/default/settings/groups/edit.php index 362d355af..1cf6be466 100644 --- a/mod/groups/views/default/settings/groups/edit.php +++ b/mod/groups/views/default/settings/groups/edit.php @@ -12,7 +12,7 @@ echo '<p>'; echo elgg_echo('groups:allowhiddengroups'); echo ' '; echo elgg_view('input/dropdown', array( - 'internalname' => 'params[hidden_groups]', + 'name' => 'params[hidden_groups]', 'options_values' => array( 'no' => elgg_echo('option:no'), 'yes' => elgg_echo('option:yes') diff --git a/mod/groups/views/default/widgets/a_users_groups/edit.php b/mod/groups/views/default/widgets/a_users_groups/edit.php index 4d61b3259..e49a996b7 100644 --- a/mod/groups/views/default/widgets/a_users_groups/edit.php +++ b/mod/groups/views/default/widgets/a_users_groups/edit.php @@ -12,7 +12,7 @@ if (!isset($vars['entity']->num_display)) { } $params = array( - 'internalname' => 'params[num_display]', + 'name' => 'params[num_display]', 'value' => $vars['entity']->num_display, 'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20), ); diff --git a/mod/logbrowser/views/default/logbrowser/form.php b/mod/logbrowser/views/default/logbrowser/form.php index 0b76ba313..e7c2257ce 100644 --- a/mod/logbrowser/views/default/logbrowser/form.php +++ b/mod/logbrowser/views/default/logbrowser/form.php @@ -31,19 +31,19 @@ $form = "<p>" . elgg_echo('logbrowser:user'); $form .= elgg_view('input/text', array( - 'internalname' => 'search_username', + 'name' => 'search_username', 'value' => $userval, )) . "</p>"; $form .= "<p>" . elgg_echo('logbrowser:starttime'); $form .= elgg_view('input/text', array( - 'internalname' => 'timelower', + 'name' => 'timelower', 'value' => $lowerval, )) . "</p>"; $form .= "<p>" . elgg_echo('logbrowser:endtime'); $form .= elgg_view('input/text', array( - 'internalname' => 'timeupper', + 'name' => 'timeupper', 'value' => $upperval, )) . "</p>"; $form .= elgg_view('input/submit', array( diff --git a/mod/logrotate/views/default/settings/logrotate/edit.php b/mod/logrotate/views/default/settings/logrotate/edit.php index 8a2dabba6..c73bec52c 100644 --- a/mod/logrotate/views/default/settings/logrotate/edit.php +++ b/mod/logrotate/views/default/settings/logrotate/edit.php @@ -16,7 +16,7 @@ if (!$period) { <?php echo elgg_view('input/dropdown', array( - 'internalname' => 'params[period]', + 'name' => 'params[period]', 'options_values' => array( 'weekly' => elgg_echo('logrotate:weekly'), 'monthly' => elgg_echo('logrotate:monthly'), diff --git a/mod/messages/read.php b/mod/messages/read.php index 9fda13f5f..83c7dccee 100644 --- a/mod/messages/read.php +++ b/mod/messages/read.php @@ -30,7 +30,7 @@ $buttons = ''; $content = elgg_view_entity($message, true); if ($inbox) { $form_params = array( - 'internalid' => 'messages-reply-form', + 'id' => 'messages-reply-form', 'class' => 'hidden', 'action' => 'action/messages/send', ); @@ -41,7 +41,7 @@ if ($inbox) { $buttons = elgg_view('output/url', array( 'text' => elgg_echo('messages:answer'), 'class' => 'elgg-button-action', - 'internalid' => 'messages-show-reply', + 'id' => 'messages-show-reply', )); } } diff --git a/mod/messages/views/default/forms/messages/process.php b/mod/messages/views/default/forms/messages/process.php index 7b3cd1a9e..ce24360e7 100644 --- a/mod/messages/views/default/forms/messages/process.php +++ b/mod/messages/views/default/forms/messages/process.php @@ -13,20 +13,20 @@ echo $vars['list']; echo '<div class="messages-buttonbank">'; echo elgg_view('input/submit', array( 'value' => elgg_echo('delete'), - 'internalname' => 'delete', + 'name' => 'delete', )); if ($vars['folder'] == "inbox") { echo elgg_view('input/submit', array( 'value' => elgg_echo('messages:markread'), - 'internalname' => 'read', + 'name' => 'read', )); } echo elgg_view('input/button', array( 'value' => elgg_echo('messages:toggle'), 'class' => 'elgg-button-cancel', - 'internalid' => 'messages-toggle', + 'id' => 'messages-toggle', )); echo '</div>'; diff --git a/mod/messages/views/default/forms/messages/reply.php b/mod/messages/views/default/forms/messages/reply.php index 4c1832672..2288f25f4 100644 --- a/mod/messages/views/default/forms/messages/reply.php +++ b/mod/messages/views/default/forms/messages/reply.php @@ -12,7 +12,7 @@ if (strncmp($reply_title, "RE:", 3) != 0) { } echo elgg_view('input/hidden', array( - 'internalname' => 'recipient_guid', + 'name' => 'recipient_guid', 'value' => $vars['message']->fromId, )); ?> @@ -20,7 +20,7 @@ echo elgg_view('input/hidden', array( <div> <label><?php echo elgg_echo("messages:title"); ?>: <br /></label> <?php echo elgg_view('input/text', array( - 'internalname' => 'subject', + 'name' => 'subject', 'value' => $reply_title, )); ?> @@ -28,7 +28,7 @@ echo elgg_view('input/hidden', array( <div> <label><?php echo elgg_echo("messages:message"); ?>:</label> <?php echo elgg_view("input/longtext", array( - 'internalname' => 'body', + 'name' => 'body', 'value' => '', )); ?> diff --git a/mod/messages/views/default/forms/messages/send.php b/mod/messages/views/default/forms/messages/send.php index 31918b314..db857b6f4 100644 --- a/mod/messages/views/default/forms/messages/send.php +++ b/mod/messages/views/default/forms/messages/send.php @@ -16,7 +16,7 @@ foreach ($vars['friends'] as $friend) { } $recipient_drop_down = elgg_view('input/dropdown', array( - 'internalname' => 'recipient_guid', + 'name' => 'recipient_guid', 'value' => $recipient_guid, 'options_values' => $recipients_options, )); @@ -29,7 +29,7 @@ $recipient_drop_down = elgg_view('input/dropdown', array( <div> <label><?php echo elgg_echo("messages:title"); ?>: <br /></label> <?php echo elgg_view('input/text', array( - 'internalname' => 'subject', + 'name' => 'subject', 'value' => $subject, )); ?> @@ -37,7 +37,7 @@ $recipient_drop_down = elgg_view('input/dropdown', array( <div> <label><?php echo elgg_echo("messages:message"); ?>:</label> <?php echo elgg_view("input/longtext", array( - 'internalname' => 'body', + 'name' => 'body', 'value' => $body, )); ?> diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php index 98ca1ccb5..d7ee65f12 100644 --- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php +++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php @@ -32,11 +32,11 @@ global $pickerinuse; $pickerinuse = true; $chararray = elgg_echo('friendspicker:chararray'); -// Initialise internalname -if (!isset($vars['internalname'])) { - $internalname = "friend"; +// Initialise name +if (!isset($vars['name'])) { + $name = "friend"; } else { - $internalname = $vars['internalname']; + $name = $vars['name']; } // Initialise values diff --git a/mod/pages/views/default/forms/pages/edit.php b/mod/pages/views/default/forms/pages/edit.php index 793e5c39e..abb6716fd 100644 --- a/mod/pages/views/default/forms/pages/edit.php +++ b/mod/pages/views/default/forms/pages/edit.php @@ -11,7 +11,7 @@ foreach ($variables as $name => $type) { <div> <label><?php echo elgg_echo("pages:$name") ?></label><br /> <?php echo elgg_view("input/$type", array( - 'internalname' => $name, + 'name' => $name, 'value' => $vars[$name], )); ?> @@ -28,17 +28,17 @@ if (!empty($cats)) { echo '<div>'; if ($vars['guid']) { echo elgg_view('input/hidden', array( - 'internalname' => 'page_guid', + 'name' => 'page_guid', 'value' => $vars['guid'], )); } echo elgg_view('input/hidden', array( - 'internalname' => 'container_guid', + 'name' => 'container_guid', 'value' => $vars['container_guid'], )); if ($vars['parent_guid']) { echo elgg_view('input/hidden', array( - 'internalname' => 'parent_guid', + 'name' => 'parent_guid', 'value' => $vars['parent_guid'], )); } diff --git a/mod/pages/views/default/widgets/pages/edit.php b/mod/pages/views/default/widgets/pages/edit.php index 69710e50a..f23514380 100644 --- a/mod/pages/views/default/widgets/pages/edit.php +++ b/mod/pages/views/default/widgets/pages/edit.php @@ -11,7 +11,7 @@ if (!isset($vars['entity']->pages_num)) { } $params = array( - 'internalname' => 'params[pages_num]', + 'name' => 'params[pages_num]', 'value' => $vars['entity']->pages_num, 'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10), ); diff --git a/mod/reportedcontent/views/default/forms/reportedcontent/add.php b/mod/reportedcontent/views/default/forms/reportedcontent/add.php index abc53e750..0b1716a35 100644 --- a/mod/reportedcontent/views/default/forms/reportedcontent/add.php +++ b/mod/reportedcontent/views/default/forms/reportedcontent/add.php @@ -19,7 +19,7 @@ $owner = elgg_get_logged_in_user_entity(); <?php echo elgg_echo('reportedcontent:title'); echo elgg_view('input/text', array( - 'internalname' => 'title', + 'name' => 'title', 'value' => $title, )); ?> @@ -30,7 +30,7 @@ $owner = elgg_get_logged_in_user_entity(); <?php echo elgg_echo('reportedcontent:address'); echo elgg_view('input/url', array( - 'internalname' => 'address', + 'name' => 'address', 'value' => $address, )); @@ -43,7 +43,7 @@ $owner = elgg_get_logged_in_user_entity(); </label> <?php echo elgg_view('input/longtext',array( - 'internalname' => 'description', + 'name' => 'description', 'value' => $description, )); ?> diff --git a/mod/reportedcontent/views/default/object/reported_content.php b/mod/reportedcontent/views/default/object/reported_content.php index 83e49142c..e755fae5b 100644 --- a/mod/reportedcontent/views/default/object/reported_content.php +++ b/mod/reportedcontent/views/default/object/reported_content.php @@ -58,7 +58,7 @@ if ($report->state == 'archived') { 'href' => '#', 'text' => elgg_echo('reportedcontent:moreinfo'), 'class' => "elgg-toggle", - 'internalid' => "elgg-toggler-report-$report->guid", + 'id' => "elgg-toggler-report-$report->guid", )); ?> </p> diff --git a/mod/reportedcontent/views/default/widgets/reportedcontent/edit.php b/mod/reportedcontent/views/default/widgets/reportedcontent/edit.php index 810d549af..ecd732d23 100644 --- a/mod/reportedcontent/views/default/widgets/reportedcontent/edit.php +++ b/mod/reportedcontent/views/default/widgets/reportedcontent/edit.php @@ -9,7 +9,7 @@ if (!isset($vars['entity']->num_display)) { } $params = array( - 'internalname' => 'params[num_display]', + 'name' => 'params[num_display]', 'value' => $vars['entity']->num_display, 'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10), ); diff --git a/mod/tagcloud/views/default/widgets/tagcloud/edit.php b/mod/tagcloud/views/default/widgets/tagcloud/edit.php index d860df549..919c8ccd4 100644 --- a/mod/tagcloud/views/default/widgets/tagcloud/edit.php +++ b/mod/tagcloud/views/default/widgets/tagcloud/edit.php @@ -10,7 +10,7 @@ if (!isset($vars['entity']->num_items)) { } $params = array( - 'internalname' => 'params[num_items]', + 'name' => 'params[num_items]', 'value' => $vars['entity']->num_items, 'options' => array(10, 20, 30, 50, 100), ); diff --git a/mod/thewire/views/default/forms/thewire/add.php b/mod/thewire/views/default/forms/thewire/add.php index 9a72e4109..54d5a5ea7 100644 --- a/mod/thewire/views/default/forms/thewire/add.php +++ b/mod/thewire/views/default/forms/thewire/add.php @@ -14,7 +14,7 @@ if ($post) { if ($post) { echo elgg_view('input/hidden', array( - 'internalname' => 'parent_guid', + 'name' => 'parent_guid', 'value' => $post->guid, )); } @@ -27,7 +27,7 @@ if ($post) { echo elgg_view('input/submit', array( 'value' => $text, - 'internalid' => 'thewire-submit-button', + 'id' => 'thewire-submit-button', )); ?> diff --git a/mod/thewire/views/default/widgets/thewire/edit.php b/mod/thewire/views/default/widgets/thewire/edit.php index 8c93383ad..cee3f769d 100644 --- a/mod/thewire/views/default/widgets/thewire/edit.php +++ b/mod/thewire/views/default/widgets/thewire/edit.php @@ -9,7 +9,7 @@ if (!isset($vars['entity']->num_display)) { } $params = array( - 'internalname' => 'params[num_display]', + 'name' => 'params[num_display]', 'value' => $vars['entity']->num_display, 'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10), ); diff --git a/mod/tinymce/views/default/input/longtext.php b/mod/tinymce/views/default/input/longtext.php index daa68502e..1d449262f 100644 --- a/mod/tinymce/views/default/input/longtext.php +++ b/mod/tinymce/views/default/input/longtext.php @@ -6,8 +6,8 @@ * * @uses $vars['value'] The current value, if any * @uses $vars['js'] Any Javascript to enter into the input tag - * @uses $vars['internalname'] The name of the input field - * @uses $vars['internalid'] The id of the input field + * @uses $vars['name'] The name of the input field + * @uses $vars['id'] The id of the input field * */ @@ -19,10 +19,10 @@ elgg_extend_view('footer/analytics', 'tinymce/init'); ?> -<a class="elgg-longtext-control tinymce-toggle-editor small" href="javascript:toggleEditor('<?php echo $vars['internalname']; ?>');"> +<a class="elgg-longtext-control tinymce-toggle-editor small" href="javascript:toggleEditor('<?php echo $vars['name']; ?>');"> <?php echo elgg_echo('tinymce:remove'); ?> </a> -<textarea class="elgg-input-textarea mceEditor" name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\""; ?> <?php echo $vars['js']; ?>> +<textarea class="elgg-input-textarea mceEditor" name="<?php echo $vars['name']; ?>" <?php if (isset($vars['id'])) echo "id=\"{$vars['id']}\""; ?> <?php echo $vars['js']; ?>> <?php echo htmlspecialchars($vars['value'], null, 'UTF-8'); ?> </textarea> diff --git a/mod/twitterservice/views/default/settings/twitterservice/edit.php b/mod/twitterservice/views/default/settings/twitterservice/edit.php index f84710af3..1e7dc1edd 100644 --- a/mod/twitterservice/views/default/settings/twitterservice/edit.php +++ b/mod/twitterservice/views/default/settings/twitterservice/edit.php @@ -6,21 +6,21 @@ $insert_view = elgg_view('twittersettings/extend'); $consumer_key_string = elgg_echo('twitterservice:consumer_key'); $consumer_key_view = elgg_view('input/text', array( - 'internalname' => 'params[consumer_key]', + 'name' => 'params[consumer_key]', 'value' => $vars['entity']->consumer_key, 'class' => 'text_input', )); $consumer_secret_string = elgg_echo('twitterservice:consumer_secret'); $consumer_secret_view = elgg_view('input/text', array( - 'internalname' => 'params[consumer_secret]', + 'name' => 'params[consumer_secret]', 'value' => $vars['entity']->consumer_secret, 'class' => 'text_input', )); $sign_on_with_twitter_string = elgg_echo('twitterservice:login'); $sign_on_with_twitter_view = elgg_view('input/dropdown', array( - 'internalname' => 'params[sign_on]', + 'name' => 'params[sign_on]', 'options_values' => array( 'yes' => elgg_echo('option:yes'), 'no' => elgg_echo('option:no'), @@ -30,7 +30,7 @@ $sign_on_with_twitter_view = elgg_view('input/dropdown', array( $new_users_with_twitter = elgg_echo('twitterservice:new_users'); $new_users_with_twitter_view = elgg_view('input/dropdown', array( - 'internalname' => 'params[new_users]', + 'name' => 'params[new_users]', 'options_values' => array( 'yes' => elgg_echo('option:yes'), 'no' => elgg_echo('option:no'), diff --git a/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php b/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php index 3389fc7f9..d5060d7e5 100644 --- a/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php +++ b/mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php @@ -49,7 +49,7 @@ if ($users) { } $form_body .= elgg_echo('uservalidationbyemail:admin:with_checked') . elgg_view('input/dropdown', array( - 'internalname' => 'action_type', + 'name' => 'action_type', 'options_values' => array( 'validate' => elgg_echo('uservalidationbyemail:admin:validate'), 'resend_validation' => elgg_echo('uservalidationbyemail:admin:resend_validation'), diff --git a/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php b/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php index 7babd5e87..295f4170e 100644 --- a/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php +++ b/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php @@ -10,7 +10,7 @@ $user = elgg_extract('theuser', $vars); // doesn't work. //$checkbox = elgg_view('input/checkboxes', array( -// 'internalname' => 'user_guids', +// 'name' => 'user_guids', // 'options' => array("$user->username - \"$user->name\" <$user->email>" => $user->guid) //)); $checkbox = "<label><input type=\"checkbox\" value=\"$user->guid\" class=\"elgg-input-checkboxes\" name=\"user_guids[]\">" |