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

Use template for getOptionsForExportTemplates method

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
This commit is contained in:
Maurício Meneghini Fauth 2018-01-09 22:04:58 -02:00
parent 367f49b12b
commit c0ea9039d4
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libraries/classes/Display/Export.php
View File

@ -34,7 +34,7 @@ class Export
*
* @return string
*/
public static function exportCheckboxCheck($str)
private static function exportCheckboxCheck($str)
{
if (isset($GLOBALS['cfg']['Export'][$str]) && $GLOBALS['cfg']['Export'][$str]) {
return ' checked="checked"';
@ -165,16 +165,14 @@ class Export
}
/**
* Returns HTML for the options in teplate dropdown
* Returns HTML for the options in template dropdown
*
* @param string $export_type export type - server, database, or table
* @param string $exportType export type - server, database, or table
*
* @return string HTML for the options in teplate dropdown
*/
public static function getOptionsForExportTemplates($export_type)
private static function getOptionsForExportTemplates($exportType)
{
$ret = '<option value="">-- ' . __('Select a template') . ' --</option>';
// Get the relation settings
$cfgRelation = Relation::getRelationsParam();
@ -183,24 +181,25 @@ class Export
. Util::backquote($cfgRelation['export_templates'])
. " WHERE `username` = "
. "'" . $GLOBALS['dbi']->escapeString($GLOBALS['cfg']['Server']['user'])
. "' AND `export_type` = '" . $GLOBALS['dbi']->escapeString($export_type) . "'"
. "' AND `export_type` = '" . $GLOBALS['dbi']->escapeString($exportType) . "'"
. " ORDER BY `template_name`;";
$result = Relation::queryAsControlUser($query);
if (!$result) {
return $ret;
}
while ($row = $GLOBALS['dbi']->fetchAssoc($result, DatabaseInterface::CONNECT_CONTROL)) {
$ret .= '<option value="' . htmlspecialchars($row['id']) . '"';
if (!empty($_GET['template_id']) && $_GET['template_id'] == $row['id']) {
$ret .= ' selected="selected"';
$templates = [];
if ($result !== false) {
while ($row = $GLOBALS['dbi']->fetchAssoc($result, DatabaseInterface::CONNECT_CONTROL)) {
$templates[] = [
'name' => $row['template_name'],
'id' => $row['id'],
];
}
$ret .= '>';
$ret .= htmlspecialchars($row['template_name']) . '</option>';
}
return $ret;
return Template::get('display/export/template_options')->render([
'templates' => $templates,
'selected_template' => !empty($_GET['template_id']) ? $_GET['template_id'] : null,
]);
}
/**

7
templates/display/export/template_options.twig Normal file
View File

@ -0,0 +1,7 @@
<option value="">-- {% trans 'Select a template' %} --</option>
{% for template in templates %}
<option value="{{ template.id }}"{{ template.id == selected_template ? ' selected' }}>
{{ template.name }}
</option>
{% endfor %}