From 9e4d47622622b872f5fa1afadb98a03579723d82 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 10 Feb 2008 12:41:57 +0000
Subject: [PATCH] use PMA_generate_html_radio()

---
 libraries/common.lib.php |  7 ++++---
 tbl_structure.php        | 24 +++++++++++++++++-------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index c8db52c05..4ad91fee0 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2291,15 +2291,16 @@ function PMA_externalBug($functionality, $component, $minimum_version, $bugref)
 
 
 /**
- * Generates a set of radio HTML fields
+ * Generates and echoes a set of radio HTML fields
  *
  * @uses    htmlspecialchars()
  * @param   string  $html_field_name the radio HTML field
  * @param   array   $choices the choices values and labels
  * @param   string  $checked_choice the choice to check by default
  * @param   boolean $line_break whether to add an HTML line break after a choice
+ * @param   boolean $escape_label whether to use htmlspecialchars() on label 
  */
-function PMA_generate_html_radio($html_field_name, $choices, $checked_choice = '', $line_break = true) {
+function PMA_generate_html_radio($html_field_name, $choices, $checked_choice = '', $line_break = true, $escape_label = true) {
     foreach ($choices as $choice_value => $choice_label) {
         $html_field_id = $html_field_name . '_' . $choice_value;
         echo '<input type="radio" name="' . $html_field_name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"';
@@ -2307,7 +2308,7 @@ function PMA_generate_html_radio($html_field_name, $choices, $checked_choice = '
             echo ' checked="checked"';
         }
         echo ' />' . "\n";
-        echo '<label for="' . $html_field_id . '">' . htmlspecialchars($choice_label) . '</label>';
+        echo '<label for="' . $html_field_id . '">' . ($escape_label ? htmlspecialchars($choice_label)  : $choice_label) . '</label>';
         if ($line_break) {
             echo '<br />';
         }
diff --git a/tbl_structure.php b/tbl_structure.php
index 2d25bfb3d..c7f3ddb8d 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -500,17 +500,27 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
         echo '<img class="icon" src="' . $pmaThemeImage . 'b_insrow.png" width="16" height="16" alt="' . $strAddNewField . '"/>';
     }
     echo sprintf($strAddFields, '<input type="text" name="num_fields" size="2" maxlength="2" value="1" style="vertical-align: middle" onfocus="this.select()" />');
-    ?>
-<input type="radio" name="field_where" id="radio_field_where_last" value="last" checked="checked" /><label for="radio_field_where_last"><?php echo $strAtEndOfTable; ?></label>
-<input type="radio" name="field_where" id="radio_field_where_first" value="first" /><label for="radio_field_where_first"><?php echo $strAtBeginningOfTable; ?></label>
-<input type="radio" name="field_where" id="radio_field_where_after" value="after" /><?php
-    $fieldOptions = '</label><select name="after_field" style="vertical-align: middle" onclick="this.form.field_where[2].checked=true" onchange="this.form.field_where[2].checked=true">';
+
+    // here we want to display a field selector inside the label for
+    // the After choice, and $strAfter contains a parameter to display
+    // this selector at the best place for each language; thus we
+    // set the fifth parameter of PMA_generate_html_radio() to false
+    // in order to avoid the usual escaping with htmlspecialchars() inside
+    // the label
+    $fieldOptions = '<select name="after_field" style="vertical-align: middle" onclick="this.form.field_where[2].checked=true" onchange="this.form.field_where[2].checked=true">';
     foreach ($aryFields as $fieldname) {
         $fieldOptions .= '<option value="' . htmlspecialchars($fieldname) . '">' . htmlspecialchars($fieldname) . '</option>' . "\n";
     }
     unset($aryFields);
-    $fieldOptions .= '</select><label for="radio_field_where_after">';
-    echo str_replace('<label for="radio_field_where_after"></label>', '', '<label for="radio_field_where_after">' . sprintf($strAfter, $fieldOptions) . '</label>') . "\n";
+    $fieldOptions .= '</select>';
+
+    $choices = array(
+        'last'  => $strAtEndOfTable,
+        'first' => $strAtBeginningOfTable,
+        'after' => sprintf($strAfter, $fieldOptions) 
+    );
+    PMA_generate_html_radio('field_where', $choices, 'last', false, false);
+    unset($fieldOptions, $choices);
     ?>
 <input type="submit" value="<?php echo $strGo; ?>" style="vertical-align: middle" />
 </form>