]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Fixes #2921: converted internalname => name and internalid => id
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Tue, 15 Feb 2011 01:27:40 +0000 (01:27 +0000)
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Tue, 15 Feb 2011 01:27:40 +0000 (01:27 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@8249 36083f99-b078-4883-b0ff-0f9b5a30f544

103 files changed:
mod/blog/lib/blog.php
mod/blog/views/default/forms/blog/save.php
mod/blog/views/default/input/datetime.php
mod/blog/views/default/widgets/blog/edit.php
mod/bookmarks/views/default/bookmarks/form.php
mod/bookmarks/views/default/bookmarks/sharing.php
mod/categories/views/default/input/categories.php
mod/categories/views/default/settings/categories/edit.php
mod/defaultwidgets/views/default/defaultwidgets/editor.php
mod/developers/views/default/theme_preview/forms.php
mod/embed/views/default/embed/link.php
mod/embed/views/default/embed/upload/content.php
mod/externalpages/views/default/forms/expages/edit.php
mod/file/views/default/file/embed_upload.php
mod/file/views/default/forms/file/upload.php
mod/file/views/default/widgets/filerepo/edit.php
mod/garbagecollector/views/default/settings/garbagecollector/edit.php
mod/groups/views/default/forms/discussion/save.php
mod/groups/views/default/forms/groups/delete.php
mod/groups/views/default/forms/groups/edit.php
mod/groups/views/default/forms/groups/invite.php
mod/groups/views/default/forms/groups/search.php
mod/groups/views/default/settings/groups/edit.php
mod/groups/views/default/widgets/a_users_groups/edit.php
mod/logbrowser/views/default/logbrowser/form.php
mod/logrotate/views/default/settings/logrotate/edit.php
mod/messages/read.php
mod/messages/views/default/forms/messages/process.php
mod/messages/views/default/forms/messages/reply.php
mod/messages/views/default/forms/messages/send.php
mod/notifications/views/default/notifications/subscriptions/forminternals.php
mod/pages/views/default/forms/pages/edit.php
mod/pages/views/default/widgets/pages/edit.php
mod/reportedcontent/views/default/forms/reportedcontent/add.php
mod/reportedcontent/views/default/object/reported_content.php
mod/reportedcontent/views/default/widgets/reportedcontent/edit.php
mod/tagcloud/views/default/widgets/tagcloud/edit.php
mod/thewire/views/default/forms/thewire/add.php
mod/thewire/views/default/widgets/thewire/edit.php
mod/tinymce/views/default/input/longtext.php
mod/twitterservice/views/default/settings/twitterservice/edit.php
mod/uservalidationbyemail/views/default/forms/uservalidationbyemail/bulk_action.php
mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php
views/default/admin/components/plugin_settings.php
views/default/admin/plugins/advanced.php
views/default/core/account/login_walled_garden.php
views/default/core/friends/picker.php
views/default/core/river/controls.php
views/default/core/river/filter.php
views/default/core/river/footer.php
views/default/core/settings/account/default_access.php
views/default/core/settings/account/email.php
views/default/core/settings/account/language.php
views/default/core/settings/account/name.php
views/default/core/settings/account/notifications.php
views/default/core/settings/account/password.php
views/default/forms/admin/menu/save.php
views/default/forms/admin/site/update_advanced.php
views/default/forms/admin/site/update_basic.php
views/default/forms/avatar/crop.php
views/default/forms/avatar/upload.php
views/default/forms/comments/add.php
views/default/forms/comments/inline.php
views/default/forms/friends/edit.php
views/default/forms/login.php
views/default/forms/members/name_search.php
views/default/forms/members/tag_search.php
views/default/forms/plugins/settings/save.php
views/default/forms/profile/edit.php
views/default/forms/profile/fields/add.php
views/default/forms/register.php
views/default/forms/user/passwordreset.php
views/default/forms/user/requestnewpassword.php
views/default/forms/useradd.php
views/default/forms/widgets/save.php
views/default/graphics/ajax_loader.php
views/default/input/access.php
views/default/input/checkboxes.php
views/default/input/datepicker.php
views/default/input/password.php
views/default/input/plaintext.php
views/default/input/radio.php
views/default/input/securitytoken.php
views/default/input/userpicker.php
views/default/layout/objects/widget/controls.php
views/default/layout/shells/widgets.php
views/default/layout/shells/widgets/add_panel.php
views/default/navigation/tabs.php
views/default/widgets/content_stats/edit.php
views/default/widgets/friends/edit.php
views/default/widgets/new_users/edit.php
views/default/widgets/online_users/edit.php
views/installation/input/access.php
views/installation/input/button.php
views/installation/input/checkboxes.php
views/installation/input/dropdown.php
views/installation/input/form.php
views/installation/input/hidden.php
views/installation/input/longtext.php
views/installation/input/password.php
views/installation/input/securitytoken.php
views/installation/input/text.php
views/installation/install/forms/template.php

index ede87386c586213f9194f54979b5d845508c281b..6ab51ccbd5addee7168a6f0b4aae7f623a01b042 100644 (file)
@@ -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);
index 47f306ba1ab3411e9fe104d1e02bd564199b126a..6020ad4b009013344451eae52f1c8846976cc7e1 100644 (file)
@@ -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
index 7933c7bd78c975a556d63cb05a4fa02a095ac1c4..3a7244b88ee664d91f684e96588ee86c8c6042a6 100644 (file)
@@ -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',
 ));
