nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use PMA_generate_html_radio()

Browse Source
This commit is contained in:
Marc Delisle
2008-02-10 12:41:57 +00:00
parent 47445e0699
commit 9e4d476226
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/common.lib.php
View File

@@ -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() * @uses htmlspecialchars()
* @param string $html_field_name the radio HTML field * @param string $html_field_name the radio HTML field
* @param array $choices the choices values and labels * @param array $choices the choices values and labels
* @param string $checked_choice the choice to check by default * @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 $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) { foreach ($choices as $choice_value => $choice_label) {
$html_field_id = $html_field_name . '_' . $choice_value; $html_field_id = $html_field_name . '_' . $choice_value;
echo '<input type="radio" name="' . $html_field_name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($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 ' checked="checked"';
} }
echo ' />' . "\n"; 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) { if ($line_break) {
echo '<br />'; echo '<br />';
} }

24
tbl_structure.php
View File

@@ -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 '<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()" />'); 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> // here we want to display a field selector inside the label for
<input type="radio" name="field_where" id="radio_field_where_first" value="first" /><label for="radio_field_where_first"><?php echo $strAtBeginningOfTable; ?></label> // the After choice, and $strAfter contains a parameter to display
<input type="radio" name="field_where" id="radio_field_where_after" value="after" /><?php // this selector at the best place for each language; thus we
$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">'; // 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) { foreach ($aryFields as $fieldname) {
$fieldOptions .= '<option value="' . htmlspecialchars($fieldname) . '">' . htmlspecialchars($fieldname) . '</option>' . "\n"; $fieldOptions .= '<option value="' . htmlspecialchars($fieldname) . '">' . htmlspecialchars($fieldname) . '</option>' . "\n";
} }
unset($aryFields); unset($aryFields);
$fieldOptions .= '</select><label for="radio_field_where_after">'; $fieldOptions .= '</select>';
echo str_replace('<label for="radio_field_where_after"></label>', '', '<label for="radio_field_where_after">' . sprintf($strAfter, $fieldOptions) . '</label>') . "\n";
$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" /> <input type="submit" value="<?php echo $strGo; ?>" style="vertical-align: middle" />
</form> </form>