From af2f3805095f8a91d85847e11faeb280fddf58c0 Mon Sep 17 00:00:00 2001 From: ewinslow Date: Tue, 15 Feb 2011 01:27:40 +0000 Subject: Fixes #2921: converted internalname => name and internalid => id git-svn-id: http://code.elgg.org/elgg/trunk@8249 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/blog/lib/blog.php | 4 +- mod/blog/views/default/forms/blog/save.php | 36 ++++++------- mod/blog/views/default/input/datetime.php | 10 ++-- mod/blog/views/default/widgets/blog/edit.php | 2 +- mod/bookmarks/views/default/bookmarks/form.php | 14 ++--- mod/bookmarks/views/default/bookmarks/sharing.php | 2 +- mod/categories/views/default/input/categories.php | 2 +- .../views/default/settings/categories/edit.php | 2 +- .../views/default/defaultwidgets/editor.php | 4 +- .../views/default/theme_preview/forms.php | 60 +++++++++++----------- mod/embed/views/default/embed/link.php | 2 +- mod/embed/views/default/embed/upload/content.php | 2 +- .../views/default/forms/expages/edit.php | 8 +-- mod/file/views/default/file/embed_upload.php | 2 +- mod/file/views/default/forms/file/upload.php | 16 +++--- mod/file/views/default/widgets/filerepo/edit.php | 2 +- .../default/settings/garbagecollector/edit.php | 2 +- mod/groups/views/default/forms/discussion/save.php | 14 ++--- mod/groups/views/default/forms/groups/delete.php | 2 +- mod/groups/views/default/forms/groups/edit.php | 14 ++--- mod/groups/views/default/forms/groups/invite.php | 2 +- mod/groups/views/default/forms/groups/search.php | 2 +- mod/groups/views/default/settings/groups/edit.php | 2 +- .../views/default/widgets/a_users_groups/edit.php | 2 +- mod/logbrowser/views/default/logbrowser/form.php | 6 +-- .../views/default/settings/logrotate/edit.php | 2 +- mod/messages/read.php | 4 +- .../views/default/forms/messages/process.php | 6 +-- .../views/default/forms/messages/reply.php | 6 +-- mod/messages/views/default/forms/messages/send.php | 6 +-- .../notifications/subscriptions/forminternals.php | 8 +-- mod/pages/views/default/forms/pages/edit.php | 8 +-- mod/pages/views/default/widgets/pages/edit.php | 2 +- .../views/default/forms/reportedcontent/add.php | 6 +-- .../views/default/object/reported_content.php | 2 +- .../views/default/widgets/reportedcontent/edit.php | 2 +- .../views/default/widgets/tagcloud/edit.php | 2 +- mod/thewire/views/default/forms/thewire/add.php | 4 +- mod/thewire/views/default/widgets/thewire/edit.php | 2 +- mod/tinymce/views/default/input/longtext.php | 8 +-- .../views/default/settings/twitterservice/edit.php | 8 +-- .../forms/uservalidationbyemail/bulk_action.php | 2 +- .../uservalidationbyemail/unvalidated_user.php | 2 +- views/default/admin/components/plugin_settings.php | 2 +- views/default/admin/plugins/advanced.php | 2 +- views/default/core/account/login_walled_garden.php | 4 +- views/default/core/friends/picker.php | 10 ++-- views/default/core/river/controls.php | 2 +- views/default/core/river/filter.php | 2 +- views/default/core/river/footer.php | 2 +- .../core/settings/account/default_access.php | 2 +- views/default/core/settings/account/email.php | 2 +- views/default/core/settings/account/language.php | 2 +- views/default/core/settings/account/name.php | 4 +- .../core/settings/account/notifications.php | 2 +- views/default/core/settings/account/password.php | 6 +-- views/default/forms/admin/menu/save.php | 10 ++-- views/default/forms/admin/site/update_advanced.php | 22 ++++---- views/default/forms/admin/site/update_basic.php | 4 +- views/default/forms/avatar/crop.php | 4 +- views/default/forms/avatar/upload.php | 4 +- views/default/forms/comments/add.php | 4 +- views/default/forms/comments/inline.php | 4 +- views/default/forms/friends/edit.php | 8 +-- views/default/forms/login.php | 4 +- views/default/forms/members/name_search.php | 2 +- views/default/forms/members/tag_search.php | 2 +- views/default/forms/plugins/settings/save.php | 4 +- views/default/forms/profile/edit.php | 8 +-- views/default/forms/profile/fields/add.php | 6 +-- views/default/forms/register.php | 18 +++---- views/default/forms/user/passwordreset.php | 4 +- views/default/forms/user/requestnewpassword.php | 2 +- views/default/forms/useradd.php | 14 ++--- views/default/forms/widgets/save.php | 4 +- views/default/graphics/ajax_loader.php | 4 +- views/default/input/access.php | 2 +- views/default/input/checkboxes.php | 18 +++---- views/default/input/datepicker.php | 6 +-- views/default/input/password.php | 2 +- views/default/input/plaintext.php | 2 +- views/default/input/radio.php | 2 +- views/default/input/securitytoken.php | 4 +- views/default/input/userpicker.php | 2 +- views/default/layout/objects/widget/controls.php | 4 +- views/default/layout/shells/widgets.php | 2 +- views/default/layout/shells/widgets/add_panel.php | 2 +- views/default/navigation/tabs.php | 2 +- views/default/widgets/content_stats/edit.php | 2 +- views/default/widgets/friends/edit.php | 4 +- views/default/widgets/new_users/edit.php | 2 +- views/default/widgets/online_users/edit.php | 2 +- views/installation/input/access.php | 4 +- views/installation/input/button.php | 6 +-- views/installation/input/checkboxes.php | 4 +- views/installation/input/dropdown.php | 4 +- views/installation/input/form.php | 8 +-- views/installation/input/hidden.php | 4 +- views/installation/input/longtext.php | 4 +- views/installation/input/password.php | 4 +- views/installation/input/securitytoken.php | 4 +- views/installation/input/text.php | 4 +- views/installation/install/forms/template.php | 2 +- 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'])){ 'title', + 'name' => 'title', 'value' => $title, )); @@ -61,7 +61,7 @@ if(isset($vars['entity'])){ 'address', + 'name' => 'address', 'value' => $address, )); @@ -75,7 +75,7 @@ if(isset($vars['entity'])){ 'description', + 'name' => 'description', 'value' => $description, )); @@ -88,7 +88,7 @@ if(isset($vars['entity'])){ 'tags', + 'name' => 'tags', 'value' => $tags, )); @@ -103,7 +103,7 @@ if(isset($vars['entity'])){


