From 0db0ba0c55de3cafb1cbbbe69ebcdc5c2fab4e4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?=
 <mauriciofauth@gmail.com>
Date: Sat, 27 Jan 2018 22:50:42 -0200
Subject: [PATCH] Use template for getContinueInsertionForm 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/InsertEdit.php              | 43 ++++++++-----------
 .../table/insert/continue_insertion_form.twig | 19 ++++++++
 2 files changed, 36 insertions(+), 26 deletions(-)
 create mode 100644 templates/table/insert/continue_insertion_form.twig

diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
index 7bda46b844..2c53895410 100644
--- a/libraries/classes/InsertEdit.php
+++ b/libraries/classes/InsertEdit.php
@@ -14,6 +14,7 @@ use PhpMyAdmin\Plugins\TransformationsPlugin;
 use PhpMyAdmin\Relation;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Sanitize;
+use PhpMyAdmin\Template;
 use PhpMyAdmin\Transformations;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
@@ -1448,32 +1449,22 @@ class InsertEdit
      *
      * @return string                   an html snippet
      */
-    public static function getContinueInsertionForm($table, $db, array $where_clause_array, $err_url)
-    {
-        $html_output = '<form id="continueForm" method="post"'
-            . ' action="tbl_replace.php" name="continueForm">'
-            . Url::getHiddenInputs($db, $table)
-            . '<input type="hidden" name="goto"'
-            . ' value="' . htmlspecialchars($GLOBALS['goto']) . '" />'
-            . '<input type="hidden" name="err_url"'
-            . ' value="' . htmlspecialchars($err_url) . '" />'
-            . '<input type="hidden" name="sql_query"'
-            . ' value="' . htmlspecialchars($_POST['sql_query']) . '" />';
-
-        if (isset($_REQUEST['where_clause'])) {
-            foreach ($where_clause_array as $key_id => $where_clause) {
-
-                $html_output .= '<input type="hidden"'
-                    . ' name="where_clause[' . $key_id . ']"'
-                    . ' value="' . htmlspecialchars(trim($where_clause)) . '" />' . "\n";
-            }
-        }
-        $tmp = '<input type="number" name="insert_rows" id="insert_rows">' . "\n";
-        $tmp .= '</input>' . "\n";
-        $html_output .= "\n" . sprintf(__('Continue insertion with %s rows'), $tmp);
-        unset($tmp);
-        $html_output .= '</form>' . "\n";
-        return $html_output;
+    public static function getContinueInsertionForm(
+        $table,
+        $db,
+        array $where_clause_array,
+        $err_url
+    ) {
+        return Template::get('table/insert/continue_insertion_form')->render([
+            'db' => $db,
+            'table' => $table,
+            'where_clause_array' => $where_clause_array,
+            'err_url' => $err_url,
+            'goto' => $GLOBALS['goto'],
+            'sql_query' => isset($_POST['sql_query']) ? $_POST['sql_query'] : null,
+            'has_where_clause' => isset($_REQUEST['where_clause']),
+            'insert_rows_default' => $GLOBALS['cfg']['InsertRows'],
+        ]);
     }
 
     /**
diff --git a/templates/table/insert/continue_insertion_form.twig b/templates/table/insert/continue_insertion_form.twig
new file mode 100644
index 0000000000..c39a96f3e8
--- /dev/null
+++ b/templates/table/insert/continue_insertion_form.twig
@@ -0,0 +1,19 @@
+<form id="continueForm" method="post" action="tbl_replace.php" name="continueForm">
+    {{ Url_getHiddenInputs(db, table) }}
+    <input type="hidden" name="goto" value="{{ goto }}">
+    <input type="hidden" name="err_url" value="{{ err_url }}">
+    <input type="hidden" name="sql_query" value="{{ sql_query }}">
+
+    {% if has_where_clause %}
+        {% for key_id, where_clause in where_clause_array %}
+            <input type="hidden" name="where_clause[{{ key_id }}]" value="
+                {{- where_clause|trim }}">
+        {% endfor %}
+    {% endif %}
+
+    {% set insert_rows %}
+        <input type="number" name="insert_rows" id="insert_rows" value="
+            {{- insert_rows_default }}" min="1">
+    {% endset %}
+    {{ 'Continue insertion with %s rows'|trans|format(insert_rows)|raw }}
+</form>