diff options
| author | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-15 01:27:40 +0000 |
|---|---|---|
| committer | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-15 01:27:40 +0000 |
| commit | af2f3805095f8a91d85847e11faeb280fddf58c0 (patch) | |
| tree | 221ef519a94523d494511ba33acb3f34f68f04c0 | |
| parent | 9af0f9be12346d2008cf6de6e5ab7bd083c09c8c (diff) | |
| download | elgg-af2f3805095f8a91d85847e11faeb280fddf58c0.tar.gz elgg-af2f3805095f8a91d85847e11faeb280fddf58c0.tar.bz2 | |
Fixes #2921: converted internalname => name and internalid => id
git-svn-id: http://code.elgg.org/elgg/trunk@8249 36083f99-b078-4883-b0ff-0f9b5a30f544
103 files changed, 287 insertions, 287 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[]\">" diff --git a/views/default/admin/components/plugin_settings.php b/views/default/admin/components/plugin_settings.php index 30cf3d21a..48e65b4dd 100644 --- a/views/default/admin/components/plugin_settings.php +++ b/views/default/admin/components/plugin_settings.php @@ -20,7 +20,7 @@ if (elgg_view_exists("settings/$plugin_id/edit")) { </div> <div class="elgg-body"> <?php - $params = array('internalid' => "$plugin_id-settings"); + $params = array('id' => "$plugin_id-settings"); echo elgg_view_form("plugins/settings/save", $params, $vars); ?> </div> diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php index 45c12a74f..1c42be14d 100644 --- a/views/default/admin/plugins/advanced.php +++ b/views/default/admin/plugins/advanced.php @@ -44,7 +44,7 @@ $token = generate_action_token($ts); $categories = array_merge(array('' => elgg_echo('admin:plugins:categories:all')), $categories); $category_dropdown = elgg_view('input/dropdown', array( - 'internalname' => 'category', + 'name' => 'category', 'options_values' => $categories, 'value' => $show_category )); diff --git a/views/default/core/account/login_walled_garden.php b/views/default/core/account/login_walled_garden.php index 6bd028da6..93aa87782 100644 --- a/views/default/core/account/login_walled_garden.php +++ b/views/default/core/account/login_walled_garden.php @@ -4,7 +4,7 @@ */ $form_body = elgg_view('forms/login'); -$form_body .= elgg_view('input/hidden', array('internalname' => 'returntoreferer', 'value' => 'true')); +$form_body .= elgg_view('input/hidden', array('name' => 'returntoreferer', 'value' => 'true')); $login_url = elgg_get_site_url(); if (elgg_get_config('https_login')) { @@ -38,7 +38,7 @@ __HTML; <?php $lostpassword_form_body = "<div>" . elgg_echo('user:password:text') . "</div>"; $lostpassword_form_body .= "<div class='margin-none'><label>". elgg_echo('username') . " " - . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea lostusername')) . "</label></div>"; + . elgg_view('input/text', array('name' => 'username', 'class' => 'login-textarea lostusername')) . "</label></div>"; $lostpassword_form_body .= elgg_view('input/captcha'); $lostpassword_form_body .= "<div>" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "<input class='elgg-button-action elgg-state-disabled cancel_request' type='reset' value='Cancel'></div>"; diff --git a/views/default/core/friends/picker.php b/views/default/core/friends/picker.php index 2d5976540..04a40d0d7 100644 --- a/views/default/core/friends/picker.php +++ b/views/default/core/friends/picker.php @@ -17,11 +17,11 @@ elgg_register_js($url, 'friendsPicker'); $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']; } // Are we highlighting default or all? @@ -204,7 +204,7 @@ if (!isset($vars['replacement'])) { <td> - <input type="checkbox" <?php echo $checked; ?> name="<?php echo $internalname; ?>[]" value="<?php echo $options[$label]; ?>" /> + <input type="checkbox" <?php echo $checked; ?> name="<?php echo $name; ?>[]" value="<?php echo $options[$label]; ?>" /> </td> diff --git a/views/default/core/river/controls.php b/views/default/core/river/controls.php index 37bfba91b..6f2be623c 100644 --- a/views/default/core/river/controls.php +++ b/views/default/core/river/controls.php @@ -15,7 +15,7 @@ if (elgg_is_logged_in()) { 'href' => '#', 'text' => elgg_echo('generic_comments:text'), 'class' => 'elgg-toggle', - 'internalid' => "elgg-toggler-{$object->getGUID()}", + 'id' => "elgg-toggler-{$object->getGUID()}", ); echo elgg_view('output/url', $params); diff --git a/views/default/core/river/filter.php b/views/default/core/river/filter.php index 74af9969b..aaa4beb89 100644 --- a/views/default/core/river/filter.php +++ b/views/default/core/river/filter.php @@ -24,7 +24,7 @@ if (!empty($registered_entities)) { } $params = array( - 'internalid' => 'elgg-river-selector', + 'id' => 'elgg-river-selector', 'options_values' => $options, ); $selector = $vars['selector']; diff --git a/views/default/core/river/footer.php b/views/default/core/river/footer.php index ee9d5dc58..ff960cebe 100644 --- a/views/default/core/river/footer.php +++ b/views/default/core/river/footer.php @@ -49,5 +49,5 @@ if ($comments) { // inline comment form echo elgg_view_form('comments/inline', array( 'action' => 'action/comments/add', - 'internalid' => "elgg-togglee-{$object->getGUID()}", + 'id' => "elgg-togglee-{$object->getGUID()}", ), array('entity' => $object)); diff --git a/views/default/core/settings/account/default_access.php b/views/default/core/settings/account/default_access.php index 67a0a4137..e33211460 100644 --- a/views/default/core/settings/account/default_access.php +++ b/views/default/core/settings/account/default_access.php @@ -22,7 +22,7 @@ if (elgg_get_config('allow_user_default_access')) { <?php echo elgg_echo('default_access:label'); ?>: <?php - echo elgg_view('input/access', array('internalname' => 'default_access', 'value' => $default_access)); + echo elgg_view('input/access', array('name' => 'default_access', 'value' => $default_access)); ?> </p> diff --git a/views/default/core/settings/account/email.php b/views/default/core/settings/account/email.php index 3782d39a8..fda83e795 100644 --- a/views/default/core/settings/account/email.php +++ b/views/default/core/settings/account/email.php @@ -18,7 +18,7 @@ if ($user) { <p> <?php echo elgg_echo('email:address:label'); ?>: <?php - echo elgg_view('input/email',array('internalname' => 'email', 'value' => $user->email)); + echo elgg_view('input/email',array('name' => 'email', 'value' => $user->email)); ?> </p> </div> diff --git a/views/default/core/settings/account/language.php b/views/default/core/settings/account/language.php index a1e8d9886..3a992966f 100644 --- a/views/default/core/settings/account/language.php +++ b/views/default/core/settings/account/language.php @@ -19,7 +19,7 @@ if ($user) { <?php echo elgg_echo('user:language:label'); ?>: <?php echo elgg_view("input/dropdown", array( - 'internalname' => 'language', + 'name' => 'language', 'value' => $user->language, 'options_values' => get_installed_translations() )); diff --git a/views/default/core/settings/account/name.php b/views/default/core/settings/account/name.php index 22f950925..69ffcecaf 100644 --- a/views/default/core/settings/account/name.php +++ b/views/default/core/settings/account/name.php @@ -11,5 +11,5 @@ $user = elgg_get_page_owner_entity(); // all hidden, but necessary for properly updating user details -echo elgg_view('input/hidden', array('internalname' => 'name', 'value' => $user->name)); -echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $user->guid)); +echo elgg_view('input/hidden', array('name' => 'name', 'value' => $user->name)); +echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $user->guid)); diff --git a/views/default/core/settings/account/notifications.php b/views/default/core/settings/account/notifications.php index decf000ea..ae5fe40bb 100644 --- a/views/default/core/settings/account/notifications.php +++ b/views/default/core/settings/account/notifications.php @@ -36,7 +36,7 @@ $notification_settings = get_user_notification_settings(elgg_get_page_owner_guid } echo elgg_view('input/radio', array( - 'internalname' => "method[$k]", + 'name' => "method[$k]", 'value' => $val, 'options' => array( elgg_echo('option:yes') => 'yes', diff --git a/views/default/core/settings/account/password.php b/views/default/core/settings/account/password.php index 06e59dfbb..a80f3df6b 100644 --- a/views/default/core/settings/account/password.php +++ b/views/default/core/settings/account/password.php @@ -22,7 +22,7 @@ if ($user) { <p> <?php echo elgg_echo('user:current_password:label'); ?>: <?php - echo elgg_view('input/password', array('internalname' => 'current_password')); + echo elgg_view('input/password', array('name' => 'current_password')); ?> </p> <?php } ?> @@ -30,13 +30,13 @@ if ($user) { <p> <?php echo elgg_echo('user:password:label'); ?>: <?php - echo elgg_view('input/password', array('internalname' => 'password')); + echo elgg_view('input/password', array('name' => 'password')); ?> </p> <p> <?php echo elgg_echo('user:password2:label'); ?>: <?php - echo elgg_view('input/password', array('internalname' => 'password2')); + echo elgg_view('input/password', array('name' => 'password2')); ?> </p> </div> diff --git a/views/default/forms/admin/menu/save.php b/views/default/forms/admin/menu/save.php index 4025117f8..2cafaa89b 100644 --- a/views/default/forms/admin/menu/save.php +++ b/views/default/forms/admin/menu/save.php @@ -39,7 +39,7 @@ for ($i=0; $i<6; $i++) { echo elgg_view('input/dropdown', array( 'options_values' => $dropdown_values, - 'internalname' => 'featured_menu_names[]', + 'name' => 'featured_menu_names[]', 'value' => $current_value )); } @@ -67,12 +67,12 @@ echo '<ul class="elgg-simple-list">'; if (is_array($custom_items)) { foreach ($custom_items as $title => $url) { $name_input = elgg_view('input/text', array( - 'internalname' => 'custom_menu_titles[]', + 'name' => 'custom_menu_titles[]', 'value' => $title )); $url_input = elgg_view('input/text', array( - 'internalname' => 'custom_menu_urls[]', + 'name' => 'custom_menu_urls[]', 'value' => $url )); @@ -82,11 +82,11 @@ if (is_array($custom_items)) { $new = elgg_echo('new'); $name_input = elgg_view('input/text', array( - 'internalname' => 'custom_menu_titles[]', + 'name' => 'custom_menu_titles[]', )); $url_input = elgg_view('input/text', array( - 'internalname' => 'custom_menu_urls[]', + 'name' => 'custom_menu_urls[]', )); echo "<li class='custom_menuitem'>$name_str: $name_input $url_str: $url_input</li> diff --git a/views/default/forms/admin/site/update_advanced.php b/views/default/forms/admin/site/update_advanced.php index af41002e9..d3ae5e250 100644 --- a/views/default/forms/admin/site/update_advanced.php +++ b/views/default/forms/admin/site/update_advanced.php @@ -12,32 +12,32 @@ foreach (array('wwwroot', 'path', 'dataroot', 'view') as $field) { echo "<b>" . $warning . "</b><br />"; } $value = elgg_get_config($field); - $form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value)); + $form_body .= elgg_view("input/text",array('name' => $field, 'value' => $value)); $form_body .= "</div>"; } $form_body .= "<div>" . elgg_echo('admin:site:access:warning') . "<br />"; $form_body .= elgg_echo('installation:sitepermissions'); $form_body .= elgg_view('input/access', array( - 'internalname' => 'default_access', + 'name' => 'default_access', 'value' => elgg_get_config('default_access'), )) . "</div>"; $form_body .= "<div>" . elgg_echo('installation:allow_user_default_access:description') . "<br />"; $form_body .= elgg_view("input/checkboxes", array( 'options' => array(elgg_echo('installation:allow_user_default_access:label')), - 'internalname' => 'allow_user_default_access', + 'name' => 'allow_user_default_access', 'value' => (elgg_get_config('allow_user_default_access') ? elgg_echo('installation:allow_user_default_access:label') : ""), )) . "</div>"; $form_body .= "<div>" . elgg_echo('installation:simplecache:description') . "<br />"; $form_body .= elgg_view("input/checkboxes", array( 'options' => array(elgg_echo('installation:simplecache:label')), - 'internalname' => 'simplecache_enabled', + 'name' => 'simplecache_enabled', 'value' => (elgg_get_config('simplecache_enabled') ? elgg_echo('installation:simplecache:label') : ""), )) . "</div>"; $form_body .= "<div>" . elgg_echo('installation:viewpathcache:description') . "<br />"; $form_body .= elgg_view("input/checkboxes", array( 'options' => array(elgg_echo('installation:viewpathcache:label')), - 'internalname' => 'viewpath_cache_enabled', + 'name' => 'viewpath_cache_enabled', 'value' => (elgg_get_config('viewpath_cache_enabled') ? elgg_echo('installation:viewpathcache:label') : ""), )) . "</div>"; @@ -45,7 +45,7 @@ $debug_options = array('0' => elgg_echo('installation:debug:none'), 'ERROR' => e $form_body .= "<div>" . elgg_echo('installation:debug'); $form_body .= elgg_view('input/dropdown', array( 'options_values' => $debug_options, - 'internalname' => 'debug', + 'name' => 'debug', 'value' => elgg_get_config('debug'), )); $form_body .= '</div>'; @@ -53,7 +53,7 @@ $form_body .= '</div>'; // control new user registration $options = array( 'options' => array(elgg_echo('installation:registration:label')), - 'internalname' => 'allow_registration', + 'name' => 'allow_registration', 'value' => elgg_get_config('allow_registration') ? elgg_echo('installation:registration:label') : '', ); $form_body .= '<div>' . elgg_echo('installation:registration:description'); @@ -63,7 +63,7 @@ $form_body .= '<br />' .elgg_view('input/checkboxes', $options) . '</div>'; $walled_garden = elgg_get_config(walled_garden); $options = array( 'options' => array(elgg_echo('installation:walled_garden:label')), - 'internalname' => 'walled_garden', + 'name' => 'walled_garden', 'value' => $walled_garden ? elgg_echo('installation:walled_garden:label') : '', ); $form_body .= '<div>' . elgg_echo('installation:walled_garden:description'); @@ -72,7 +72,7 @@ $form_body .= '<br />' . elgg_view('input/checkboxes', $options) . '</div>'; $form_body .= "<div>" . elgg_echo('installation:httpslogin') . "<br />"; $form_body .= elgg_view("input/checkboxes", array( 'options' => array(elgg_echo('installation:httpslogin:label')), - 'internalname' => 'https_login', + 'name' => 'https_login', 'value' => (elgg_get_config('https_login') ? elgg_echo('installation:httpslogin:label') : "") )) . "</div>"; @@ -84,12 +84,12 @@ if ($disable_api) { } $form_body .= elgg_view("input/checkboxes", array( 'options' => array(elgg_echo('installation:disableapi:label')), - 'internalname' => 'api', + 'name' => 'api', 'value' => $on, )); $form_body .= "</div>"; -$form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go')); +$form_body .= elgg_view('input/hidden', array('name' => 'settings', 'value' => 'go')); $form_body .= '<div class="bta">'; $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save"))); diff --git a/views/default/forms/admin/site/update_basic.php b/views/default/forms/admin/site/update_basic.php index e9e2e6c13..eb4218810 100644 --- a/views/default/forms/admin/site/update_basic.php +++ b/views/default/forms/admin/site/update_basic.php @@ -12,14 +12,14 @@ foreach (array('sitename','sitedescription', 'siteemail') as $field) { echo "<b>" . $warning . "</b><br />"; } $value = elgg_get_config($field); - $form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value)); + $form_body .= elgg_view("input/text",array('name' => $field, 'value' => $value)); $form_body .= "</div>"; } $languages = get_installed_translations(); $form_body .= "<div>" . elgg_echo('installation:language'); $form_body .= elgg_view("input/dropdown", array( - 'internalname' => 'language', + 'name' => 'language', 'value' => elgg_get_config('language'), 'options_values' => $languages, )) . "</div>"; diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php index 01ceb3fec..380a4bb6c 100644 --- a/views/default/forms/avatar/crop.php +++ b/views/default/forms/avatar/crop.php @@ -16,10 +16,10 @@ $master_image = $vars['entity']->getIcon('master'); <?php $coords = array('x1', 'x2', 'y1', 'y2'); foreach ($coords as $coord) { - echo elgg_view('input/hidden', array('internalname' => $coord, 'value' => $vars['entity']->$coord)); + echo elgg_view('input/hidden', array('name' => $coord, 'value' => $vars['entity']->$coord)); } -echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $vars['entity']->guid)); +echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity']->guid)); echo elgg_view('input/submit', array('value' => elgg_echo('avatar:create'))); diff --git a/views/default/forms/avatar/upload.php b/views/default/forms/avatar/upload.php index a89f5ee68..08db1f7e0 100644 --- a/views/default/forms/avatar/upload.php +++ b/views/default/forms/avatar/upload.php @@ -5,11 +5,11 @@ * @uses $vars['entity'] */ -echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $vars['entity']->guid)); +echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity']->guid)); ?> <div> <label><?php echo elgg_echo("avatar:upload"); ?></label><br /> - <?php echo elgg_view("input/file",array('internalname' => 'avatar')); ?> + <?php echo elgg_view("input/file",array('name' => 'avatar')); ?> <br /> <?php echo elgg_view('input/submit', array('value' => elgg_echo('upload'))); ?> </div> diff --git a/views/default/forms/comments/add.php b/views/default/forms/comments/add.php index b4f63b814..8a2b89f2d 100644 --- a/views/default/forms/comments/add.php +++ b/views/default/forms/comments/add.php @@ -11,12 +11,12 @@ if (isset($vars['entity']) && elgg_is_logged_in()) { ?> <div class="mbn"> <label><?php echo elgg_echo("generic_comments:text"); ?></label> - <?php echo elgg_view('input/longtext', array('internalname' => 'generic_comment')); ?> + <?php echo elgg_view('input/longtext', array('name' => 'generic_comment')); ?> </div> <?php echo elgg_view('input/hidden', array( - 'internalname' => 'entity_guid', + 'name' => 'entity_guid', 'value' => $vars['entity']->getGUID() )); echo elgg_view('input/submit', array('value' => elgg_echo("generic_comments:post"))); diff --git a/views/default/forms/comments/inline.php b/views/default/forms/comments/inline.php index 9c44905be..14b8a086d 100644 --- a/views/default/forms/comments/inline.php +++ b/views/default/forms/comments/inline.php @@ -6,9 +6,9 @@ */ if (isset($vars['entity']) && elgg_is_logged_in()) { - echo elgg_view('input/text', array('internalname' => 'generic_comment')); + echo elgg_view('input/text', array('name' => 'generic_comment')); echo elgg_view('input/hidden', array( - 'internalname' => 'entity_guid', + 'name' => 'entity_guid', 'value' => $vars['entity']->getGUID() )); echo elgg_view('input/submit', array('value' => elgg_echo('comment'))); diff --git a/views/default/forms/friends/edit.php b/views/default/forms/friends/edit.php index ac817f23a..e3bc28cfc 100644 --- a/views/default/forms/friends/edit.php +++ b/views/default/forms/friends/edit.php @@ -26,7 +26,7 @@ if (isset($vars['collection'])) { $form_body = "<div class='contentWrapper'><div><label>" . elgg_echo("friends:collectionname") . "<br />" . elgg_view("input/text", array( - "internalname" => "collection_name", + "name" => "collection_name", "value" => $title, )) . "</label></div>"; @@ -43,13 +43,13 @@ if($vars['collection_members']){ $form_body .= "</div>"; $form_body .= "<div><label>" . elgg_echo("friends:addfriends") . "</label>". - elgg_view('core/friends/picker',array('entities' => $vars['friends'], 'internalname' => 'friends_collection', 'highlight' => $highlight)) . "</div>"; + elgg_view('core/friends/picker',array('entities' => $vars['friends'], 'name' => 'friends_collection', 'highlight' => $highlight)) . "</div>"; $form_body .= "<div>"; if (isset($vars['collection'])) { - $form_body .= elgg_view('input/hidden', array('internalname' => 'collection_id', 'value' => "{$vars['collection'][0]->id}")); + $form_body .= elgg_view('input/hidden', array('name' => 'collection_id', 'value' => "{$vars['collection'][0]->id}")); } -$form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save'))); +$form_body .= elgg_view('input/submit', array('name' => 'submit', 'value' => elgg_echo('save'))); $form_body .= "</div></div>"; echo elgg_view('input/form', array('body' => $form_body, 'action' => "action/$action"));
\ No newline at end of file diff --git a/views/default/forms/login.php b/views/default/forms/login.php index 44d134ba8..a4d9e57c6 100644 --- a/views/default/forms/login.php +++ b/views/default/forms/login.php @@ -9,11 +9,11 @@ <div> <label><?php echo elgg_echo('loginusername'); ?></label> - <?php echo elgg_view('input/text', array('internalname' => 'username')); ?> + <?php echo elgg_view('input/text', array('name' => 'username')); ?> </div> <div> <label><?php echo elgg_echo('password'); ?></label> - <?php echo elgg_view('input/password', array('internalname' => 'password')); ?> + <?php echo elgg_view('input/password', array('name' => 'password')); ?> </div> <?php echo elgg_view('login/extend'); ?> diff --git a/views/default/forms/members/name_search.php b/views/default/forms/members/name_search.php index 265290fc9..23e6c066e 100644 --- a/views/default/forms/members/name_search.php +++ b/views/default/forms/members/name_search.php @@ -1,7 +1,7 @@ <?php $params = array( - 'internalname' => 'name', + 'name' => 'name', ); echo elgg_view('input/text', $params); diff --git a/views/default/forms/members/tag_search.php b/views/default/forms/members/tag_search.php index 1a281963d..7badf8cda 100644 --- a/views/default/forms/members/tag_search.php +++ b/views/default/forms/members/tag_search.php @@ -4,7 +4,7 @@ */ $params = array( - 'internalname' => 'tag', + 'name' => 'tag', ); echo elgg_view('input/text', $params); diff --git a/views/default/forms/plugins/settings/save.php b/views/default/forms/plugins/settings/save.php index 744133c79..3cb4a1472 100644 --- a/views/default/forms/plugins/settings/save.php +++ b/views/default/forms/plugins/settings/save.php @@ -20,7 +20,7 @@ if ($type != 'user') { echo elgg_view("{$type}settings/$plugin_id/edit", $vars); echo "<div>"; -echo elgg_view('input/hidden', array('internalname' => 'plugin_id', 'value' => $plugin_id)); -echo elgg_view('input/hidden', array('internalname' => 'user_guid', 'value' => $user_guid)); +echo elgg_view('input/hidden', array('name' => 'plugin_id', 'value' => $plugin_id)); +echo elgg_view('input/hidden', array('name' => 'user_guid', 'value' => $user_guid)); echo elgg_view('input/submit', array('value' => elgg_echo('save'))); echo "</div>"; diff --git a/views/default/forms/profile/edit.php b/views/default/forms/profile/edit.php index 4d2987a03..aaf9ac01e 100644 --- a/views/default/forms/profile/edit.php +++ b/views/default/forms/profile/edit.php @@ -9,7 +9,7 @@ <div> <label><?php echo elgg_echo('user:name:label'); ?></label> - <?php echo elgg_view('input/text', array('internalname' => 'name', 'value' => $vars['entity']->name)); ?> + <?php echo elgg_view('input/text', array('name' => 'name', 'value' => $vars['entity']->name)); ?> </div> <?php @@ -44,12 +44,12 @@ if (is_array($profile_fields) && count($profile_fields) > 0) { <label><?php echo elgg_echo("profile:{$shortname}") ?></label> <?php $params = array( - 'internalname' => $shortname, + 'name' => $shortname, 'value' => $value, ); echo elgg_view("input/{$valtype}", $params); $params = array( - 'internalname' => "accesslevel[$shortname]", + 'name' => "accesslevel[$shortname]", 'value' => $access_id, ); echo elgg_view('input/access', $params); @@ -61,7 +61,7 @@ if (is_array($profile_fields) && count($profile_fields) > 0) { ?> <div> <?php - echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $vars['entity']->guid)); + echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity']->guid)); echo elgg_view('input/submit', array('value' => elgg_echo('save'))); ?> </div> diff --git a/views/default/forms/profile/fields/add.php b/views/default/forms/profile/fields/add.php index de43b9ec9..c700cf7f5 100644 --- a/views/default/forms/profile/fields/add.php +++ b/views/default/forms/profile/fields/add.php @@ -8,8 +8,8 @@ $label_text = elgg_echo('profile:label'); $type_text = elgg_echo('profile:type'); -$label_control = elgg_view('input/text', array('internalname' => 'label')); -$type_control = elgg_view('input/pulldown', array('internalname' => 'type', 'options_values' => array( +$label_control = elgg_view('input/text', array('name' => 'label')); +$type_control = elgg_view('input/pulldown', array('name' => 'type', 'options_values' => array( 'text' => elgg_echo('text'), 'longtext' => elgg_echo('longtext'), 'tags' => elgg_echo('tags'), @@ -17,7 +17,7 @@ $type_control = elgg_view('input/pulldown', array('internalname' => 'type', 'opt 'email' => elgg_echo('email') ))); -$submit_control = elgg_view('input/submit', array('internalname' => elgg_echo('add'), 'value' => elgg_echo('add'))); +$submit_control = elgg_view('input/submit', array('name' => elgg_echo('add'), 'value' => elgg_echo('add'))); $formbody = <<< END <p>$label_text: $label_control diff --git a/views/default/forms/register.php b/views/default/forms/register.php index a7f34f777..8828e89e1 100644 --- a/views/default/forms/register.php +++ b/views/default/forms/register.php @@ -19,27 +19,27 @@ if (elgg_is_admin_logged_in() && isset($vars['show_admin'])) { <div class="mtm"> <label><?php echo elgg_echo('name'); ?></label> <br /> - <?php echo elgg_view('input/text', array('internalname' => 'name', 'value' => $name)); ?> + <?php echo elgg_view('input/text', array('name' => 'name', 'value' => $name)); ?> </div> <div> <label><?php echo elgg_echo('email'); ?></label> <br /> - <?php echo elgg_view('input/text', array('internalname' => 'email', 'value' => $email)); ?> + <?php echo elgg_view('input/text', array('name' => 'email', 'value' => $email)); ?> </div> <div> <label><?php echo elgg_echo('username'); ?></label> <br /> - <?php echo elgg_view('input/text', array('internalname' => 'username', 'value' => $username)); ?> + <?php echo elgg_view('input/text', array('name' => 'username', 'value' => $username)); ?> </div> <div> <label><?php echo elgg_echo('password'); ?></label> <br /> - <?php echo elgg_view('input/password', array('internalname' => 'password')); ?> + <?php echo elgg_view('input/password', array('name' => 'password')); ?> </div> <div> <label><?php echo elgg_echo('passwordagain'); ?></label> <br /> - <?php echo elgg_view('input/password', array('internalname' => 'password2')); ?> + <?php echo elgg_view('input/password', array('name' => 'password2')); ?> </div> <?php @@ -50,12 +50,12 @@ echo elgg_view('register/extend'); echo elgg_view('input/captcha'); if ($admin_option) { - echo elgg_view('input/checkboxes', array('internalname' => "admin", 'options' => array(elgg_echo('admin_option')))); + echo elgg_view('input/checkboxes', array('name' => "admin", 'options' => array(elgg_echo('admin_option')))); } -echo elgg_view('input/hidden', array('internalname' => 'friend_guid', 'value' => $vars['friend_guid'])); -echo elgg_view('input/hidden', array('internalname' => 'invitecode', 'value' => $vars['invitecode'])); -echo elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))); +echo elgg_view('input/hidden', array('name' => 'friend_guid', 'value' => $vars['friend_guid'])); +echo elgg_view('input/hidden', array('name' => 'invitecode', 'value' => $vars['invitecode'])); +echo elgg_view('input/submit', array('name' => 'submit', 'value' => elgg_echo('register'))); ?> <?php //@todo JS 1.8: no ?> <script type="text/javascript"> diff --git a/views/default/forms/user/passwordreset.php b/views/default/forms/user/passwordreset.php index d553bdc14..7b13f120c 100644 --- a/views/default/forms/user/passwordreset.php +++ b/views/default/forms/user/passwordreset.php @@ -5,12 +5,12 @@ $user = $vars['user']; echo elgg_echo('user:resetpassword:reset_password_confirm') . "<br />"; echo elgg_view('input/hidden', array( - 'internalname' => 'u', + 'name' => 'u', 'value' => $user->guid )); echo elgg_view('input/hidden', array( - 'internalname' => 'c', + 'name' => 'c', 'value' => $code )); diff --git a/views/default/forms/user/requestnewpassword.php b/views/default/forms/user/requestnewpassword.php index 8a83da709..f2f276417 100644 --- a/views/default/forms/user/requestnewpassword.php +++ b/views/default/forms/user/requestnewpassword.php @@ -12,7 +12,7 @@ </div> <div> <label><?php echo elgg_echo('username'); ?></label> - <?php echo elgg_view('input/text', array('internalname' => 'username')); ?> + <?php echo elgg_view('input/text', array('name' => 'username')); ?> </div> <?php echo elgg_view('input/captcha'); ?> <div> diff --git a/views/default/forms/useradd.php b/views/default/forms/useradd.php index 9926bb437..1119d180f 100644 --- a/views/default/forms/useradd.php +++ b/views/default/forms/useradd.php @@ -13,19 +13,19 @@ if ((elgg_get_logged_in_user_entity()->isAdmin()) && ($vars['show_admin'])) { $admin_option = true; } -$form_body = "<div><label>" . elgg_echo('name') . "</label><br />" . elgg_view('input/text' , array('internalname' => 'name')) . "</div>"; -$form_body .= "<div><label>" . elgg_echo('username') . "</label><br />" . elgg_view('input/text' , array('internalname' => 'username')) . "</div>"; -$form_body .= "<div><label>" . elgg_echo('email') . "</label><br />" . elgg_view('input/text' , array('internalname' => 'email')) . "</div>"; -$form_body .= "<div><label>" . elgg_echo('password') . "</label><br />" . elgg_view('input/password' , array('internalname' => 'password')) . "</div>"; -$form_body .= "<div><label>" . elgg_echo('passwordagain') . "</label><br />" . elgg_view('input/password' , array('internalname' => 'password2')) . "</div>"; +$form_body = "<div><label>" . elgg_echo('name') . "</label><br />" . elgg_view('input/text' , array('name' => 'name')) . "</div>"; +$form_body .= "<div><label>" . elgg_echo('username') . "</label><br />" . elgg_view('input/text' , array('name' => 'username')) . "</div>"; +$form_body .= "<div><label>" . elgg_echo('email') . "</label><br />" . elgg_view('input/text' , array('name' => 'email')) . "</div>"; +$form_body .= "<div><label>" . elgg_echo('password') . "</label><br />" . elgg_view('input/password' , array('name' => 'password')) . "</div>"; +$form_body .= "<div><label>" . elgg_echo('passwordagain') . "</label><br />" . elgg_view('input/password' , array('name' => 'password2')) . "</div>"; $form_body .= "<div>"; if ($admin_option) { - $form_body .= elgg_view('input/checkboxes', array('internalname' => "admin", 'options' => array(elgg_echo('admin_option')))); + $form_body .= elgg_view('input/checkboxes', array('name' => "admin", 'options' => array(elgg_echo('admin_option')))); $form_body .= '</div><div>'; } -$form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "</div>"; +$form_body .= elgg_view('input/submit', array('name' => 'submit', 'value' => elgg_echo('register'))) . "</div>"; ?> <div class="elgg-module elgg-module-inline"> diff --git a/views/default/forms/widgets/save.php b/views/default/forms/widgets/save.php index b8d6017f5..d16318cd1 100644 --- a/views/default/forms/widgets/save.php +++ b/views/default/forms/widgets/save.php @@ -15,7 +15,7 @@ $custom_form_section = elgg_view($edit_view, array('entity' => $widget)); $access = ''; if ($show_access) { $access = elgg_view('input/access', array( - 'internalname' => 'params[access_id]', + 'name' => 'params[access_id]', 'value' => $widget->access_id, )); } @@ -24,7 +24,7 @@ if (!$custom_form_section && !$access) { return true; } -$hidden = elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $widget->guid)); +$hidden = elgg_view('input/hidden', array('name' => 'guid', 'value' => $widget->guid)); $submit = elgg_view('input/submit', array('value' => elgg_echo('save'))); $body = <<<___END diff --git a/views/default/graphics/ajax_loader.php b/views/default/graphics/ajax_loader.php index 2d2da30b7..77c1fbf4c 100644 --- a/views/default/graphics/ajax_loader.php +++ b/views/default/graphics/ajax_loader.php @@ -9,8 +9,8 @@ * @uses $vars['hidden'] Begin hidden? (true) */ -if (isset($vars['internalid'])) { - $id = "id=\"{$vars['internalid']}\""; +if (isset($vars['id'])) { + $id = "id=\"{$vars['id']}\""; } $hidden = 'hidden'; diff --git a/views/default/input/access.php b/views/default/input/access.php index 523c0aaf4..7fa2323bf 100644 --- a/views/default/input/access.php +++ b/views/default/input/access.php @@ -8,7 +8,7 @@ * * @uses $vars['value'] The current value, if any * @uses $vars['options_values'] - * @uses $vars['internalname'] The name of the input field + * @uses $vars['name'] The name of the input field */ $defaults = array( diff --git a/views/default/input/checkboxes.php b/views/default/input/checkboxes.php index 17c8ab8bd..c78fe4db0 100644 --- a/views/default/input/checkboxes.php +++ b/views/default/input/checkboxes.php @@ -6,7 +6,7 @@ * @note This also includes a hidden input with the same name as the checkboxes * to make sure something is sent to the server. The default value is 0. * If using JS, be specific to avoid selecting the hidden default value: - * $('input[type=checkbox][name=internalname]') + * $('input[type=checkbox][name=name]') * * @warning Passing integers as labels does not currently work due to a * deprecated hack that will be removed in Elgg 1.9. To use integer labels, @@ -15,11 +15,11 @@ * @package Elgg * @subpackage Core * - * @uses string $vars['internalname'] The name of the input fields + * @uses string $vars['name'] The name of the input fields * (Forced to an array by appending []) * @uses array $vars['options'] An array of strings representing the * label => option for the each checkbox field - * @uses string $vars['internalid'] The id for each input field. Optional. + * @uses string $vars['id'] The id for each input field. Optional. * (Only use this with a single value.) * @uses string $vars['default'] The default value to send if nothing is checked. * Optional, defaults to 0. Set to FALSE for no default. @@ -34,11 +34,11 @@ $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'] : ''; +$name = (isset($vars['name'])) ? $vars['name'] : ''; $options = (isset($vars['options']) && is_array($vars['options'])) ? $vars['options'] : array(); $default = (isset($vars['default'])) ? $vars['default'] : 0; -$id = (isset($vars['internalid'])) ? $vars['internalid'] : ''; +$id = (isset($vars['id'])) ? $vars['id'] : ''; $disabled = (isset($vars['disabled'])) ? $vars['disabled'] : FALSE; $js = (isset($vars['js'])) ? $vars['js'] : ''; @@ -49,8 +49,8 @@ if ($additional_class) { if ($options && count($options) > 0) { // include a default value so if nothing is checked 0 will be passed. - if ($internalname && $default !== FALSE) { - echo "<input type=\"hidden\" name=\"$internalname\" value=\"$default\" />"; + if ($name && $default !== FALSE) { + echo "<input type=\"hidden\" name=\"$name\" value=\"$default\" />"; } echo "<ul class=\"$class\">"; @@ -70,8 +70,8 @@ if ($options && count($options) > 0) { 'default' => false, ); - if ($internalname) { - $input_vars['name'] = "{$internalname}[]"; + if ($name) { + $input_vars['name'] = "{$name}[]"; } $input = elgg_view('input/checkbox', $input_vars); diff --git a/views/default/input/datepicker.php b/views/default/input/datepicker.php index 0687f9e31..4af54096b 100644 --- a/views/default/input/datepicker.php +++ b/views/default/input/datepicker.php @@ -8,11 +8,11 @@ * * @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['name'] The name of the input field * */ -$cal_name = sanitise_string($vars['internalname']); +$cal_name = sanitise_string($vars['name']); if (isset($vars['class'])) { $class = "{$vars['class']} popup_calendar"; @@ -28,7 +28,7 @@ if ($vars['value'] > 86400) { } ?> -<input type="text" name="<?php echo $vars['internalname']; ?>" value="<?php echo $val; ?>" /> +<input type="text" name="<?php echo $vars['name']; ?>" value="<?php echo $val; ?>" /> <?php //@todo JS 1.8: no ?> <script type="text/javascript"> $(document).ready(function() { diff --git a/views/default/input/password.php b/views/default/input/password.php index 335325c21..62c8fb53d 100644 --- a/views/default/input/password.php +++ b/views/default/input/password.php @@ -8,7 +8,7 @@ * * @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['name'] The name of the input field * */ diff --git a/views/default/input/plaintext.php b/views/default/input/plaintext.php index 05018e1ed..7d59b3d0d 100644 --- a/views/default/input/plaintext.php +++ b/views/default/input/plaintext.php @@ -7,7 +7,7 @@ * @subpackage Core * * @uses $vars['value'] The current value, if any - * @uses $vars['internalname'] The name of the input field + * @uses $vars['name'] The name of the input field * @uses $vars['class'] * @uses $vars['disabled'] */ diff --git a/views/default/input/radio.php b/views/default/input/radio.php index fbfc9c5a1..0ad28423f 100644 --- a/views/default/input/radio.php +++ b/views/default/input/radio.php @@ -11,7 +11,7 @@ * @subpackage Core * * @uses $vars['value'] The current value, if any - * @uses $vars['internalname'] The name of the input field + * @uses $vars['name'] The name of the input field * @uses $vars['options'] An array of strings representing the options for the * radio field as "label" => option * @uses $vars['class'] Additional class of the list. Optional. diff --git a/views/default/input/securitytoken.php b/views/default/input/securitytoken.php index 9a8cb1ebe..75410848a 100644 --- a/views/default/input/securitytoken.php +++ b/views/default/input/securitytoken.php @@ -11,5 +11,5 @@ $ts = time(); $token = generate_action_token($ts); -echo elgg_view('input/hidden', array('internalname' => '__elgg_token', 'value' => $token)); -echo elgg_view('input/hidden', array('internalname' => '__elgg_ts', 'value' => $ts)); +echo elgg_view('input/hidden', array('name' => '__elgg_token', 'value' => $token)); +echo elgg_view('input/hidden', array('name' => '__elgg_ts', 'value' => $ts)); diff --git a/views/default/input/userpicker.php b/views/default/input/userpicker.php index 980af2684..77a51f37c 100644 --- a/views/default/input/userpicker.php +++ b/views/default/input/userpicker.php @@ -6,7 +6,7 @@ * @subpackage Core * * @uses $vars['value'] The current value, if any - * @uses $vars['internalname'] The name of the input field + * @uses $vars['name'] The name of the input field * * * pops up defaulted to lazy load friends lists in paginated alphabetical order. diff --git a/views/default/layout/objects/widget/controls.php b/views/default/layout/objects/widget/controls.php index be7a10083..09f5fc947 100644 --- a/views/default/layout/objects/widget/controls.php +++ b/views/default/layout/objects/widget/controls.php @@ -24,7 +24,7 @@ if ($widget->canEdit()) { 'href' => elgg_get_site_url() . "action/widgets/delete?guid=$widget->guid", 'is_action' => true, 'class' => 'elgg-widget-delete-button', - 'internalid' => "elgg-widget-delete-button-$widget->guid" + 'id' => "elgg-widget-delete-button-$widget->guid" ); $delete_link = elgg_view('output/url', $params); @@ -34,7 +34,7 @@ if ($widget->canEdit()) { 'title' => elgg_echo('widget:edit'), 'href' => "#", 'class' => 'elgg-widget-edit-button elgg-toggle', - 'internalid' => "elgg-toggler-widget-$widget->guid" + 'id' => "elgg-toggler-widget-$widget->guid" ); $edit_link = elgg_view('output/url', $params); } diff --git a/views/default/layout/shells/widgets.php b/views/default/layout/shells/widgets.php index e551f288f..8d122738e 100644 --- a/views/default/layout/shells/widgets.php +++ b/views/default/layout/shells/widgets.php @@ -50,4 +50,4 @@ for ($column_index = 1; $column_index <= $num_columns; $column_index++) { elgg_pop_context(); -echo elgg_view('graphics/ajax_loader', array('internalid' => 'elgg-widget-loader')); +echo elgg_view('graphics/ajax_loader', array('id' => 'elgg-widget-loader')); diff --git a/views/default/layout/shells/widgets/add_panel.php b/views/default/layout/shells/widgets/add_panel.php index e6b13d573..b440e323f 100644 --- a/views/default/layout/shells/widgets/add_panel.php +++ b/views/default/layout/shells/widgets/add_panel.php @@ -50,7 +50,7 @@ foreach ($widgets as $column_widgets) { </ul> <?php $params = array( - 'internalname' => 'widget_context', + 'name' => 'widget_context', 'value' => $context ); echo elgg_view('input/hidden', $params); diff --git a/views/default/navigation/tabs.php b/views/default/navigation/tabs.php index 376464ee5..0108126ad 100644 --- a/views/default/navigation/tabs.php +++ b/views/default/navigation/tabs.php @@ -55,7 +55,7 @@ if (isset($vars['tabs']) && is_array($vars['tabs']) && !empty($vars['tabs'])) { } if (isset($info['url_id'])) { - $options['internalid'] = $info['url_id']; + $options['id'] = $info['url_id']; } $link = elgg_view('output/url', $options); diff --git a/views/default/widgets/content_stats/edit.php b/views/default/widgets/content_stats/edit.php index d0746a534..f1a050df8 100644 --- a/views/default/widgets/content_stats/edit.php +++ b/views/default/widgets/content_stats/edit.php @@ -10,7 +10,7 @@ if (!isset($vars['entity']->num_display)) { } $params = array( - 'internalname' => 'params[num_display]', + 'name' => 'params[num_display]', 'value' => $vars['entity']->num_display, 'options' => array(5, 8, 10, 12, 15, 20), ); diff --git a/views/default/widgets/friends/edit.php b/views/default/widgets/friends/edit.php index 025f5f98b..c7e6b06ff 100644 --- a/views/default/widgets/friends/edit.php +++ b/views/default/widgets/friends/edit.php @@ -10,7 +10,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, 12, 15, 20, 30, 50, 100), ); @@ -30,7 +30,7 @@ if (!isset($vars['entity']->icon_size)) { } $params = array( - 'internalname' => 'params[icon_size]', + 'name' => 'params[icon_size]', 'value' => $vars['entity']->icon_size, 'options_values' => array( 'small' => elgg_echo('friends:small'), diff --git a/views/default/widgets/new_users/edit.php b/views/default/widgets/new_users/edit.php index e951264bf..ed07213cb 100644 --- a/views/default/widgets/new_users/edit.php +++ b/views/default/widgets/new_users/edit.php @@ -10,7 +10,7 @@ if (!isset($vars['entity']->num_display)) { } $params = array( - 'internalname' => 'params[num_display]', + 'name' => 'params[num_display]', 'value' => $vars['entity']->num_display, 'options' => array(5, 8, 10, 12, 15, 20), ); diff --git a/views/default/widgets/online_users/edit.php b/views/default/widgets/online_users/edit.php index dfbe6ecd6..66f03a745 100644 --- a/views/default/widgets/online_users/edit.php +++ b/views/default/widgets/online_users/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(5, 8, 10, 12, 15, 20), ); diff --git a/views/installation/input/access.php b/views/installation/input/access.php index ab4064ef1..3fde7295f 100644 --- a/views/installation/input/access.php +++ b/views/installation/input/access.php @@ -8,7 +8,7 @@ * * @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['name'] The name of the input field * */ @@ -28,7 +28,7 @@ if (is_array($vars['options']) && sizeof($vars['options']) > 0) { ?> - <select name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['js'])) echo $vars['js']; ?> <?php if ((isset($vars['disabled'])) && ($vars['disabled'])) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>"> + <select name="<?php echo $vars['name']; ?>" <?php if (isset($vars['js'])) echo $vars['js']; ?> <?php if ((isset($vars['disabled'])) && ($vars['disabled'])) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>"> <?php foreach($vars['options'] as $key => $option) { diff --git a/views/installation/input/button.php b/views/installation/input/button.php index 81a5414c4..a69f7dbfa 100644 --- a/views/installation/input/button.php +++ b/views/installation/input/button.php @@ -9,7 +9,7 @@ * * @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['name'] The name of the input field * @uses $vars['type'] Submit or reset, defaults to submit. * @uses $vars['src'] Src of an image * @@ -39,11 +39,11 @@ switch ($type) { } $value = htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); -$name = $vars['internalname']; +$name = $vars['name']; $src = $vars['src']; // blank src if trying to access an offsite image. if (strpos($src, elgg_get_site_url()) === false) { $src = ""; } ?> -<input type="<?php echo $type; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\"";?> <?php echo $vars['js']; ?> value="<?php echo $value; ?>" src="<?php echo $src; ?>" class="<?php echo $class; ?>" />
\ No newline at end of file +<input type="<?php echo $type; ?>" <?php if (isset($vars['id'])) echo "id=\"{$vars['id']}\"";?> <?php echo $vars['js']; ?> value="<?php echo $value; ?>" src="<?php echo $src; ?>" class="<?php echo $class; ?>" />
\ No newline at end of file diff --git a/views/installation/input/checkboxes.php b/views/installation/input/checkboxes.php index 04533f6f5..164509831 100644 --- a/views/installation/input/checkboxes.php +++ b/views/installation/input/checkboxes.php @@ -8,7 +8,7 @@ * * @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['name'] The name of the input field * @uses $vars['options'] An array of strings representing the options for the checkbox field * */ @@ -44,5 +44,5 @@ foreach($vars['options'] as $label => $option) { if ($vars['disabled']) { $disabled = ' disabled="yes" '; } - echo "<label><input type=\"checkbox\" $disabled {$vars['js']} name=\"{$vars['internalname']}[]\" {$selected} value=\"".htmlentities($option, ENT_QUOTES, 'UTF-8')."\" {$selected} class=\"$class\" />{$label}</label><br />"; + echo "<label><input type=\"checkbox\" $disabled {$vars['js']} name=\"{$vars['name']}[]\" {$selected} value=\"".htmlentities($option, ENT_QUOTES, 'UTF-8')."\" {$selected} class=\"$class\" />{$label}</label><br />"; }
\ No newline at end of file diff --git a/views/installation/input/dropdown.php b/views/installation/input/dropdown.php index 11802a669..141ff65b0 100644 --- a/views/installation/input/dropdown.php +++ b/views/installation/input/dropdown.php @@ -8,7 +8,7 @@ * * @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['name'] The name of the input field * @uses $vars['options'] An array of strings representing the options for the dropdown field * @uses $vars['options_values'] An associative array of "value" => "option" where "value" is an internal name and "option" is * the value displayed on the button. Replaces $vars['options'] when defined. @@ -20,7 +20,7 @@ if (!$class) { $class = "elgg-input-dropdown"; } ?> -<select name="<?php echo $vars['internalname']; ?>" <?php echo $vars['js']; ?> <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>"> +<select name="<?php echo $vars['name']; ?>" <?php echo $vars['js']; ?> <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>"> <?php if ($vars['options_values']) { foreach($vars['options_values'] as $value => $option) { diff --git a/views/installation/input/form.php b/views/installation/input/form.php index a4707f257..b131c9d10 100644 --- a/views/installation/input/form.php +++ b/views/installation/input/form.php @@ -14,13 +14,13 @@ * */ -if (isset($vars['internalid'])) { - $id = $vars['internalid']; +if (isset($vars['id'])) { + $id = $vars['id']; } else { $id = ''; } -if (isset($vars['internalname'])) { - $name = $vars['internalname']; +if (isset($vars['name'])) { + $name = $vars['name']; } else { $name = ''; } diff --git a/views/installation/input/hidden.php b/views/installation/input/hidden.php index 7a0798e48..c9800ebbb 100644 --- a/views/installation/input/hidden.php +++ b/views/installation/input/hidden.php @@ -9,8 +9,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['name'] The name of the input field * */ ?> -<input type="hidden" <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" />
\ No newline at end of file +<input type="hidden" <?php echo $vars['js']; ?> name="<?php echo $vars['name']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" />
\ No newline at end of file diff --git a/views/installation/input/longtext.php b/views/installation/input/longtext.php index a909f55f2..820a51da4 100644 --- a/views/installation/input/longtext.php +++ b/views/installation/input/longtext.php @@ -8,7 +8,7 @@ * * @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['name'] The name of the input field * */ @@ -19,4 +19,4 @@ if (!$class) { ?> -<textarea class="<?php echo $class; ?>" name="<?php echo $vars['internalname']; ?>" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?>><?php echo $vars['value']; ?></textarea>
\ No newline at end of file +<textarea class="<?php echo $class; ?>" name="<?php echo $vars['name']; ?>" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?>><?php echo $vars['value']; ?></textarea>
\ No newline at end of file diff --git a/views/installation/input/password.php b/views/installation/input/password.php index 541728ee3..8ba79228d 100644 --- a/views/installation/input/password.php +++ b/views/installation/input/password.php @@ -8,7 +8,7 @@ * * @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['name'] The name of the input field * */ @@ -18,4 +18,4 @@ if (!$class) { } ?> -<input type="password" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\""; ?> value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class; ?>" /> +<input type="password" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['name']; ?>" <?php if (isset($vars['id'])) echo "id=\"{$vars['id']}\""; ?> value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class; ?>" /> diff --git a/views/installation/input/securitytoken.php b/views/installation/input/securitytoken.php index 9a8cb1ebe..75410848a 100644 --- a/views/installation/input/securitytoken.php +++ b/views/installation/input/securitytoken.php @@ -11,5 +11,5 @@ $ts = time(); $token = generate_action_token($ts); -echo elgg_view('input/hidden', array('internalname' => '__elgg_token', 'value' => $token)); -echo elgg_view('input/hidden', array('internalname' => '__elgg_ts', 'value' => $ts)); +echo elgg_view('input/hidden', array('name' => '__elgg_token', 'value' => $token)); +echo elgg_view('input/hidden', array('name' => '__elgg_ts', 'value' => $ts)); diff --git a/views/installation/input/text.php b/views/installation/input/text.php index 73801dcf7..c59278b40 100644 --- a/views/installation/input/text.php +++ b/views/installation/input/text.php @@ -10,7 +10,7 @@ * * @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['name'] The name of the input field * @uses $vars['disabled'] If true then control is read-only * @uses $vars['class'] Class override */ @@ -21,4 +21,4 @@ if (!$class) { } ?> -<input type="text" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class ?>"/>
\ No newline at end of file +<input type="text" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['name']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class ?>"/>
\ No newline at end of file diff --git a/views/installation/install/forms/template.php b/views/installation/install/forms/template.php index 897772dd4..5e44d928e 100644 --- a/views/installation/install/forms/template.php +++ b/views/installation/install/forms/template.php @@ -13,7 +13,7 @@ $form_body = ''; foreach ($variables as $field => $params) { $label = elgg_echo("install:$type:label:$field"); $help = elgg_echo("install:$type:help:$field"); - $params['internalname'] = $field; + $params['name'] = $field; $form_body .= '<p>'; $form_body .= "<label>$label</label>"; |