From ef16b1e3584e08f42647cc2c92542ae07568057c Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Fri, 17 Jul 2015 23:36:23 +0200
Subject: [PATCH] Templating error report form.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 libraries/error_report.lib.php    | 49 +++++++------------------------
 templates/error/report_form.phtml | 35 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 39 deletions(-)
 create mode 100644 templates/error/report_form.phtml

diff --git a/libraries/error_report.lib.php b/libraries/error_report.lib.php
index 4ab60d7de25b..70615d6926bc 100644
--- a/libraries/error_report.lib.php
+++ b/libraries/error_report.lib.php
@@ -343,49 +343,20 @@ function PMA_translateStacktrace($stack)
  */
 function PMA_getErrorReportForm()
 {
-    $html = "";
-    $html .= '<form action="error_report.php" method="post" name="report_frm"'
-            . ' id="report_frm" class="ajax">'
-            . '<fieldset style="padding-top:0px">';
-
-    $html .= '<p>' . __(
-        'phpMyAdmin has encountered an error. We have collected data about'
-        . ' this error as well as information about relevant configuration'
-        . ' settings to send to the phpMyAdmin team to help us in'
-        . ' debugging the problem.'
-    ) . '</p>';
-
-    $html .= '<div class="label"><label><p>'
-            . __('You may examine the data in the error report:')
-            . '</p></label></div>'
-            . '<pre class="report-data">'
-            . htmlspecialchars(PMA_getPrettyReportData())
-            . '</pre>';
-
-    $html .= '<div class="label"><label><p>'
-            . __('Please explain the steps that lead to the error:')
-            . '</p></label></div>'
-            . '<textarea class="report-description" name="description"'
-            . 'id="report_description"></textarea>';
-
-    $html .= '<input type="checkbox" name="always_send"'
-            . ' id="always_send_checkbox"/>'
-            . '<label for="always_send_checkbox">'
-            . __('Automatically send report next time')
-            . '</label>';
-
-    $html .= '</fieldset>';
-
-    $html .= PMA_URL_getHiddenInputs();
+    $datas = array(
+        'report_data' => PMA_getPrettyReportData(),
+        'hidden_inputs' => PMA_URL_getHiddenInputs(),
+        'hidden_fields' => null,
+    );
 
     $reportData = PMA_getReportData();
-    if (! empty($reportData)) {
-        $html .= PMA_getHiddenFields($reportData);
+    if (!empty($reportData)) {
+        $datas['hidden_fields'] = PMA_getHiddenFields($reportData);
     }
 
-    $html .= '</form>';
-
-    return $html;
+    include_once './libraries/Template.class.php';
+    return PMA\Template::get('error/report_form')
+        ->render($datas);
 }
 
 /**
diff --git a/templates/error/report_form.phtml b/templates/error/report_form.phtml
new file mode 100644
index 000000000000..847923d86271
--- /dev/null
+++ b/templates/error/report_form.phtml
@@ -0,0 +1,35 @@
+<form action="error_report.php" method="post" name="report_frm" id="report_frm"
+      class="ajax">
+    <fieldset style="padding-top:0px">
+
+        <p>
+            <?php echo __(
+                'phpMyAdmin has encountered an error. We have collected data about'
+                . ' this error as well as information about relevant configuration'
+                . ' settings to send to the phpMyAdmin team to help us in'
+                . ' debugging the problem.'
+            ) ?>
+        </p>
+
+        <div class="label"><label><p>
+            <?php echo __('You may examine the data in the error report:') ?>
+        </p></label></div>
+        <pre class="report-data"><?php echo htmlspecialchars($report_data) ?></pre>
+
+        <div class="label"><label><p>
+            <?php echo __('Please explain the steps that lead to the error:') ?>
+        </p></label>
+        </div>
+        <textarea class="report-description" name="description"
+                  id="report_description"></textarea>
+
+        <input type="checkbox" name="always_send" id="always_send_checkbox" />
+        <label for="always_send_checkbox">
+            <?php echo __('Automatically send report next time') ?>
+        </label>
+
+    </fieldset>
+
+    <?php echo $hidden_inputs ?>
+    <?php echo $hidden_fields ?>
+</form>
\ No newline at end of file