Fixes #2921: converted internalname => name and internalid => id

git-svn-id: http://code.elgg.org/elgg/trunk@8249 36083f99-b078-4883-b0ff-0f9b5a30f544

8 files changed, 19 insertions, 19 deletions

diff --git a/views/default/input/access.php b/views/default/input/access.php
index 523c0aaf4..7fa2323bf 100644
--- a/views/default/input/access.php
+++ b/views/default/input/access.php
@@ -8,7 +8,7 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['options_values']
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  */
 
 $defaults = array(
diff --git a/views/default/input/checkboxes.php b/views/default/input/checkboxes.php
index 17c8ab8bd..c78fe4db0 100644
--- a/views/default/input/checkboxes.php
+++ b/views/default/input/checkboxes.php
@@ -6,7 +6,7 @@
  * @note This also includes a hidden input with the same name as the checkboxes
  * to make sure something is sent to the server.  The default value is 0.
  * If using JS, be specific to avoid selecting the hidden default value:
- * 	$('input[type=checkbox][name=internalname]')
+ * 	$('input[type=checkbox][name=name]')
  * 
  * @warning Passing integers as labels does not currently work due to a
  * deprecated hack that will be removed in Elgg 1.9. To use integer labels,
@@ -15,11 +15,11 @@
  * @package Elgg
  * @subpackage Core
  *
- * @uses string $vars['internalname'] The name of the input fields
+ * @uses string $vars['name'] The name of the input fields
  *                                    (Forced to an array by appending [])
  * @uses array  $vars['options']      An array of strings representing the
  *                                    label => option for the each checkbox field
- * @uses string $vars['internalid']   The id for each input field. Optional.
+ * @uses string $vars['id']   The id for each input field. Optional.
  *                                    (Only use this with a single value.)
  * @uses string $vars['default']      The default value to send if nothing is checked.
  *                                    Optional, defaults to 0. Set to FALSE for no default.
@@ -34,11 +34,11 @@ $additional_class = elgg_extract('class', $vars);
 $align = elgg_extract('align', $vars, 'vertical');
 $value = (isset($vars['value'])) ? $vars['value'] : NULL;
 $value_array = (is_array($value)) ? array_map('elgg_strtolower', $value) : array(elgg_strtolower($value));
-$internalname = (isset($vars['internalname'])) ? $vars['internalname'] : '';
+$name = (isset($vars['name'])) ? $vars['name'] : '';
 $options = (isset($vars['options']) && is_array($vars['options'])) ? $vars['options'] : array();
 $default = (isset($vars['default'])) ? $vars['default'] : 0;
 
-$id = (isset($vars['internalid'])) ? $vars['internalid'] : '';
+$id = (isset($vars['id'])) ? $vars['id'] : '';
 $disabled = (isset($vars['disabled'])) ? $vars['disabled'] : FALSE;
 $js = (isset($vars['js'])) ? $vars['js'] : '';
 
@@ -49,8 +49,8 @@ if ($additional_class) {
 
 if ($options && count($options) > 0) {
 	// include a default value so if nothing is checked 0 will be passed.
-	if ($internalname && $default !== FALSE) {
-		echo "<input type=\"hidden\" name=\"$internalname\" value=\"$default\" />";
+	if ($name && $default !== FALSE) {
+		echo "<input type=\"hidden\" name=\"$name\" value=\"$default\" />";
 	}
 
 	echo "<ul class=\"$class\">";
@@ -70,8 +70,8 @@ if ($options && count($options) > 0) {
 			'default' => false,
 		);
 
-		if ($internalname) {
-			$input_vars['name'] = "{$internalname}[]";
+		if ($name) {
+			$input_vars['name'] = "{$name}[]";
 		}
 		
 		$input = elgg_view('input/checkbox', $input_vars);
diff --git a/views/default/input/datepicker.php b/views/default/input/datepicker.php
index 0687f9e31..4af54096b 100644
--- a/views/default/input/datepicker.php
+++ b/views/default/input/datepicker.php
@@ -8,11 +8,11 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  *
  */
 
-$cal_name = sanitise_string($vars['internalname']);
+$cal_name = sanitise_string($vars['name']);
 
 if (isset($vars['class'])) {
 	$class = "{$vars['class']} popup_calendar";
@@ -28,7 +28,7 @@ if ($vars['value'] > 86400) {
 }
 
 ?>
-<input type="text" name="<?php echo $vars['internalname']; ?>" value="<?php echo $val; ?>" />
+<input type="text" name="<?php echo $vars['name']; ?>" value="<?php echo $val; ?>" />
 <?php //@todo JS 1.8: no ?>
 <script type="text/javascript">
 	$(document).ready(function() {
diff --git a/views/default/input/password.php b/views/default/input/password.php
index 335325c21..62c8fb53d 100644
--- a/views/default/input/password.php
+++ b/views/default/input/password.php
@@ -8,7 +8,7 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  *
  */
 
diff --git a/views/default/input/plaintext.php b/views/default/input/plaintext.php
index 05018e1ed..7d59b3d0d 100644
--- a/views/default/input/plaintext.php
+++ b/views/default/input/plaintext.php
@@ -7,7 +7,7 @@
  * @subpackage Core
  *
  * @uses $vars['value'] The current value, if any
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  * @uses $vars['class']
  * @uses $vars['disabled']
  */
diff --git a/views/default/input/radio.php b/views/default/input/radio.php
index fbfc9c5a1..0ad28423f 100644
--- a/views/default/input/radio.php
+++ b/views/default/input/radio.php
@@ -11,7 +11,7 @@
  * @subpackage Core
  *
  * @uses $vars['value']        The current value, if any
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  * @uses $vars['options']      An array of strings representing the options for the
  *                             radio field as "label" => option
  * @uses $vars['class']        Additional class of the list. Optional.
diff --git a/views/default/input/securitytoken.php b/views/default/input/securitytoken.php
index 9a8cb1ebe..75410848a 100644
--- a/views/default/input/securitytoken.php
+++ b/views/default/input/securitytoken.php
@@ -11,5 +11,5 @@
 $ts = time();
 $token = generate_action_token($ts);
 
-echo elgg_view('input/hidden', array('internalname' => '__elgg_token', 'value' => $token));
-echo elgg_view('input/hidden', array('internalname' => '__elgg_ts', 'value' => $ts));
+echo elgg_view('input/hidden', array('name' => '__elgg_token', 'value' => $token));
+echo elgg_view('input/hidden', array('name' => '__elgg_ts', 'value' => $ts));
diff --git a/views/default/input/userpicker.php b/views/default/input/userpicker.php
index 980af2684..77a51f37c 100644
--- a/views/default/input/userpicker.php
+++ b/views/default/input/userpicker.php
@@ -6,7 +6,7 @@
  * @subpackage Core
  *
  * @uses $vars['value'] The current value, if any
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  *
  *
  * pops up defaulted to lazy load friends lists in paginated alphabetical order.