index 4c3b1d4e284d87e20e9086cdd55f2d285922d694..30c3b2e7308e6507b80f23d6313ca0fe4eeca91d 100644 (file)
@@ -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),
 );
index 2131f7cd80287a031a9755fbfc90ed81cac3c406..ef8a18dc3f6829cfb74ee45da8efe9045b41d265 100644 (file)
@@ -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>
index 63738d94d46b1761e5e71eec95bdc09fe5c50917..779af4de2f799bad9255e6a0ebd922e5a789b9e1 100644 (file)
@@ -69,7 +69,7 @@
                
                /*echo elgg_view('input/checkboxes',array(
                
-                       'internalname' => 'shares',
+                       'name' => 'shares',
                        'options' => $options,
                        'value' => $vars['shares'],
                
index dfb8b117fbb7635c3669a687368a03cfffa91250..1f71dc0b42d063583b6e244116c60069f4c5b838 100644 (file)
@@ -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',
                ));
 
index e4750f02f7ae5d0e5e7aad4edcf32e14a3dcbb30..583292e72552311f5dc9caae9cad766449951821 100644 (file)
@@ -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'));
index 439f36ce4987fed70ef0f3dcec4243423ba63e80..b03023b3584bbba4f188add7d7a7b36a8d1c38ff 100644 (file)
 <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(); ?>" />
index 5550e51d4c4dee82aeb872f1f029eb4e4ae25c41..5915678c64f305d25a08398125e46ce342ffe680 100644 (file)
@@ -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,
                                                ));
                                ?>
index 4ed193047c5615b48b8ad68ef861fc5926c8709c..2bcf4830070e3a929319432a9713c1621bffbdde 100644 (file)
@@ -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);
 
 ?>
index a8330bce056edab23770da52588e3e591a23a811..f314c26d2cc9616913886d00b695b1b547b2d7ef 100644 (file)
@@ -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
        ));
 
index afe091337fbcd6e2f975b779fef4304e1838dd14..58c174d6e030407d36faa7f276cd0ff54f2166a5 100644 (file)
@@ -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,
 ));
 
index a5cf7ee5969c75de33baf394b6c3e0e25d21cd15..8536acd7713acf78539ecacad075dfa931257e03 100644 (file)
@@ -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));
 
 ?>
 
index a96cbaef6a04cf230baf18051eaecfc5eaf53b11..001e6667459b095169faba55c8a108a6e2e63403 100644 (file)
@@ -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")));
index 6de77fc78c01d3ae2393353829152ea2a300dde7..cab35b6effd85499fd68e8463e822e223e70e98a 100644 (file)
@@ -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),
 );
index e736f9f9fe470d3be4aa09ff9c41c52738687a37..a0f9677a04e120fb6827b784ba0c190550bb5dcd 100644 (file)
@@ -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'),
index af8d730d5f4280ff8953ddb34e4a3c9ee358d036..5d50d5c918518b1d31282989637b375e3ac63bd2 100644 (file)
@@ -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")));
index 67a4bcd854fc55ef8b9caebd33009d197c0eb219..4c380718a1aa27c1d1227dbba91e7825b36a4c57 100644 (file)
@@ -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(),
 ));
 
index d4a2754ca90a60f4f1bb7501d97febbd1c95fdf7..f9ef86296f4a5ae5ccbc46767d585c0da0243cc4 100644 (file)
@@ -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(),
        ));
 }
index 2c89db3848feca479abbc86cdbf1bfb2997ecdb0..73eadb0249189b6a1642aaee5fb689016ebc8aa2 100644 (file)
@@ -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; ?>" />
index fbb01513d06f679551e9294125c30d57baeed03e..8912b245cb6bebf378fb86669a21f7b39722e410 100644 (file)
@@ -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='' }",
index 362d355afea19e6d47535eaca90e9aa4b8daa834..1cf6be466cc1122e68b814d89a870e235a801e7f 100644 (file)
@@ -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')
index 4d61b3259cdac7cb7ae912e7b29b5164b14ca9a9..e49a996b7de3183df4e532e76c01b1b62c41e290 100644 (file)
@@ -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),
 );
index 0b76ba313a744c010c8760880c018fd36ed5ab9c..e7c2257ce764ac8b77dc297f6c5a3ac8c1c90727 100644 (file)
 
                $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(
index 8a2dabba6b0352d65610a69b00b99f905df97bfb..c73bec52c68e34a5b3e5bb9f51fd5b5f551870a2 100644 (file)
@@ -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'),
index 9fda13f5f19cb1505603fa95613fa998e3dd949f..83c7dccee4c713f5554282bb90f0f63f03198498 100644 (file)
@@ -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',
                ));
        }
 }
index 7b3cd1a9ec2780fb15381da3e79853e3c2be28f8..ce24360e70460aa1c0a68fc815601c3576bbd92b 100644 (file)
@@ -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>';
index 4c1832672725f33fa53eba800bd0395073ee272e..2288f25f4d68170298a845c74405d5d5d93d5586 100644 (file)
@@ -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' => '',
        ));
        ?>
index 31918b314b7c1fec5475e27450c7f33c1b258a9f..db857b6f408f23312e79abd2fcefcbd489bd7647 100644 (file)
@@ -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,
        ));
        ?>
index 98ca1ccb521547fc5dcf8fb24059a7d7e1ff78af..d7ee65f1239706aeb58dfe4fc6bea12e30f1b437 100644 (file)
@@ -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
index 793e5c39efa477cee083d57e77dc806566732e88..abb6716fd5f95010547127d2799756aef7aa1c69 100644 (file)
@@ -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'],
        ));
 }
index 69710e50a4b9bf71fd6656de5eb7d4b54fc3ff14..f23514380f182b81d736152a58eaeaca30f619d6 100644 (file)
@@ -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),
 );
index abc53e750a9b3028a4004738131249eeced83d5a..0b1716a350b832f8332ff33b580b8e9f10de109b 100644 (file)
@@ -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,
                )); 
        ?>
index 83e49142c5451bd1971335a915d25b8923317317..e755fae5bea7ccae4016e81a96cae6fdfa3424c6 100644 (file)
@@ -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>
index 810d549afdadf337b24aa2e2afe83e226b73ef43..ecd732d23844797caaba05508eef35309fdfcadd 100644 (file)
@@ -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),
 );
index d860df5494464f6a19ea9288881c248a18855a6e..919c8ccd4055d127bff694d3ac0d57ab984e22db 100644 (file)
@@ -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),
 );
index 9a72e41091487fca9c1c473be9d93ef22f11f8be..54d5a5ea77700680b5363bf9a1b3d3cb4add169a 100644 (file)
@@ -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',
 ));
 
 ?>
index 8c93383ad961e3bfa8c09ad698eba5f49c8cc811..cee3f769ddecfae1ec77530127e73b2ecb4ca246 100644 (file)
@@ -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),
 );
index daa68502e04ba2b3259062b5903173f868c39d90..1d449262fb9f23c28634579ea18341e875231030 100644 (file)
@@ -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>
index f84710af35651a1c15aa729b5ad5e1b4466e3123..1e7dc1edd11b2eb6e61ff288110b245243865360 100644 (file)
@@ -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'),
index 3389fc7f9868decac3130bf82774ea44605d810a..d5060d7e5f2366b85be211bcc35afd7c4aa6b67d 100644 (file)
@@ -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'),
index 7babd5e87ecea05442a1335cc9f47f845d811706..295f4170e05fceebb2841978f3e0fb57992abee0 100644 (file)
@@ -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\" &lt;$user->email&gt;" => $user->guid)
 //));
 $checkbox = "<label><input type=\"checkbox\" value=\"$user->guid\" class=\"elgg-input-checkboxes\" name=\"user_guids[]\">"
index 30cf3d21af9537a47d6602f1bb60b4cc26f564ab..48e65b4dd3d824bfa8b6598fdeeaa50676aa623a 100644 (file)
@@ -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>
index 45c12a74f2b62426e9c1e80012bfcc407a5229b8..1c42be14d1e0b4a4a682c533c2cd52a5848bb784 100644 (file)
@@ -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
 ));
index 6bd028da68fb62929cf78722c0f210765861ac2e..93aa877823b991ccc762c10f371077f41301153a 100644 (file)
@@ -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>";
        
index 2d5976540457268e20352140cd7c84508f11ec7b..04a40d0d76cc99523a311dff881fb6085da5456c 100644 (file)
@@ -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>
 
index 37bfba91baf453f26d6bae089c95032e4396cf6f..6f2be623c543ee95e362c43d31f320cff3bfb2f5 100644 (file)
@@ -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);
 
index 74af9969bed88270f2ee6ff8ce795e7e062631f1..aaa4beb89afd4fd9691a13baef8116b62879e501 100644 (file)
@@ -24,7 +24,7 @@ if (!empty($registered_entities)) {
 }
 
 $params = array(
-       'internalid' => 'elgg-river-selector',
+       'id' => 'elgg-river-selector',
        'options_values' => $options,
 );
 $selector = $vars['selector'];
index ee9d5dc58fe7ceb831bfe211634c40f8cf4028fa..ff960cebe94ddeb8d8c1a1c1288e1f22d42a92d0 100644 (file)
@@ -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));
index 67a0a4137d2b92719efe8063a6a5a1880a634a54..e33211460e8f74911d79d2f2cc5d0e7695168c09 100644 (file)
@@ -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>
index 3782d39a83b6e7cac3d24a98ca8e436f094fb887..fda83e795fa09c6755fb3f070f9161d56a7af176 100644 (file)
@@ -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>
index a1e8d9886b449537a682a23802ae47457705ddfb..3a992966fe2c2d27289fc8dc557b3b0ba3185060 100644 (file)
@@ -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()
                        ));
index 22f9509251c724ee796cadfc13d182e558d1f1a5..69ffcecaf146ddfa2cc0c090e79d522606a4239f 100644 (file)
@@ -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));
index decf000ea4065929d48e5c150ca46b001a448264..ae5fe40bb6a91a015dc5f292fbb722a06a011046 100644 (file)
@@ -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',
index 06e59dfbb6545959588ff8cfac4bd21998d5122e..a80f3df6b73997184f1fe12a7619186e8bcf2422 100644 (file)
@@ -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>
index 4025117f8848d4d959537d23869bbed36a26a759..2cafaa89b91609a1b82091b10dd33b28738fb11a 100644 (file)
@@ -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>
index af41002e908597191d9e87eeb7fce8ab5b3dbee9..d3ae5e250117c3e0068ca5cb270a01f42ce8b456 100644 (file)
@@ -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")));
index e9e2e6c13fee84823abd93cff589dfe27efc1f1a..eb421881000cb3716bcf458306cc63331dc4d3bb 100644 (file)
@@ -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>";
index 01ceb3fec409ac2a5a2cb9f54b92487bcd8be277..380a4bb6c441dd7ec3336113f14ab9887095521c 100644 (file)
@@ -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')));
 
index a89f5ee68569d1fbf8a5093e007639bf8cd78098..08db1f7e03654c786363de4e99def96d0392e736 100644 (file)
@@ -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>
index b4f63b8145a95bf396d8093172b7e2e0204b9546..8a2b89f2dd7370bdcde7ef5ef8d8db6337f5dabe 100644 (file)
@@ -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")));
index 9c44905be0d853d3789c3a5a867caa3fac957944..14b8a086dbe301bb272d4f97fe5a08ff91484edb 100644 (file)
@@ -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')));
index ac817f23acd1a2dc299351d9148356451efb4a08..e3bc28cfc8db158310165a988a47e8633b9b3d44 100644 (file)
@@ -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
index 44d134ba8432218235bbd74496c374e811aac4e2..a4d9e57c6b28d717d26ff557cf13fc2eab57049f 100644 (file)
@@ -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'); ?>
index 265290fc93e502914c149fb41ff6a7664d9e79f4..23e6c066e626bcc57dc2ad28c447a69343030ad1 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 
 $params = array(
-       'internalname' => 'name',
+       'name' => 'name',
 );
 echo elgg_view('input/text', $params);
 
index 1a281963d8e656340e9daca2b76f997181c32a31..7badf8cdaab0fda932fec6b47b56e17e55d13890 100644 (file)
@@ -4,7 +4,7 @@
  */
 
 $params = array(
-       'internalname' => 'tag',
+       'name' => 'tag',
 );
 echo elgg_view('input/text', $params);
 