$friends, 'internalname' => 'shares', 'highlight' => $highlight)); + echo elgg_view('friends/picker',array('entities' => $friends, 'name' => 'shares', 'highlight' => $highlight)); ?>

'access', + 'name' => 'access', 'value' => $access_id, )); @@ -124,7 +124,7 @@ if(isset($vars['entity'])){

- 'container_guid', 'value' => $vars['container_guid'])) : ""; ?> + 'container_guid', 'value' => $vars['container_guid'])) : ""; ?>

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)) {

$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 @@ '__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'])); ?> 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');
'f1', - 'internalid' => 'f1', + 'name' => 'f1', + 'id' => 'f1', 'value' => 'input text', )); ?> @@ -26,8 +26,8 @@ $ipsum = elgg_get_config('tp_ipsum');
'f2', - 'internalid' => 'f2', + 'name' => 'f2', + 'id' => 'f2', 'value' => 'password', )); ?> @@ -35,8 +35,8 @@ $ipsum = elgg_get_config('tp_ipsum');

'f3', - 'internalid' => 'f3', + 'name' => 'f3', + 'id' => 'f3', 'options' => array('a' => 1, 'b' => 2), )); ?> @@ -44,8 +44,8 @@ $ipsum = elgg_get_config('tp_ipsum');

'f4', - 'internalid' => 'f4', + 'name' => 'f4', + 'id' => 'f4', 'options' => array('a' => 1, 'b' => 2), )); ?> @@ -53,8 +53,8 @@ $ipsum = elgg_get_config('tp_ipsum');

'f5', - 'internalid' => 'f5', + 'name' => 'f5', + 'id' => 'f5', 'options' => array('option 1', 'option 2'), )); ?> @@ -62,8 +62,8 @@ $ipsum = elgg_get_config('tp_ipsum');
'f6', - 'internalid' => 'f6', + 'name' => 'f6', + 'id' => 'f6', 'value' => ACCESS_PUBLIC, )); ?> @@ -71,16 +71,16 @@ $ipsum = elgg_get_config('tp_ipsum');
'f7', - 'internalid' => 'f7', + 'name' => 'f7', + 'id' => 'f7', )); ?>
'f8', - 'internalid' => 'f8', + 'name' => 'f8', + 'id' => 'f8', 'value' => 'http://elgg.org/', )); ?> @@ -88,8 +88,8 @@ $ipsum = elgg_get_config('tp_ipsum');
'f9', - 'internalid' => 'f9', + 'name' => 'f9', + 'id' => 'f9', 'value' => 'one, two, three', )); ?> @@ -97,8 +97,8 @@ $ipsum = elgg_get_config('tp_ipsum');
'f10', - 'internalid' => 'f10', + 'name' => 'f10', + 'id' => 'f10', 'value' => 'noone@elgg.org', )); ?> @@ -106,8 +106,8 @@ $ipsum = elgg_get_config('tp_ipsum');
'f11', - 'internalid' => 'f11', + 'name' => 'f11', + 'id' => 'f11', 'match_on' => 'users', )); ?> @@ -115,24 +115,24 @@ $ipsum = elgg_get_config('tp_ipsum');
'f12', - 'internalid' => 'f12', + 'name' => 'f12', + 'id' => 'f12', )); ?>
'f13', - 'internalid' => 'f13', + 'name' => 'f13', + 'id' => 'f13', )); ?>
'f14', - 'internalid' => 'f14', + 'name' => 'f14', + 'id' => 'f14', 'value' => $ipsum, )); ?> @@ -140,8 +140,8 @@ $ipsum = elgg_get_config('tp_ipsum');
'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) { ?>

