';
+
+ return $table_navigation_html;
+ }
+
+ /**
+ * function generate and return the table header for central columns page
+ *
+ * @param string $class styling class of 'th' elements
+ * @param string $title title of the 'th' elements
+ * @param integer $actionCount number of actions
+ *
+ * @return string html for table header in central columns view/edit page
+ */
+ public static function getTableHeader($class='', $title='', $actionCount=0)
+ {
+ $action = '';
+ if ($actionCount > 0) {
+ $action .= '
'
+ . __('Action') . '
';
+ }
+ $tableheader = '';
+ $tableheader .= '
'
+ . '
'
+ . '
'
+ . $action
+ . '
'
+ . __('Name') . '
'
+ . '
'
+ . __('Type') . '
'
+ . '
'
+ . __('Length/Values') . '
'
+ . '
'
+ . __('Default') . '
'
+ . '
' . __('Collation') . '
'
+ . '
'
+ . __('Attribute') . '
'
+ . '
'
+ . __('Null') . '
'
+ . '
'
+ . __('A_I') . '
'
+ . '
';
+ $tableheader .= '';
+ return $tableheader;
+ }
+
+ /**
+ * Function generate and return the table header for
+ * multiple edit central columns page
+ *
+ * @param array $header_cells headers list
+ *
+ * @return string html for table header in central columns multi edit page
+ */
+ public static function getEditTableHeader($header_cells)
+ {
+ $html = '
';
+ return $html;
+ }
+
+ /**
+ * build the dropdown select html for tables of given database
+ *
+ * @param string $db current database
+ *
+ * @return string html dropdown for selecting table
+ */
+ public static function getHtmlForTableDropdown($db)
+ {
+ $GLOBALS['dbi']->selectDb($db, $GLOBALS['userlink']);
+ $tables = $GLOBALS['dbi']->getTables($db, $GLOBALS['userlink']);
+ $selectHtml = '';
+ return $selectHtml;
+ }
+
+ /**
+ * build dropdown select html to select column in selected table,
+ * include only columns which are not already in central list
+ *
+ * @param string $db current database to which selected table belongs
+ * @param string $selected_tbl selected table
+ *
+ * @return string html to select column
+ */
+ public static function getHtmlForColumnDropdown($db, $selected_tbl)
+ {
+ $existing_cols = self::getFromTable($db, $selected_tbl);
+ $GLOBALS['dbi']->selectDb($db, $GLOBALS['userlink']);
+ $columns = (array) $GLOBALS['dbi']->getColumnNames(
+ $db, $selected_tbl, $GLOBALS['userlink']
+ );
+ $selectColHtml = "";
+ foreach ($columns as $column) {
+ if (!in_array($column, $existing_cols)) {
+ $selectColHtml .= '';
+ }
+ }
+ return $selectColHtml;
+ }
+
+ /**
+ * html to display the form that let user to add a column on Central columns page
+ *
+ * @param int $total_rows total number of rows in complete result set
+ * @param int $pos offset of first result with complete result set
+ * @param string $db current database
+ *
+ * @return string html to add a column in the central list
+ */
+ public static function getHtmlForAddCentralColumn($total_rows, $pos, $db)
+ {
+ $columnAdd = '
';
+
+ return $columnAdd;
+ }
+
+ /**
+ * build html for a row in central columns table
+ *
+ * @param array $row array contains complete information of a particular row of central list table
+ * @param int $row_num position the row in the table
+ * @param string $db current database
+ *
+ * @return string html of a particular row in the central columns table.
+ */
+ public static function getHtmlForCentralColumnsTableRow($row, $row_num, $db)
+ {
+ $tableHtml = '
';
+
+ return $tableHtml;
+ }
+
+ /**
+ * build html for editing a row in central columns table
+ *
+ * @param array $row array contains complete information of a particular row of central list table
+ * @param int $row_num position the row in the table
+ *
+ * @return string html of a particular row in the central columns table.
+ */
+ public static function getHtmlForCentralColumnsEditTableRow($row, $row_num)
+ {
+ $tableHtml = '
';
+ return $addNewColumn;
+ }
+
+ /**
+ * Get HTML for editing page central columns
+ *
+ * @param array $selected_fld Array containing the selected fields
+ * @param string $selected_db String containing the name of database
+ *
+ * @return string HTML for complete editing page for central columns
+ */
+ public static function getHtmlForEditingPage($selected_fld,$selected_db)
+ {
+ $html = '
';
+ $html .= self::getEditTableFooter();
+ $html .= '';
+ return $html;
+ }
+}
diff --git a/libraries/classes/Controllers/Table/TableStructureController.php b/libraries/classes/Controllers/Table/TableStructureController.php
index 28a5b7f96d..8b799aab3f 100644
--- a/libraries/classes/Controllers/Table/TableStructureController.php
+++ b/libraries/classes/Controllers/Table/TableStructureController.php
@@ -7,6 +7,7 @@
*/
namespace PhpMyAdmin\Controllers\Table;
+use PhpMyAdmin\CentralColumns;
use PhpMyAdmin\Config\PageSettings;
use PhpMyAdmin\Controllers\TableController;
use PhpMyAdmin\Core;
@@ -21,8 +22,8 @@ use PhpMyAdmin\SqlParser\Utils\Table as SqlTable;
use PhpMyAdmin\Table;
use PhpMyAdmin\Template;
use PhpMyAdmin\Transformations;
-use PhpMyAdmin\Util;
use PhpMyAdmin\Url;
+use PhpMyAdmin\Util;
require_once 'libraries/config/messages.inc.php';
require_once 'libraries/config/user_preferences.forms.php';
@@ -1178,8 +1179,7 @@ class TableStructureController extends TableController
$mime_map = Transformations::getMIME($this->db, $this->table, true);
}
}
- include_once 'libraries/central_columns.lib.php';
- $central_list = PMA_getCentralColumnsFromTable($this->db, $this->table);
+ $central_list = CentralColumns::getFromTable($this->db, $this->table);
$columns_list = array();
$titles = array(
@@ -1464,12 +1464,10 @@ class TableStructureController extends TableController
$mult_btn = __('Yes');
break;
case 'add_to_central_columns':
- include_once 'libraries/central_columns.lib.php';
- $centralColsError = PMA_syncUniqueColumns($selected, false);
+ $centralColsError = CentralColumns::syncUniqueColumns($selected, false);
break;
case 'remove_from_central_columns':
- include_once 'libraries/central_columns.lib.php';
- $centralColsError = PMA_deleteColumnsFromList($selected, false);
+ $centralColsError = CentralColumns::deleteColumnsFromList($selected, false);
break;
case 'change':
$this->displayHtmlForColumnChange($selected, $action);
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 307538bda5..946bfcc7f0 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -6,6 +6,7 @@
* @package PhpMyAdmin
*/
+use PhpMyAdmin\CentralColumns;
use PhpMyAdmin\Message;
use PhpMyAdmin\Response;
use PhpMyAdmin\Sql;
@@ -118,16 +119,13 @@ if (! empty($submit_mult)
$response->addJSON('message', $show_create);
exit;
case 'sync_unique_columns_central_list':
- include_once 'libraries/central_columns.lib.php';
- $centralColsError = PMA_syncUniqueColumns($selected);
+ $centralColsError = CentralColumns::syncUniqueColumns($selected);
break;
case 'delete_unique_columns_central_list':
- include_once 'libraries/central_columns.lib.php';
- $centralColsError = PMA_deleteColumnsFromList($selected);
+ $centralColsError = CentralColumns::deleteColumnsFromList($selected);
break;
case 'make_consistent_with_central_list':
- include_once 'libraries/central_columns.lib.php';
- $centralColsError = PMA_makeConsistentWithList(
+ $centralColsError = CentralColumns::makeConsistentWithList(
$GLOBALS['db'],
$selected
);
diff --git a/test/libraries/PMA_central_columns_test.php b/test/classes/CentralColumnsTest.php
similarity index 82%
rename from test/libraries/PMA_central_columns_test.php
rename to test/classes/CentralColumnsTest.php
index b7b3004047..c099f8648c 100644
--- a/test/libraries/PMA_central_columns_test.php
+++ b/test/classes/CentralColumnsTest.php
@@ -1,29 +1,28 @@
'phpmyadmin',
'table' => 'pma_central_columns'
),
- PMA_centralColumnsGetParams()
+ CentralColumns::getParams()
);
}
/**
- * Test for PMA_getColumnsList
+ * Test for CentralColumns::getColumnsList
*
* @return void
*/
@@ -161,16 +160,16 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
$this->assertEquals(
$this->_modifiedColumnData,
- PMA_getColumnsList('phpmyadmin')
+ CentralColumns::getColumnsList('phpmyadmin')
);
$this->assertEquals(
array_slice($this->_modifiedColumnData, 1, 2),
- PMA_getColumnsList('phpmyadmin', 1, 2)
+ CentralColumns::getColumnsList('phpmyadmin', 1, 2)
);
}
/**
- * Test for PMA_getCentralColumnsCount
+ * Test for CentralColumns::getCount
*
* @return void
*/
@@ -189,12 +188,12 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
$this->assertEquals(
3,
- PMA_getCentralColumnsCount('phpmyadmin')
+ CentralColumns::getCount('phpmyadmin')
);
}
/**
- * Test for PMA_syncUniqueColumns
+ * Test for CentralColumns::syncUniqueColumns
*
* @return void
*/
@@ -204,12 +203,12 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
$_REQUEST['table'] = 'PMA_table';
$this->assertTrue(
- PMA_syncUniqueColumns(array('PMA_table'))
+ CentralColumns::syncUniqueColumns(array('PMA_table'))
);
}
/**
- * Test for PMA_deleteColumnsFromList
+ * Test for CentralColumns::deleteColumnsFromList
*
* @return void
*/
@@ -242,21 +241,21 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
);
$this->assertTrue(
- PMA_deleteColumnsFromList(array("col1"), false)
+ CentralColumns::deleteColumnsFromList(array("col1"), false)
);
// when column does not exist in the central column list
$this->assertInstanceOf(
- 'PhpMyAdmin\Message', PMA_deleteColumnsFromList(array('column1'), false)
+ 'PhpMyAdmin\Message', CentralColumns::deleteColumnsFromList(array('column1'), false)
);
$this->assertInstanceOf(
- 'PhpMyAdmin\Message', PMA_deleteColumnsFromList(array('PMA_table'))
+ 'PhpMyAdmin\Message', CentralColumns::deleteColumnsFromList(array('PMA_table'))
);
}
/**
- * Test for PMA_makeConsistentWithList
+ * Test for CentralColumns::makeConsistentWithList
*
* @return void
*/
@@ -273,12 +272,12 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
$this->returnValue('PMA_table=CREATE table `PMA_table` (id integer)')
);
$this->assertTrue(
- PMA_makeConsistentWithList("phpmyadmin", array('PMA_table'))
+ CentralColumns::makeConsistentWithList("phpmyadmin", array('PMA_table'))
);
}
/**
- * Test for PMA_getCentralColumnsFromTable
+ * Test for CentralColumns::getFromTable
*
* @return void
*/
@@ -299,12 +298,12 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
);
$this->assertEquals(
array("id", "col1"),
- PMA_getCentralColumnsFromTable($db, $table)
+ CentralColumns::getFromTable($db, $table)
);
}
/**
- * Test for PMA_getCentralColumnsFromTable with $allFields = true
+ * Test for CentralColumns::getFromTable with $allFields = true
*
* @return void
*/
@@ -325,31 +324,31 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
);
$this->assertEquals(
array_slice($this->_modifiedColumnData, 0, 2),
- PMA_getCentralColumnsFromTable($db, $table, true)
+ CentralColumns::getFromTable($db, $table, true)
);
}
/**
- * Test for PMA_updateOneColumn
+ * Test for CentralColumns::updateOneColumn
*
* @return void
*/
public function testPMAUpdateOneColumn()
{
$this->assertTrue(
- PMA_updateOneColumn(
+ CentralColumns::updateOneColumn(
"phpmyadmin", "", "", "", "", "", "", "", "", ""
)
);
$this->assertTrue(
- PMA_updateOneColumn(
+ CentralColumns::updateOneColumn(
"phpmyadmin", "col1", "", "", "", "", "", "", "", ""
)
);
}
/**
- * Test for PMA_updateMultipleColumn
+ * Test for CentralColumns::updateMultipleColumn
*
* @return void
*/
@@ -365,13 +364,13 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
$_POST['field_type'] = array("","");
$_POST['field_collation'] = array("","");
$this->assertTrue(
- PMA_updateMultipleColumn()
+ CentralColumns::updateMultipleColumn()
);
}
/**
- * Test for PMA_getHTMLforEditingPage
+ * Test for CentralColumns::getHtmlForEditingPage
*
* @return void
*/
@@ -387,7 +386,7 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
->will(
$this->returnValue($this->_columnData)
);
- $result = PMA_getHTMLforEditingPage(
+ $result = CentralColumns::getHtmlForEditingPage(
array("col1", "col2"), 'phpmyadmin'
);
$this->assertContains(
@@ -399,30 +398,30 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
__('Collation'), __('Attributes'), __('Null'), __('A_I')
);
$this->assertContains(
- PMA_getCentralColumnsEditTableHeader($header_cells), $result
+ CentralColumns::getEditTableHeader($header_cells), $result
);
- $list_detail_cols = PMA_findExistingColNames(
+ $list_detail_cols = CentralColumns::findExistingColNames(
'phpmyadmin', "'col1','col2'", true
);
$this->assertContains(
- PMA_getHTMLforCentralColumnsEditTableRow(
+ CentralColumns::getHtmlForCentralColumnsEditTableRow(
$list_detail_cols[0], 0
), $result
);
$this->assertContains(
- PMA_getCentralColumnsEditTableFooter(), $result
+ CentralColumns::getEditTableFooter(), $result
);
}
/**
- * Test for PMA_getHTMLforTableNavigation
+ * Test for CentralColumns::getHtmlForTableNavigation
*
* @return void
*/
public function testPMAGetHTMLforTableNavigation()
{
- $result = PMA_getHTMLforTableNavigation(0, 0, 'phpmyadmin');
+ $result = CentralColumns::getHtmlForTableNavigation(0, 0, 'phpmyadmin');
$this->assertContains(
'assertContains(
'