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

Distinguish between options of each result set

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2014-12-01 08:44:07 +05:30
parent 4cf4e41dec
commit b8e13f5b7a
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/DisplayResults.class.php
View File

@ -1642,7 +1642,8 @@ class PMA_DisplayResults
// pftext means "partial or full texts" (done to reduce line lengths)
$options_html .= PMA_Util::getRadioFields(
'pftext', $choices,
$_SESSION['tmpval']['pftext']
$_SESSION['tmpval']['pftext'],
true, true, '', 'pftext_' . $this->__get('unique_id')
)
. '</div>';
@ -1657,7 +1658,8 @@ class PMA_DisplayResults
$options_html .= PMA_Util::getRadioFields(
'relational_display', $choices,
$_SESSION['tmpval']['relational_display']
$_SESSION['tmpval']['relational_display'],
true, true, '', 'relational_display_' . $this->__get('unique_id')
)
. '</div>';
}
@ -1666,13 +1668,13 @@ class PMA_DisplayResults
. PMA_Util::getCheckbox(
'display_binary', __('Show binary contents'),
! empty($_SESSION['tmpval']['display_binary']), false,
'display_binary'
'display_binary_' . $this->__get('unique_id')
)
. '<br />'
. PMA_Util::getCheckbox(
'display_blob', __('Show BLOB contents'),
! empty($_SESSION['tmpval']['display_blob']), false,
'display_blob'
'display_blob_' . $this->__get('unique_id')
)
. '</div>';
@ -1684,7 +1686,7 @@ class PMA_DisplayResults
. PMA_Util::getCheckbox(
'hide_transformation', __('Hide browser transformation'),
! empty($_SESSION['tmpval']['hide_transformation']), false,
'hide_transformation'
'hide_transformation_' . $this->__get('unique_id')
)
. '</div>';
@ -1698,7 +1700,8 @@ class PMA_DisplayResults
$options_html .= PMA_Util::getRadioFields(
'geoOption', $choices,
$_SESSION['tmpval']['geoOption']
$_SESSION['tmpval']['geoOption'],
true, true, '', 'geoOption_' . $this->__get('unique_id')
)
. '</div>';
}

10
libraries/Util.class.php
View File

@ -2629,12 +2629,15 @@ class PMA_Util
* @param boolean $line_break whether to add HTML line break after a choice
* @param boolean $escape_label whether to use htmlspecialchars() on label
* @param string $class enclose each choice with a div of this class
* @param string $id_prefix prefix for the id attribute, name will be
* used if this is not supplied
*
* @return string set of html radio fiels
*/
public static function getRadioFields(
$html_field_name, $choices, $checked_choice = '',
$line_break = true, $escape_label = true, $class = ''
$line_break = true, $escape_label = true, $class = '',
$id_prefix = ''
) {
$radio_html = '';
@ -2644,7 +2647,10 @@ class PMA_Util
$radio_html .= '<div class="' . $class . '">';
}
$html_field_id = $html_field_name . '_' . $choice_value;
if (! $id_prefix) {
$id_prefix = $html_field_name;
}
$html_field_id = $id_prefix . '_' . $choice_value;
$radio_html .= '<input type="radio" name="' . $html_field_name . '" id="'
. $html_field_id . '" value="'
. htmlspecialchars($choice_value) . '"';