- 'upload')); ?> + 'upload')); ?>

- 'title', 'value' => $title)); ?> + 'title', 'value' => $title)); ?>
- 'description', 'value' => $desc)); ?> + 'description', 'value' => $desc)); ?>
- 'tags', 'value' => $tags)); ?> + 'tags', 'value' => $tags)); ?>

- 'access_id', 'value' => $access_id)); ?> + 'access_id', 'value' => $access_id)); ?>
'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) { '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); ?>

- 'title', 'value' => $title)); ?> + 'title', 'value' => $title)); ?>
- 'description', 'value' => $desc)); ?> + 'description', 'value' => $desc)); ?>
- 'tags', 'value' => $tags)); ?> + 'tags', 'value' => $tags)); ?>

'status', + 'name' => 'status', 'value' => $status, 'options_values' => array( 'open' => elgg_echo('groups:topicopen'), @@ -40,15 +40,15 @@ $guid = elgg_extract('guid', $vars, null);

- 'access_id', 'value' => $access_id)); ?> + 'access_id', 'value' => $access_id)); ?>
'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'])) { ?>

- 'icon')); ?> + 'icon')); ?>

'name', + 'name' => 'name', 'value' => $vars['entity']->name, )); ?> @@ -38,7 +38,7 @@ if ($group_profile_fields > 0) { echo elgg_echo("groups:{$shortname}"); echo "$line_break"; echo elgg_view("input/{$valtype}", array( - 'internalname' => $shortname, + 'name' => $shortname, 'value' => $vars['entity']->$shortname, )); echo '
'; @@ -50,7 +50,7 @@ if ($group_profile_fields > 0) {
'; // 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 .= '
' . elgg_echo('installation:registration:description'); @@ -63,7 +63,7 @@ $form_body .= '
' .elgg_view('input/checkboxes', $options) . '
'; $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 .= '
' . elgg_echo('installation:walled_garden:description'); @@ -72,7 +72,7 @@ $form_body .= '
' . elgg_view('input/checkboxes', $options) . '
'; $form_body .= "
" . elgg_echo('installation:httpslogin') . "
"; $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') : "") )) . "
"; @@ -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 .= "
"; -$form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go')); +$form_body .= elgg_view('input/hidden', array('name' => 'settings', 'value' => 'go')); $form_body .= '
'; $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 "" . $warning . "
"; } $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 .= "
"; } $languages = get_installed_translations(); $form_body .= "
" . elgg_echo('installation:language'); $form_body .= elgg_view("input/dropdown", array( - 'internalname' => 'language', + 'name' => 'language', 'value' => elgg_get_config('language'), 'options_values' => $languages, )) . "
"; 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'); $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)); ?>

- 'avatar')); ?> + 'avatar')); ?>
elgg_echo('upload'))); ?>
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()) { ?>
- 'generic_comment')); ?> + 'generic_comment')); ?>
'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 = "
"; @@ -43,13 +43,13 @@ if($vars['collection_members']){ $form_body .= "
"; $form_body .= "
". - elgg_view('core/friends/picker',array('entities' => $vars['friends'], 'internalname' => 'friends_collection', 'highlight' => $highlight)) . "
"; + elgg_view('core/friends/picker',array('entities' => $vars['friends'], 'name' => 'friends_collection', 'highlight' => $highlight)) . "
"; $form_body .= "
"; 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 .= "
"; 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 @@
- 'username')); ?> + 'username')); ?>
- 'password')); ?> + 'password')); ?>
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 @@ '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 "
"; -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 "
"; 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 @@
- 'name', 'value' => $vars['entity']->name)); ?> + 'name', 'value' => $vars['entity']->name)); ?>
0) { $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) { ?>
'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'))); ?>
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

$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'])) {


- 'name', 'value' => $name)); ?> + 'name', 'value' => $name)); ?>

- 'email', 'value' => $email)); ?> + 'email', 'value' => $email)); ?>

- 'username', 'value' => $username)); ?> + 'username', 'value' => $username)); ?>

- 'password')); ?> + 'password')); ?>

- 'password2')); ?> + 'password2')); ?>
"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'))); ?>