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

Better fix against bug #547384 (Marker Color can't equal Pointer Color)

Browse Source
This commit is contained in:
Loïc Chapeaux
2002-04-27 09:47:11 +00:00
parent 30aa3d4052
commit 6f00c13b2a
3 changed files with 81 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -7,6 +7,8 @@ $Source$
2002-04-27 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2002-04-27 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* Documentation.html: xhtml fixes. * Documentation.html: xhtml fixes.
* libraries/display_tbl.lib.php3; libraries/functions.js: better fix
against bug #547384 (Marker Color can't equal Pointer Color).
2002-04-26 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2002-04-26 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* ## created 2.2.7 branch into the CVS tree ## * ## created 2.2.7 branch into the CVS tree ##
@@ -20,7 +22,7 @@ $Source$
2002-04-26 Marc Delisle <lem9@users.sourceforge.net> 2002-04-26 Marc Delisle <lem9@users.sourceforge.net>
* tbl_qbe.php3: automatic joints from Relation table, thanks * tbl_qbe.php3: automatic joints from Relation table, thanks
to Mike Beck (mike.beck at ibmiller.de) to Mike Beck (mike.beck at ibmiller.de)
(experimental: some things remain to be tested) (experimental: some things remain to be tested)
* Documentation.html: example for automatic joints * Documentation.html: example for automatic joints
* tbl_qbe.php3, tbl_printview.php3, libraries/display_tbl.lib.php3, * tbl_qbe.php3, tbl_printview.php3, libraries/display_tbl.lib.php3,
Documentation.html: rename fields in the relation table Documentation.html: rename fields in the relation table

116
libraries/display_tbl.lib.php3
View File

