From ceffd6934b1e9da2279127c8a5fb27247caee569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?=
 <mauriciofauth@gmail.com>
Date: Mon, 5 Jun 2017 00:52:46 -0300
Subject: [PATCH] Refactor index.lib function into static method
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>
---
 libraries/Index.php                           | 33 +++++++++++++++
 .../table/TableRelationController.php         |  4 +-
 .../table/TableStructureController.php        |  1 -
 libraries/index.lib.php                       | 41 -------------------
 .../table/structure/display_structure.phtml   |  3 +-
 5 files changed, 36 insertions(+), 46 deletions(-)
 delete mode 100644 libraries/index.lib.php

diff --git a/libraries/Index.php b/libraries/Index.php
index 269b448eb5..c6c814aab0 100644
--- a/libraries/Index.php
+++ b/libraries/Index.php
@@ -634,6 +634,39 @@ class Index
         return $this->_columns;
     }
 
+    /**
+     * Get HTML for display indexes
+     *
+     * @return string $html_output
+     */
+    public static function getHtmlForDisplayIndexes()
+    {
+        $html_output = '<div id="index_div" class="ajax" >';
+        $html_output .= self::getHtmlForIndexes(
+            $GLOBALS['table'],
+            $GLOBALS['db']
+        );
+        $html_output .= '<fieldset class="tblFooters print_ignore" style="text-align: '
+            . 'left;"><form action="tbl_indexes.php" method="post">';
+        $html_output .= URL::getHiddenInputs(
+            $GLOBALS['db'], $GLOBALS['table']
+        );
+        $html_output .= sprintf(
+            __('Create an index on &nbsp;%s&nbsp;columns'),
+            '<input type="number" name="added_fields" value="1" '
+            . 'min="1" required="required" />'
+        );
+        $html_output .= '<input type="hidden" name="create_index" value="1" />'
+            . '<input class="add_index ajax"'
+            . ' type="submit" value="' . __('Go') . '" />';
+
+        $html_output .= '</form>'
+            . '</fieldset>'
+            . '</div>';
+
+        return $html_output;
+    }
+
     /**
      * Show index data
      *
diff --git a/libraries/controllers/table/TableRelationController.php b/libraries/controllers/table/TableRelationController.php
index 163c2d74eb..39b7cd7662 100644
--- a/libraries/controllers/table/TableRelationController.php
+++ b/libraries/controllers/table/TableRelationController.php
@@ -8,8 +8,6 @@
 
 namespace PMA\libraries\controllers\table;
 
-require_once 'libraries/index.lib.php';
-
 use PMA\libraries\controllers\TableController;
 use PMA\libraries\DatabaseInterface;
 use PMA\libraries\Index;
@@ -191,7 +189,7 @@ class TableRelationController extends TableController
         );
 
         if (Util::isForeignKeySupported($this->tbl_storage_engine)) {
-            $this->response->addHTML(PMA_getHtmlForDisplayIndexes());
+            $this->response->addHTML(Index::getHtmlForDisplayIndexes());
         }
         $this->response->addHTML('</div>');
     }
diff --git a/libraries/controllers/table/TableStructureController.php b/libraries/controllers/table/TableStructureController.php
index b213ad2a35..6377c38783 100644
--- a/libraries/controllers/table/TableStructureController.php
+++ b/libraries/controllers/table/TableStructureController.php
@@ -118,7 +118,6 @@ class TableStructureController extends TableController
          * Function implementations for this script
          */
         include_once 'libraries/check_user_privileges.lib.php';
-        include_once 'libraries/index.lib.php';
 
         $this->response->getHeader()->getScripts()->addFiles(
             array(
diff --git a/libraries/index.lib.php b/libraries/index.lib.php
deleted file mode 100644
index de1d76da31..0000000000
--- a/libraries/index.lib.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * set of functions for structure section in pma
- *
- * @package PhpMyAdmin
- */
-use PMA\libraries\URL;
-
-/**
- * Get HTML for display indexes
- *
- * @return string $html_output
- */
-function PMA_getHtmlForDisplayIndexes()
-{
-    $html_output = '<div id="index_div" class="ajax" >';
-    $html_output .= PMA\libraries\Index::getHtmlForIndexes(
-        $GLOBALS['table'],
-        $GLOBALS['db']
-    );
-    $html_output .= '<fieldset class="tblFooters print_ignore" style="text-align: '
-        . 'left;"><form action="tbl_indexes.php" method="post">';
-    $html_output .= URL::getHiddenInputs(
-        $GLOBALS['db'], $GLOBALS['table']
-    );
-    $html_output .= sprintf(
-        __('Create an index on &nbsp;%s&nbsp;columns'),
-        '<input type="number" name="added_fields" value="1" '
-        . 'min="1" required="required" />'
-    );
-    $html_output .= '<input type="hidden" name="create_index" value="1" />'
-        . '<input class="add_index ajax"'
-        . ' type="submit" value="' . __('Go') . '" />';
-
-    $html_output .= '</form>'
-        . '</fieldset>'
-        . '</div>';
-
-    return $html_output;
-}
diff --git a/templates/table/structure/display_structure.phtml b/templates/table/structure/display_structure.phtml
index e441d428b5..bb36efd06a 100644
--- a/templates/table/structure/display_structure.phtml
+++ b/templates/table/structure/display_structure.phtml
@@ -1,4 +1,5 @@
 <?php
+use PMA\libraries\Index;
 use PMA\libraries\Partition;
 use PMA\libraries\Template;
 use PMA\libraries\Tracker;
@@ -167,7 +168,7 @@ $rownum = 0; ?>
 <!--Displays indexes-->
 <?php if (! $tbl_is_view
     && ! $db_is_system_schema && 'ARCHIVE' !=  $tbl_storage_engine): ?>
-    <?= PMA_getHtmlForDisplayIndexes(); ?>
+    <?= Index::getHtmlForDisplayIndexes(); ?>
 <?php endif; ?>
 
 <!--Display partition details-->