From f31d0ba0b9c1f01a44d8d5db566182614e1a6428 Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Sat, 25 Jul 2015 13:14:43 +0200
Subject: [PATCH] Templating user preferences form.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 libraries/user_preferences.lib.php | 42 ++++++++++++------------------
 templates/prefs_autoload.phtml     | 17 ++++++++++++
 2 files changed, 33 insertions(+), 26 deletions(-)
 create mode 100644 templates/prefs_autoload.phtml

diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index 52aabc1a1a..2d1df548f8 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -9,6 +9,8 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+require_once './libraries/Template.class.php';
+
 /**
  * Common initialization for user preferences modification pages
  *
@@ -266,35 +268,23 @@ function PMA_userprefsRedirect($file_name,
  */
 function PMA_userprefsAutoloadGetHeader()
 {
-    $retval = '';
-
     if (isset($_REQUEST['prefs_autoload'])
         && $_REQUEST['prefs_autoload'] == 'hide'
     ) {
         $_SESSION['userprefs_autoload'] = true;
-    } else {
-        $script_name = basename(basename($GLOBALS['PMA_PHP_SELF']));
-        $return_url = htmlspecialchars(
-            $script_name . '?' . http_build_query($_GET, '', '&')
-        );
-
-        $retval .= '<div id="prefs_autoload" class="notice print_ignore" style="display:none">';
-        $retval .= '<form action="prefs_manage.php" method="post" class="disableAjax">';
-        $retval .= PMA_URL_getHiddenInputs();
-        $retval .= '<input type="hidden" name="json" value="" />';
-        $retval .= '<input type="hidden" name="submit_import" value="1" />';
-        $retval .= '<input type="hidden" name="return_url" value="'
-            . $return_url . '" />';
-        $retval .=  __(
-            'Your browser has phpMyAdmin configuration for this domain. '
-            . 'Would you like to import it for current session?'
-        );
-        $retval .= '<br />';
-        $retval .= '<a href="#yes">' . __('Yes') . '</a>';
-        $retval .= ' / ';
-        $retval .= '<a href="#no">' . __('No') . '</a>';
-        $retval .= '</form>';
-        $retval .= '</div>';
+        return '';
     }
-    return $retval;
+
+    $script_name = basename(basename($GLOBALS['PMA_PHP_SELF']));
+    $return_url = htmlspecialchars(
+        $script_name . '?' . http_build_query($_GET, '', '&')
+    );
+
+    return PMA\Template::get('prefs_autoload')
+        ->render(
+            array(
+                'hiddenInputs' => PMA_URL_getHiddenInputs(),
+                'return_url' => $return_url,
+            )
+        );
 }
diff --git a/templates/prefs_autoload.phtml b/templates/prefs_autoload.phtml
new file mode 100644
index 0000000000..bfd7d3f64a
--- /dev/null
+++ b/templates/prefs_autoload.phtml
@@ -0,0 +1,17 @@
+<div id="prefs_autoload" class="notice print_ignore" style="display:none">
+    <form action="prefs_manage.php" method="post" class="disableAjax">
+        <?php echo $hiddenInputs; ?>
+        <input type="hidden" name="json" value="" />
+        <input type="hidden" name="submit_import" value="1" />
+        <input type="hidden" name="return_url" value="<?php echo $return_url ?>" />
+        <?php
+        echo __(
+            'Your browser has phpMyAdmin configuration for this domain. '
+            . 'Would you like to import it for current session?'
+        );
+        ?>
+        <br />
+        <a href="#yes"><?php echo __('Yes') ?></a>
+        / <a href="#no"><?php echo __('No') ?></a>
+    </form>
+</div>
\ No newline at end of file