Merge pull request #58 from roccivic/menu-refactoring-rebased

Menu refactoring
This commit is contained in:
Marc Delisle 2012-05-05 11:51:19 -07:00
commit ac5a8ca9df
44 changed files with 561 additions and 726 deletions

View File

@ -57,11 +57,6 @@ if ($num_tables == 0 && count($data['ddlog']) == 0) {
// ---------------------------------------------------------------------------
/*
* Display top menu links
*/
require_once 'libraries/db_links.inc.php';
// Prepare statement to get HEAD version
$all_tables_query = ' SELECT table_name, MAX(version) as version FROM ' .
PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . '.' .

504
libraries/Menu.class.php Normal file
View File

@ -0,0 +1,504 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Generates and renders the top menu
*
* @package PhpMyAdmin
*/
if (! defined('PHPMYADMIN')) {
exit;
}
/**
* Singleton class for generating the top menu
*
* @package PhpMyAdmin
*/
class PMA_Menu {
private $server;
private $db;
private $table;
private static $instance;
/**
* Private constructor disables direct object creation
*
* @param int $server Server id
* @param string $db Database name
* @param string $table Table name
*
* @return New PMA_Table
*/
private function __construct($server, $db, $table)
{
$this->server = $server;
$this->db = $db;
$this->table = $table;
}
/**
* Prints the menu and the breadcrumbs
*
* @return void
*/
public static function getInstance()
{
if (empty(self::$instance)) {
self::$instance = new PMA_Menu(
$GLOBALS['server'],
$GLOBALS['db'],
$GLOBALS['table']
);
}
return self::$instance;
}
/**
* Prints the menu and the breadcrumbs
*
* @return void
*/
public function display()
{
echo $this->_getBreadcrumbs();
echo $this->_getMenu();
if (! empty($GLOBALS['message'])) {
PMA_showMessage($GLOBALS['message']);
unset($GLOBALS['message']);
}
}
/**
* Returns the menu as HTML
*
* @return string HTML formatted menubar
*/
private function _getMenu()
{
$tabs = '';
$url_params = array('db' => $this->db);
if (strlen($this->table)) {
$tabs = $this->_getTableTabs();
$url_params['table'] = $this->table;
} else if (strlen($this->db)) {
$tabs = $this->_getDbTabs();
} else {
$tabs = $this->_getServerTabs();
}
return PMA_generate_html_tabs($tabs, $url_params);
}
/**
* Returns the breadcrumbs as HTML
*
* @return string HTML formatted breadcrumbs
*/
private function _getBreadcrumbs()
{
$retval = '';
$tbl_is_view = PMA_Table::isView($this->db, $this->table);
$server_info = ! empty($GLOBALS['cfg']['Server']['verbose'])
? $GLOBALS['cfg']['Server']['verbose']
: $GLOBALS['cfg']['Server']['host'];
$server_info .= empty($GLOBALS['cfg']['Server']['port'])
? ''
: ':' . $GLOBALS['cfg']['Server']['port'];
$separator = "<span class='separator item'>&nbsp;»</span>";
$item = '<a href="%1$s?%2$s" class="item">';
if ($GLOBALS['cfg']['NavigationBarIconic'] !== true) {
$item .= '%4$s: ';
}
$item .= '%3$s</a>';
$retval .= "<div id='floating_menubar'></div>";
$retval .= "<div id='serverinfo'>";
if ($GLOBALS['cfg']['NavigationBarIconic']) {
$retval .= PMA_getImage(
's_host.png',
'',
array('class' => 'item')
);
}
$retval .= sprintf(
$item,
$GLOBALS['cfg']['DefaultTabServer'],
PMA_generate_common_url(),
htmlspecialchars($server_info),
__('Server')
);
if (strlen($this->db)) {
$retval .= $separator;
if ($GLOBALS['cfg']['NavigationBarIconic']) {
$retval .= PMA_getImage(
's_db.png',
'',
array('class' => 'item')
);
}
$retval .= sprintf(
$item,
$GLOBALS['cfg']['DefaultTabDatabase'],
PMA_generate_common_url($this->db),
htmlspecialchars($this->db),
__('Database')
);
// if the table is being dropped, $_REQUEST['purge'] is set to '1'
// so do not display the table name in upper div
if (
strlen($this->table)
&&
! (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1')
) {
include_once './libraries/tbl_info.inc.php';
$retval .= $separator;
if ($GLOBALS['cfg']['NavigationBarIconic']) {
$icon = $tbl_is_view ? 'b_views.png' : 's_tbl.png';
$retval .= PMA_getImage(
$icon,
'',
array('class' => 'item')
);
}
$retval .= sprintf(
$item,
$GLOBALS['cfg']['DefaultTabTable'],
PMA_generate_common_url($this->db, $this->table),
str_replace(' ', '&nbsp;', htmlspecialchars($this->table)),
$tbl_is_view ? __('View') : __('Table')
);
/**
* Displays table comment
*/
if (! empty($show_comment)
&& ! isset($GLOBALS['avoid_show_comment'])
) {
if (strstr($show_comment, '; InnoDB free')) {
$show_comment = preg_replace(
'@; InnoDB free:.*?$@',
'',
$show_comment
);
}
$retval .= '<span class="table_comment"';
$retval .= ' id="span_table_comment">&quot;';
$retval .= htmlspecialchars($show_comment);
$retval .= '&quot;</span>';
} // end if
} else {
// no table selected, display database comment if present
/**
* Settings for relations stuff
*/
include_once './libraries/relation.lib.php';
$cfgRelation = PMA_getRelationsParam();
// Get additional information about tables for tooltip is done
// in libraries/db_info.inc.php only once
if ($cfgRelation['commwork']) {
$comment = PMA_getDbComment($this->db);
/**
* Displays table comment
*/
if (! empty($comment)) {
$retval .= '<span class="table_comment"'
. ' id="span_table_comment">&quot;'
. htmlspecialchars($comment)
. '&quot;</span>';
} // end if
}
}
}
$retval .= '<div class="clearfloat"></div>';
$retval .= '</div>';
return $retval;
}
/**
* Returns the table tabs as an array
*
* @return array Data for generating table tabs
*/
private function _getTableTabs()
{
$db_is_information_schema = PMA_is_system_schema($this->db);
$tbl_is_view = PMA_Table::isView($this->db, $this->table);
$table_status = PMA_Table::sGetStatusInfo($this->db, $this->table);
$table_info_num_rows = 0;
if (isset($table_status['Rows'])) {
$table_info_num_rows = $table_status['Rows'];
}
$tabs = array();
$tabs['browse']['icon'] = 'b_browse.png';
$tabs['browse']['text'] = __('Browse');
$tabs['browse']['link'] = 'sql.php';
$tabs['browse']['args']['pos'] = 0;
$tabs['structure']['icon'] = 'b_props.png';
$tabs['structure']['link'] = 'tbl_structure.php';
$tabs['structure']['text'] = __('Structure');
$tabs['sql']['icon'] = 'b_sql.png';
$tabs['sql']['link'] = 'tbl_sql.php';
$tabs['sql']['text'] = __('SQL');
$tabs['search']['icon'] = 'b_search.png';
$tabs['search']['text'] = __('Search');
$tabs['search']['link'] = 'tbl_select.php';
if (! $db_is_information_schema) {
$tabs['insert']['icon'] = 'b_insrow.png';
$tabs['insert']['link'] = 'tbl_change.php';
$tabs['insert']['text'] = __('Insert');
}
$tabs['export']['icon'] = 'b_tblexport.png';
$tabs['export']['link'] = 'tbl_export.php';
$tabs['export']['args']['single_table'] = 'true';
$tabs['export']['text'] = __('Export');
/**
* Don't display "Import" and "Operations"
* for views and information_schema
*/
if (! $tbl_is_view && ! $db_is_information_schema) {
$tabs['import']['icon'] = 'b_tblimport.png';
$tabs['import']['link'] = 'tbl_import.php';
$tabs['import']['text'] = __('Import');
$tabs['operation']['icon'] = 'b_tblops.png';
$tabs['operation']['link'] = 'tbl_operations.php';
$tabs['operation']['text'] = __('Operations');
}
if (PMA_Tracker::isActive()) {
$tabs['tracking']['icon'] = 'eye.png';
$tabs['tracking']['text'] = __('Tracking');
$tabs['tracking']['link'] = 'tbl_tracking.php';
}
if (! $db_is_information_schema
&& ! PMA_DRIZZLE
&& PMA_currentUserHasPrivilege('TRIGGER', $this->db, $this->table)
&& ! $tbl_is_view
) {
$tabs['triggers']['link'] = 'tbl_triggers.php';
$tabs['triggers']['text'] = __('Triggers');
$tabs['triggers']['icon'] = 'b_triggers.png';
}
/**
* Views support a limited number of operations
*/
if ($tbl_is_view && ! $db_is_information_schema) {
$tabs['operation']['icon'] = 'b_tblops.png';
$tabs['operation']['link'] = 'view_operations.php';
$tabs['operation']['text'] = __('Operations');
}
if ($table_info_num_rows == 0 && ! $tbl_is_view) {
$tabs['browse']['warning'] = __('Table seems to be empty!');
$tabs['search']['warning'] = __('Table seems to be empty!');
}
return $tabs;
}
/**
* Returns the db tabs as an array
*
* @return array Data for generating db tabs
*/
private function _getDbTabs()
{
$db_is_information_schema = PMA_is_system_schema($this->db);
$num_tables = count(PMA_DBI_get_tables($this->db));
$is_superuser = PMA_isSuperuser();
/**
* Gets the relation settings
*/
$cfgRelation = PMA_getRelationsParam();
$tabs = array();
/**
* export, search and qbe links if there is at least one table
*/
if ($num_tables == 0) {
$tabs['qbe']['warning'] = __('Database seems to be empty!');
$tabs['search']['warning'] = __('Database seems to be empty!');
$tabs['export']['warning'] = __('Database seems to be empty!');
}
$tabs['structure']['link'] = 'db_structure.php';
$tabs['structure']['text'] = __('Structure');
$tabs['structure']['icon'] = 'b_props.png';
$tabs['sql']['link'] = 'db_sql.php';
$tabs['sql']['args']['db_query_force'] = 1;
$tabs['sql']['text'] = __('SQL');
$tabs['sql']['icon'] = 'b_sql.png';
$tabs['search']['text'] = __('Search');
$tabs['search']['icon'] = 'b_search.png';
$tabs['search']['link'] = 'db_search.php';
$tabs['qbe']['text'] = __('Query');
$tabs['qbe']['icon'] = 's_db.png';
$tabs['qbe']['link'] = 'db_qbe.php';
$tabs['export']['text'] = __('Export');
$tabs['export']['icon'] = 'b_export.png';
$tabs['export']['link'] = 'db_export.php';
if (! $db_is_information_schema) {
$tabs['import']['link'] = 'db_import.php';
$tabs['import']['text'] = __('Import');
$tabs['import']['icon'] = 'b_import.png';
$tabs['operation']['link'] = 'db_operations.php';
$tabs['operation']['text'] = __('Operations');
$tabs['operation']['icon'] = 'b_tblops.png';
if ($is_superuser && ! PMA_DRIZZLE) {
$tabs['privileges']['link'] = 'server_privileges.php';
$tabs['privileges']['args']['checkprivs'] = $this->db;
// stay on database view
$tabs['privileges']['args']['viewing_mode'] = 'db';
$tabs['privileges']['text'] = __('Privileges');
$tabs['privileges']['icon'] = 's_rights.png';
}
if (! PMA_DRIZZLE) {
$tabs['routines']['link'] = 'db_routines.php';
$tabs['routines']['text'] = __('Routines');
$tabs['routines']['icon'] = 'b_routines.png';
}
if (PMA_MYSQL_INT_VERSION >= 50106
&& ! PMA_DRIZZLE
&& PMA_currentUserHasPrivilege('EVENT', $this->db)
) {
$tabs['events']['link'] = 'db_events.php';
$tabs['events']['text'] = __('Events');
$tabs['events']['icon'] = 'b_events.png';
}
if (! PMA_DRIZZLE
&& PMA_currentUserHasPrivilege('TRIGGER', $this->db)
) {
$tabs['triggers']['link'] = 'db_triggers.php';
$tabs['triggers']['text'] = __('Triggers');
$tabs['triggers']['icon'] = 'b_triggers.png';
}
}
if (PMA_Tracker::isActive()) {
$tabs['tracking']['text'] = __('Tracking');
$tabs['tracking']['icon'] = 'eye.png';
$tabs['tracking']['link'] = 'db_tracking.php';
}
if (! $db_is_information_schema && $cfgRelation['designerwork']) {
$tabs['designer']['text'] = __('Designer');
$tabs['designer']['icon'] = 'b_relations.png';
$tabs['designer']['link'] = 'pmd_general.php';
}
return $tabs;
}
/**
* Returns the server tabs as an array
*
* @return array Data for generating server tabs
*/
private function _getServerTabs()
{
$is_superuser = PMA_isSuperuser();
$binary_logs = null;
if (! PMA_DRIZZLE){
$binary_logs = PMA_DBI_fetch_result(
'SHOW MASTER LOGS',
'Log_name',
null,
null,
PMA_DBI_QUERY_STORE
);
}
$tabs = array();
$tabs['databases']['icon'] = 's_db.png';
$tabs['databases']['link'] = 'server_databases.php';
$tabs['databases']['text'] = __('Databases');
$tabs['sql']['icon'] = 'b_sql.png';
$tabs['sql']['link'] = 'server_sql.php';
$tabs['sql']['text'] = __('SQL');
$tabs['status']['icon'] = 's_status.png';
$tabs['status']['link'] = 'server_status.php';
$tabs['status']['text'] = __('Status');
if ($is_superuser && ! PMA_DRIZZLE) {
$tabs['rights']['icon'] = 's_rights.png';
$tabs['rights']['link'] = 'server_privileges.php';
$tabs['rights']['text'] = __('Users');
}
$tabs['export']['icon'] = 'b_export.png';
$tabs['export']['link'] = 'server_export.php';
$tabs['export']['text'] = __('Export');
$tabs['import']['icon'] = 'b_import.png';
$tabs['import']['link'] = 'server_import.php';
$tabs['import']['text'] = __('Import');
$tabs['settings']['icon'] = 'b_tblops.png';
$tabs['settings']['link'] = 'prefs_manage.php';
$tabs['settings']['text'] = __('Settings');
$tabs['settings']['active'] = in_array(
basename($GLOBALS['PMA_PHP_SELF']),
array('prefs_forms.php', 'prefs_manage.php')
);
$tabs['synchronize']['icon'] = 's_sync.png';
$tabs['synchronize']['link'] = 'server_synchronize.php';
$tabs['synchronize']['text'] = __('Synchronize');
if (! empty($binary_logs)) {
$tabs['binlog']['icon'] = 's_tbl.png';
$tabs['binlog']['link'] = 'server_binlog.php';
$tabs['binlog']['text'] = __('Binary log');
}
if ($is_superuser && ! PMA_DRIZZLE) {
$tabs['replication']['icon'] = 's_replication.png';
$tabs['replication']['link'] = 'server_replication.php';
$tabs['replication']['text'] = __('Replication');
}
$tabs['vars']['icon'] = 's_vars.png';
$tabs['vars']['link'] = 'server_variables.php';
$tabs['vars']['text'] = __('Variables');
$tabs['charset']['icon'] = 's_asci.png';
$tabs['charset']['link'] = 'server_collations.php';
$tabs['charset']['text'] = __('Charsets');
if (PMA_DRIZZLE) {
$tabs['plugins']['icon'] = 'b_engine.png';
$tabs['plugins']['link'] = 'server_plugins.php';
$tabs['plugins']['text'] = __('Plugins');
} else {
$tabs['engine']['icon'] = 'b_engine.png';
$tabs['engine']['link'] = 'server_engines.php';
$tabs['engine']['text'] = __('Engines');
}
return $tabs;
}
}
?>

View File

@ -283,10 +283,10 @@ if (! isset($total_num_tables)) {
unset($each_table, $tbl_group_sql, $db_info_result);
/**
* Displays top menu links
* If in an Ajax request, we do not need to show this
* If coming from a Show MySQL link on the home page,
* put something in $sub_part
*/
if ($GLOBALS['is_ajax_request'] != true) {
include './libraries/db_links.inc.php';
if (empty($sub_part)) {
$sub_part = '_structure';
}
?>

View File

@ -1,158 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
*
* @package PhpMyAdmin
*/
if (! defined('PHPMYADMIN')) {
exit;
}
/**
*
*/
require_once './libraries/common.inc.php';
/**
* Gets the relation settings
*/
$cfgRelation = PMA_getRelationsParam();
/**
* If coming from a Show MySQL link on the home page,
* put something in $sub_part
*/
if (empty($sub_part)) {
$sub_part = '_structure';
}
/**
* Checks for superuser privileges
*/
$is_superuser = PMA_isSuperuser();
/**
* Prepares links
*/
/**
* export, search and qbe links if there is at least one table
*/
if ($num_tables == 0) {
$tab_qbe['warning'] = __('Database seems to be empty!');
$tab_search['warning'] = __('Database seems to be empty!');
$tab_export['warning'] = __('Database seems to be empty!');
}
$tab_structure['link'] = 'db_structure.php';
$tab_structure['text'] = __('Structure');
$tab_structure['icon'] = 'b_props.png';
$tab_sql['link'] = 'db_sql.php';
$tab_sql['args']['db_query_force'] = 1;
$tab_sql['text'] = __('SQL');
$tab_sql['icon'] = 'b_sql.png';
$tab_export['text'] = __('Export');
$tab_export['icon'] = 'b_export.png';
$tab_export['link'] = 'db_export.php';
$tab_search['text'] = __('Search');
$tab_search['icon'] = 'b_search.png';
$tab_search['link'] = 'db_search.php';
if (PMA_Tracker::isActive()) {
$tab_tracking['text'] = __('Tracking');
$tab_tracking['icon'] = 'eye.png';
$tab_tracking['link'] = 'db_tracking.php';
}
$tab_qbe['text'] = __('Query');
$tab_qbe['icon'] = 's_db.png';
$tab_qbe['link'] = 'db_qbe.php';
if ($cfgRelation['designerwork']) {
$tab_designer['text'] = __('Designer');
$tab_designer['icon'] = 'b_relations.png';
$tab_designer['link'] = 'pmd_general.php';
}
if (! $db_is_information_schema) {
$tab_import['link'] = 'db_import.php';
$tab_import['text'] = __('Import');
$tab_import['icon'] = 'b_import.png';
$tab_operation['link'] = 'db_operations.php';
$tab_operation['text'] = __('Operations');
$tab_operation['icon'] = 'b_tblops.png';
if ($is_superuser && !PMA_DRIZZLE) {
$tab_privileges['link'] = 'server_privileges.php';
$tab_privileges['args']['checkprivs'] = $db;
// stay on database view
$tab_privileges['args']['viewing_mode'] = 'db';
$tab_privileges['text'] = __('Privileges');
$tab_privileges['icon'] = 's_rights.png';
}
$tab_routines['link'] = 'db_routines.php';
$tab_routines['text'] = __('Routines');
$tab_routines['icon'] = 'b_routines.png';
$tab_events['link'] = 'db_events.php';
$tab_events['text'] = __('Events');
$tab_events['icon'] = 'b_events.png';
$tab_triggers['link'] = 'db_triggers.php';
$tab_triggers['text'] = __('Triggers');
$tab_triggers['icon'] = 'b_triggers.png';
}
/**
* Displays tab links
*/
$tabs = array();
$tabs[] =& $tab_structure;
$tabs[] =& $tab_sql;
$tabs[] =& $tab_search;
$tabs[] =& $tab_qbe;
$tabs[] =& $tab_export;
if (! $db_is_information_schema) {
$tabs[] =& $tab_import;
$tabs[] =& $tab_operation;
if ($is_superuser && !PMA_DRIZZLE) {
$tabs[] =& $tab_privileges;
}
if (!PMA_DRIZZLE) {
$tabs[] =& $tab_routines;
}
if (PMA_MYSQL_INT_VERSION >= 50106 && ! PMA_DRIZZLE) {
if (PMA_currentUserHasPrivilege('EVENT', $db)) {
$tabs[] =& $tab_events;
}
}
if (!PMA_DRIZZLE) {
if (PMA_currentUserHasPrivilege('TRIGGER', $db)) {
$tabs[] =& $tab_triggers;
}
}
}
if (PMA_Tracker::isActive()) {
$tabs[] =& $tab_tracking;
}
if (! $db_is_information_schema) {
if ($cfgRelation['designerwork']) {
$tabs[] =& $tab_designer;
}
}
$url_params['db'] = $db;
echo PMA_generate_html_tabs($tabs, $url_params);
unset($tabs);
/**
* Displays a message
*/
if (!empty($message)) {
PMA_showMessage($message);
unset($message);
}
?>

View File

@ -8,8 +8,8 @@ if (! defined('PHPMYADMIN')) {
exit;
}
require_once './libraries/common.inc.php';
require_once './libraries/RecentTable.class.php';
require_once 'libraries/Menu.class.php';
/**
@ -96,7 +96,12 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
PMA_userprefs_autoload_header();
}
if (!defined('PMA_DISPLAY_HEADING')) {
// add recently used table and reload the navigation
if (strlen($GLOBALS['table']) && $GLOBALS['cfg']['LeftRecentTable'] > 0) {
PMA_addRecentTable($GLOBALS['db'], $GLOBALS['table']);
}
if (! defined('PMA_DISPLAY_HEADING')) {
define('PMA_DISPLAY_HEADING', 1);
}
@ -109,110 +114,11 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
/**
* Display heading if needed. Design can be set in css file.
*/
if (PMA_DISPLAY_HEADING && $GLOBALS['server'] > 0) {
$server_info = ! empty($GLOBALS['cfg']['Server']['verbose'])
? $GLOBALS['cfg']['Server']['verbose']
: $GLOBALS['cfg']['Server']['host'];
$server_info .= empty($GLOBALS['cfg']['Server']['port'])
? ''
: ':' . $GLOBALS['cfg']['Server']['port'];
$separator = "<span class='separator item'>&nbsp;»</span>\n";
$item = '<a href="%1$s?%2$s" class="item">';
if ($GLOBALS['cfg']['NavigationBarIconic'] !== true) {
$item .= '%4$s: ';
}
$item .= '%3$s</a>' . "\n";
echo "<div id='floating_menubar'></div>\n";
echo "<div id='serverinfo'>\n";
if ($GLOBALS['cfg']['NavigationBarIconic']) {
echo PMA_getImage('s_host.png', '', array('class' => 'item')) . "\n";
}
printf(
$item,
$GLOBALS['cfg']['DefaultTabServer'],
PMA_generate_common_url(),
htmlspecialchars($server_info),
__('Server')
);
if (strlen($GLOBALS['db'])) {
echo $separator;
if ($GLOBALS['cfg']['NavigationBarIconic']) {
echo PMA_getImage('s_db.png', '', array('class' => 'item')) . "\n";
}
printf(
$item,
$GLOBALS['cfg']['DefaultTabDatabase'],
PMA_generate_common_url($GLOBALS['db']),
htmlspecialchars($GLOBALS['db']),
__('Database')
);
// if the table is being dropped, $_REQUEST['purge'] is set to '1'
// so do not display the table name in upper div
if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1')) {
include_once './libraries/tbl_info.inc.php';
echo $separator;
if ($GLOBALS['cfg']['NavigationBarIconic']) {
$icon = isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? 'b_views.png' : 's_tbl.png';
echo PMA_getImage($icon, '', array('class' => 'item')) . "\n";
}
printf(
$item,
$GLOBALS['cfg']['DefaultTabTable'],
PMA_generate_common_url($GLOBALS['db'], $GLOBALS['table']),
str_replace(' ', '&nbsp;', htmlspecialchars($GLOBALS['table'])),
(isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? __('View') : __('Table'))
);
/**
* Displays table comment
*/
if (!empty($show_comment) && ! isset($GLOBALS['avoid_show_comment'])) {
if (strstr($show_comment, '; InnoDB free')) {
$show_comment = preg_replace('@; InnoDB free:.*?$@', '', $show_comment);
}
echo '<span class="table_comment" id="span_table_comment">'
.'&quot;' . htmlspecialchars($show_comment)
.'&quot;</span>' . "\n";
} // end if
// add recently used table and reload the navigation
if ($GLOBALS['cfg']['LeftRecentTable'] > 0) {
PMA_addRecentTable($GLOBALS['db'], $GLOBALS['table']);
}
} else {
// no table selected, display database comment if present
/**
* Settings for relations stuff
*/
include_once './libraries/relation.lib.php';
$cfgRelation = PMA_getRelationsParam();
// Get additional information about tables for tooltip is done
// in libraries/db_info.inc.php only once
if ($cfgRelation['commwork']) {
$comment = PMA_getDbComment($GLOBALS['db']);
/**
* Displays table comment
*/
if (! empty($comment)) {
echo '<span class="table_comment"'
. ' id="span_table_comment">&quot;'
. htmlspecialchars($comment)
. '&quot;</span>' . "\n";
} // end if
}
}
}
echo '<div class="clearfloat"></div>';
echo '</div>';
PMA_Menu::getInstance()->display();
}
}
/**
* Sets a variable to remember headers have been sent
*/

View File

@ -145,16 +145,14 @@ if (!empty($submit_mult) && !empty($what)) {
include_once './libraries/header.inc.php';
if (strlen($table)) {
include './libraries/tbl_common.php';
include './libraries/tbl_common.inc.php';
$url_query .= '&amp;goto=tbl_sql.php&amp;back=tbl_sql.php';
include './libraries/tbl_info.inc.php';
include_once './libraries/tbl_links.inc.php';
} elseif (strlen($db)) {
include './libraries/db_common.inc.php';
include './libraries/db_info.inc.php';
} else {
include_once './libraries/server_common.inc.php';
include_once './libraries/server_links.inc.php';
}
// Builds the query

View File

@ -23,8 +23,7 @@ if ($GLOBALS['is_ajax_request'] != true) {
* Displays the header and tabs
*/
if (! empty($table) && in_array($table, PMA_DBI_get_tables($db))) {
include_once './libraries/tbl_common.php';
include_once './libraries/tbl_links.inc.php';
include_once './libraries/tbl_common.inc.php';
} else {
$table = '';
include_once './libraries/db_common.inc.php';

View File

@ -53,4 +53,6 @@ if ($is_superuser && ! PMA_DRIZZLE) {
$binary_logs = PMA_DRIZZLE
? null
: PMA_DBI_fetch_result('SHOW MASTER LOGS', 'Log_name', null, null, PMA_DBI_QUERY_STORE);
PMA_checkParameters(array('is_superuser', 'url_query'), false);
?>

View File

@ -1,126 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
*
* @package PhpMyAdmin
*/
if (! defined('PHPMYADMIN')) {
exit;
}
/**
* Check parameters
*/
require_once './libraries/common.inc.php';
require_once './libraries/server_common.inc.php';
PMA_checkParameters(array('is_superuser', 'url_query'), false);
// Don't print all these links if in an Ajax request
if (!$GLOBALS['is_ajax_request']) {
/**
* Counts amount of navigation tabs
*/
$server_links_count_tabs = 0;
/**
* Put something in $sub_part
*/
if (! isset($sub_part)) {
$sub_part = '';
}
/**
* Displays tab links
* Put the links we assume are used less, towards the end
*/
$tabs = array();
$tabs['databases']['icon'] = 's_db.png';
$tabs['databases']['link'] = 'server_databases.php';
$tabs['databases']['text'] = __('Databases');
$tabs['sql']['icon'] = 'b_sql.png';
$tabs['sql']['link'] = 'server_sql.php';
$tabs['sql']['text'] = __('SQL');
$tabs['status']['icon'] = 's_status.png';
$tabs['status']['link'] = 'server_status.php';
$tabs['status']['text'] = __('Status');
/*$tabs['process']['icon'] = 's_process.png';
$tabs['process']['link'] = 'server_processlist.php';
$tabs['process']['text'] = __('Processes');*/
if ($is_superuser && !PMA_DRIZZLE) {
$tabs['rights']['icon'] = 's_rights.png';
$tabs['rights']['link'] = 'server_privileges.php';
$tabs['rights']['text'] = __('Users');
}
$tabs['export']['icon'] = 'b_export.png';
$tabs['export']['link'] = 'server_export.php';
$tabs['export']['text'] = __('Export');
$tabs['import']['icon'] = 'b_import.png';
$tabs['import']['link'] = 'server_import.php';
$tabs['import']['text'] = __('Import');
$tabs['settings']['icon'] = 'b_tblops.png';
$tabs['settings']['link'] = 'prefs_manage.php';
$tabs['settings']['text'] = __('Settings');
$tabs['settings']['active'] = in_array(
basename($GLOBALS['PMA_PHP_SELF']),
array('prefs_forms.php', 'prefs_manage.php')
);
$tabs['synchronize']['icon'] = 's_sync.png';
$tabs['synchronize']['link'] = 'server_synchronize.php';
$tabs['synchronize']['text'] = __('Synchronize');
if (! empty($binary_logs)) {
$tabs['binlog']['icon'] = 's_tbl.png';
$tabs['binlog']['link'] = 'server_binlog.php';
$tabs['binlog']['text'] = __('Binary log');
}
if ($is_superuser && !PMA_DRIZZLE) {
$tabs['replication']['icon'] = 's_replication.png';
$tabs['replication']['link'] = 'server_replication.php';
$tabs['replication']['text'] = __('Replication');
}
$tabs['vars']['icon'] = 's_vars.png';
$tabs['vars']['link'] = 'server_variables.php';
$tabs['vars']['text'] = __('Variables');
$tabs['charset']['icon'] = 's_asci.png';
$tabs['charset']['link'] = 'server_collations.php';
$tabs['charset']['text'] = __('Charsets');
if (PMA_DRIZZLE) {
$tabs['plugins']['icon'] = 'b_engine.png';
$tabs['plugins']['link'] = 'server_plugins.php';
$tabs['plugins']['text'] = __('Plugins');
} else {
$tabs['engine']['icon'] = 'b_engine.png';
$tabs['engine']['link'] = 'server_engines.php';
$tabs['engine']['text'] = __('Engines');
}
echo PMA_generate_html_tabs($tabs, array());
unset($tabs);
/**
* Displays a message
*/
if (!empty($message)) {
PMA_showMessage($message);
unset($message);
}
}// end if ($GLOBALS['is_ajax_request'] == true)
?>

View File

@ -25,6 +25,10 @@ $db_is_information_schema = PMA_is_system_schema($db);
*/
$url_query = PMA_generate_common_url($db, $table);
/**
* Set parameters for links
*/
$url_params = array();
$url_params['db'] = $db;
$url_params['table'] = $table;
@ -40,4 +44,14 @@ $err_url = $cfg['DefaultTabTable'] . PMA_generate_common_url($url_params);
*/
require_once './libraries/db_table_exists.lib.php';
/**
* Displays headers
*/
require_once './libraries/header.inc.php';
if (PMA_Tracker::isActive() and PMA_Tracker::isTracked($GLOBALS["db"], $GLOBALS["table"])) {
$msg = PMA_Message::notice('<a href="tbl_tracking.php?'.$url_query.'">'.sprintf(__('Tracking of %s is activated.'), htmlspecialchars($GLOBALS["db"] . '.' . $GLOBALS["table"])).'</a>');
$msg->display();
}
?>

View File

@ -1,138 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
*
* @package PhpMyAdmin
*/
if (! defined('PHPMYADMIN')) {
exit;
}
/**
* Check parameters
*/
require_once './libraries/common.inc.php';
PMA_checkParameters(array('db', 'table'));
/**
* Prepares links
*/
require_once './libraries/bookmark.lib.php';
/**
* Set parameters for links
*/
$url_params = array();
$url_params['db'] = $db;
$url_params['table'] = $table;
/**
* Defines the urls to return to in case of error in a sql statement
*/
$err_url_0 = $cfg['DefaultTabDatabase'] . PMA_generate_common_url(array('db' => $db,));
$err_url = $cfg['DefaultTabTable'] . PMA_generate_common_url($url_params);
/**
* Displays headers
*/
require_once './libraries/header.inc.php';
/**
* Ensure that $db_is_information_schema is not null
*/
if (! isset($db_is_information_schema)) {
$db_is_information_schema = false;
}
/**
* Displays links
*/
$tabs = array();
$tabs['browse']['icon'] = 'b_browse.png';
$tabs['browse']['text'] = __('Browse');
$tabs['browse']['link'] = 'sql.php';
$tabs['browse']['args']['pos'] = 0;
$tabs['structure']['icon'] = 'b_props.png';
$tabs['structure']['link'] = 'tbl_structure.php';
$tabs['structure']['text'] = __('Structure');
$tabs['sql']['icon'] = 'b_sql.png';
$tabs['sql']['link'] = 'tbl_sql.php';
$tabs['sql']['text'] = __('SQL');
$tabs['search']['icon'] = 'b_search.png';
$tabs['search']['text'] = __('Search');
$tabs['search']['link'] = 'tbl_select.php';
if (!$db_is_information_schema) {
$tabs['insert']['icon'] = 'b_insrow.png';
$tabs['insert']['link'] = 'tbl_change.php';
$tabs['insert']['text'] = __('Insert');
}
$tabs['export']['icon'] = 'b_tblexport.png';
$tabs['export']['link'] = 'tbl_export.php';
$tabs['export']['args']['single_table'] = 'true';
$tabs['export']['text'] = __('Export');
/**
* Don't display "Import" and "Operations"
* for views and information_schema
*/
if (! $tbl_is_view && !$db_is_information_schema) {
$tabs['import']['icon'] = 'b_tblimport.png';
$tabs['import']['link'] = 'tbl_import.php';
$tabs['import']['text'] = __('Import');
$tabs['operation']['icon'] = 'b_tblops.png';
$tabs['operation']['link'] = 'tbl_operations.php';
$tabs['operation']['text'] = __('Operations');
}
if (PMA_Tracker::isActive()) {
$tabs['tracking']['icon'] = 'eye.png';
$tabs['tracking']['text'] = __('Tracking');
$tabs['tracking']['link'] = 'tbl_tracking.php';
}
if (!$db_is_information_schema && !PMA_DRIZZLE) {
if (PMA_currentUserHasPrivilege('TRIGGER', $db, $table) && ! PMA_Table::isView($db, $table)) {
$tabs['triggers']['link'] = 'tbl_triggers.php';
$tabs['triggers']['text'] = __('Triggers');
$tabs['triggers']['icon'] = 'b_triggers.png';
}
}
/**
* Views support a limited number of operations
*/
if ($tbl_is_view && !$db_is_information_schema) {
$tabs['operation']['icon'] = 'b_tblops.png';
$tabs['operation']['link'] = 'view_operations.php';
$tabs['operation']['text'] = __('Operations');
}
if ($table_info_num_rows == 0 && !$tbl_is_view) {
$tabs['browse']['warning'] = __('Table seems to be empty!');
$tabs['search']['warning'] = __('Table seems to be empty!');
}
echo PMA_generate_html_tabs($tabs, $url_params);
unset($tabs);
if (PMA_Tracker::isActive() and PMA_Tracker::isTracked($GLOBALS["db"], $GLOBALS["table"])) {
$msg = PMA_Message::notice('<a href="tbl_tracking.php?'.$url_query.'">'.sprintf(__('Tracking of %s is activated.'), htmlspecialchars($GLOBALS["db"] . '.' . $GLOBALS["table"])).'</a>');
$msg->display();
}
/**
* Displays a message
*/
if (!empty($message)) {
PMA_showMessage($message);
unset($message);
}
?>

View File

@ -8,10 +8,6 @@
if (!defined('PHPMYADMIN')) {
exit;
}
// show server tabs
require './libraries/server_links.inc.php';
// build user preferences menu
$form_param = filter_input(INPUT_GET, 'form');

View File

@ -41,7 +41,6 @@ $common_url_query = PMA_generate_common_url('', '');
if ($server > 0) {
include 'libraries/server_common.inc.php';
include 'libraries/StorageEngine.class.php';
include 'libraries/server_links.inc.php';
// Use the verbose name of the server instead of the hostname
// if a value is set

View File

@ -16,11 +16,6 @@ require_once 'libraries/common.inc.php';
*/
require_once 'libraries/server_common.inc.php';
/**
* Displays the links
*/
require_once 'libraries/server_links.inc.php';
$url_params = array();
/**

View File

@ -16,12 +16,6 @@ require_once 'libraries/common.inc.php';
require 'libraries/server_common.inc.php';
/**
* Displays the links
*/
require 'libraries/server_links.inc.php';
/**
* Displays the sub-page heading
*/

View File

@ -120,12 +120,6 @@ if ((isset($_REQUEST['drop_selected_dbs']) || isset($_REQUEST['query_type']))
}
}
/**
* Displays the links
*/
require 'libraries/server_links.inc.php';
/**
* Displays the sub-page heading
*/

View File

@ -17,12 +17,6 @@ require_once 'libraries/common.inc.php';
require 'libraries/server_common.inc.php';
require 'libraries/StorageEngine.class.php';
/**
* Displays the links
*/
require 'libraries/server_links.inc.php';
/**
* Did the user request information about a certain storage engine?
*/

View File

@ -9,14 +9,10 @@
* Does the common work
*/
require_once 'libraries/common.inc.php';
require 'libraries/server_common.inc.php';
$GLOBALS['js_include'][] = 'export.js';
/**
* Displays the links
*/
require 'libraries/server_links.inc.php';
$export_page_title = __('View dump (schema) of databases') . "\n";
$checkall_url = 'server_export.php?'
. PMA_generate_common_url()

View File

@ -17,12 +17,6 @@ $GLOBALS['js_include'][] = 'import.js';
*/
require 'libraries/server_common.inc.php';
/**
* Displays the links
*/
require 'libraries/server_links.inc.php';
$import_type = 'server';
require 'libraries/display_import.lib.php';
/**

View File

@ -22,12 +22,6 @@ $GLOBALS['js_include'][] = 'server_plugins.js';
*/
require 'libraries/server_common.inc.php';
/**
* Displays the links
*/
require 'libraries/server_links.inc.php';
/**
* Displays the sub-page heading
*/

View File

@ -173,7 +173,7 @@ if (isset($dbname)) {
* Checks if the user is allowed to do what he tries to...
*/
if (! $is_superuser) {
include 'libraries/server_links.inc.php';
include 'libraries/header.inc.php';
echo '<h2>' . "\n"
. PMA_getIcon('b_usrlist.png')
. __('Privileges') . "\n"
@ -1656,7 +1656,10 @@ if (isset($viewing_mode) && $viewing_mode == 'db') {
include 'libraries/db_info.inc.php';
echo "\n";
} else {
include 'libraries/server_links.inc.php';
if (! empty($GLOBALS['message'])) {
PMA_showMessage($GLOBALS['message']);
unset($GLOBALS['message']);
}
}

View File

@ -25,7 +25,7 @@ require_once 'libraries/server_synchronize.lib.php';
* Checks if the user is allowed to do what he tries to...
*/
if (! $is_superuser) {
include 'libraries/server_links.inc.php';
include 'libraries/header.inc.php';
echo '<h2>' . "\n"
. PMA_getIcon('s_replication.png')
. __('Replication') . "\n"
@ -181,10 +181,7 @@ if (isset($GLOBALS['sr_take_action'])) {
}
unset($refresh);
}
/**
* Displays the links
*/
require 'libraries/server_links.inc.php';
echo '<div id="replication">';
echo ' <h2>';

View File

@ -20,13 +20,6 @@ $GLOBALS['js_include'][] = 'sql.js';
require_once 'libraries/server_common.inc.php';
require_once 'libraries/sql_query_form.lib.php';
/**
* Displays the links
*/
require 'libraries/server_links.inc.php';
/**
* Query box, bookmark, insert data from textfile
*/

View File

@ -772,13 +772,6 @@ PMA_AddJSVar(
*/
require 'libraries/server_common.inc.php';
/**
* Displays the links
*/
require 'libraries/server_links.inc.php';
?>
<div id="serverstatus">
<h2><?php

View File

@ -27,11 +27,6 @@ require 'libraries/server_synchronize.lib.php';
*/
@set_time_limit($cfg['ExecTimeLimit']);
/**
* Displays the links
*/
require 'libraries/server_links.inc.php';
/**
* Enables warnings on the page
*/

View File

@ -96,12 +96,6 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
}
}
/**
* Displays the links
*/
require 'libraries/server_links.inc.php';
/**
* Displays the sub-page heading
*/

View File

@ -920,16 +920,14 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
if (! $GLOBALS['is_ajax_request'] || ! $GLOBALS['cfg']['AjaxEnable']) {
if (strlen($table)) {
include 'libraries/tbl_common.php';
include 'libraries/tbl_common.inc.php';
$url_query .= '&amp;goto=tbl_sql.php&amp;back=tbl_sql.php';
include 'libraries/tbl_info.inc.php';
include 'libraries/tbl_links.inc.php';
} elseif (strlen($db)) {
include 'libraries/db_common.inc.php';
include 'libraries/db_info.inc.php';
} else {
include 'libraries/server_common.inc.php';
include 'libraries/server_links.inc.php';
}
} else {
include_once 'libraries/header.inc.php';

View File

@ -220,15 +220,10 @@ if ($abort == false) {
/**
* Gets tables informations
*/
include_once 'libraries/tbl_common.php';
include_once 'libraries/tbl_common.inc.php';
include_once 'libraries/tbl_info.inc.php';
/**
* Displays top menu links
*/
$active_page = 'tbl_structure.php';
if ($GLOBALS['is_ajax_request'] != true) {
include_once 'libraries/tbl_links.inc.php';
}
/**
* Display the form
*/

View File

@ -26,7 +26,7 @@ PMA_checkParameters(array('db', 'table'));
/**
* Gets tables informations
*/
require_once 'libraries/tbl_common.php';
require_once 'libraries/tbl_common.inc.php';
require_once 'libraries/tbl_info.inc.php';
$active_page = 'tbl_structure.php';
@ -279,10 +279,6 @@ if (isset($_REQUEST['do_save_data'])) {
* $selected comes from multi_submits.inc.php
*/
if ($abort == false) {
if (!isset($_REQUEST['ajax_request']) || $_REQUEST['ajax_request'] != true) {
include_once 'libraries/tbl_links.inc.php';
}
if (! isset($selected)) {
PMA_checkParameters(array('field'));
$selected[] = $_REQUEST['field'];

View File

@ -136,12 +136,6 @@ if (! empty($disp_message)) {
PMA_showMessage($disp_message, $disp_query);
}
/**
* Displays top menu links
*/
require_once 'libraries/tbl_links.inc.php';
/**
* Get the analysis of SHOW CREATE TABLE for this table
* @todo should be handled by class Table

View File

@ -27,9 +27,8 @@ $GLOBALS['js_include'][] = 'canvg/canvg.js';
if (strlen($GLOBALS['table'])) {
$url_params['goto'] = $cfg['DefaultTabTable'];
$url_params['back'] = 'tbl_sql.php';
include 'libraries/tbl_common.php';
include 'libraries/tbl_common.inc.php';
include 'libraries/tbl_info.inc.php';
include 'libraries/tbl_links.inc.php';
} elseif (strlen($GLOBALS['db'])) {
$url_params['goto'] = $cfg['DefaultTabDatabase'];
$url_params['back'] = 'sql.php';
@ -39,7 +38,6 @@ if (strlen($GLOBALS['table'])) {
$url_params['goto'] = $cfg['DefaultTabServer'];
$url_params['back'] = 'sql.php';
include 'libraries/server_common.inc.php';
include 'libraries/server_links.inc.php';
}
/*

View File

@ -15,7 +15,7 @@ $GLOBALS['js_include'][] = 'export.js';
/**
* Gets tables informations and displays top links
*/
require_once 'libraries/tbl_common.php';
require_once 'libraries/tbl_common.inc.php';
$url_query .= '&amp;goto=tbl_export.php&amp;back=tbl_export.php';
require_once 'libraries/tbl_info.inc.php';
@ -76,14 +76,9 @@ if (! empty($sql_query)) {
// Just crop LIMIT clause
$sql_query = $analyzed_sql[0]['section_before_limit'] . $analyzed_sql[0]['section_after_limit'];
}
$message = PMA_Message::success();
PMA_showMessage(PMA_Message::success());
}
/**
* Displays top menu links
*/
require 'libraries/tbl_links.inc.php';
$export_type = 'table';
require_once 'libraries/display_export.lib.php';

View File

@ -15,14 +15,10 @@ $GLOBALS['js_include'][] = 'import.js';
/**
* Gets tables informations and displays top links
*/
require_once 'libraries/tbl_common.php';
require_once 'libraries/tbl_common.inc.php';
$url_query .= '&amp;goto=tbl_import.php&amp;back=tbl_import.php';
require_once 'libraries/tbl_info.inc.php';
/**
* Displays top menu links
*/
require_once 'libraries/tbl_links.inc.php';
$import_type = 'table';
require_once 'libraries/display_import.lib.php';

View File

@ -11,7 +11,7 @@
*/
require_once 'libraries/common.inc.php';
require_once 'libraries/Index.class.php';
require_once 'libraries/tbl_common.php';
require_once 'libraries/tbl_common.inc.php';
// Get fields and stores their name/type
$fields = array();
@ -131,9 +131,6 @@ if (isset($_REQUEST['do_save_data'])) {
// Displays headers (if needed)
$GLOBALS['js_include'][] = 'indexes.js';
require_once 'libraries/tbl_info.inc.php';
if ($GLOBALS['is_ajax_request'] != true) {
include_once 'libraries/tbl_links.inc.php';
}
if (isset($_REQUEST['index']) && is_array($_REQUEST['index'])) {
// coming already from form

View File

@ -15,7 +15,7 @@ $pma_table = new PMA_Table($GLOBALS['table'], $GLOBALS['db']);
/**
* Runs common work
*/
require 'libraries/tbl_common.php';
require 'libraries/tbl_common.inc.php';
$url_query .= '&amp;goto=tbl_operations.php&amp;back=tbl_operations.php';
$url_params['goto'] = $url_params['back'] = 'tbl_operations.php';
@ -223,12 +223,6 @@ if ($reread_info) {
}
unset($reread_info);
/**
* Displays top menu links in non ajax requests
*/
if (!isset($_REQUEST['ajax_request'])) {
include_once 'libraries/tbl_links.inc.php';
}
if (isset($result) && empty($message_to_show)) {
// set to success by default, because result set could be empty
// (for example, a table rename)

View File

@ -10,7 +10,7 @@
*/
require_once 'libraries/common.inc.php';
require 'libraries/tbl_common.php';
require 'libraries/tbl_common.inc.php';
/**
* Gets the variables sent or posted to this script, then displays headers

View File

@ -19,7 +19,7 @@
require_once 'libraries/common.inc.php';
$GLOBALS['js_include'][] = 'tbl_relation.js';
require_once 'libraries/tbl_common.php';
require_once 'libraries/tbl_common.inc.php';
$url_query .= '&amp;goto=tbl_sql.php';
/**
@ -44,16 +44,6 @@ foreach ($post_params as $one_post_param) {
*/
require_once 'libraries/tbl_info.inc.php';
// Note: in libraries/tbl_links.inc.php we get and display the table comment.
// For InnoDB, this comment contains the REFER information but any update
// has not been done yet (will be done in tbl_relation.php later).
$avoid_show_comment = true;
/**
* Displays top menu links
*/
require_once 'libraries/tbl_links.inc.php';
$options_array = array(
'CASCADE' => 'CASCADE',
'SET_NULL' => 'SET NULL',

View File

@ -57,7 +57,7 @@ foreach ($post_params as $one_post_param) {
*/
if (! isset($param) || $param[0] == '') {
// Gets some core libraries
include_once 'libraries/tbl_common.php';
include_once 'libraries/tbl_common.inc.php';
//$err_url = 'tbl_select.php' . $err_url;
$url_query .= '&amp;goto=tbl_select.php&amp;back=tbl_select.php';
@ -66,11 +66,6 @@ if (! isset($param) || $param[0] == '') {
*/
include_once 'libraries/tbl_info.inc.php';
/**
* Displays top menu links
*/
include_once 'libraries/tbl_links.inc.php';
if (! isset($goto)) {
$goto = $GLOBALS['cfg']['DefaultTabTable'];
}

View File

@ -17,7 +17,7 @@ $GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'makegrid.js';
$GLOBALS['js_include'][] = 'sql.js';
require 'libraries/tbl_common.php';
require 'libraries/tbl_common.inc.php';
$url_query .= '&amp;goto=tbl_sql.php&amp;back=tbl_sql.php';
require_once 'libraries/sql_query_form.lib.php';
@ -33,11 +33,6 @@ $back = 'tbl_sql.php';
*/
require_once 'libraries/tbl_info.inc.php';
/**
* Displays top menu links
*/
require_once 'libraries/tbl_links.inc.php';
/**
* Query box, bookmark, insert data from textfile
*/

View File

@ -70,7 +70,6 @@ if (! empty($submit_mult) && isset($_REQUEST['selected_fld'])) {
$action = 'tbl_structure.php';
include 'libraries/mult_submits.inc.php';
//require_once 'libraries/header.inc.php';
//require_once 'libraries/tbl_links.inc.php';
if (empty($message)) {
$message = PMA_Message::success();
@ -86,7 +85,7 @@ $cfgRelation = PMA_getRelationsParam();
/**
* Runs common work
*/
require_once 'libraries/tbl_common.php';
require_once 'libraries/tbl_common.inc.php';
$url_query .= '&amp;goto=tbl_structure.php&amp;back=tbl_structure.php';
$url_params['goto'] = 'tbl_structure.php';
$url_params['back'] = 'tbl_structure.php';
@ -101,10 +100,6 @@ $url_params['back'] = 'tbl_structure.php';
*/
require_once 'libraries/tbl_info.inc.php';
/**
* Displays top menu links
*/
require_once 'libraries/tbl_links.inc.php';
require_once 'libraries/Index.class.php';
// 2. Gets table keys and retains them
@ -727,14 +722,6 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
<?php
}
/**
* If there are more than 20 rows, displays browse/select/insert/empty/drop
* links again
*/
if (count($fields) > 20) {
include 'libraries/tbl_links.inc.php';
} // end if (count($fields) > 20)
/**
* Displays indexes
*/

View File

@ -9,7 +9,7 @@
require_once './libraries/common.inc.php';
define('TABLE_MAY_BE_ABSENT', true);
require './libraries/tbl_common.php';
require './libraries/tbl_common.inc.php';
$url_query .= '&amp;goto=tbl_tracking.php&amp;back=tbl_tracking.php';
$url_params['goto'] = 'tbl_tracking.php';;
$url_params['back'] = 'tbl_tracking.php';
@ -146,10 +146,6 @@ if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'sqldumpfil
* Gets tables informations
*/
/**
* Displays top menu links
*/
require_once './libraries/tbl_links.inc.php';
echo '<br />';
/**

View File

@ -138,7 +138,7 @@ $titles['Browse'] = PMA_getIcon('b_browse.png', __('Browse foreign values'));
*/
// Gets some core libraries
require_once './libraries/tbl_common.php';
require_once './libraries/tbl_common.inc.php';
$url_query .= '&amp;goto=tbl_select.php&amp;back=tbl_select.php';
/**
@ -146,11 +146,6 @@ $url_query .= '&amp;goto=tbl_select.php&amp;back=tbl_select.php';
*/
require_once './libraries/tbl_info.inc.php';
/**
* Displays top menu links
*/
require_once './libraries/tbl_links.inc.php';
if (! isset($goto)) {
$goto = $GLOBALS['cfg']['DefaultTabTable'];
}

View File

@ -93,14 +93,6 @@ if (PMA_isValid($_REQUEST['view'], 'array')) {
$view = array_merge($view, $_REQUEST['view']);
}
/**
* Displays top menu links
* We use db links because a VIEW is not necessarily on a single table
*/
$num_tables = 0;
if ($GLOBALS['is_ajax_request'] != true) {
include_once './libraries/db_links.inc.php';
}
$url_params['db'] = $GLOBALS['db'];
$url_params['reload'] = 1;

View File

@ -15,7 +15,7 @@ $pma_table = new PMA_Table($GLOBALS['table'], $GLOBALS['db']);
/**
* Runs common work
*/
require './libraries/tbl_common.php';
require './libraries/tbl_common.inc.php';
$url_query .= '&amp;goto=view_operations.php&amp;back=view_operations.php';
$url_params['goto'] = $url_params['back'] = 'view_operations.php';
@ -47,11 +47,6 @@ if (isset($_REQUEST['submitoptions'])) {
}
}
/**
* Displays top menu links
*/
require_once './libraries/tbl_links.inc.php';
if (isset($result)) {
// set to success by default, because result set could be empty
// (for example, a table rename)