index 744133c79d07a07df4481118a0c821c917754642..3cb4a1472713101713b7016ce6eb16e915351927 100644 (file)
@@ -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>";
index 4d2987a03221cf8e1177390d82dc2d219860447d..aaf9ac01e4f5cac6d0b6892743202eefdbba849f 100644 (file)
@@ -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>
index de43b9ec96c60b4b97b5ad940e00c4504029c27d..c700cf7f59aea331482d4d75eb765ea462b16f9a 100644 (file)
@@ -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
index a7f34f777f2d9e57207a99dcdd9c659d35fc06e8..8828e89e159d538d7916583aad7abb0975ca320f 100644 (file)
@@ -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">
index d553bdc14789dba6912bc8e6053800c7ccaafe3c..7b13f120cba3427258a483e659c1a67fbd1de13f 100644 (file)
@@ -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
 ));
 
index 8a83da709f2382e5655c94a0bd24a568e1389189..f2f2764177a6f43a07248622e8c5e58e193e2614 100644 (file)
@@ -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>
index 9926bb437460c0238b23e671cec425e50c3e730c..1119d180f15bf39343c7a83c9b4a2288956dda3b 100644 (file)
@@ -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">
index b8d6017f506a4165d7cf427e8c53a8dc7307d29b..d16318cd171301a21f692abfcca6a011f90461ff 100644 (file)
@@ -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
index 2d2da30b7f95f1da8169c27c879a17eb95e13a3e..77c1fbf4cbee937aeb19bc00198ac63312468423 100644 (file)
@@ -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';
index 523c0aaf477538575ea96a610d8cefd81a2ed3d3..7fa2323bfc1e502aa1e974c4622f752a78442e55 100644 (file)
@@ -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(
index 17c8ab8bd82ba480e2be9cbb942a8188bc9f51ed..c78fe4db08ba32211a3787e87df967f3e7c39f2d 100644 (file)
@@ -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,
  * @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);
