From 04c2e88d6720991daa232174416d03e06fcb7b37 Mon Sep 17 00:00:00 2001 From: Kasun Chathuranga Date: Thu, 25 Jul 2013 21:26:23 +0530 Subject: [PATCH] Change tables name from 'navigation' to 'navigationhiding' --- config.sample.inc.php | 2 +- doc/config.rst | 8 ++++---- examples/config.manyhosts.inc.php | 2 +- examples/create_tables.sql | 4 ++-- examples/create_tables_drizzle.sql | 4 ++-- libraries/config.default.php | 4 ++-- libraries/config/setup.forms.php | 2 +- libraries/navigation/Navigation.class.php | 6 +++--- libraries/navigation/Nodes/Node_Database.class.php | 4 ++-- libraries/relation.lib.php | 12 ++++++------ 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/config.sample.inc.php b/config.sample.inc.php index b633138a6212..117798fbf4ba 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -61,7 +61,7 @@ // $cfg['Servers'][$i]['recent'] = 'pma__recent'; // $cfg['Servers'][$i]['users'] = 'pma__users'; // $cfg['Servers'][$i]['usergroups'] = 'pma__usergroups'; -// $cfg['Servers'][$i]['navigation'] = 'pma__navigation'; +// $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding'; /* Contrib / Swekey authentication */ // $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf'; diff --git a/doc/config.rst b/doc/config.rst index 2a4e957ba091..b46cec31597b 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -673,8 +673,8 @@ Server connection settings :config:option:`$cfg['Servers'][$i]['users']` (e.g. ``pma__users``) and :config:option:`$cfg['Servers'][$i]['usergroups']` (e.g. ``pma__usergroups``) -.. _navigation: -.. config:option:: $cfg['Servers'][$i]['navigation'] +.. _navigationhiding: +.. config:option:: $cfg['Servers'][$i]['navigationhiding'] :type: string :default: ``''`` @@ -684,8 +684,8 @@ Server connection settings To allow the usage of this functionality: * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage - * put the table name in :config:option:`$cfg['Servers'][$i]['navigation']` (e.g. - ``pma__navigation``) + * put the table name in :config:option:`$cfg['Servers'][$i]['navigationhiding']` (e.g. + ``pma__navigationhiding``) .. _tracking: .. config:option:: $cfg['Servers'][$i]['tracking'] diff --git a/examples/config.manyhosts.inc.php b/examples/config.manyhosts.inc.php index 86992ae6046d..3ab6572bccb2 100644 --- a/examples/config.manyhosts.inc.php +++ b/examples/config.manyhosts.inc.php @@ -47,5 +47,5 @@ $cfg['Servers'][$i]['recent'] = 'pma__recent'; $cfg['Servers'][$i]['users'] = 'pma__users'; $cfg['Servers'][$i]['usergroups'] = 'pma__usergroups'; - $cfg['Servers'][$i]['navigation'] = 'pma__navigation'; + $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding'; } diff --git a/examples/create_tables.sql b/examples/create_tables.sql index 1e98d884fc12..ca23e71c06c1 100644 --- a/examples/create_tables.sql +++ b/examples/create_tables.sql @@ -306,10 +306,10 @@ CREATE TABLE IF NOT EXISTS `pma__usergroups` ( -- -------------------------------------------------------- -- --- Table structure for table `pma__navigation` +-- Table structure for table `pma__navigationhiding` -- -CREATE TABLE IF NOT EXISTS `pma__navigation` ( +CREATE TABLE IF NOT EXISTS `pma__navigationhiding` ( `username` varchar(64) NOT NULL, `item_name` varchar(64) NOT NULL, `item_type` varchar(64) NOT NULL, diff --git a/examples/create_tables_drizzle.sql b/examples/create_tables_drizzle.sql index e8713517af29..4bbb9c34d565 100644 --- a/examples/create_tables_drizzle.sql +++ b/examples/create_tables_drizzle.sql @@ -292,10 +292,10 @@ CREATE TABLE IF NOT EXISTS `pma__usergroups` ( -- -------------------------------------------------------- -- --- Table structure for table `pma__navigation` +-- Table structure for table `pma__navigationhiding` -- -CREATE TABLE IF NOT EXISTS `pma__navigation` ( +CREATE TABLE IF NOT EXISTS `pma__navigationhiding` ( `username` varchar(64) NOT NULL, `item_name` varchar(64) NOT NULL, `item_type` varchar(64) NOT NULL, diff --git a/libraries/config.default.php b/libraries/config.default.php index ae5fc450a8f1..5d28fbdeb3e7 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -423,9 +423,9 @@ /** * table to store information about item hidden from navigation triee * - leave blank to disable hide/show navigation items feature - * SUGGESTED: 'pma__navigation' + * SUGGESTED: 'pma__navigationhiding' * - * @global string $cfg['Servers'][$i]['navigation'] + * @global string $cfg['Servers'][$i]['navigationhiding'] */ $cfg['Servers'][$i]['nagivation'] = ''; diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php index 76af7d586724..43d6569427d9 100644 --- a/libraries/config/setup.forms.php +++ b/libraries/config/setup.forms.php @@ -72,7 +72,7 @@ 'userconfig' => 'pma__userconfig', 'users' => 'pma__users', 'usergroups' => 'pma__usergroups', - 'navigation' => 'pma__navigation', + 'navigationhiding' => 'pma__navigationhiding', 'table_info' => 'pma__table_info', 'column_info' => 'pma__column_info', 'history' => 'pma__history', diff --git a/libraries/navigation/Navigation.class.php b/libraries/navigation/Navigation.class.php index 6fbc585ad4f2..98665ce07d2d 100644 --- a/libraries/navigation/Navigation.class.php +++ b/libraries/navigation/Navigation.class.php @@ -88,7 +88,7 @@ public function hideNavigationItem( $itemName, $itemType, $dbName, $tableName = null ) { $navTable = PMA_Util::backquote($GLOBALS['cfgRelation']['db']) - . "." . PMA_Util::backquote($GLOBALS['cfgRelation']['navigation']); + . "." . PMA_Util::backquote($GLOBALS['cfgRelation']['navigationhiding']); $sqlQuery = "INSERT INTO " . $navTable . "(`username`, `item_name`, `item_type`, `db_name`, `table_name`)" . " VALUES (" @@ -116,7 +116,7 @@ public function unhideNavigationItem( $itemName, $itemType, $dbName, $tableName = null ) { $navTable = PMA_Util::backquote($GLOBALS['cfgRelation']['db']) - . "." . PMA_Util::backquote($GLOBALS['cfgRelation']['navigation']); + . "." . PMA_Util::backquote($GLOBALS['cfgRelation']['navigationhiding']); $sqlQuery = "DELETE FROM " . $navTable . " WHERE " . " `username`='" @@ -147,7 +147,7 @@ public function getItemUnhideDialog($dbName, $itemType = null, $tableName = null $html .= PMA_generate_common_hidden_inputs($dbName, $tableName); $navTable = PMA_Util::backquote($GLOBALS['cfgRelation']['db']) - . "." . PMA_Util::backquote($GLOBALS['cfgRelation']['navigation']); + . "." . PMA_Util::backquote($GLOBALS['cfgRelation']['navigationhiding']); $sqlQuery = "SELECT `item_name`, `item_type` FROM " . $navTable . " WHERE `username`='" . PMA_Util::sqlAddSlashes($GLOBALS['cfg']['Server']['user']) ."'" diff --git a/libraries/navigation/Nodes/Node_Database.class.php b/libraries/navigation/Nodes/Node_Database.class.php index 87fb0a6b0df8..b5026b4153e2 100644 --- a/libraries/navigation/Nodes/Node_Database.class.php +++ b/libraries/navigation/Nodes/Node_Database.class.php @@ -445,7 +445,7 @@ public function getData($type, $pos, $searchClause = '') $cfgRelation = PMA_getRelationsParam(); if ($cfgRelation['navwork']) { $navTable = PMA_Util::backquote($cfgRelation['db']) - . "." . PMA_Util::backquote($cfgRelation['navigation']); + . "." . PMA_Util::backquote($cfgRelation['navigationhiding']); $sqlQuery = "SELECT `item_name` FROM " . $navTable . " WHERE `username`='" . $cfgRelation['user'] . "'" . " AND `item_type`='" . substr($type, 0, -1) . "'" @@ -493,7 +493,7 @@ public function getHtmlForControlButtons() $cfgRelation = PMA_getRelationsParam(); if ($cfgRelation['navwork']) { $navTable = PMA_Util::backquote($cfgRelation['db']) - . "." . PMA_Util::backquote($cfgRelation['navigation']); + . "." . PMA_Util::backquote($cfgRelation['navigationhiding']); $sqlQuery = "SELECT COUNT(*) FROM " . $navTable . " WHERE `username`='" . PMA_Util::sqlAddSlashes($GLOBALS['cfg']['Server']['user']) ."'" diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 62af80282eb1..3f60f5be82d3 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -266,10 +266,10 @@ function PMA_getRelationsParamDiagnostic($cfgRelation) $messages ); $retval .= PMA_getDiagMessageForParameter( - 'navigation', - isset($cfgRelation['navigation']), + 'navigationhiding', + isset($cfgRelation['navigationhiding']), $messages, - 'navigation' + 'navigationhiding' ); $retval .= PMA_getDiagMessageForFeature( __('Hide/show navigation items'), @@ -457,8 +457,8 @@ function PMA_checkRelationsParam() $cfgRelation['users'] = $curr_table[0]; } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['usergroups']) { $cfgRelation['usergroups'] = $curr_table[0]; - } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['navigation']) { - $cfgRelation['navigation'] = $curr_table[0]; + } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['navigationhiding']) { + $cfgRelation['navigationhiding'] = $curr_table[0]; } } // end while $GLOBALS['dbi']->freeResult($tab_rs); @@ -513,7 +513,7 @@ function PMA_checkRelationsParam() $cfgRelation['menuswork'] = true; } - if (isset($cfgRelation['navigation'])) { + if (isset($cfgRelation['navigationhiding'])) { $cfgRelation['navwork'] = true; }