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

* improved the js object detection system;

Browse Source 
* fixed some bugs with the patch from Korakot.
This commit is contained in:
Loïc Chapeaux
2001-10-04 20:15:22 +00:00
parent 28299866ea
commit 282c7e6341
2 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@@ -5,29 +5,34 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2001-10-04 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* left.php3:
- improved the js object detection system;
- fixed some bugs with the patch from Korakot.
* Documentation.html, lines 469-475: added the $cfgShowTooltip entry.
2001-10-04 Korakot Chaovavanich <korakot@iname.com> 2001-10-04 Korakot Chaovavanich <korakot@iname.com>
* table comment(description) as tooltip (request #464084) * table comment(description) as tooltip (request #464084).
2001-10-03 Marc Delisle <lem9@users.sourceforge.net> 2001-10-03 Marc Delisle <lem9@users.sourceforge.net>
* release 2.2.1-rc1 * release 2.2.1-rc1
2001-10-03 Geert Lund <glund@silversoft.dk> 2001-10-03 Geert Lund <glund@silversoft.dk>
* libraries/common.lib.php3: fixed localised_date() function: * libraries/common.lib.php3: fixed localised_date() function:
- get correct month name (and not month+1) - get correct month name (and not month+1).
2001-10-02 Marc Delisle <lem9@users.sourceforge.net> 2001-10-02 Marc Delisle <lem9@users.sourceforge.net>
* lang/bulgarian-win1251.inc.php3 updates, * lang/bulgarian-win1251.inc.php3 updates, thanks to Peter Petrov.
thanks to Peter Petrov (boncev@yahoo.com) and Lo<4C>c
2001-10-01 Marc Delisle <lem9@users.sourceforge.net> 2001-10-01 Marc Delisle <lem9@users.sourceforge.net>
* lang/czech* updates, thanks to Michal Cihar * lang/czech* updates, thanks to Michal Cihar.
2001-10-01 Steve Alberty <alberty@neptunlabs.se> 2001-10-01 Steve Alberty <alberty@neptunlabs.se>
* db_details.php3: Fixed problems with cfgSkipLockedTables * db_details.php3: Fixed problems with cfgSkipLockedTables.
2001-10-01 Geert Lund <glund@silversoft.dk> 2001-10-01 Geert Lund <glund@silversoft.dk>
* db_stats.php3, line 261: fixed error where server and language setting * db_stats.php3, line 261: fixed error where server and language setting
wasen't in link, thanx to Joshua Nye <josh at boxcarmedia.com> wasen't in link, thanx to Joshua Nye <josh at boxcarmedia.com>.
2001-09-30 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2001-09-30 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* libraries/common.lib.php3, lines 489-493: fixed "backslashed backslash" * libraries/common.lib.php3, lines 489-493: fixed "backslashed backslash"

64
left.php3
View File

@@ -2,7 +2,7 @@
/* $Id$ */ /* $Id$ */
/** /**
* Gets the variables sent to this script, retains the db name that may have * Gets the variables sent to this script, retains the db name that may have
* been defined as startup option and include a core library * been defined as startup option and include a core library
*/ */
@@ -61,14 +61,22 @@ if ($num_dbs > 1) {
<!-- Collapsible tables list scripts --> <!-- Collapsible tables list scripts -->
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
<!-- <!--
var isDOM = (typeof(document.getElementsByTagName) != 'undefined') ? 1 : 0; var isDOM = (typeof(document.getElementsByTagName) != 'undefined'
var isIE4 = ((typeof(document.all) != 'undefined') && (parseInt(navigator.appVersion) >= 4)) ? 1 : 0; && typeof(document.createElement) != 'undefined'
var isNS4 = (typeof(document.layers) != 'undefined') ? 1 : 0; && typeof(document.appendChild) != 'undefined')
var capable = (isDOM || isIE4 || isNS4) ? 1 : 0; ? 1 : 0;
// Uggly fix for Konqueror and Opera that are not fully DOM compliant var isIE4 = (typeof(document.all) != 'undefined'
&& parseInt(navigator.appVersion) >= 4
&& !typeof(window.opera))
? 1 : 0;
var isNS4 = (typeof(document.layers) != 'undefined')
? 1 : 0;
var capable = (isDOM || isIE4 || isNS4)
? 1 : 0;
// Uggly fix for Konqueror 2.2 that is half DOM compliant
if (capable && typeof(navigator.userAgent) != 'undefined') { if (capable && typeof(navigator.userAgent) != 'undefined') {
var browserName = ' ' + navigator.userAgent.toLowerCase(); var browserName = ' ' + navigator.userAgent.toLowerCase();
if (browserName.indexOf('opera') > 0 || browserName.indexOf('konqueror') > 0) { if (browserName.indexOf('konqueror') > 0) {
capable = 0; capable = 0;
} }
} }
@@ -85,6 +93,7 @@ if ($num_dbs > 1) {
<!-- <!--
div {color: #000000} div {color: #000000}
.heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000} .heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
.headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none} .parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none}
.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none} .child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
.item, .item:active, .item:hover, .tblItem, .tblItem:active {color: #333399; text-decoration: none} .item, .item:active, .item:hover, .tblItem, .tblItem:active {color: #333399; text-decoration: none}
@@ -109,10 +118,10 @@ else if ($num_dbs == 1) {
body {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>} body {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>}
div {color: #000000} div {color: #000000}
.heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000} .heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
.heada_cnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000} .headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none} .parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none}
.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none} .child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
.item, .item:active, .item:hover, .tblItem, .tblItem:active {color: #333399; text-decoration: none} .item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
.tblItem:hover {color: #FF0000; text-decoration: underline} .tblItem:hover {color: #FF0000; text-decoration: underline}
//--> //-->
</style> </style>
@@ -127,7 +136,8 @@ else {
body {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>} body {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>}
div {color: #000000} div {color: #000000}
.heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000} .heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
.heada_cnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000} .parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none}
.item, .item:active, .item:hover {color: #333399; text-decoration: none}
//--> //-->
</style> </style>
<?php <?php
@@ -177,13 +187,15 @@ if ($num_dbs > 1) {
} }
// Get additional infomation about tables for tooltip // Get additional infomation about tables for tooltip
if ($cfgShowTooltip && MYSQL_INT_VERSION >= 32303) { if ($cfgShowTooltip && MYSQL_INT_VERSION >= 32303
&& $num_tables) {
$tooltip = array(); $tooltip = array();
$result = mysql_query("SHOW TABLE STATUS FROM $db"); $result = mysql_query('SHOW TABLE STATUS FROM ' . backquote($db));
while ($tmp = mysql_fetch_array($result)) { while ($tmp = mysql_fetch_array($result)) {
$tooltip[$tmp['Name']] = $tmp['Comment'] . ' (' . $tmp['Rows'] . ' rows)'; // loic1: use md5 to ensure the key use valid characters only
} $tooltip[md5($tmp['Name'])] = rtrim($tmp['Comment'] . ' (' . $tmp['Rows'] . ' ' . $strRows . ')');
} } // end while
} // end if
// Displays the database name // Displays the database name
echo "\n"; echo "\n";
@@ -204,7 +216,7 @@ if ($num_dbs > 1) {
echo "\n"; echo "\n";
?> ?>
<a class="item" href="db_details.php3?<?php echo $common_url_query; ?>" onclick="if (capable) {expandBase('el<?php echo $j; ?>', false)}"> <a class="item" href="db_details.php3?<?php echo $common_url_query; ?>" onclick="if (capable) {expandBase('el<?php echo $j; ?>', false)}">
<span class="heada"><?php echo $db; ?>&nbsp;&nbsp;</span><span class="heada_cnt">(<?php echo $num_tables_disp; ?>)</span></a></nobr> <span class="heada"><?php echo $db; ?>&nbsp;&nbsp;</span><span class="headaCnt">(<?php echo $num_tables_disp; ?>)</span></a></nobr>
</div> </div>
<div id="el<?php echo $j;?>Child" class="child" style="margin-bottom: 5px"> <div id="el<?php echo $j;?>Child" class="child" style="margin-bottom: 5px">
@@ -218,7 +230,7 @@ if ($num_dbs > 1) {
<nobr><img src="images/spacer.gif" border="0" width="9" height="9" alt="" /> <nobr><img src="images/spacer.gif" border="0" width="9" height="9" alt="" />
<a target="phpmain" href="sql.php3?<?php echo $common_url_query; ?>&table=<?php echo urlencode($table); ?>&sql_query=<?php echo urlencode('SELECT * FROM ' . backquote($table)); ?>&pos=0&goto=tbl_properties.php3"> <a target="phpmain" href="sql.php3?<?php echo $common_url_query; ?>&table=<?php echo urlencode($table); ?>&sql_query=<?php echo urlencode('SELECT * FROM ' . backquote($table)); ?>&pos=0&goto=tbl_properties.php3">
<img src="images/browse.gif" border="0" alt="<?php echo "$strBrowse: $table"; ?>" /></a>&nbsp; <img src="images/browse.gif" border="0" alt="<?php echo "$strBrowse: $table"; ?>" /></a>&nbsp;
<a class="tblItem" title="<?php echo addslashes($tooltip[$table]);?>" target="phpmain" href="tbl_properties.php3?<?php echo $common_url_query; ?>&table=<?php echo urlencode($table); ?>"> <a class="tblItem" title="<?php echo str_replace('"', '&quot;', $tooltip[md5($table)]); ?>" target="phpmain" href="tbl_properties.php3?<?php echo $common_url_query; ?>&table=<?php echo urlencode($table); ?>">
<?php echo $table; ?></a></nobr><br /> <?php echo $table; ?></a></nobr><br />
<?php <?php
} // end for $j (tables list) } // end for $j (tables list)
@@ -261,20 +273,22 @@ else if ($num_dbs == 1) {
} }
// Get additional infomation about tables for tooltip // Get additional infomation about tables for tooltip
if ($cfgShowTooltip && MYSQL_INT_VERSION >= 32303) { if ($cfgShowTooltip && MYSQL_INT_VERSION >= 32303
&& $num_tables) {
$tooltip = array(); $tooltip = array();
$result = mysql_query("SHOW TABLE STATUS FROM $db"); $result = mysql_query('SHOW TABLE STATUS FROM ' . backquote($db));
while ($tmp = mysql_fetch_array($result)) { while ($tmp = mysql_fetch_array($result)) {
$tooltip[$tmp['Name']] = $tmp['Comment'] . ' (' . $tmp['Rows'] . ' rows)'; // loic1: use md5 to ensure the key use valid characters only
} $tooltip[md5($tmp['Name'])] = rtrim($tmp['Comment'] . ' (' . $tmp['Rows'] . ' ' . $strRows . ')');
} } // end while
} // end if
// Displays the database name // Displays the database name
echo "\n"; echo "\n";
?> ?>
<div id="el2Parent" class="parent"> <div id="el2Parent" class="parent">
<nobr><a class="item" href="db_details.php3?<?php echo $common_url_query; ?>"> <nobr><a class="item" href="db_details.php3?<?php echo $common_url_query; ?>">
<span class="heada"><?php echo $db; ?>&nbsp;&nbsp;</span><span class="heada_cnt">(<?php echo $num_tables_disp; ?>)</span></a></nobr> <span class="heada"><?php echo $db; ?>&nbsp;&nbsp;</span><span class="headaCnt">(<?php echo $num_tables_disp; ?>)</span></a></nobr>
</div> </div>
<div id="el2Child" class="child" style="margin-bottom: 5px"> <div id="el2Child" class="child" style="margin-bottom: 5px">
<?php <?php
@@ -285,7 +299,7 @@ else if ($num_dbs == 1) {
?> ?>
<nobr><a target="phpmain" href="sql.php3?<?php echo $common_url_query; ?>&table=<?php echo urlencode($table); ?>&sql_query=<?php echo urlencode('SELECT * FROM ' . backquote($table)); ?>&pos=0&goto=tbl_properties.php3"> <nobr><a target="phpmain" href="sql.php3?<?php echo $common_url_query; ?>&table=<?php echo urlencode($table); ?>&sql_query=<?php echo urlencode('SELECT * FROM ' . backquote($table)); ?>&pos=0&goto=tbl_properties.php3">
<img src="images/browse.gif" border="0" alt="<?php echo "$strBrowse: $table"; ?>" /></a>&nbsp; <img src="images/browse.gif" border="0" alt="<?php echo "$strBrowse: $table"; ?>" /></a>&nbsp;
<a class="tblItem" title="<?php echo addslashes($tooltip[$table]);?>" target="phpmain" href="tbl_properties.php3?<?php echo $common_url_query; ?>&table=<?php echo urlencode($table); ?>"> <a class="tblItem" title="<?php echo str_replace('"', '&quot;', $tooltip[md5($table)]); ?>" target="phpmain" href="tbl_properties.php3?<?php echo $common_url_query; ?>&table=<?php echo urlencode($table); ?>">
<?php echo $table; ?></a></nobr><br /> <?php echo $table; ?></a></nobr><br />
<?php <?php
} // end for $j (tables list) } // end for $j (tables list)