index 0687f9e31a9ed09a7cd3ab0c8cbc91c852e7a45d..4af54096bec9781db003219be1ffc0c324fe4210 100644 (file)
@@ -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() {
index 335325c21ed14dd88db1b203965b02838ba0f075..62c8fb53dd8714c234a1b777f6962530f1e2b91e 100644 (file)
@@ -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
  *
  */
 
index 05018e1ed1ded90caa9ee80675126b8c371553db..7d59b3d0d43d7174e2cc53b75580299fb8b9a67c 100644 (file)
@@ -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']
  */
index fbfc9c5a1fef32589196136256a68dc7c308ad82..0ad28423fb40354df4c19f281a6f2fb02c73b9a2 100644 (file)
@@ -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.
index 9a8cb1ebe44465114828ebbc14ef3099f3ec2bad..75410848a4bfe292569895f7b7fc6e40a6fc0aff 100644 (file)
@@ -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));
index 980af268454b4f836302bf2541437a8259bd3c2e..77a51f37c302683e6d3c94fbbb76c6da066af873 100644 (file)
@@ -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.
index be7a10083d83eddc2c7b417e5ae8d772b1185eba..09f5fc947ffcea1130adefb2205e2fabc59f25ee 100644 (file)
@@ -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);
        }
index e551f288f384daa1e2cf83c4ef2e6c7e4099734b..8d122738e149fbed9e5ff2df060745535b21badb 100644 (file)
@@ -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'));
index e6b13d5730d15124ed106d3303e2037796ca4fbb..b440e323f6812412b6aee1493c980061d1f08c05 100644 (file)
@@ -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);
index 376464ee502209e466325893e13c7cbb7b434f22..0108126ad7a5ea55b9abe1b14afba89dddcee0e6 100644 (file)
@@ -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);
index d0746a5340369e8f4cea94490fc1e9052062ce78..f1a050df83c089e5e534c291c21aa530cbfae9d0 100644 (file)
@@ -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),
 );
