From 47ff2312377b05c8c10be78b344ac92b602e3f85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?=
 <mauriciofauth@gmail.com>
Date: Sun, 7 Jan 2018 16:34:24 -0200
Subject: [PATCH 1/4] Use template for getHtmlForExportSelectOptions method
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
---
 libraries/classes/Display/Export.php         | 59 +++++++-------------
 templates/display/export/select_options.twig | 19 +++++++
 2 files changed, 40 insertions(+), 38 deletions(-)
 create mode 100644 templates/display/export/select_options.twig

diff --git a/libraries/classes/Display/Export.php b/libraries/classes/Display/Export.php
index 90662fd54b..c02dab0f5c 100644
--- a/libraries/classes/Display/Export.php
+++ b/libraries/classes/Display/Export.php
@@ -46,28 +46,12 @@ class Export
     /**
      * Prints Html For Export Selection Options
      *
-     * @param String $tmp_select Tmp selected method of export
+     * @param string $tmpSelect Tmp selected method of export
      *
      * @return string
      */
-    public static function getHtmlForExportSelectOptions($tmp_select = '')
+    public static function getHtmlForExportSelectOptions($tmpSelect = '')
     {
-        $multi_values  = '<div>';
-        $multi_values .= '<a href="#"';
-        $multi_values .= ' onclick="setSelectOptions'
-            . '(\'dump\', \'db_select[]\', true); return false;">';
-        $multi_values .= __('Select all');
-        $multi_values .= '</a>';
-        $multi_values .= ' / ';
-        $multi_values .= '<a href="#"';
-        $multi_values .= ' onclick="setSelectOptions'
-            . '(\'dump\', \'db_select[]\', false); return false;">';
-        $multi_values .= __('Unselect all') . '</a><br />';
-
-        $multi_values .= '<select name="db_select[]" '
-            . 'id="db_select" size="10" multiple="multiple">';
-        $multi_values .= "\n";
-
         // Check if the selected databases are defined in $_GET
         // (from clicking Back button on export.php)
         if (isset($_GET['db_select'])) {
@@ -75,36 +59,35 @@ class Export
             $_GET['db_select'] = explode(",", $_GET['db_select']);
         }
 
-        foreach ($GLOBALS['dblist']->databases as $current_db) {
-            if ($GLOBALS['dbi']->isSystemSchema($current_db, true)) {
+        $databases = [];
+        foreach ($GLOBALS['dblist']->databases as $currentDb) {
+            if ($GLOBALS['dbi']->isSystemSchema($currentDb, true)) {
                 continue;
             }
+            $isSelected = false;
             if (isset($_GET['db_select'])) {
-                if (in_array($current_db, $_GET['db_select'])) {
-                    $is_selected = ' selected="selected"';
-                } else {
-                    $is_selected = '';
+                if (in_array($currentDb, $_GET['db_select'])) {
+                    $isSelected = true;
                 }
-            } elseif (!empty($tmp_select)) {
+            } elseif (!empty($tmpSelect)) {
                 if (mb_strpos(
-                    ' ' . $tmp_select,
-                    '|' . $current_db . '|'
+                    ' ' . $tmpSelect,
+                    '|' . $currentDb . '|'
                 )) {
-                    $is_selected = ' selected="selected"';
-                } else {
-                    $is_selected = '';
+                    $isSelected = true;
                 }
             } else {
-                $is_selected = ' selected="selected"';
+                $isSelected = true;
             }
-            $current_db   = htmlspecialchars($current_db);
-            $multi_values .= '                <option value="' . $current_db . '"'
-                . $is_selected . '>' . $current_db . '</option>' . "\n";
-        } // end while
-        $multi_values .= "\n";
-        $multi_values .= '</select></div>';
+            $databases[] = [
+                'name' => $currentDb,
+                'is_selected' => $isSelected,
+            ];
+        }
 
-        return $multi_values;
+        return Template::get('display/export/select_options')->render([
+            'databases' => $databases,
+        ]);
     }
 
     /**
diff --git a/templates/display/export/select_options.twig b/templates/display/export/select_options.twig
new file mode 100644
index 0000000000..7b153a3d4e
--- /dev/null
+++ b/templates/display/export/select_options.twig
@@ -0,0 +1,19 @@
+<div>
+    <p>
+        <a href="#" onclick="setSelectOptions('dump', 'db_select[]', true); return false;">
+            {% trans 'Select all' %}
+        </a>
+        /
+        <a href="#" onclick="setSelectOptions('dump', 'db_select[]', false); return false;">
+            {% trans 'Unselect all' %}
+        </a>
+    </p>
+
+    <select name="db_select[]" id="db_select" size="10" multiple>
+        {% for database in databases %}
+            <option value="{{ database.name }}"{{ database.is_selected ? ' selected' }}>
+                {{ database.name }}
+            </option>
+        {% endfor %}
+    </select>
+</div>

From 0fa3dd73665c5de27c33a261a3ebd21d9e22bd71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?=
 <mauriciofauth@gmail.com>
Date: Sun, 7 Jan 2018 17:11:11 -0200
Subject: [PATCH 2/4] Use template for getHtmlForHiddenInput method
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
---
 libraries/classes/Display/Export.php        | 62 +++++++--------------
 templates/display/export/hidden_inputs.twig | 23 ++++++++
 2 files changed, 44 insertions(+), 41 deletions(-)
 create mode 100644 templates/display/export/hidden_inputs.twig

diff --git a/libraries/classes/Display/Export.php b/libraries/classes/Display/Export.php
index c02dab0f5c..5a5e44bf2d 100644
--- a/libraries/classes/Display/Export.php
+++ b/libraries/classes/Display/Export.php
@@ -93,37 +93,22 @@ class Export
     /**
      * Prints Html For Export Hidden Input
      *
-     * @param String $export_type  Selected Export Type
-     * @param String $db           Selected DB
-     * @param String $table        Selected Table
-     * @param String $single_table Single Table
-     * @param String $sql_query    Sql Query
+     * @param string $exportType  Selected Export Type
+     * @param string $db          Selected DB
+     * @param string $table       Selected Table
+     * @param string $singleTable Single Table
+     * @param string $sqlQuery    SQL Query
      *
      * @return string
      */
     public static function getHtmlForHiddenInput(
-        $export_type, $db, $table, $single_table, $sql_query
+        $exportType,
+        $db,
+        $table,
+        $singleTable,
+        $sqlQuery
     ) {
         global $cfg;
-        $html = "";
-        if ($export_type == 'server') {
-            $html .= Url::getHiddenInputs('', '', 1);
-        } elseif ($export_type == 'database') {
-            $html .= Url::getHiddenInputs($db, '', 1);
-        } else {
-            $html .= Url::getHiddenInputs($db, $table, 1);
-        }
-
-        // just to keep this value for possible next display of this form after saving
-        // on server
-        if (!empty($single_table)) {
-            $html .= '<input type="hidden" name="single_table" value="TRUE" />'
-                . "\n";
-        }
-
-        $html .= '<input type="hidden" name="export_type" value="'
-            . $export_type . '" />';
-        $html .= "\n";
 
         // If the export method was not set, the default is quick
         if (isset($_GET['export_method'])) {
@@ -131,25 +116,20 @@ class Export
         } elseif (! isset($cfg['Export']['method'])) {
             $cfg['Export']['method'] = 'quick';
         }
-        // The export method (quick, custom or custom-no-form)
-        $html .= '<input type="hidden" name="export_method" value="'
-            . htmlspecialchars($cfg['Export']['method']) . '" />';
 
-        if (! empty($sql_query)) {
-            $html .= '<input type="hidden" name="sql_query" value="'
-                . htmlspecialchars($sql_query) . '" />' . "\n";
-        } elseif (isset($_GET['sql_query'])) {
-            $html .= '<input type="hidden" name="sql_query" value="'
-                . htmlspecialchars($_GET['sql_query']) . '" />' . "\n";
+        if (empty($sqlQuery) && isset($_GET['sql_query'])) {
+            $sqlQuery = $_GET['sql_query'];
         }
 
-        $html .= '<input type="hidden" name="template_id"' . ' value="'
-            . (isset($_GET['template_id'])
-                ?  htmlspecialchars($_GET['template_id'])
-                : '')
-            . '" />';
-
-        return $html;
+        return Template::get('display/export/hidden_inputs')->render([
+            'db' => $db,
+            'table' => $table,
+            'export_type' => $exportType,
+            'export_method' => $cfg['Export']['method'],
+            'single_table' => $singleTable,
+            'sql_query' => $sqlQuery,
+            'template_id' => isset($_GET['template_id']) ? $_GET['template_id'] : '',
+        ]);
     }
 
     /**
diff --git a/templates/display/export/hidden_inputs.twig b/templates/display/export/hidden_inputs.twig
new file mode 100644
index 0000000000..fa01a18759
--- /dev/null
+++ b/templates/display/export/hidden_inputs.twig
@@ -0,0 +1,23 @@
+{% if export_type == 'server' %}
+    {{ Url_getHiddenInputs('', '', 1) }}
+{% elseif export_type == 'database' %}
+    {{ Url_getHiddenInputs(db, '', 1) }}
+{% else %}
+    {{ Url_getHiddenInputs(db, table, 1) }}
+{% endif %}
+
+{# Just to keep this value for possible next display of this form after saving on server #}
+{% if single_table is not empty %}
+    <input type="hidden" name="single_table" value="TRUE">
+{% endif %}
+
+<input type="hidden" name="export_type" value="{{ export_type }}">
+
+{# The export method (quick, custom or custom-no-form) #}
+<input type="hidden" name="export_method" value="{{ export_method }}">
+
+{% if sql_query is not empty %}
+    <input type="hidden" name="sql_query" value="{{ sql_query }}">
+{% endif %}
+
+<input type="hidden" name="template_id" value="{{ template_id }}">

From 0cefaca34159b6201376d97e814f610911900ab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?=
 <mauriciofauth@gmail.com>
Date: Sun, 7 Jan 2018 17:22:44 -0200
Subject: [PATCH 3/4] Use template for getHtmlForExportOptionHeader method
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
---
 libraries/classes/Display/Export.php        | 35 ++++++---------------
 templates/display/export/option_header.twig | 12 +++++++
 2 files changed, 22 insertions(+), 25 deletions(-)
 create mode 100644 templates/display/export/option_header.twig

diff --git a/libraries/classes/Display/Export.php b/libraries/classes/Display/Export.php
index 5a5e44bf2d..d799899491 100644
--- a/libraries/classes/Display/Export.php
+++ b/libraries/classes/Display/Export.php
@@ -135,34 +135,19 @@ class Export
     /**
      * Prints Html For Export Options Header
      *
-     * @param String $export_type Selected Export Type
-     * @param String $db          Selected DB
-     * @param String $table       Selected Table
+     * @param string $exportType Selected Export Type
+     * @param string $db         Selected DB
+     * @param string $table      Selected Table
      *
-     * @return string
+     * @return string HTML
      */
-    public static function getHtmlForExportOptionHeader($export_type, $db, $table)
+    public static function getHtmlForExportOptionHeader($exportType, $db, $table)
     {
-        $html  = '<div class="exportoptions" id="header">';
-        $html .= '<h2>';
-        $html .= Util::getImage('b_export', __('Export'));
-        if ($export_type == 'server') {
-            $html .= __('Exporting databases from the current server');
-        } elseif ($export_type == 'database') {
-            $html .= sprintf(
-                __('Exporting tables from "%s" database'),
-                htmlspecialchars($db)
-            );
-        } else {
-            $html .= sprintf(
-                __('Exporting rows from "%s" table'),
-                htmlspecialchars($table)
-            );
-        }
-        $html .= '</h2>';
-        $html .= '</div>';
-
-        return $html;
+        return Template::get('display/export/option_header')->render([
+            'export_type' => $exportType,
+            'db' => $db,
+            'table' => $table,
+        ]);
     }
 
     /**
diff --git a/templates/display/export/option_header.twig b/templates/display/export/option_header.twig
new file mode 100644
index 0000000000..074586a7ba
--- /dev/null
+++ b/templates/display/export/option_header.twig
@@ -0,0 +1,12 @@
+<div class="exportoptions" id="header">
+    <h2>
+        {{ Util_getImage('b_export', 'Export'|trans) }}
+        {% if export_type == 'server' %}
+            {% trans 'Exporting databases from the current server' %}
+        {% elseif export_type == 'database' %}
+            {{ 'Exporting tables from "%s" database'|trans|format(db) }}
+        {% else %}
+            {{ 'Exporting rows from "%s" table'|trans|format(table) }}
+        {% endif %}
+    </h2>
+</div>

From d87245e8d462424dd3d1dccebff384faea057bff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?=
 <mauriciofauth@gmail.com>
Date: Sun, 7 Jan 2018 18:01:46 -0200
Subject: [PATCH 4/4] Use template for getHtmlForExportTemplateLoading method
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
---
 libraries/classes/Display/Export.php          | 42 +++----------------
 .../display/export/template_loading.twig      | 27 ++++++++++++
 2 files changed, 32 insertions(+), 37 deletions(-)
 create mode 100644 templates/display/export/template_loading.twig

diff --git a/libraries/classes/Display/Export.php b/libraries/classes/Display/Export.php
index d799899491..ab53769201 100644
--- a/libraries/classes/Display/Export.php
+++ b/libraries/classes/Display/Export.php
@@ -153,47 +153,15 @@ class Export
     /**
      * Returns HTML for export template operations
      *
-     * @param string $export_type export type - server, database, or table
+     * @param string $exportType export type - server, database, or table
      *
      * @return string HTML for export template operations
      */
-    public static function getHtmlForExportTemplateLoading($export_type)
+    public static function getHtmlForExportTemplateLoading($exportType)
     {
-        $html  = '<div class="exportoptions" id="export_templates">';
-        $html .= '<h3>' . __('Export templates:') . '</h3>';
-
-        $html .= '<div class="floatleft">';
-        $html .= '<form method="post" action="tbl_export.php" id="newTemplateForm"'
-            . ' class="ajax">';
-        $html .= '<h4>' . __('New template:') . '</h4>';
-        $html .= '<input type="text" name="templateName" id="templateName" '
-            . 'maxlength="64"' . 'required="required" '
-            . 'placeholder="' . __('Template name') . '" />';
-        $html .= '<input type="submit" name="createTemplate" id="createTemplate" '
-            . 'value="' . __('Create') . '" />';
-        $html .= '</form>';
-        $html .= '</div>';
-
-        $html .= '<div class="floatleft" style="margin-left: 50px;">';
-        $html .= '<form method="post" action="tbl_export.php"'
-            . ' id="existingTemplatesForm" class="ajax">';
-        $html .= '<h4>' . __('Existing templates:') . '</h4>';
-        $html .= '<label for="template">' . __('Template:') . '</label>';
-        $html .= '<select required="required" name="template" id="template">';
-        $html .= self::getOptionsForExportTemplates($export_type);
-        $html .= '</select>';
-        $html .= '<input type="submit" name="updateTemplate" '
-            . 'id="updateTemplate" value="' . __('Update') . '" />';
-        $html .= '<input type="submit" name="deleteTemplate" '
-            . 'id="deleteTemplate" value="' . __('Delete') . '" />';
-        $html .= '</form>';
-        $html .= '</div>';
-
-        $html .= '<div class="clearfloat"></div>';
-
-        $html .= '</div>';
-
-        return $html;
+        return Template::get('display/export/template_loading')->render([
+            'options' => self::getOptionsForExportTemplates($exportType),
+        ]);
     }
 
     /**
diff --git a/templates/display/export/template_loading.twig b/templates/display/export/template_loading.twig
new file mode 100644
index 0000000000..e1f57d83e2
--- /dev/null
+++ b/templates/display/export/template_loading.twig
@@ -0,0 +1,27 @@
+<div class="exportoptions" id="export_templates">
+    <h3>{% trans 'Export templates:' %}</h3>
+
+    <div class="floatleft">
+        <form method="post" action="tbl_export.php" id="newTemplateForm" class="ajax">
+            <h4>{% trans 'New template:' %}</h4>
+            <input type="text" name="templateName" id="templateName"
+                maxlength="64" placeholder="{% trans 'Template name' %}" required>
+            <input type="submit" name="createTemplate" id="createTemplate"
+                value="{% trans 'Create' %}">
+        </form>
+    </div>
+
+    <div class="floatleft" style="margin-left: 50px;">
+        <form method="post" action="tbl_export.php" id="existingTemplatesForm" class="ajax">
+            <h4>{% trans 'Existing templates:' %}</h4>
+            <label for="template">{% trans 'Template:' %}</label>
+            <select name="template" id="template" required>
+                {{ options|raw }}
+            </select>
+            <input type="submit" name="updateTemplate" id="updateTemplate" value="{% trans 'Update' %}">
+            <input type="submit" name="deleteTemplate" id="deleteTemplate" value="{% trans 'Delete' %}">
+        </form>
+    </div>
+
+    <div class="clearfloat"></div>
+</div>