@@ -722,7 +722,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
<?php <?php
echo "\n"; echo "\n";
$foo = 0; $row_no = 0;
$vertical_display['edit'] = array(); $vertical_display['edit'] = array();
$vertical_display['delete'] = array(); $vertical_display['delete'] = array();
$vertical_display['data'] = array(); $vertical_display['data'] = array();
@@ -742,10 +742,10 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
// loic1: use 'mysql_fetch_array' rather than 'mysql_fetch_row' to get // loic1: use 'mysql_fetch_array' rather than 'mysql_fetch_row' to get
// the NULL values // the NULL values
for ($row_no = 0; $row = mysql_fetch_array($dt_result); $row_no++) { while ($row = mysql_fetch_array($dt_result)) {
// lem9: "vertical display" mode stuff // lem9: "vertical display" mode stuff
if (($foo != 0) && ($repeat_cells != 0) && !($foo % $repeat_cells) && $disp_direction == 'horizontal') { if (($row_no != 0) && ($repeat_cells != 0) && !($row_no % $repeat_cells) && $disp_direction == 'horizontal') {
echo '<tr>' . "\n"; echo '<tr>' . "\n";
for ($foo_i = 0; $foo_i < $vertical_display['emptypre']; $foo_i++) { for ($foo_i = 0; $foo_i < $vertical_display['emptypre']; $foo_i++) {
@@ -764,29 +764,17 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
echo '</tr>' . "\n"; echo '</tr>' . "\n";
} // end if } // end if
$bgcolor = ($foo % 2) ? $GLOBALS['cfg']['BgcolorOne'] : $GLOBALS['cfg']['BgcolorTwo']; $bgcolor = ($row_no % 2) ? $GLOBALS['cfg']['BgcolorOne'] : $GLOBALS['cfg']['BgcolorTwo'];
if ($disp_direction == 'horizontal') { if ($disp_direction == 'horizontal') {
// loic1: pointer code part // loic1: pointer code part
$on_mouse = ''; $on_mouse = '';
if ($GLOBALS['cfg']['BrowsePointerColor'] != '') { if ($GLOBALS['cfg']['BrowsePointerColor'] != '') {
$on_mouse = ' onmouseover="'; $on_mouse = ' onmouseover="setPointer(this, ' . $row_no . ', \'over\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\')"'
if ($GLOBALS['cfg']['BrowsePointerColor'] == $GLOBALS['cfg']['BrowsePointerColor']) { . ' onmouseout="setPointer(this, ' . $row_no . ', \'out\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\')"';
$on_mouse .= 'if (typeof(row' . $row_no . '_marked) == \'undefined\') { row' . $row_no . '_marked = false; }; ';
}
$on_mouse .= 'setPointer(this, \'over\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"'
. ' onmouseout="';
if ($GLOBALS['cfg']['BrowsePointerColor'] == $GLOBALS['cfg']['BrowsePointerColor']) {
$on_mouse .= 'if (!row' . $row_no . '_marked) ';
}
$on_mouse .= 'setPointer(this, \'out\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"';
} }
if ($GLOBALS['cfg']['BrowseMarkerColor'] != '') { if ($GLOBALS['cfg']['BrowseMarkerColor'] != '') {
$on_mouse .= ' onmousedown="setPointer(this, \'click\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');'; $on_mouse .= ' onmousedown="setPointer(this, ' . $row_no . ', \'click\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\')"';
if ($GLOBALS['cfg']['BrowsePointerColor'] == $GLOBALS['cfg']['BrowsePointerColor']) {
$on_mouse .= 'if (row' . $row_no . '_marked) { row' . $row_no . '_marked = false; } else { row' . $row_no . '_marked = true; }';
}
$on_mouse .= '"';
} }
?> ?>
<tr<?php echo $on_mouse; ?>> <tr<?php echo $on_mouse; ?>>
@@ -931,22 +919,22 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
if ($meta->numeric == 1) { if ($meta->numeric == 1) {
if (!isset($row[$meta->name]) if (!isset($row[$meta->name])
|| (function_exists('is_null') && is_null($row[$pointer]))) { || (function_exists('is_null') && is_null($row[$pointer]))) {
$vertical_display['data'][$foo][$i] = ' <td align="right" valign="top" bgcolor="' . $bgcolor . '"><i>NULL</i></td>' . "\n"; $vertical_display['data'][$row_no][$i] = ' <td align="right" valign="top" bgcolor="' . $bgcolor . '"><i>NULL</i></td>' . "\n";
} else if ($row[$pointer] != '') { } else if ($row[$pointer] != '') {
$vertical_display['data'][$foo][$i] = ' <td align="right" valign="top" bgcolor="' . $bgcolor . '">'; $vertical_display['data'][$row_no][$i] = ' <td align="right" valign="top" bgcolor="' . $bgcolor . '">';
if (isset($map[$meta->name])) { if (isset($map[$meta->name])) {
$vertical_display['data'][$foo][$i] .= '<a href="sql.php3?' $vertical_display['data'][$row_no][$i] .= '<a href="sql.php3?'
. 'lang=' . $lang . '&amp;server=' . $server . 'lang=' . $lang . '&amp;server=' . $server
. '&amp;db=' . urlencode($db) . '&amp;table=' . urlencode($map[$meta->name][0]) . '&amp;db=' . urlencode($db) . '&amp;table=' . urlencode($map[$meta->name][0])
. '&amp;pos=0&amp;session_max_rows=' . $session_max_rows . '&amp;dontlimitchars=' . $dontlimitchars . '&amp;pos=0&amp;session_max_rows=' . $session_max_rows . '&amp;dontlimitchars=' . $dontlimitchars
. '&amp;sql_query=' . urlencode('SELECT * FROM ' . PMA_backquote($map[$meta->name][0]) . ' WHERE ' . $map[$meta->name][1] . ' = ' . $row[$pointer]) . '">' . '&amp;sql_query=' . urlencode('SELECT * FROM ' . PMA_backquote($map[$meta->name][0]) . ' WHERE ' . $map[$meta->name][1] . ' = ' . $row[$pointer]) . '">'
. $row[$pointer] . '</a>'; . $row[$pointer] . '</a>';
} else { } else {
$vertical_display['data'][$foo][$i] .= $row[$pointer]; $vertical_display['data'][$row_no][$i] .= $row[$pointer];
} }
$vertical_display['data'][$foo][$i] .= '</td>' . "\n"; $vertical_display['data'][$row_no][$i] .= '</td>' . "\n";
} else { } else {
$vertical_display['data'][$foo][$i] = ' <td align="right" valign="top" bgcolor="' . $bgcolor . '">&nbsp;</td>' . "\n"; $vertical_display['data'][$row_no][$i] = ' <td align="right" valign="top" bgcolor="' . $bgcolor . '">&nbsp;</td>' . "\n";
} }
} else if ($GLOBALS['cfg']['ShowBlob'] == FALSE && eregi('BLOB', $meta->type)) { } else if ($GLOBALS['cfg']['ShowBlob'] == FALSE && eregi('BLOB', $meta->type)) {
// loic1 : mysql_fetch_fields returns BLOB in place of TEXT // loic1 : mysql_fetch_fields returns BLOB in place of TEXT
@@ -955,11 +943,11 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
// fields. // fields.
$field_flags = mysql_field_flags($dt_result, $i); $field_flags = mysql_field_flags($dt_result, $i);
if (eregi('BINARY', $field_flags)) { if (eregi('BINARY', $field_flags)) {
$vertical_display['data'][$foo][$i] = ' <td align="center" valign="top" bgcolor="' . $bgcolor . '">[BLOB]</td>' . "\n"; $vertical_display['data'][$row_no][$i] = ' <td align="center" valign="top" bgcolor="' . $bgcolor . '">[BLOB]</td>' . "\n";
} else { } else {
if (!isset($row[$meta->name]) if (!isset($row[$meta->name])
|| (function_exists('is_null') && is_null($row[$pointer]))) { || (function_exists('is_null') && is_null($row[$pointer]))) {
$vertical_display['data'][$foo][$i] = ' <td valign="top" bgcolor="' . $bgcolor . '"><i>NULL</i></td>' . "\n"; $vertical_display['data'][$row_no][$i] = ' <td valign="top" bgcolor="' . $bgcolor . '"><i>NULL</i></td>' . "\n";
} else if ($row[$pointer] != '') { } else if ($row[$pointer] != '') {
if (strlen($row[$pointer]) > $GLOBALS['cfg']['LimitChars'] && ($dontlimitchars != 1)) { if (strlen($row[$pointer]) > $GLOBALS['cfg']['LimitChars'] && ($dontlimitchars != 1)) {
$row[$pointer] = substr($row[$pointer], 0, $GLOBALS['cfg']['LimitChars']) . '...'; $row[$pointer] = substr($row[$pointer], 0, $GLOBALS['cfg']['LimitChars']) . '...';
@@ -969,15 +957,15 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
$row[$pointer] = htmlspecialchars($row[$pointer]); $row[$pointer] = htmlspecialchars($row[$pointer]);
$row[$pointer] = str_replace("\011", ' &nbsp;&nbsp;&nbsp;', str_replace(' ', ' &nbsp;', $row[$pointer])); $row[$pointer] = str_replace("\011", ' &nbsp;&nbsp;&nbsp;', str_replace(' ', ' &nbsp;', $row[$pointer]));
$row[$pointer] = ereg_replace("((\015\012)|(\015)|(\012))", '<br />', $row[$pointer]); $row[$pointer] = ereg_replace("((\015\012)|(\015)|(\012))", '<br />', $row[$pointer]);
$vertical_display['data'][$foo][$i] = ' <td valign="top" bgcolor="' . $bgcolor . '">' . $row[$pointer] . '</td>' . "\n"; $vertical_display['data'][$row_no][$i] = ' <td valign="top" bgcolor="' . $bgcolor . '">' . $row[$pointer] . '</td>' . "\n";
} else { } else {
$vertical_display['data'][$foo][$i] = ' <td valign="top" bgcolor="' . $bgcolor . '">&nbsp;</td>' . "\n"; $vertical_display['data'][$row_no][$i] = ' <td valign="top" bgcolor="' . $bgcolor . '">&nbsp;</td>' . "\n";
} }
} }
} else { } else {
if (!isset($row[$meta->name]) if (!isset($row[$meta->name])
|| (function_exists('is_null') && is_null($row[$pointer]))) { || (function_exists('is_null') && is_null($row[$pointer]))) {
$vertical_display['data'][$foo][$i] = ' <td valign="top" bgcolor="' . $bgcolor . '"><i>NULL</i></td>' . "\n"; $vertical_display['data'][$row_no][$i] = ' <td valign="top" bgcolor="' . $bgcolor . '"><i>NULL</i></td>' . "\n";
} else if ($row[$pointer] != '') { } else if ($row[$pointer] != '') {
// loic1: support blanks in the key // loic1: support blanks in the key
$relation_id = $row[$pointer]; $relation_id = $row[$pointer];
@@ -1004,32 +992,32 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
$row[$pointer] = str_replace("\011", ' &nbsp;&nbsp;&nbsp;', str_replace(' ', ' &nbsp;', $row[$pointer])); $row[$pointer] = str_replace("\011", ' &nbsp;&nbsp;&nbsp;', str_replace(' ', ' &nbsp;', $row[$pointer]));
$row[$pointer] = ereg_replace("((\015\012)|(\015)|(\012))", '<br />', $row[$pointer]); $row[$pointer] = ereg_replace("((\015\012)|(\015)|(\012))", '<br />', $row[$pointer]);
} }
$vertical_display['data'][$foo][$i] = ' <td valign="top" bgcolor="' . $bgcolor . '">'; $vertical_display['data'][$row_no][$i] = ' <td valign="top" bgcolor="' . $bgcolor . '">';
if (isset($map[$meta->name])) { if (isset($map[$meta->name])) {
$vertical_display['data'][$foo][$i] .= '<a href="sql.php3?' $vertical_display['data'][$row_no][$i] .= '<a href="sql.php3?'
. 'lang=' . $lang . '&amp;server=' . $server . 'lang=' . $lang . '&amp;server=' . $server
. '&amp;db=' . urlencode($db) . '&amp;table=' . urlencode($map[$meta->name][0]) . '&amp;db=' . urlencode($db) . '&amp;table=' . urlencode($map[$meta->name][0])
. '&amp;pos=0&amp;session_max_rows=' . $session_max_rows . '&amp;dontlimitchars=' . $dontlimitchars . '&amp;pos=0&amp;session_max_rows=' . $session_max_rows . '&amp;dontlimitchars=' . $dontlimitchars
. '&amp;sql_query=' . urlencode('SELECT * FROM ' . PMA_backquote($map[$meta->name][0]) . ' WHERE ' . $map[$meta->name][1] . ' = \'' . PMA_sqlAddslashes($relation_id) . '\'') . '">' . '&amp;sql_query=' . urlencode('SELECT * FROM ' . PMA_backquote($map[$meta->name][0]) . ' WHERE ' . $map[$meta->name][1] . ' = \'' . PMA_sqlAddslashes($relation_id) . '\'') . '">'
. $row[$pointer] . '</a>'; . $row[$pointer] . '</a>';
} else { } else {
$vertical_display['data'][$foo][$i] .= $row[$pointer]; $vertical_display['data'][$row_no][$i] .= $row[$pointer];
} }
$vertical_display['data'][$foo][$i] .= ' </td>' . "\n"; $vertical_display['data'][$row_no][$i] .= ' </td>' . "\n";
} else { } else {
$vertical_display['data'][$foo][$i] = ' <td valign="top" bgcolor="' . $bgcolor . '">&nbsp;</td>' . "\n"; $vertical_display['data'][$row_no][$i] = ' <td valign="top" bgcolor="' . $bgcolor . '">&nbsp;</td>' . "\n";
} }
} }
// lem9: output stored cell // lem9: output stored cell
if ($disp_direction == 'horizontal') { if ($disp_direction == 'horizontal') {
echo $vertical_display['data'][$foo][$i]; echo $vertical_display['data'][$row_no][$i];
} }
if (isset($vertical_display['rowdata'][$i][$foo])) { if (isset($vertical_display['rowdata'][$i][$row_no])) {
$vertical_display['rowdata'][$i][$foo] .= $vertical_display['data'][$foo][$i]; $vertical_display['rowdata'][$i][$row_no] .= $vertical_display['data'][$row_no][$i];
} else { } else {
$vertical_display['rowdata'][$i][$foo] = $vertical_display['data'][$foo][$i]; $vertical_display['rowdata'][$i][$row_no] = $vertical_display['data'][$row_no][$i];
} }
} // end for (2) } // end for (2)
@@ -1065,33 +1053,33 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
// 4. Gather links of del_urls and edit_urls in an array for later // 4. Gather links of del_urls and edit_urls in an array for later
// output // output
if (!isset($vertical_display['edit'][$foo])) { if (!isset($vertical_display['edit'][$row_no])) {
$vertical_display['edit'][$foo] = ''; $vertical_display['edit'][$row_no] = '';
$vertical_display['delete'][$foo] = ''; $vertical_display['delete'][$row_no] = '';
} }
if (isset($edit_url)) { if (isset($edit_url)) {
$vertical_display['edit'][$foo] .= ' <td bgcolor="' . $bgcolor . '">' . "\n" $vertical_display['edit'][$row_no] .= ' <td bgcolor="' . $bgcolor . '">' . "\n"
. ' <a href="' . $edit_url . '">' . "\n" . ' <a href="' . $edit_url . '">' . "\n"
. ' ' . $edit_str . '</a>' . "\n" . ' ' . $edit_str . '</a>' . "\n"
. ' </td>' . "\n"; . ' </td>' . "\n";
} }
if (isset($del_url)) { if (isset($del_url)) {
$vertical_display['delete'][$foo] .= ' <td bgcolor="' . $bgcolor . '">' . "\n" $vertical_display['delete'][$row_no] .= ' <td bgcolor="' . $bgcolor . '">' . "\n"
. ' <a href="' . $del_url . '"'; . ' <a href="' . $del_url . '"';
} }
if (isset($js_conf)) { if (isset($js_conf)) {
$vertical_display['delete'][$foo] .= 'onclick="return confirmLink(this, \'' . $js_conf . '\')"'; $vertical_display['delete'][$row_no] .= 'onclick="return confirmLink(this, \'' . $js_conf . '\')"';
} }
if (isset($del_str)) { if (isset($del_str)) {
$vertical_display['delete'][$foo] .= '>' . "\n" $vertical_display['delete'][$row_no] .= '>' . "\n"
. ' ' . $del_str . '</a>' . "\n" . ' ' . $del_str . '</a>' . "\n"
. ' </td>' . "\n"; . ' </td>' . "\n";
} }
echo (($disp_direction == 'horizontal') ? "\n" : ''); echo (($disp_direction == 'horizontal') ? "\n" : '');
$foo++; $row_no++;
} // end for } // end while
return TRUE; return TRUE;
} // end of the 'PMA_displayTableBody()' function } // end of the 'PMA_displayTableBody()' function

40
libraries/functions.js
View File

@@ -297,18 +297,25 @@ function checkTransmitDump(theForm, theAction)
} // end of the 'checkTransmitDump()' function } // end of the 'checkTransmitDump()' function
/**
* This array is used to remember mark status of rows in browse mode
*/
var marked_row = new Array;
/** /**
* Sets/unsets the pointer and marker in browse mode * Sets/unsets the pointer and marker in browse mode
* *
* @param object the table row * @param object the table row
* @param string the action calling this script (over, out or click) * @param interger the row number
* @param string the default background color * @param string the action calling this script (over, out or click)
* @param string the color to use for mouseover * @param string the default background color
* @param string the color to use for marking a row * @param string the color to use for mouseover
* @param string the color to use for marking a row
* *
* @return boolean whether pointer is set or not * @return boolean whether pointer is set or not
*/ */
function setPointer(theRow, theAction, theDefaultColor, thePointerColor, theMarkColor) function setPointer(theRow, theRowNum, theAction, theDefaultColor, thePointerColor, theMarkColor)
{ {
var theCells = null; var theCells = null;
@@ -353,27 +360,32 @@ function setPointer(theRow, theAction, theDefaultColor, thePointerColor, theMark
if (currentColor == '' if (currentColor == ''
|| currentColor.toLowerCase() == theDefaultColor.toLowerCase()) { || currentColor.toLowerCase() == theDefaultColor.toLowerCase()) {
if (theAction == 'over' && thePointerColor != '') { if (theAction == 'over' && thePointerColor != '') {
newColor = thePointerColor; newColor = thePointerColor;
} }
else if (theAction == 'click' && theMarkColor != '') { else if (theAction == 'click' && theMarkColor != '') {
newColor = theMarkColor; newColor = theMarkColor;
} }
} }
// 4.1.2 Current color is the pointer one // 4.1.2 Current color is the pointer one
else if (currentColor.toLowerCase() == thePointerColor.toLowerCase()) { else if (currentColor.toLowerCase() == thePointerColor.toLowerCase()
&& (typeof(marked_row[theRowNum]) == 'undefined' || !marked_row[theRowNum])) {
if (theAction == 'out') { if (theAction == 'out') {
newColor = theDefaultColor; newColor = theDefaultColor;
} }
else if (theAction == 'click' && theMarkColor != '') { else if (theAction == 'click' && theMarkColor != '') {
newColor = theMarkColor; newColor = theMarkColor;
marked_row[theRowNum] = true;
} }
} }
// 4.1.3 Current color is the marker one // 4.1.3 Current color is the marker one
else if (currentColor.toLowerCase() == theMarkColor.toLowerCase()) { else if (currentColor.toLowerCase() == theMarkColor.toLowerCase()) {
if (theAction == 'click') { if (theAction == 'click') {
newColor = (thePointerColor != '') newColor = (thePointerColor != '')
? thePointerColor ? thePointerColor
: theDefaultColor; : theDefaultColor;
marked_row[theRowNum] = (typeof(marked_row[theRowNum]) == 'undefined' || !marked_row[theRowNum])
? true
: null;
} }
} // end 4 } // end 4