index 025f5f98beec5c1d6b13495f47fc7be7283fae28..c7e6b06ffa2e874c7083212357a2b17b3ae82df0 100644 (file)
@@ -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'),
index e951264bfdee634817b3f62d115690a758235fde..ed07213cb973f04d2dc79d01931538705922da14 100644 (file)
@@ -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),
 );
index dfbe6ecd685da7f8a29528f690e1d7a12069265d..66f03a745350ebaca362d719ca0e0e2a5307dfc9 100644 (file)
@@ -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),
 );
index ab4064ef11f110d974983131809c9dc1a8368ef1..3fde7295fccf4fa4a6438bd18002818cd93483b7 100644 (file)
@@ -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) {
index 81a5414c466164b0f2f081f951b5a85321fc4b67..a69f7dbfaad309c6b9af3dd6a0e1baccbe26df58 100644 (file)
@@ -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
index 04533f6f57beba0d999917953d20d73bf4f559f0..1645098318667e96a21cfe762705f61c0435b5e2 100644 (file)
@@ -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
index 11802a669260a011f95c0633209998da38369e68..141ff65b0adcc6dfba571359c75644a4736ba983 100644 (file)
@@ -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) {
index a4707f25796d95050538a947dead291a0aaefec9..b131c9d1029381d4d9fcbb8e4ad7a912f8a5311f 100644 (file)
  *
  */
 
-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 = '';
 }
index 7a0798e4845d94c296dec3ccce14685bdf7ab5f2..c9800ebbb6caa6fbf9d86d96d326df9b80a6b12f 100644 (file)
@@ -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
index a909f55f2abc5bf38082bdc01b1449f35ee39c88..820a51da4486bc0f61c766b3ecc4faa982d6597d 100644 (file)
@@ -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
index 541728ee32e7a9e12c23215d1d1544358dd15c15..8ba79228da68556a0d037627c3a18014a90ac144 100644 (file)
@@ -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; ?>" />
index 9a8cb1ebe44465114828ebbc14ef3099f3ec2bad..75410848a4bfe292569895f7b7fc6e40a6fc0aff 100644 (file)
@@ -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));
index 73801dcf742f2b22ba02227610258d3639659a77..c59278b401fd66abce1979338993e16f9d918a96 100644 (file)
@@ -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
index 897772dd44bb7ab0ad97064eae3148a0e902206d..5e44d928e524cfbc078938848133b3537a167120 100644 (file)
@@ -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>";