Port server/databases/table_footer to Twig

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
phpmyadmin · Oct 29, 2017 · 0e86725 · 0e86725
1 parent c7ca02f
commit 0e86725
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 51 deletions.
diff --git 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
@@ -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
diff --git a/templates/server/databases/table_footer.twig 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>