From 0e867253dd592b2dfb9771e3eccc989142b70dc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?=
 <mauriciofauth@gmail.com>
Date: Thu, 26 Oct 2017 00:19:06 -0200
Subject: [PATCH] Port server/databases/table_footer to Twig
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>
---
 .../Server/ServerDatabasesController.php      | 18 ++++----
 .../classes/Twig/PhpFunctionsExtension.php    |  1 +
 templates/server/databases/table_footer.phtml | 42 ------------------
 templates/server/databases/table_footer.twig  | 43 +++++++++++++++++++
 4 files changed, 53 insertions(+), 51 deletions(-)
 delete mode 100644 templates/server/databases/table_footer.phtml
 create mode 100644 templates/server/databases/table_footer.twig

diff --git a/libraries/classes/Controllers/Server/ServerDatabasesController.php b/libraries/classes/Controllers/Server/ServerDatabasesController.php
index 3d52df193cd0..5cf1632e5780 100644
--- a/libraries/classes/Controllers/Server/ServerDatabasesController.php
+++ b/libraries/classes/Controllers/Server/ServerDatabasesController.php
@@ -419,15 +419,15 @@ private function _getHtmlForTableFooterButtons()
      */
     private function _getHtmlForTableFooter($column_order, $first_database)
     {
-        return Template::get('server/databases/table_footer')->render(
-            array(
-                'column_order' => $column_order,
-                'first_database' => $first_database,
-                'master_replication' => $GLOBALS['replication_info']['master']['status'],
-                'slave_replication' => $GLOBALS['replication_info']['slave']['status'],
-                'databaseCount' => $this->_database_count,
-            )
-        );
+        return Template::get('server/databases/table_footer')->render([
+            'column_order' => $column_order,
+            'first_database' => $first_database,
+            'master_replication' => $GLOBALS['replication_info']['master']['status'],
+            'slave_replication' => $GLOBALS['replication_info']['slave']['status'],
+            'database_count' => $this->_database_count,
+            'is_superuser' => $GLOBALS['dbi']->isSuperuser(),
+            'allow_user_drop_database' => $GLOBALS['cfg']['AllowUserDropDatabase'],
+        ]);
     }
 
     /**
diff --git a/libraries/classes/Twig/PhpFunctionsExtension.php b/libraries/classes/Twig/PhpFunctionsExtension.php
index ed67ac38654c..3247b0f5e959 100644
--- a/libraries/classes/Twig/PhpFunctionsExtension.php
+++ b/libraries/classes/Twig/PhpFunctionsExtension.php
@@ -27,6 +27,7 @@ public function getFunctions()
         return array(
             new Twig_SimpleFunction('array_search', 'array_search'),
             new Twig_SimpleFunction('bin2hex', 'bin2hex'),
+            new Twig_SimpleFunction('htmlentities', 'htmlentities'),
             new Twig_SimpleFunction('md5', 'md5'),
             new Twig_SimpleFunction('preg_quote', 'preg_quote'),
             new Twig_SimpleFunction('preg_replace', 'preg_replace'),
diff --git a/templates/server/databases/table_footer.phtml b/templates/server/databases/table_footer.phtml
deleted file mode 100644
index 2f1f45fd7887..000000000000
--- a/templates/server/databases/table_footer.phtml
+++ /dev/null
@@ -1,42 +0,0 @@
-<tfoot>
-    <tr>
-        <?php if ($GLOBALS['dbi']->isSuperuser() || $GLOBALS['cfg']['AllowUserDropDatabase']): ?>
-            <th></th>
-        <?php endif; ?>
-        <th>
-            <?= __('Total'); ?>: <span id="databases_count"><?= $databaseCount; ?></span>
-        </th>
-        <?php foreach ($column_order as $stat_name => $stat):
-            if (! array_key_exists($stat_name, $first_database)) {
-                continue;
-            }
-            if ($stat['format'] === 'byte') {
-                list($value, $unit) = \PhpMyAdmin\Util::formatByteDown($stat['footer'], 3, 1);
-            } elseif ($stat['format'] === 'number') {
-                $value = \PhpMyAdmin\Util::formatNumber($stat['footer'], 0);
-            } else {
-                $value = htmlentities($stat['footer'], 0);
-            } ?>
-
-            <th class="value">
-                <?php if (isset($stat['description_function'])): ?>
-                    <dfn title="<?= $stat['description_function']($stat['footer']); ?>">
-                        <?= $value; ?>
-                    </dfn>
-                <?php else: ?>
-                    <?= $value; ?>
-                <?php endif; ?>
-            </th>
-            <?php if ($stat['format'] === 'byte'): ?>
-                <th class="unit"><?= $unit; ?></th>
-            <?php endif; ?>
-        <?php endforeach; ?>
-        <?php if ($master_replication): ?>
-            <th></th>
-        <?php endif; ?>
-        <?php if ($slave_replication): ?>
-            <th></th>
-        <?php endif; ?>
-        <th></th>
-    </tr>
-</tfoot>
diff --git a/templates/server/databases/table_footer.twig b/templates/server/databases/table_footer.twig
new file mode 100644
index 000000000000..0484f503bd60
--- /dev/null
+++ b/templates/server/databases/table_footer.twig
@@ -0,0 +1,43 @@
+<tfoot>
+    <tr>
+        {% if is_superuser or allow_user_drop_database %}
+            <th></th>
+        {% endif %}
+        <th>
+            {% trans 'Total' %}: <span id="databases_count">
+                {{- database_count -}}
+            </span>
+        </th>
+        {% for stat_name, stat in column_order if stat_name in first_database|keys %}
+            {% if stat['format'] is same as('byte') %}
+                {% set byte_format = Util_formatByteDown(stat['footer'], 3, 1) %}
+                {% set value = byte_format[0] %}
+                {% set unit = byte_format[1] %}
+            {% elseif stat['format'] is same as('number') %}
+                {% set value = Util_formatNumber(stat['footer'], 0) %}
+            {% else %}
+                {% set value = htmlentities(stat['footer'], 0) %}
+            {% endif %}
+
+            <th class="value">
+                {% if stat['description_function'] is defined %}
+                    <dfn title="{{ Charsets_getCollationDescr(stat['footer']) }}">
+                        {{ value }}
+                    </dfn>
+                {% else %}
+                    {{ value }}
+                {% endif %}
+            </th>
+            {% if stat['format'] is same as('byte') %}
+                <th class="unit">{{ unit }}</th>
+            {% endif %}
+        {% endfor %}
+        {% if master_replication %}
+            <th></th>
+        {% endif %}
+        {% if slave_replication %}
+            <th></th>
+        {% endif %}
+        <th></th>
+    </tr>
+</tfoot>