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

Use template for getHtmlForExportOptionsOutputSaveDir

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
This commit is contained in:
Maurício Meneghini Fauth 2018-01-10 17:30:00 -02:00
parent 0183003195
commit 11c43ef980
3 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,29 +325,19 @@ class Export
public static function getHtmlForExportOptionsOutputSaveDir()
{
global $cfg;
$html = '<li>';
$html .= '<input type="checkbox" name="onserver" value="saveit" ';
$html .= 'id="checkbox_dump_onserver" ';
$html .= self::exportCheckboxCheck('onserver');
$html .= '/>';
$html .= '<label for="checkbox_dump_onserver">';
$html .= sprintf(
__('Save on server in the directory <b>%s</b>'),
htmlspecialchars(Util::userDir($cfg['SaveDir']))
$saveDir = Util::userDir($cfg['SaveDir']);
$exportIsChecked = (bool) self::exportCheckboxCheck(
'onserver'
);
$exportOverwriteIsChecked = (bool) self::exportCheckboxCheck(
'onserver_overwrite'
);
$html .= '</label>';
$html .= '</li>';
$html .= '<li>';
$html .= '<input type="checkbox" name="onserver_overwrite" value="saveitover"';
$html .= ' id="checkbox_dump_onserver_overwrite" ';
$html .= self::exportCheckboxCheck('onserver_overwrite');
$html .= '/>';
$html .= '<label for="checkbox_dump_onserver_overwrite">';
$html .= __('Overwrite existing file(s)');
$html .= '</label>';
$html .= '</li>';
return $html;
return Template::get('display/export/options_output_save_dir')->render([
'save_dir' => $saveDir,
'export_is_checked' => $exportIsChecked,
'export_overwrite_is_checked' => $exportOverwriteIsChecked,
]);
}

15
templates/display/export/options_output_save_dir.twig Normal file
View File

@ -0,0 +1,15 @@
<li>
<input type="checkbox" name="onserver" value="saveit"
id="checkbox_dump_onserver"{{ export_is_checked ? ' checked' }}>
<label for="checkbox_dump_onserver">
{{ 'Save on server in the directory <strong>%s</strong>'|trans|format(save_dir|e)|raw }}
</label>
</li>
<li>
<input type="checkbox" name="onserver_overwrite"
value="saveitover" id="checkbox_dump_onserver_overwrite"
{{- export_overwrite_is_checked ? ' checked' }}>
<label for="checkbox_dump_onserver_overwrite">
{% trans 'Overwrite existing file(s)' %}
</label>
</li>

4
test/classes/Display/ExportTest.php
View File

@ -203,12 +203,12 @@ class ExportTest extends TestCase
//validate 4: Export::getHtmlForExportOptionsQuickExport
$this->assertContains(
'<input type="checkbox" name="onserver" value="saveit" ',
'<input type="checkbox" name="onserver" value="saveit"',
$html
);
$dir = htmlspecialchars(Util::userDir($cfg['SaveDir']));
$this->assertContains(
'Save on server in the directory <b>' . $dir . '</b>',
'Save on server in the directory <strong>' . $dir . '</strong>',
$html
);