nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

View detection for header.inc.php.

Browse Source
This commit is contained in:
Alexander M. Turek
2005-02-06 21:53:30 +00:00
parent f28ed14479
commit 4864c836d6
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$
$Source$
2005-02-06 Alexander M. Turek <me@derrabus.de>
* header.inc.php, tbl_properties_table_info.php: View detection for
header.inc.php.
2005-02-05 Marc Delisle <lem9@users.sourceforge.net>
* tbl_relation.php: removed comments handling (pmadb-style) from relation view

9
header.inc.php
View File

@@ -192,12 +192,17 @@ if (empty($GLOBALS['is_header_sent'])) {
. '</td>' . "\n\n";
if (!empty($GLOBALS['table'])) {
if (PMA_MYSQL_INT_VERSION >= 50000) {
require_once('./tbl_properties_table_info.php');
} else {
$tbl_is_view = FALSE;
}
echo ' '
. '<td class="serverinfo"><div></div></td>' . "\n" . ' '
. '<td class="serverinfo">' . $GLOBALS['strTable'] . ':&nbsp;'
. '<td class="serverinfo">' . ($GLOBALS['tbl_is_view'] ? $GLOBALS['strView'] : $GLOBALS['strTable']) . ':&nbsp;'
. '<a href="' . $GLOBALS['cfg']['DefaultTabTable'] . '?' . PMA_generate_common_url($GLOBALS['db'], $GLOBALS['table']) . '">';
if ($GLOBALS['cfg']['MainPageIconic']) {
echo '<img src="' . $GLOBALS['pmaThemeImage'] . 's_tbl.png" width="16" height="16" border="0" alt="' . htmlspecialchars($GLOBALS['table']) . '" />';
echo '<img src="' . $GLOBALS['pmaThemeImage'] . ($GLOBALS['tbl_is_view'] ? 'b_view' : 's_tbl') . '.png" width="16" height="16" border="0" alt="' . htmlspecialchars($GLOBALS['table']) . '" />';
}
echo htmlspecialchars($GLOBALS['table']) . '</a>' . "\n"
. '</td>' . "\n\n";

9
tbl_properties_table_info.php
View File

@@ -11,6 +11,13 @@ require_once('./libraries/common.lib.php');
PMA_checkParameters(array('db', 'table'));
/**
* Defining global variables, in case this script is included by a function.
* This is necessary because this script can be included by header.inc.php.
*/
global $showtable, $tbl_is_view, $tbl_type, $show_comment, $tbl_collation,
$table_info_num_rows, $auto_increment;
/**
* Gets table informations
*/
@@ -29,7 +36,7 @@ if (PMA_MYSQL_INT_VERSION >= 50000 && !isset($showtable['Type']) && isset($showt
$tbl_type = isset($showtable['Type']) ? strtoupper($showtable['Type']) : '';
$show_comment = (isset($showtable['Comment']) ? $showtable['Comment'] : '');
}
$tbl_collation = empty($showtable['Collation']) ? '' : $showtable['Collation'];
$tbl_collation = empty($showtable['Collation']) ? '' : $showtable['Collation'];
$table_info_num_rows = (isset($showtable['Rows']) ? $showtable['Rows'] : 0);
$auto_increment = (isset($showtable['Auto_increment']) ? $showtable['Auto_increment'] : '');