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

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

11 files changed, 24 insertions, 24 deletions

diff --git a/views/installation/input/access.php b/views/installation/input/access.php
index ab4064ef1..3fde7295f 100644
--- a/views/installation/input/access.php
+++ b/views/installation/input/access.php
@@ -8,7 +8,7 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  *
  */
 
@@ -28,7 +28,7 @@ if (is_array($vars['options']) && sizeof($vars['options']) > 0) {
 
 	?>
 
-	<select name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['js'])) echo $vars['js']; ?> <?php if ((isset($vars['disabled'])) && ($vars['disabled'])) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>">
+	<select name="<?php echo $vars['name']; ?>" <?php if (isset($vars['js'])) echo $vars['js']; ?> <?php if ((isset($vars['disabled'])) && ($vars['disabled'])) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>">
 	<?php
 
 		foreach($vars['options'] as $key => $option) {
diff --git a/views/installation/input/button.php b/views/installation/input/button.php
index 81a5414c4..a69f7dbfa 100644
--- a/views/installation/input/button.php
+++ b/views/installation/input/button.php
@@ -9,7 +9,7 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  * @uses $vars['type'] Submit or reset, defaults to submit.
  * @uses $vars['src'] Src of an image
  *
@@ -39,11 +39,11 @@ switch ($type) {
 }
 
 $value = htmlentities($vars['value'], ENT_QUOTES, 'UTF-8');
-$name = $vars['internalname'];
+$name = $vars['name'];
 $src = $vars['src'];
 // blank src if trying to access an offsite image.
 if (strpos($src, elgg_get_site_url()) === false) {
 	$src = "";
 }
 ?>
-<input type="<?php echo $type; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\"";?> <?php echo $vars['js']; ?> value="<?php echo $value; ?>" src="<?php echo $src; ?>" class="<?php echo $class; ?>" />
\ No newline at end of file
+<input type="<?php echo $type; ?>" <?php if (isset($vars['id'])) echo "id=\"{$vars['id']}\"";?> <?php echo $vars['js']; ?> value="<?php echo $value; ?>" src="<?php echo $src; ?>" class="<?php echo $class; ?>" />
\ No newline at end of file
diff --git a/views/installation/input/checkboxes.php b/views/installation/input/checkboxes.php
index 04533f6f5..164509831 100644
--- a/views/installation/input/checkboxes.php
+++ b/views/installation/input/checkboxes.php
@@ -8,7 +8,7 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  * @uses $vars['options'] An array of strings representing the options for the checkbox field
  *
  */
@@ -44,5 +44,5 @@ foreach($vars['options'] as $label => $option) {
 	if ($vars['disabled']) {
 		$disabled = ' disabled="yes" ';
 	}
-	echo "<label><input type=\"checkbox\" $disabled {$vars['js']} name=\"{$vars['internalname']}[]\" {$selected} value=\"".htmlentities($option, ENT_QUOTES, 'UTF-8')."\" {$selected} class=\"$class\" />{$label}</label><br />";
+	echo "<label><input type=\"checkbox\" $disabled {$vars['js']} name=\"{$vars['name']}[]\" {$selected} value=\"".htmlentities($option, ENT_QUOTES, 'UTF-8')."\" {$selected} class=\"$class\" />{$label}</label><br />";
 }
\ No newline at end of file
diff --git a/views/installation/input/dropdown.php b/views/installation/input/dropdown.php
index 11802a669..141ff65b0 100644
--- a/views/installation/input/dropdown.php
+++ b/views/installation/input/dropdown.php
@@ -8,7 +8,7 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  * @uses $vars['options'] An array of strings representing the options for the dropdown field
  * @uses $vars['options_values'] An associative array of "value" => "option" where "value" is an internal name and "option" is
  * 								 the value displayed on the button. Replaces $vars['options'] when defined.
@@ -20,7 +20,7 @@ if (!$class) {
 	$class = "elgg-input-dropdown";
 }
 ?>
-<select name="<?php echo $vars['internalname']; ?>" <?php echo $vars['js']; ?> <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>">
+<select name="<?php echo $vars['name']; ?>" <?php echo $vars['js']; ?> <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>">
 <?php
 if ($vars['options_values']) {
 	foreach($vars['options_values'] as $value => $option) {
diff --git a/views/installation/input/form.php b/views/installation/input/form.php
index a4707f257..b131c9d10 100644
--- a/views/installation/input/form.php
+++ b/views/installation/input/form.php
@@ -14,13 +14,13 @@
  *
  */
 
-if (isset($vars['internalid'])) {
-	$id = $vars['internalid'];
+if (isset($vars['id'])) {
+	$id = $vars['id'];
 } else {
 	$id = '';
 }
-if (isset($vars['internalname'])) {
-	$name = $vars['internalname'];
+if (isset($vars['name'])) {
+	$name = $vars['name'];
 } else {
 	$name = '';
 }
diff --git a/views/installation/input/hidden.php b/views/installation/input/hidden.php
index 7a0798e48..c9800ebbb 100644
--- a/views/installation/input/hidden.php
+++ b/views/installation/input/hidden.php
@@ -9,8 +9,8 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  *
  */
 ?>
-<input type="hidden" <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" />
\ No newline at end of file
+<input type="hidden" <?php echo $vars['js']; ?> name="<?php echo $vars['name']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" />
\ No newline at end of file
diff --git a/views/installation/input/longtext.php b/views/installation/input/longtext.php
index a909f55f2..820a51da4 100644
--- a/views/installation/input/longtext.php
+++ b/views/installation/input/longtext.php
@@ -8,7 +8,7 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  *
  */
 
@@ -19,4 +19,4 @@ if (!$class) {
 
 ?>
 
-<textarea class="<?php echo $class; ?>" name="<?php echo $vars['internalname']; ?>" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?>><?php echo $vars['value']; ?></textarea>
\ No newline at end of file
+<textarea class="<?php echo $class; ?>" name="<?php echo $vars['name']; ?>" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?>><?php echo $vars['value']; ?></textarea>
\ No newline at end of file
diff --git a/views/installation/input/password.php b/views/installation/input/password.php
index 541728ee3..8ba79228d 100644
--- a/views/installation/input/password.php
+++ b/views/installation/input/password.php
@@ -8,7 +8,7 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  *
  */
 
@@ -18,4 +18,4 @@ if (!$class) {
 }
 ?>
 
-<input type="password" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\""; ?> value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class; ?>" />
+<input type="password" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['name']; ?>" <?php if (isset($vars['id'])) echo "id=\"{$vars['id']}\""; ?> value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class; ?>" />
diff --git a/views/installation/input/securitytoken.php b/views/installation/input/securitytoken.php
index 9a8cb1ebe..75410848a 100644
--- a/views/installation/input/securitytoken.php
+++ b/views/installation/input/securitytoken.php
@@ -11,5 +11,5 @@
 $ts = time();
 $token = generate_action_token($ts);
 
-echo elgg_view('input/hidden', array('internalname' => '__elgg_token', 'value' => $token));
-echo elgg_view('input/hidden', array('internalname' => '__elgg_ts', 'value' => $ts));
+echo elgg_view('input/hidden', array('name' => '__elgg_token', 'value' => $token));
+echo elgg_view('input/hidden', array('name' => '__elgg_ts', 'value' => $ts));
diff --git a/views/installation/input/text.php b/views/installation/input/text.php
index 73801dcf7..c59278b40 100644
--- a/views/installation/input/text.php
+++ b/views/installation/input/text.php
@@ -10,7 +10,7 @@
  *
  * @uses $vars['value'] The current value, if any
  * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
+ * @uses $vars['name'] The name of the input field
  * @uses $vars['disabled'] If true then control is read-only
  * @uses $vars['class'] Class override
  */
@@ -21,4 +21,4 @@ if (!$class) {
 }
 
 ?>
-<input type="text" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class ?>"/>
\ No newline at end of file
+<input type="text" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['name']; ?>" value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class ?>"/>
\ No newline at end of file
diff --git a/views/installation/install/forms/template.php b/views/installation/install/forms/template.php
index 897772dd4..5e44d928e 100644
--- a/views/installation/install/forms/template.php
+++ b/views/installation/install/forms/template.php
@@ -13,7 +13,7 @@ $form_body = '';
 foreach ($variables as $field => $params) {
 	$label = elgg_echo("install:$type:label:$field");
 	$help = elgg_echo("install:$type:help:$field");
-	$params['internalname'] = $field;
+	$params['name'] = $field;
 
 	$form_body .= '<p>';
 	$form_body .= "<label>$label</label>";