From 345bd297065fbcd6da4440b9c3863cb5b3e8638b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Sat, 6 Apr 2019 20:58:34 -0300
Subject: [PATCH] Extract HTML from themes.php
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 templates/themes.twig |  7 +++++++
 themes.php            | 26 +++++++++++---------------
 2 files changed, 18 insertions(+), 15 deletions(-)
 create mode 100644 templates/themes.twig

diff --git a/templates/themes.twig b/templates/themes.twig
new file mode 100644
index 0000000000..c03089cb04
--- /dev/null
+++ b/templates/themes.twig
@@ -0,0 +1,7 @@
+<h1>phpMyAdmin - {% trans 'Theme' %}</h1>
+<p>
+  <a href="{{ 'https://www.phpmyadmin.net/themes/'|link }}#pma_{{ version }}" rel="noopener noreferrer" target="_blank">
+    {% trans 'Get more themes!' %}
+  </a>
+</p>
+{{ previews|raw }}
diff --git a/themes.php b/themes.php
index 8cfa1f4eac..41a8079fae 100644
--- a/themes.php
+++ b/themes.php
@@ -7,7 +7,7 @@
  */
 declare(strict_types=1);
 
-use PhpMyAdmin\Core;
+use PhpMyAdmin\Template;
 use PhpMyAdmin\ThemeManager;
 use PhpMyAdmin\Response;
 
@@ -15,11 +15,10 @@ if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-/**
- * get some globals
- */
 include ROOT_PATH . 'libraries/common.inc.php';
 
+$template = new Template();
+
 $response = Response::getInstance();
 $response->getFooter()->setMinimal();
 $header = $response->getHeader();
@@ -27,14 +26,11 @@ $header->setBodyId('bodythemes');
 $header->setTitle('phpMyAdmin - ' . __('Theme'));
 $header->disableMenuAndConsole();
 
-$hash    = '#pma_' . preg_replace('/([0-9]*)\.([0-9]*)\..*/', '\1_\2', PMA_VERSION);
-$url     = Core::linkURL('https://www.phpmyadmin.net/themes/') . $hash;
-$output  = '<h1>phpMyAdmin - ' . __('Theme') . '</h1>';
-$output .= '<p>';
-$output .= '<a href="' . $url . '" rel="noopener noreferrer" target="_blank">';
-$output .= __('Get more themes!');
-$output .= '</a>';
-$output .= '</p>';
-$output .= ThemeManager::getInstance()->getPrintPreviews();
-
-$response->addHTML($output);
+$response->addHTML($template->render('themes', [
+    'version' => preg_replace(
+        '/([0-9]*)\.([0-9]*)\..*/',
+        '\1_\2',
+        PMA_VERSION
+    ),
+    'previews' => ThemeManager::getInstance()->getPrintPreviews(),
+]));