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

Be valid XHTML.

Browse Source
This commit is contained in:
Michal Čihař
2004-04-27 11:54:54 +00:00
parent ea13babc3a
commit 04229e997f
14 changed files with 167 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -8,6 +8,11 @@ $Source$
2004-04-27 Michal Cihar <michal@cihar.com> 2004-04-27 Michal Cihar <michal@cihar.com>
* calendar.php, libraries/tbl_change.js: Don't reset clock when moving in * calendar.php, libraries/tbl_change.js: Don't reset clock when moving in
calendar. calendar.
* db_details_links.php, db_details_structure.php, left.php,
querywindow.php, tbl_change.php, tbl_indexes.php,
tbl_properties_links.php, tbl_properties_structure.php,
tbl_query_box.php, tbl_select.php, css/phpmyadmin.css.php,
libraries/common.lib.php, libraries/display_tbl.lib.php: Be valid XHTML.
2004-04-27 Garvin Hicking <pma@supergarv.de> 2004-04-27 Garvin Hicking <pma@supergarv.de>
* libraries/display_tbl.lib.php: RFE #867284 - Click on result row * libraries/display_tbl.lib.php: RFE #867284 - Click on result row

4
css/phpmyadmin.css.php
View File

@@ -277,3 +277,7 @@ img.calendar {
form.clock { form.clock {
text-align: center; text-align: center;
} }
.nowrap {
white-space: nowrap;
}

6
db_details_links.php
View File

@@ -47,8 +47,8 @@ if ($cfg['AllowUserDropDatabase']) {
. '&amp;zero_rows=' . '&amp;zero_rows='
. urlencode(sprintf($strDatabaseHasBeenDropped, htmlspecialchars(PMA_backquote($db)))) . urlencode(sprintf($strDatabaseHasBeenDropped, htmlspecialchars(PMA_backquote($db))))
. '&amp;goto=main.php&amp;back=db_details' . $sub_part . '.php&amp;reload=1&amp;purge=1'; . '&amp;goto=main.php&amp;back=db_details' . $sub_part . '.php&amp;reload=1&amp;purge=1';
$att5 = 'class="drop" ' $att5 = 'onclick="return confirmLinkDropDB(this, \'DROP DATABASE ' . PMA_jsFormat($db) . '\')"';
. 'onclick="return confirmLinkDropDB(this, \'DROP DATABASE ' . PMA_jsFormat($db) . '\')"'; $class5 = 'drop';
} }
else { else {
$lnk5 = ''; $lnk5 = '';
@@ -75,7 +75,7 @@ echo PMA_printTab($strQBE, ($num_tables > 0) ? 'db_details_qbe.php' : '', $url_q
// Displays drop link // Displays drop link
if ($lnk5) { if ($lnk5) {
echo PMA_printTab($strDrop, $lnk5, $arg5, $att5); echo PMA_printTab($strDrop, $lnk5, $arg5, $att5, $class5);
} // end if } // end if
echo "\n"; echo "\n";

20
db_details_structure.php
View File

@@ -176,7 +176,7 @@ if ($cfg['PropertiesIconic'] == true) {
$propicon = (string)$cfg['PropertiesIconic']; $propicon = (string)$cfg['PropertiesIconic'];
if ($propicon == 'both') { if ($propicon == 'both') {
$iconic_spacer = '<nobr>'; $iconic_spacer = '<div class="nowrap">';
} else { } else {
$iconic_spacer = ''; $iconic_spacer = '';
} }
@@ -192,15 +192,15 @@ if ($cfg['PropertiesIconic'] == true) {
$titles['NoEmpty'] = $iconic_spacer . '<img hspace="7" width="11" height="13" src="images/button_noempty.png" alt="' . $strEmpty . '" title="' . $strEmpty . '" border="0" />'; $titles['NoEmpty'] = $iconic_spacer . '<img hspace="7" width="11" height="13" src="images/button_noempty.png" alt="' . $strEmpty . '" title="' . $strEmpty . '" border="0" />';
if ($propicon == 'both') { if ($propicon == 'both') {
$titles['Browse'] .= '&nbsp;' . $strBrowse . '</nobr>'; $titles['Browse'] .= '&nbsp;' . $strBrowse . '</div>';
$titles['Search'] .= '&nbsp;' . $strSearch . '</nobr>'; $titles['Search'] .= '&nbsp;' . $strSearch . '</div>';
$titles['NoBrowse'] .= '&nbsp;' . $strBrowse . '</nobr>'; $titles['NoBrowse'] .= '&nbsp;' . $strBrowse . '</div>';
$titles['NoSearch'] .= '&nbsp;' . $strSearch . '</nobr>'; $titles['NoSearch'] .= '&nbsp;' . $strSearch . '</div>';
$titles['Insert'] .= '&nbsp;' . $strInsert . '</nobr>'; $titles['Insert'] .= '&nbsp;' . $strInsert . '</div>';
$titles['Properties'] .= '&nbsp;' . $strProperties . '</nobr>'; $titles['Properties'] .= '&nbsp;' . $strProperties . '</div>';
$titles['Drop'] .= '&nbsp;' . $strDrop . '</nobr>'; $titles['Drop'] .= '&nbsp;' . $strDrop . '</div>';
$titles['Empty'] .= '&nbsp;' . $strEmpty . '</nobr>'; $titles['Empty'] .= '&nbsp;' . $strEmpty . '</div>';
$titles['NoEmpty'] .= '&nbsp;' . $strEmpty . '</nobr>'; $titles['NoEmpty'] .= '&nbsp;' . $strEmpty . '</div>';
} }
} else { } else {
$titles['Browse'] = $strBrowse; $titles['Browse'] = $strBrowse;

51
left.php
View File

@@ -94,9 +94,9 @@ function PMA_nestedSetHeaderParent($baseid, $key, $keyhistory, $indent, $indent_
echo "\n"; echo "\n";
echo PMA_indent($indent * 5) . '<div id="el' . $id . 'Parent" class="parent"' . $on_mouse . '>' . "\n"; echo PMA_indent($indent * 5) . '<div id="el' . $id . 'Parent" class="parent"' . $on_mouse . '>' . "\n";
echo PMA_indent($indent * 6) . '<nobr><img src="images/spacer.gif" border="0" width="' . (($indent - 1) * $indent_level) . '" height="9" alt="" /><a class="item" href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . $GLOBALS['common_url_query'] . '" onclick="if (capable) {expandBase(\'el' . $id . '\', true); return false} else {return true}">'; echo PMA_indent($indent * 6) . '<div class="nowrap"><img src="images/spacer.gif" border="0" width="' . (($indent - 1) * $indent_level) . '" height="9" alt="" /><a class="item" href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . $GLOBALS['common_url_query'] . '" onclick="if (capable) {expandBase(\'el' . $id . '\', true); return false} else {return true}">';
echo '<img name="imEx" id="el' . $id . 'Img" src="images/plus.png" border="0" width="9" height="9" alt="+" /></a>' . "\n"; echo '<img name="imEx" id="el' . $id . 'Img" src="images/plus.png" border="0" width="9" height="9" alt="+" /></a>' . "\n";
echo PMA_indent($indent * 6) . '<a class="item" href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . $GLOBALS['common_url_query'] . '" title="' . htmlspecialchars($name) . '" onclick="if (capable) {expandBase(\'el' . $id . '\', false)}"><span class="heada">' . htmlspecialchars($name) . '<bdo dir="' . $GLOBALS['text_dir'] . '">&nbsp;&nbsp;</bdo></span><span class="headaCnt">(' . $counter . ')</span></a></nobr>' . "\n"; echo PMA_indent($indent * 6) . '<a class="item" href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . $GLOBALS['common_url_query'] . '" title="' . htmlspecialchars($name) . '" onclick="if (capable) {expandBase(\'el' . $id . '\', false)}"><span class="heada">' . htmlspecialchars($name) . '<bdo dir="' . $GLOBALS['text_dir'] . '">&nbsp;&nbsp;</bdo></span><span class="headaCnt">(' . $counter . ')</span></a></div>' . "\n";
echo PMA_indent($indent * 5) . '</div><id class="PMA_nestedSetHeaderParent">' . "\n"; echo PMA_indent($indent * 5) . '</div><id class="PMA_nestedSetHeaderParent">' . "\n";
echo "\n"; echo "\n";
@@ -163,13 +163,13 @@ function PMA_nestedSet($baseid, $tablestack, $key = '__protected__', $keyhistory
$loops = 0; $loops = 0;
foreach($tablestack['pma_name'] AS $tkey => $tval) { foreach($tablestack['pma_name'] AS $tkey => $tval) {
echo PMA_indent($indent * 5) . '<nobr><img src="images/spacer.gif" border="0" width="' . (($indent+$extra_indent) * $indent_level) . '" height="9" alt="" />'; echo PMA_indent($indent * 5) . '<div class="nowrap"><img src="images/spacer.gif" border="0" width="' . (($indent+$extra_indent) * $indent_level) . '" height="9" alt="" />';
$items = explode("\n", $tablestack['pma_list_item'][$tkey]); $items = explode("\n", $tablestack['pma_list_item'][$tkey]);
foreach($items AS $ikey => $ival) { foreach($items AS $ikey => $ival) {
echo "\n"; echo "\n";
echo PMA_indent(($indent * 5)) . $ival; echo PMA_indent(($indent * 5)) . $ival;
} }
echo "\n"; echo "</div>\n";
$loops++; $loops++;
} }
@@ -383,13 +383,13 @@ if ($cfg['LeftDisplayServers']) {
echo "\n"; echo "\n";
?> ?>
<!-- Link to the welcome page --> <!-- Link to the welcome page -->
<div id="el1Parent" class="parent" style="margin-bottom: 5px"> <div id="el1Parent" class="parent nowrap" style="margin-bottom: 5px">
<nobr><a class="item" href="main.php?<?php echo PMA_generate_common_url(); ?>"><span class="heada"><b><?php echo $strHome; ?></b></span></a></nobr> <a class="item" href="main.php?<?php echo PMA_generate_common_url(); ?>"><span class="heada"><b><?php echo $strHome; ?></b></span></a>
<?php <?php
// Logout for advanced authentication // Logout for advanced authentication
if ($cfg['Server']['auth_type'] != 'config') { if ($cfg['Server']['auth_type'] != 'config') {
?> ?>
- <nobr><a class="item" href="index.php?<?php echo PMA_generate_common_url(); ?>&amp;old_usr=<?php echo urlencode($PHP_AUTH_USER); ?>" target="_parent"><span class="heada"><b><?php echo $strLogout; ?></b></span></a></nobr> - <a class="item" href="index.php?<?php echo PMA_generate_common_url(); ?>&amp;old_usr=<?php echo urlencode($PHP_AUTH_USER); ?>" target="_parent"><span class="heada"><b><?php echo $strLogout; ?></b></span></a>
<?php <?php
} // end if } // end if
?> ?>
@@ -491,27 +491,27 @@ if ($num_dbs > 1) {
$on_mouse = (($cfg['LeftPointerColor'] == '') ? '' : ' onmouseover="if (isDOM || isIE4) {hilightBase(\'el' . $j . '\', \'' . $cfg['LeftPointerColor'] . '\')}" onmouseout="if (isDOM || isIE4) {hilightBase(\'el' . $j . '\', \'' . $cfg['LeftBgColor'] . '\')}"'); $on_mouse = (($cfg['LeftPointerColor'] == '') ? '' : ' onmouseover="if (isDOM || isIE4) {hilightBase(\'el' . $j . '\', \'' . $cfg['LeftPointerColor'] . '\')}" onmouseout="if (isDOM || isIE4) {hilightBase(\'el' . $j . '\', \'' . $cfg['LeftBgColor'] . '\')}"');
echo "\n"; echo "\n";
echo ' <div id="el' . $j . 'Parent" class="parent"' . $on_mouse . '>'; echo ' <div id="el' . $j . 'Parent" class="parent nowrap"' . $on_mouse . '>';
if (!empty($num_tables)) { if (!empty($num_tables)) {
echo "\n"; echo "\n";
?> ?>
<nobr><a class="item" href="<?php echo $cfg['DefaultTabDatabase']; ?>?<?php echo $common_url_query; ?>" onclick="if (capable) {expandBase('el<?php echo $j; ?>', true); return false} else {return true}"> <a class="item" href="<?php echo $cfg['DefaultTabDatabase']; ?>?<?php echo $common_url_query; ?>" onclick="if (capable) {expandBase('el<?php echo $j; ?>', true); return false} else {return true}">
<img name="imEx" id="el<?php echo $j; ?>Img" src="images/plus.png" border="0" width="9" height="9" alt="+" /></a> <img name="imEx" id="el<?php echo $j; ?>Img" src="images/plus.png" border="0" width="9" height="9" alt="+" /></a>
<?php <?php
} else { } else {
echo "\n"; echo "\n";
?> ?>
<nobr><img name="imEx" src="images/minus.png" border="0" width="9" height="9" alt="-" /> <img name="imEx" src="images/minus.png" border="0" width="9" height="9" alt="-" />
<?php <?php
} }
echo "\n"; echo "\n";
?> ?>
<a class="item" href="<?php echo $cfg['DefaultTabDatabase']; ?>?<?php echo $common_url_query; ?>" title="<?php echo ($db_tooltip != '' && $cfg['ShowTooltipAliasDB'] ? htmlspecialchars($db) : htmlspecialchars($db_tooltip)); ?>" onclick="if (capable) {expandBase('el<?php echo $j; ?>', false)}"> <a class="item" href="<?php echo $cfg['DefaultTabDatabase']; ?>?<?php echo $common_url_query; ?>" title="<?php echo ($db_tooltip != '' && $cfg['ShowTooltipAliasDB'] ? htmlspecialchars($db) : htmlspecialchars($db_tooltip)); ?>" onclick="if (capable) {expandBase('el<?php echo $j; ?>', false)}">
<span class="heada"><?php echo ($db_tooltip != '' && $cfg['ShowTooltipAliasDB'] ? '<i>' . htmlspecialchars($db_tooltip) . '</i>' : htmlspecialchars($db)); ?><bdo dir="<?php echo($text_dir); ?>">&nbsp;&nbsp;</bdo></span><span class="headaCnt">(<?php echo $num_tables_disp; ?>)</span></a></nobr> <span class="heada"><?php echo ($db_tooltip != '' && $cfg['ShowTooltipAliasDB'] ? '<i>' . htmlspecialchars($db_tooltip) . '</i>' : htmlspecialchars($db)); ?><bdo dir="<?php echo($text_dir); ?>">&nbsp;&nbsp;</bdo></span><span class="headaCnt">(<?php echo $num_tables_disp; ?>)</span></a>
</div> </div>
<div id="el<?php echo $j;?>Child" class="child" style="margin-bottom: 5px"<?php echo $on_mouse; ?>> <div id="el<?php echo $j;?>Child" class="child nowrap" style="margin-bottom: 5px"<?php echo $on_mouse; ?>>
<?php <?php
// Displays the list of tables from the current database // Displays the list of tables from the current database
$tablestack = array(); $tablestack = array();
@@ -529,7 +529,7 @@ if ($num_dbs > 1) {
$list_item .= '<img src="images/button_smallbrowse.png" width="10" height="10" border="0" alt="' . $strBrowse . ': ' . $url_title . '" /></a>'; $list_item .= '<img src="images/button_smallbrowse.png" width="10" height="10" border="0" alt="' . $strBrowse . ': ' . $url_title . '" /></a>';
$list_item .= '<bdo dir="' . $text_dir . '">&nbsp;</bdo>' . "\n"; $list_item .= '<bdo dir="' . $text_dir . '">&nbsp;</bdo>' . "\n";
$list_item .= '<a class="tblItem" id="tbl_' . md5($table) . '" title="' . $url_title . '" target="phpmain' . $hash . '" href="' . $cfg['DefaultTabTable'] . '?' . $common_url_query . '&amp;table=' . urlencode($table) . '">'; $list_item .= '<a class="tblItem" id="tbl_' . md5($table) . '" title="' . $url_title . '" target="phpmain' . $hash . '" href="' . $cfg['DefaultTabTable'] . '?' . $common_url_query . '&amp;table=' . urlencode($table) . '">';
$list_item .= ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)) . '</a></nobr><br />' . "\n"; $list_item .= ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)) . '</a><br />' . "\n";
// garvin: Check whether to display nested sets // garvin: Check whether to display nested sets
if (!empty($cfg['LeftFrameTableSeparator'])) { if (!empty($cfg['LeftFrameTableSeparator'])) {
@@ -588,13 +588,13 @@ if ($num_dbs > 1) {
// natural order or not, use an array for the table list // natural order or not, use an array for the table list
$table_array[$table] .= ' <nobr><a target="phpmain' . $hash . '" href="sql.php?' . $common_url_query . '&amp;table=' . urlencode($table) . '&amp;sql_query=' . (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table))) . '&amp;pos=0&amp;goto=' . $cfg['DefaultTabTable'] . '">' . "\n"; $table_array[$table] .= ' <div class="nowrap"><a target="phpmain' . $hash . '" href="sql.php?' . $common_url_query . '&amp;table=' . urlencode($table) . '&amp;sql_query=' . (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table))) . '&amp;pos=0&amp;goto=' . $cfg['DefaultTabTable'] . '">' . "\n";
$table_array[$table] .= ' <img src="images/button_smallbrowse.png" width="10" height="10" border="0" alt="' . $strBrowse . ': ' . $url_title . '" title="' . $strBrowse . ': ' . $url_title . '" /></a><bdo dir="' . $text_dir . '">&nbsp;</bdo>' . "\n"; $table_array[$table] .= ' <img src="images/button_smallbrowse.png" width="10" height="10" border="0" alt="' . $strBrowse . ': ' . $url_title . '" title="' . $strBrowse . ': ' . $url_title . '" /></a><bdo dir="' . $text_dir . '">&nbsp;</bdo>' . "\n";
if (PMA_USR_BROWSER_AGENT == 'IE') { if (PMA_USR_BROWSER_AGENT == 'IE') {
$table_array[$table] .= ' <span class="tblItem"><a class="tblItem" id="tbl_' . md5($table) . '" title="' . $url_title . '" target="phpmain' . $hash . '" href="' . $cfg['DefaultTabTable'] . '?' . $common_url_query . '&amp;table=' . urlencode($table) . '">' . ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)) . '</a></span></nobr><br />' . "\n"; $table_array[$table] .= ' <span class="tblItem"><a class="tblItem" id="tbl_' . md5($table) . '" title="' . $url_title . '" target="phpmain' . $hash . '" href="' . $cfg['DefaultTabTable'] . '?' . $common_url_query . '&amp;table=' . urlencode($table) . '">' . ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)) . '</a></span></div><br />' . "\n";
} else { } else {
$table_array[$table] .= ' <a class="tblItem" id="tbl_' . md5($table) . '" title="' . $url_title . '" target="phpmain' . $hash . '" href="' . $cfg['DefaultTabTable'] . '?' . $common_url_query . '&amp;table=' . urlencode($table) . '">' . ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)) . '</a></nobr><br />' . "\n"; $table_array[$table] .= ' <a class="tblItem" id="tbl_' . md5($table) . '" title="' . $url_title . '" target="phpmain' . $hash . '" href="' . $cfg['DefaultTabTable'] . '?' . $common_url_query . '&amp;table=' . urlencode($table) . '">' . ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)) . '</a></div><br />' . "\n";
} }
$table_title[$table] = htmlspecialchars($table); $table_title[$table] = htmlspecialchars($table);
@@ -721,19 +721,19 @@ else if ($num_dbs == 1) {
if (!empty($num_tables)) { if (!empty($num_tables)) {
echo "\n"; echo "\n";
?> ?>
<nobr><a class="item" href="<?php echo $cfg['DefaultTabDatabase']; ?>?<?php echo $common_url_query; ?>" onclick="if (capable) {expandBase('el2', true); return false} else {return true}"> <div class="nowrap"><a class="item" href="<?php echo $cfg['DefaultTabDatabase']; ?>?<?php echo $common_url_query; ?>" onclick="if (capable) {expandBase('el2', true); return false} else {return true}">
<img name="imEx" id="el2Img" src="images/plus.png" border="0" width="9" height="9" alt="+" /></a> <img name="imEx" id="el2Img" src="images/plus.png" border="0" width="9" height="9" alt="+" /></a>
<?php <?php
} else { } else {
echo "\n"; echo "\n";
?> ?>
<nobr><img name="imEx" src="images/minus.png" border="0" width="9" height="9" alt="-" /> <div class="nowrap"><img name="imEx" src="images/minus.png" border="0" width="9" height="9" alt="-" />
<?php <?php
} }
echo "\n"; echo "\n";
?> ?>
<a class="item" href="<?php echo $cfg['DefaultTabDatabase']; ?>?<?php echo $common_url_query; ?>" title="<?php echo ($db_tooltip != '' && $cfg['ShowTooltipAliasDB'] ? htmlspecialchars($db) : htmlspecialchars($db_tooltip)); ?>" onclick="if (capable) {expandBase('el2', false)}"> <a class="item" href="<?php echo $cfg['DefaultTabDatabase']; ?>?<?php echo $common_url_query; ?>" title="<?php echo ($db_tooltip != '' && $cfg['ShowTooltipAliasDB'] ? htmlspecialchars($db) : htmlspecialchars($db_tooltip)); ?>" onclick="if (capable) {expandBase('el2', false)}">
<span class="heada"><?php echo ($db_tooltip != '' && $cfg['ShowTooltipAliasDB'] ? '<i>' . htmlspecialchars($db_tooltip) . '</i>' : htmlspecialchars($db)); ?><bdo dir="<?php echo($text_dir); ?>">&nbsp;&nbsp;</bdo></span><span class="headaCnt">(<?php echo $num_tables_disp; ?>)</span></a></nobr> <span class="heada"><?php echo ($db_tooltip != '' && $cfg['ShowTooltipAliasDB'] ? '<i>' . htmlspecialchars($db_tooltip) . '</i>' : htmlspecialchars($db)); ?><bdo dir="<?php echo($text_dir); ?>">&nbsp;&nbsp;</bdo></span><span class="headaCnt">(<?php echo $num_tables_disp; ?>)</span></a></div>
</div> </div>
<div id="el2Child" class="child" style="margin-bottom: 5px"<?php echo $on_mouse; ?>> <div id="el2Child" class="child" style="margin-bottom: 5px"<?php echo $on_mouse; ?>>
@@ -741,9 +741,9 @@ else if ($num_dbs == 1) {
} else { } else {
echo "\n"; echo "\n";
?> ?>
<div id="el2Parent" class="parent"> <div id="el2Parent" class="parent nowrap">
<nobr><a class="item" href="<?php echo $cfg['DefaultTabDatabase']; ?>?<?php echo $common_url_query; ?>"> <a class="item" href="<?php echo $cfg['DefaultTabDatabase']; ?>?<?php echo $common_url_query; ?>">
<span class="heada"><?php echo ($db_tooltip != '' && $cfg['ShowTooltipAliasDB'] ? htmlspecialchars($db_tooltip) : htmlspecialchars($db)); ?><bdo dir="<?php echo($text_dir); ?>">&nbsp;&nbsp;</bdo></span><span class="headaCnt">(<?php echo $num_tables_disp; ?>)</span></a></nobr> <span class="heada"><?php echo ($db_tooltip != '' && $cfg['ShowTooltipAliasDB'] ? htmlspecialchars($db_tooltip) : htmlspecialchars($db)); ?><bdo dir="<?php echo($text_dir); ?>">&nbsp;&nbsp;</bdo></span><span class="headaCnt">(<?php echo $num_tables_disp; ?>)</span></a>
</div> </div>
<div id="el2Child" class="child" style="margin-bottom: 5px"> <div id="el2Child" class="child" style="margin-bottom: 5px">
<?php <?php
@@ -760,20 +760,21 @@ else if ($num_dbs == 1) {
: ''; : '';
$book_sql_query = PMA_queryBookmarks($db, $cfg['Bookmark'], '\'' . PMA_sqlAddslashes($table) . '\'', 'label'); $book_sql_query = PMA_queryBookmarks($db, $cfg['Bookmark'], '\'' . PMA_sqlAddslashes($table) . '\'', 'label');
echo '<div class="nowrap">';
if ($cfg['LeftFrameLight']) { if ($cfg['LeftFrameLight']) {
echo "\n"; echo "\n";
?> ?>
<nobr><a target="phpmain<?php echo $hash; ?>" href="sql.php?<?php echo $common_url_query; ?>&amp;table=<?php echo urlencode($table); ?>&amp;sql_query=<?php echo (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table))); ?>&amp;pos=0&amp;goto=<?php echo $cfg['DefaultTabTable']; ?>" title="<?php echo $strBrowse . ': ' . $url_title; ?>"> <a target="phpmain<?php echo $hash; ?>" href="sql.php?<?php echo $common_url_query; ?>&amp;table=<?php echo urlencode($table); ?>&amp;sql_query=<?php echo (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table))); ?>&amp;pos=0&amp;goto=<?php echo $cfg['DefaultTabTable']; ?>" title="<?php echo $strBrowse . ': ' . $url_title; ?>">
<img src="images/button_smallbrowse.png" width="10" height="10" border="0" alt="<?php echo $strBrowse . ': ' . $url_title; ?>" /></a><bdo dir="<?php echo $text_dir; ?>">&nbsp;</bdo> <img src="images/button_smallbrowse.png" width="10" height="10" border="0" alt="<?php echo $strBrowse . ': ' . $url_title; ?>" /></a><bdo dir="<?php echo $text_dir; ?>">&nbsp;</bdo>
<a class="tblItem" id="tbl_<?php echo md5($table); ?>" title="<?php echo $url_title; ?>" target="phpmain<?php echo $hash; ?>" href="<?php echo $cfg['DefaultTabTable']; ?>?<?php echo $common_url_query; ?>&amp;table=<?php echo urlencode($table); ?>"> <a class="tblItem" id="tbl_<?php echo md5($table); ?>" title="<?php echo $url_title; ?>" target="phpmain<?php echo $hash; ?>" href="<?php echo $cfg['DefaultTabTable']; ?>?<?php echo $common_url_query; ?>&amp;table=<?php echo urlencode($table); ?>">
<?php echo ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)); ?></a></nobr><br /> <?php echo ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)); ?></a></div><br />
<?php <?php
} else { } else {
$list_item = '<a target="phpmain' . $hash . '" href="sql.php?' . $common_url_query . '&amp;table=' . urlencode($table) . '&amp;sql_query=' . (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table))) . '&amp;pos=0&amp;goto=' . $cfg['DefaultTabTable'] . '" title="' . $strBrowse . ': ' . $url_title . '">'; $list_item = '<a target="phpmain' . $hash . '" href="sql.php?' . $common_url_query . '&amp;table=' . urlencode($table) . '&amp;sql_query=' . (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table))) . '&amp;pos=0&amp;goto=' . $cfg['DefaultTabTable'] . '" title="' . $strBrowse . ': ' . $url_title . '">';
$list_item .= '<img src="images/button_smallbrowse.png" width="10" height="10" border="0" alt="' . $strBrowse . ': ' . $url_title . '" /></a>'; $list_item .= '<img src="images/button_smallbrowse.png" width="10" height="10" border="0" alt="' . $strBrowse . ': ' . $url_title . '" /></a>';
$list_item .= '<bdo dir="' . $text_dir . '">&nbsp;</bdo>' . "\n"; $list_item .= '<bdo dir="' . $text_dir . '">&nbsp;</bdo>' . "\n";
$list_item .= '<a class="tblItem" id="tbl_' . md5($table) . '" title="' . $url_title . '" target="phpmain' . $hash . '" href="' . $cfg['DefaultTabTable'] . '?' . $common_url_query . '&amp;table=' . urlencode($table) . '">'; $list_item .= '<a class="tblItem" id="tbl_' . md5($table) . '" title="' . $url_title . '" target="phpmain' . $hash . '" href="' . $cfg['DefaultTabTable'] . '?' . $common_url_query . '&amp;table=' . urlencode($table) . '">';
$list_item .= ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)) . '</a></nobr><br />'; $list_item .= ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)) . '</a></div><br />';
// garvin: Check whether to display nested sets // garvin: Check whether to display nested sets
if (!empty($cfg['LeftFrameTableSeparator'])) { if (!empty($cfg['LeftFrameTableSeparator'])) {

18
libraries/common.lib.php
View File

@@ -1663,10 +1663,12 @@ if (typeof(document.getElementById) != 'undefined'
* *
* @access public * @access public
*/ */
function PMA_printTab($text, $link, $args = '', $attr = '', $sep = '?', $active = false) { function PMA_printTab($text, $link, $args = '', $attr = '', $class = '', $sep = '?', $active = false) {
global $PHP_SELF, $cfg; global $PHP_SELF, $cfg;
global $db_details_links_count_tabs; global $db_details_links_count_tabs;
if ($class != '') $class .= ' ';
if (((!isset($GLOBALS['active_page']) && basename($PHP_SELF) == $link) || if (((!isset($GLOBALS['active_page']) && basename($PHP_SELF) == $link) ||
$active || $active ||
(isset($GLOBALS['active_page']) && $GLOBALS['active_page'] == $link) (isset($GLOBALS['active_page']) && $GLOBALS['active_page'] == $link)
@@ -1694,21 +1696,21 @@ if (typeof(document.getElementById) != 'undefined'
if ($cfg['LightTabs']) { if ($cfg['LightTabs']) {
$out = ''; $out = '';
if (strlen($link) > 0) { if (strlen($link) > 0) {
$out .= '<nobr><a href="' . $link . $sep . $args . '"' . $attr . '>' $out .= '<a href="' . $link . $sep . $args . '"' . $attr . ' class="' . $class . 'nowrap">'
. '<b>' . $text . '</b></a></nobr>'; . '<b>' . $text . '</b></a>';
} else { } else {
$out .= '<nobr><b>' . $text . '</b></nobr>'; $out .= '<b class="nowrap">' . $text . '</b>';
} }
$out = '[ ' . $out . ' ]&nbsp;&nbsp;&nbsp;'; $out = '[ ' . $out . ' ]&nbsp;&nbsp;&nbsp;';
} else { } else {
$out = "\n" . ' ' $out = "\n" . ' '
. '<td bgcolor="' . $bgcolor . '" align="center" width="64" nowrap="nowrap" class="tab">' . '<td bgcolor="' . $bgcolor . '" align="center" width="64" class="tab nowrap">'
. "\n" . ' '; . "\n" . ' ';
if (strlen($link) > 0) { if (strlen($link) > 0) {
$out .= '<nobr><a href="' . $link . $sep . $args . '"' . $attr . '>' $out .= '<a href="' . $link . $sep . $args . '"' . $attr . ' class="' . $class . 'nowrap">'
. '<b>' . $text . '</b></a></nobr>'; . '<b>' . $text . '</b></a>';
} else { } else {
$out .= '<nobr><b>' . $text . '</b></nobr>'; $out .= '<b class="nowrap">' . $text . '</b>';
} }
$out .= "\n" . ' ' $out .= "\n" . ' '
. '</td>' . '</td>'

143
libraries/display_tbl.lib.php
View File

@@ -261,7 +261,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $encoded_query)
</td> </td>
<td align="center"> <td align="center">
<form action="sql.php" method="post" <form action="sql.php" method="post"
onsubmit="return (checkFormElementInRange(this, 'session_max_rows', 1) && checkFormElementInRange(this, 'pos', 0, <?php echo $unlim_num_rows - 1; ?>))"> onsubmit="return (checkFormElementInRange(this, 'session_max_rows', 1) &amp;&amp; checkFormElementInRange(this, 'pos', 0, <?php echo $unlim_num_rows - 1; ?>))">
<?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
<input type="hidden" name="sql_query" value="<?php echo $encoded_query; ?>" /> <input type="hidden" name="sql_query" value="<?php echo $encoded_query; ?>" />
<input type="hidden" name="goto" value="<?php echo $goto; ?>" /> <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
@@ -528,60 +528,44 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
$span = $num_rows + floor($num_rows/$repeat_cells) + 1; $span = $num_rows + floor($num_rows/$repeat_cells) + 1;
} }
?> echo '<form action="sql.php" method="post">' . "\n";
<tr> echo PMA_generate_common_hidden_inputs($db, $table, 5);
<td colspan="<?php echo $span; ?>" align="center"> echo '<input type="hidden" name="pos" value="' . $pos . '" />' . "\n";
<?php echo '<input type="hidden" name="session_max_rows" value="' . $session_max_rows . '" />' . "\n";
echo '<form action="sql.php" method="POST">' . "\n"; echo '<input type="hidden" name="disp_direction" value="' . $disp_direction . '" />' . "\n";
echo PMA_generate_common_hidden_inputs($db, $table, 5); echo '<input type="hidden" name="repeat_cells" value="' . $repeat_cells . '" />' . "\n";
echo '<input type="hidden" name="pos" value="' . $pos . '" />' . "\n"; echo '<input type="hidden" name="dontlimitchars" value="' . $dontlimitchars . '" />' . "\n";
echo '<input type="hidden" name="session_max_rows" value="' . $session_max_rows . '" />' . "\n"; echo $GLOBALS['strSortByKey'] . ': <select name="sql_query">';
echo '<input type="hidden" name="disp_direction" value="' . $disp_direction . '" />' . "\n"; $used_index = false;
echo '<input type="hidden" name="repeat_cells" value="' . $repeat_cells . '" />' . "\n"; $local_order = (isset($sql_order) ? str_replace(' ', ' ', $sql_order) : '');
echo '<input type="hidden" name="dontlimitchars" value="' . $dontlimitchars . '" />' . "\n"; foreach($indexes_data AS $key => $val) {
echo $GLOBALS['strSortByKey'] . ': <select name="sql_query">&nbsp;'; $asc_sort = 'ORDER BY ';
$used_index = false; $desc_sort = 'ORDER BY ';
$local_order = (isset($sql_order) ? str_replace(' ', ' ', $sql_order) : ''); foreach($val AS $key2 => $val2) {
foreach($indexes_data AS $key => $val) { $asc_sort .= PMA_backquote($val2['Column_name']) . ' ASC , ';
$asc_sort = 'ORDER BY '; $desc_sort .= PMA_backquote($val2['Column_name']) . ' DESC , ';
$desc_sort = 'ORDER BY '; }
foreach($val AS $key2 => $val2) { $asc_sort = substr($asc_sort, 0, -3);
$asc_sort .= PMA_backquote($val2['Column_name']) . ' ASC , '; $desc_sort = substr($desc_sort, 0, -3);
$desc_sort .= PMA_backquote($val2['Column_name']) . ' DESC , '; $used_index = $used_index || $local_order == $asc_sort || $local_order == $desc_sort;
echo '<option value="' . htmlspecialchars($unsorted_sql_query . ' ' . $asc_sort) . '"' . ($local_order == $asc_sort ? ' selected="selected"' : '') . '>' . htmlspecialchars($key) . ' (' . $GLOBALS['strAscending'] . ')</option>';
echo "\n";
echo '<option value="' . htmlspecialchars($unsorted_sql_query . ' ' . $desc_sort) . '"' . ($local_order == $desc_sort ? ' selected="selected"' : '') . '>' . htmlspecialchars($key) . ' (' . $GLOBALS['strDescending'] . ')</option>';
echo "\n";
} }
$asc_sort = substr($asc_sort, 0, -3); echo '<option value="' . htmlspecialchars($unsorted_sql_query) . '"' . ($used_index ? '' : ' selected="selected"' ) . '>' . $GLOBALS['strNone'] . '</option>';
$desc_sort = substr($desc_sort, 0, -3);
$used_index = $used_index || $local_order == $asc_sort || $local_order == $desc_sort;
echo '<option value="' . htmlspecialchars($unsorted_sql_query . ' ' . $asc_sort) . '"' . ($local_order == $asc_sort ? ' selected="selected"' : '') . '>' . htmlspecialchars($key) . ' (' . $GLOBALS['strAscending'] . ')</option>';
echo "\n"; echo "\n";
echo '<option value="' . htmlspecialchars($unsorted_sql_query . ' ' . $desc_sort) . '"' . ($local_order == $desc_sort ? ' selected="selected"' : '') . '>' . htmlspecialchars($key) . ' (' . $GLOBALS['strDescending'] . ')</option>'; echo '</select>&nbsp;';
echo "\n";
echo '<input type="submit" value="' . $GLOBALS['strGo'] . '" />';
echo "\n";
echo '</form>';
echo "\n"; echo "\n";
}
echo '<option value="' . htmlspecialchars($unsorted_sql_query) . '"' . ($used_index ? '' : ' selected="selected"' ) . '>' . $GLOBALS['strNone'] . '</option>';
echo "\n";
echo '</select>&nbsp;';
echo "\n";
echo '<input type="submit" value="' . $GLOBALS['strGo'] . '" />';
echo "\n";
echo '</form>';
echo "\n";
?>
</td>
</tr>
<?php
} }
} }
} }
if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
?>
<!-- Results table headers -->
<tr>
<?php
echo "\n";
}
$vertical_display['emptypre'] = 0; $vertical_display['emptypre'] = 0;
$vertical_display['emptyafter'] = 0; $vertical_display['emptyafter'] = 0;
$vertical_display['textbtn'] = ''; $vertical_display['textbtn'] = '';
@@ -598,6 +582,22 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
echo '<input type="hidden" name="dontlimitchars" value="' . $dontlimitchars . '" />' . "\n"; echo '<input type="hidden" name="dontlimitchars" value="' . $dontlimitchars . '" />' . "\n";
} }
echo '<!-- Results table -->' . "\n"
. '<table ';
if (isset($GLOBALS['printview']) && $GLOBALS['printview'] == '1') {
echo 'border="1" cellpadding="2" cellspacing="0"';
} else {
echo 'border="' . $GLOBALS['cfg']['Border'] . '" cellpadding="5"';
}
echo '>' . "\n";
if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
?>
<!-- Results table headers -->
<tr>
<?php
echo "\n";
}
// 1. Displays the full/partial text button (part 1)... // 1. Displays the full/partial text button (part 1)...
if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') { if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
$colspan = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') $colspan = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn')
@@ -816,17 +816,32 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
echo "\n"; echo "\n";
?> ?>
<th <?php echo $column_style; ?> <?php if ($disp_direction == 'horizontalflipped') echo 'valign="bottom"'; ?>> <th <?php echo $column_style; ?> <?php if ($disp_direction == 'horizontalflipped') echo 'valign="bottom"'; ?>>
<?php echo $comments_table_wrap_pre; ?> <?php
<a href="sql.php?<?php echo $url_query; ?>" <?php echo (($disp_direction == 'horizontalflipped' AND $GLOBALS['cfg']['HeaderFlipType'] == 'css') ? 'style="direction: ltr; writing-mode: tb-rl;"' : '') . ' title="' . $GLOBALS['strSort'] . '"'; ?>> echo $comments_table_wrap_pre;
<?php echo ($disp_direction == 'horizontalflipped' && $GLOBALS['cfg']['HeaderFlipType'] == 'fake' ? PMA_flipstring(htmlspecialchars(PMA_convert_display_charset($fields_meta[$i]->name)), "<br />\n") : htmlspecialchars(PMA_convert_display_charset($fields_meta[$i]->name))); ?> </a><?php echo $order_img . "\n"; ?>
<?php echo $comments_table_wrap_post; ?> echo '<a href="sql.php?' . $url_query . '" ';
if ($disp_direction == 'horizontalflipped' && $GLOBALS['cfg']['HeaderFlipType'] == 'css') {
echo 'style="direction: ltr; writing-mode: tb-rl;"';
}
echo ' title="' . $GLOBALS['strSort'] . '">';
if ($disp_direction == 'horizontalflipped' && $GLOBALS['cfg']['HeaderFlipType'] == 'fake') {
echo PMA_flipstring(htmlspecialchars(PMA_convert_display_charset($fields_meta[$i]->name)), "<br />\n");
} else {
echo htmlspecialchars(PMA_convert_display_charset($fields_meta[$i]->name));
}
echo '</a>';
echo $order_img . "\n";
echo $comments_table_wrap_post;
?>
</th> </th>
<?php <?php
} }
$vertical_display['desc'][] = ' <th ' . $column_style . '>' . "\n" $vertical_display['desc'][] = ' <th ' . $column_style . '>' . "\n"
. $comments_table_wrap_pre . $comments_table_wrap_pre
. ' <a href="sql.php?' . $url_query . '">' . "\n" . ' <a href="sql.php?' . $url_query . '">'
. ' ' . htmlspecialchars($fields_meta[$i]->name) . '</a>' . $order_img . "\n" . htmlspecialchars($fields_meta[$i]->name) . '</a>' . $order_img . "\n"
. $comments_table_wrap_post . $comments_table_wrap_post
. ' </th>' . "\n"; . ' </th>' . "\n";
} // end if (2.1) } // end if (2.1)
@@ -1045,7 +1060,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
$propicon = (string)$GLOBALS['cfg']['PropertiesIconic']; $propicon = (string)$GLOBALS['cfg']['PropertiesIconic'];
if ($propicon == 'both') { if ($propicon == 'both') {
$iconic_spacer = '<nobr>'; $iconic_spacer = '<div class="nowrap">';
} else { } else {
$iconic_spacer = ''; $iconic_spacer = '';
} }
@@ -1069,7 +1084,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
} else { } else {
$edit_str = $iconic_spacer . '<img width="12" height="13" src="images/button_edit.png" alt="' . $GLOBALS['strEdit'] . '" title="' . $GLOBALS['strEdit'] . '" border="0" />'; $edit_str = $iconic_spacer . '<img width="12" height="13" src="images/button_edit.png" alt="' . $GLOBALS['strEdit'] . '" title="' . $GLOBALS['strEdit'] . '" border="0" />';
if ($propicon == 'both') { if ($propicon == 'both') {
$edit_str .= '&nbsp;' . $GLOBALS['strEdit'] . '</nobr>'; $edit_str .= '&nbsp;' . $GLOBALS['strEdit'] . '</div>';
} }
} }
} // end if (1.2.1) } // end if (1.2.1)
@@ -1088,7 +1103,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
} else { } else {
$bookmark_go .= $iconic_spacer . '<img width="12" height="13" src="images/button_bookmark.png" alt="' . $GLOBALS['strExecuteBookmarked'] . '" title="' . $GLOBALS['strExecuteBookmarked'] . '" border="0" />'; $bookmark_go .= $iconic_spacer . '<img width="12" height="13" src="images/button_bookmark.png" alt="' . $GLOBALS['strExecuteBookmarked'] . '" title="' . $GLOBALS['strExecuteBookmarked'] . '" border="0" />';
if ($propicon == 'both') { if ($propicon == 'both') {
$bookmark_go .= '&nbsp;' . $GLOBALS['strExecuteBookmarked'] . '</nobr>'; $bookmark_go .= '&nbsp;' . $GLOBALS['strExecuteBookmarked'] . '</div>';
} }
} }
@@ -1118,7 +1133,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
} else { } else {
$del_str = $iconic_spacer . '<img width="12" height="13" src="images/button_drop.png" alt="' . $GLOBALS['strDelete'] . '" title="' . $GLOBALS['strDelete'] . '" border="0" />'; $del_str = $iconic_spacer . '<img width="12" height="13" src="images/button_drop.png" alt="' . $GLOBALS['strDelete'] . '" title="' . $GLOBALS['strDelete'] . '" border="0" />';
if ($propicon == 'both') { if ($propicon == 'both') {
$del_str .= '&nbsp;' . $GLOBALS['strDelete'] . '</nobr>'; $del_str .= '&nbsp;' . $GLOBALS['strDelete'] . '</div>';
} }
} }
} else if ($is_display['del_lnk'] == 'kp') { // kill process case } else if ($is_display['del_lnk'] == 'kp') { // kill process case
@@ -1137,7 +1152,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
} else { } else {
$del_str = $iconic_spacer . '<img width="12" height="13" src="images/button_drop.png" alt="' . $GLOBALS['strKill'] . '" title="' . $GLOBALS['strKill'] . '" border="0" />'; $del_str = $iconic_spacer . '<img width="12" height="13" src="images/button_drop.png" alt="' . $GLOBALS['strKill'] . '" title="' . $GLOBALS['strKill'] . '" border="0" />';
if ($propicon == 'both') { if ($propicon == 'both') {
$del_str .= '&nbsp;' . $GLOBALS['strKill'] . '</nobr>'; $del_str .= '&nbsp;' . $GLOBALS['strKill'] . '</div>';
} }
} }
} // end if (1.2.2) } // end if (1.2.2)
@@ -1217,7 +1232,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
if (!isset($row[$i]) || is_null($row[$i])) { if (!isset($row[$i]) || is_null($row[$i])) {
$vertical_display['data'][$row_no][$i] = ' <td align="right" valign="top" ' . $column_style . ' bgcolor="' . $bgcolor . '"><i>NULL</i></td>' . "\n"; $vertical_display['data'][$row_no][$i] = ' <td align="right" valign="top" ' . $column_style . ' bgcolor="' . $bgcolor . '"><i>NULL</i></td>' . "\n";
} else if ($row[$i] != '') { } else if ($row[$i] != '') {
$vertical_display['data'][$row_no][$i] = ' <td align="right" valign="top" ' . $column_style . ' bgcolor="' . $bgcolor . '" nowrap="nowrap">'; $vertical_display['data'][$row_no][$i] = ' <td align="right" valign="top" ' . $column_style . ' bgcolor="' . $bgcolor . '" class="nowrap">';
if (isset($analyzed_sql[0]['select_expr']) && is_array($analyzed_sql[0]['select_expr'])) { if (isset($analyzed_sql[0]['select_expr']) && is_array($analyzed_sql[0]['select_expr'])) {
foreach($analyzed_sql[0]['select_expr'] AS $select_expr_position => $select_expr) { foreach($analyzed_sql[0]['select_expr'] AS $select_expr_position => $select_expr) {
@@ -1267,7 +1282,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
} }
$vertical_display['data'][$row_no][$i] .= '</td>' . "\n"; $vertical_display['data'][$row_no][$i] .= '</td>' . "\n";
} else { } else {
$vertical_display['data'][$row_no][$i] = ' <td align="right" ' . $column_style . ' valign="top" bgcolor="' . $bgcolor . '" nowrap="nowrap">&nbsp;</td>' . "\n"; $vertical_display['data'][$row_no][$i] = ' <td align="right" ' . $column_style . ' valign="top" bgcolor="' . $bgcolor . '" class="nowrap">&nbsp;</td>' . "\n";
} }
// b l o b // b l o b
@@ -1764,14 +1779,6 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
// end 2b // end 2b
// 3. ----- Displays the results table ----- // 3. ----- Displays the results table -----
echo '<!-- Results table -->' . "\n"
. '<table ';
if (isset($GLOBALS['printview']) && $GLOBALS['printview'] == '1') {
echo 'border="1" cellpadding="2" cellspacing="0"';
} else {
echo 'border="' . $GLOBALS['cfg']['Border'] . '" cellpadding="5"';
}
echo '>' . "\n";
PMA_displayTableHeaders($is_display, $fields_meta, $fields_cnt, $analyzed_sql); PMA_displayTableHeaders($is_display, $fields_meta, $fields_cnt, $analyzed_sql);
$url_query=''; $url_query='';
PMA_displayTableBody($dt_result, $is_display, $map, $analyzed_sql); PMA_displayTableBody($dt_result, $is_display, $map, $analyzed_sql);

12
querywindow.php
View File

@@ -103,12 +103,12 @@ if ($cfg['QueryFrameJS'] && !isset($no_js)) {
<td width="8">&nbsp;</td>'; <td width="8">&nbsp;</td>';
} }
echo "\n"; echo "\n";
echo PMA_printTab($strSQL, '#', '', 'onClick="javascript:query_tab_commit(\'sql\');return false;"', '', (isset($querydisplay_tab) && $querydisplay_tab == 'sql' ? TRUE : FALSE)); echo PMA_printTab($strSQL, '#', '', 'onClick="javascript:query_tab_commit(\'sql\');return false;"', '', '', (isset($querydisplay_tab) && $querydisplay_tab == 'sql' ? TRUE : FALSE));
echo PMA_printTab($strImportFiles, '#', '', 'onClick="javascript:query_tab_commit(\'files\');return false;"', '', (isset($querydisplay_tab) && $querydisplay_tab == 'files' ? TRUE : FALSE)); echo PMA_printTab($strImportFiles, '#', '', 'onClick="javascript:query_tab_commit(\'files\');return false;"', '', '', (isset($querydisplay_tab) && $querydisplay_tab == 'files' ? TRUE : FALSE));
echo PMA_printTab($strQuerySQLHistory, '#', '', 'onClick="javascript:query_tab_commit(\'history\');return false;"', '', (isset($querydisplay_tab) && $querydisplay_tab == 'history' ? TRUE : FALSE)); echo PMA_printTab($strQuerySQLHistory, '#', '', 'onClick="javascript:query_tab_commit(\'history\');return false;"', '', '', (isset($querydisplay_tab) && $querydisplay_tab == 'history' ? TRUE : FALSE));
if ($cfg['QueryWindowDefTab'] == 'full') { if ($cfg['QueryWindowDefTab'] == 'full') {
echo PMA_printTab($strAll, '#', '', 'onClick="javascript:query_tab_commit(\'full\');return false;"', '', (isset($querydisplay_tab) && $querydisplay_tab == 'full' ? TRUE : FALSE)); echo PMA_printTab($strAll, '#', '', 'onClick="javascript:query_tab_commit(\'full\');return false;"', '', '', (isset($querydisplay_tab) && $querydisplay_tab == 'full' ? TRUE : FALSE));
} }
if (!$cfg['LightTabs']) { if (!$cfg['LightTabs']) {
@@ -129,7 +129,7 @@ if ($cfg['PropertiesIconic'] == true) {
$propicon = (string)$cfg['PropertiesIconic']; $propicon = (string)$cfg['PropertiesIconic'];
if ($propicon == 'both') { if ($propicon == 'both') {
$iconic_spacer = '<nobr>'; $iconic_spacer = '<div class="nowrap">';
} else { } else {
$iconic_spacer = ''; $iconic_spacer = '';
} }
@@ -137,7 +137,7 @@ if ($cfg['PropertiesIconic'] == true) {
$titles['Change'] = $iconic_spacer . '<img hspace="7" width="12" height="13" src="images/button_edit.png" alt="' . $strChange . '" title="' . $strChange . '" border="0" />'; $titles['Change'] = $iconic_spacer . '<img hspace="7" width="12" height="13" src="images/button_edit.png" alt="' . $strChange . '" title="' . $strChange . '" border="0" />';
if ($propicon == 'both') { if ($propicon == 'both') {
$titles['Change'] .= '&nbsp;' . $strChange . '&nbsp;</nobr>'; $titles['Change'] .= '&nbsp;' . $strChange . '&nbsp;</div>';
} }
} else { } else {
$titles['Change'] = $strChange; $titles['Change'] = $strChange;

4
tbl_change.php
View File

@@ -178,7 +178,7 @@ if ($cfg['PropertiesIconic'] == true) {
$propicon = (string)$cfg['PropertiesIconic']; $propicon = (string)$cfg['PropertiesIconic'];
if ($propicon == 'both') { if ($propicon == 'both') {
$iconic_spacer = '<nobr>'; $iconic_spacer = '<div class="nowrap">';
} else { } else {
$iconic_spacer = ''; $iconic_spacer = '';
} }
@@ -186,7 +186,7 @@ if ($cfg['PropertiesIconic'] == true) {
$titles['Browse'] = $iconic_spacer . '<img width="12" height="13" src="images/button_browse.png" alt="' . $strBrowseForeignValues . '" title="' . $strBrowseForeignValues . '" border="0" />'; $titles['Browse'] = $iconic_spacer . '<img width="12" height="13" src="images/button_browse.png" alt="' . $strBrowseForeignValues . '" title="' . $strBrowseForeignValues . '" border="0" />';
if ($propicon == 'both') { if ($propicon == 'both') {
$titles['Browse'] .= '&nbsp;' . $strBrowseForeignValues . '</nobr>'; $titles['Browse'] .= '&nbsp;' . $strBrowseForeignValues . '</div>';
} }
} else { } else {
$titles['Browse'] = $strBrowseForeignValues; $titles['Browse'] = $strBrowseForeignValues;

8
tbl_indexes.php
View File

@@ -404,16 +404,16 @@ else if (!defined('PMA_IDX_INCLUDED')
$propicon = (string)$cfg['PropertiesIconic']; $propicon = (string)$cfg['PropertiesIconic'];
if ($cfg['PropertiesIconic'] === true || $propicon == 'both') { if ($cfg['PropertiesIconic'] === true || $propicon == 'both') {
$edit_link_text = '<img src="./images/button_edit.png" width="12" height="13" hspace="7" border="0" title="' . $strEdit . '" alt="' . $strEdit . '">'; $edit_link_text = '<img src="./images/button_edit.png" width="12" height="13" hspace="7" border="0" title="' . $strEdit . '" alt="' . $strEdit . '" />';
$drop_link_text = '<img src="./images/button_drop.png" width="11" height="12" hspace="7" border="0" title="' . $strDrop . '" alt="' . $strDrop . '">'; $drop_link_text = '<img src="./images/button_drop.png" width="11" height="12" hspace="7" border="0" title="' . $strDrop . '" alt="' . $strDrop . '" />';
} }
if ($cfg['PropertiesIconic'] === false || $propicon == 'both') { if ($cfg['PropertiesIconic'] === false || $propicon == 'both') {
$edit_link_text .= $strEdit; $edit_link_text .= $strEdit;
$drop_link_text .= $strDrop; $drop_link_text .= $strDrop;
} }
if ($propicon == 'both') { if ($propicon == 'both') {
$edit_link_text = '<nobr>' . $edit_link_text . '</nobr>'; $edit_link_text = '<div class="nowrap">' . $edit_link_text . '</div>';
$drop_link_text = '<nobr>' . $drop_link_text . '</nobr>'; $drop_link_text = '<div class="nowrap">' . $drop_link_text . '</div>';
} }
if ($idx_cnt > 0) { if ($idx_cnt > 0) {

11
tbl_properties_links.php
View File

@@ -43,7 +43,8 @@ if ($table_info_num_rows > 0) {
. urlencode($ln6_stt . PMA_backquote($table)) . urlencode($ln6_stt . PMA_backquote($table))
. '&amp;zero_rows=' . '&amp;zero_rows='
. urlencode(sprintf($strTableHasBeenEmptied, htmlspecialchars($table))); . urlencode(sprintf($strTableHasBeenEmptied, htmlspecialchars($table)));
$att6 = 'class="drop" onclick="return confirmLink(this, \'' . $ln6_stt . PMA_jsFormat($table) . '\')"'; $att6 = 'onclick="return confirmLink(this, \'' . $ln6_stt . PMA_jsFormat($table) . '\')"';
$class6 = 'drop';
} else { } else {
$lnk2 = ''; $lnk2 = '';
$arg2 = ''; $arg2 = '';
@@ -52,10 +53,12 @@ if ($table_info_num_rows > 0) {
$lnk6 = ''; $lnk6 = '';
$arg6 = ''; $arg6 = '';
$att6 = ''; $att6 = '';
$class6 = '';
} }
$arg7 = $url_query . '&amp;reload=1&amp;purge=1&amp;sql_query=' . urlencode('DROP TABLE ' . PMA_backquote($table) ) . '&amp;zero_rows=' . urlencode(sprintf($strTableHasBeenDropped, htmlspecialchars($table))); $arg7 = $url_query . '&amp;reload=1&amp;purge=1&amp;sql_query=' . urlencode('DROP TABLE ' . PMA_backquote($table) ) . '&amp;zero_rows=' . urlencode(sprintf($strTableHasBeenDropped, htmlspecialchars($table)));
$att7 = 'class="drop" onclick="return confirmLink(this, \'DROP TABLE ' . PMA_jsFormat($table) . '\')"'; $att7 = 'onclick="return confirmLink(this, \'DROP TABLE ' . PMA_jsFormat($table) . '\')"';
$class7 = 'drop';
/** /**
@@ -77,8 +80,8 @@ echo PMA_printTab($strStructure, 'tbl_properties_structure.php', $url_query)
. PMA_printTab($strInsert, 'tbl_change.php', $url_query) . PMA_printTab($strInsert, 'tbl_change.php', $url_query)
. PMA_printTab($strExport, 'tbl_properties_export.php', $url_query . '&amp;single_table=true') . PMA_printTab($strExport, 'tbl_properties_export.php', $url_query . '&amp;single_table=true')
. PMA_printTab($strOperations, 'tbl_properties_operations.php', $url_query) . PMA_printTab($strOperations, 'tbl_properties_operations.php', $url_query)
. PMA_printTab($strEmpty, $lnk6, $arg6, $att6) . PMA_printTab($strEmpty, $lnk6, $arg6, $att6, $class6)
. PMA_printTab($strDrop, 'sql.php', $arg7, $att7) . PMA_printTab($strDrop, 'sql.php', $arg7, $att7, $class7)
. "\n"; . "\n";
if (!$cfg['LightTabs']) { if (!$cfg['LightTabs']) {

4
tbl_properties_structure.php
View File

@@ -216,7 +216,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
$propicon = (string)$cfg['PropertiesIconic']; $propicon = (string)$cfg['PropertiesIconic'];
if ($propicon == 'both') { if ($propicon == 'both') {
$iconic_spacer = '<nobr>'; $iconic_spacer = '<div class="nowrap">';
} else { } else {
$iconic_spacer = ''; $iconic_spacer = '';
} }
@@ -234,7 +234,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
$titles['NoIdxFulltext'] = $iconic_spacer . '<img hspace="7" width="11" height="13" src="images/button_nofulltext.png" alt="' . $strIdxFulltext . '" title="' . $strIdxFulltext . '" border="0" />'; $titles['NoIdxFulltext'] = $iconic_spacer . '<img hspace="7" width="11" height="13" src="images/button_nofulltext.png" alt="' . $strIdxFulltext . '" title="' . $strIdxFulltext . '" border="0" />';
if ($propicon == 'both') { if ($propicon == 'both') {
$titles['Change'] .= '&nbsp;' . $strChange . '</nobr>'; $titles['Change'] .= '&nbsp;' . $strChange . '</div>';
$titles['Drop'] .= '&nbsp;' . $strDrop . '</nobr>'; $titles['Drop'] .= '&nbsp;' . $strDrop . '</nobr>';
$titles['NoDrop'] .= '&nbsp;' . $strDrop . '</nobr>'; $titles['NoDrop'] .= '&nbsp;' . $strDrop . '</nobr>';
$titles['Primary'] .= '&nbsp;' . $strPrimary . '</nobr>'; $titles['Primary'] .= '&nbsp;' . $strPrimary . '</nobr>';

18
tbl_query_box.php
View File

@@ -90,6 +90,7 @@ if ($cfg['QueryFrame'] && (!$cfg['QueryFrameJS'] && !$db || ($cfg['QueryFrameJS'
$form_items = 0; $form_items = 0;
echo "<li>\n";
if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow) && $is_inside_querywindow) { if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow) && $is_inside_querywindow) {
?> ?>
<script type="text/javascript"> <script type="text/javascript">
@@ -144,7 +145,7 @@ if (!empty($query_to_display)) {
</td> </td>
<?php if (isset($table) && $fields_cnt > 0) { ?> <?php if (isset($table) && $fields_cnt > 0) { ?>
<td align="center" valign="top"><?php echo (isset($is_inside_querywindow) ? '<br />' : '') . $strFields; ?>:<br /> <td align="center" valign="top"><?php echo (isset($is_inside_querywindow) ? '<br />' : '') . $strFields; ?>:<br />
<select name="dummy" size="4" multiple> <select name="dummy" size="4" multiple="multiple">
<?php <?php
echo "\n"; echo "\n";
for ($i = 0 ; $i < $fields_cnt; $i++) { for ($i = 0 ; $i < $fields_cnt; $i++) {
@@ -174,7 +175,6 @@ if (!empty($query_to_display)) {
$form_items++; $form_items++;
?> ?>
</div>
<?php <?php
} else { } else {
?> ?>
@@ -381,6 +381,7 @@ if (!isset($is_inside_querywindow) || (isset($is_inside_querywindow) && $is_insi
} }
?> ?>
</form> </form>
</li>
<?php <?php
if (!isset($is_inside_querywindow) || if (!isset($is_inside_querywindow) ||
(isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'files' || $querydisplay_tab == 'full')) && isset($db) && $db != '') { (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'files' || $querydisplay_tab == 'full')) && isset($db) && $db != '') {
@@ -391,14 +392,15 @@ if (!isset($is_inside_querywindow) ||
if ($is_upload && isset($db) && isset($table)) { if ($is_upload && isset($db) && isset($table)) {
?> ?>
<!-- Insert a text file --> <!-- Insert a text file -->
<br /><br /> <li style="margin-bottom: 10px">
<li>
<?php <?php
if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) { if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
?> ?>
<script type="text/javascript"> <script type="text/javascript">
document.writeln('<div style="margin-bottom: 10px"><a href="<?php echo (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE ? '#' : $ldi_target); ?>" <?php echo (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE ? 'onclick="opener.parent.frames.phpmain\' + opener.parent.frames.queryframe.document.hashform.hash.value + \'.location.href = \\\'' . $ldi_target . '\\\'; return false;"' : ''); ?>><?php echo addslashes($strInsertTextfiles); ?></a></div>'); <!--
document.writeln('<a href="<?php echo (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE ? '#' : $ldi_target); ?>" <?php echo (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE ? 'onclick="opener.parent.frames.phpmain\' + opener.parent.frames.queryframe.document.hashform.hash.value + \'.location.href = \\\'' . $ldi_target . '\\\'; return false;"' : ''); ?>><?php echo addslashes($strInsertTextfiles); ?></a>');
//-->
</script> </script>
<?php <?php
@@ -406,7 +408,9 @@ if (!isset($is_inside_querywindow) ||
?> ?>
<script type="text/javascript"> <script type="text/javascript">
document.writeln('<div style="margin-bottom: 10px"><a href="<?php echo (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE ? '#' : $ldi_target); ?>" <?php echo (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE ? 'onclick="opener.parent.frames.phpmain' . md5($cfg['PmaAbsoluteUri']) . '.location.href = \\\'' . $ldi_target . '\\\'; return false;"' : ''); ?>><?php echo addslashes($strInsertTextfiles); ?></a></div>'); <!--
document.writeln('<a href="<?php echo (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE ? '#' : $ldi_target); ?>" <?php echo (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE ? 'onclick="opener.parent.frames.phpmain' . md5($cfg['PmaAbsoluteUri']) . '.location.href = \\\'' . $ldi_target . '\\\'; return false;"' : ''); ?>><?php echo addslashes($strInsertTextfiles); ?></a>');
//-->
</script> </script>
<?php <?php
@@ -414,7 +418,7 @@ if (!isset($is_inside_querywindow) ||
?> ?>
<noscript> <noscript>
<div style="margin-bottom: 10px"><a href="<?php echo $ldi_target; ?>"><?php echo $strInsertTextfiles; ?></a></div> <a href="<?php echo $ldi_target; ?>"><?php echo $strInsertTextfiles; ?></a>
</noscript> </noscript>
</li> </li>
<?php <?php

4
tbl_select.php
View File

@@ -16,7 +16,7 @@ if ($cfg['PropertiesIconic'] == true) {
$propicon = (string)$cfg['PropertiesIconic']; $propicon = (string)$cfg['PropertiesIconic'];
if ($propicon == 'both') { if ($propicon == 'both') {
$iconic_spacer = '<nobr>'; $iconic_spacer = '<div class="nowrap">';
} else { } else {
$iconic_spacer = ''; $iconic_spacer = '';
} }
@@ -24,7 +24,7 @@ if ($cfg['PropertiesIconic'] == true) {
$titles['Browse'] = $iconic_spacer . '<img width="12" height="13" src="images/button_browse.png" alt="' . $strBrowseForeignValues . '" title="' . $strBrowseForeignValues . '" border="0" />'; $titles['Browse'] = $iconic_spacer . '<img width="12" height="13" src="images/button_browse.png" alt="' . $strBrowseForeignValues . '" title="' . $strBrowseForeignValues . '" border="0" />';
if ($propicon == 'both') { if ($propicon == 'both') {
$titles['Browse'] .= '&nbsp;' . $strBrowseForeignValues . '</nobr>'; $titles['Browse'] .= '&nbsp;' . $strBrowseForeignValues . '</div>';
} }
} else { } else {
$titles['Browse'] = $strBrowseForeignValues; $titles['Browse'] = $strBrowseForeignValues;