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

Patch #947190

Browse Source
This commit is contained in:
Alexander M. Turek
2004-05-16 17:32:15 +00:00
parent 22b5117239
commit 0b6975f8bd
16 changed files with 501 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@@ -5,6 +5,18 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2004-05-16 Alexander M. Turek <me@derrabus.de>
* db_details.php, db_details_structure.php, sql.php, tbl_indexes.php,
tbl_properties_structure.php, tbl_query_box.php,
images/b_dbstatistics.png, images/b_tbloptimize.png,
images/b_useradd.png, images/b_usercheck.png, images/b_userdrop.png,
images/b_useredit, libraries/display_tbl.lib.php,
libraries/display_tbl_links.lib.php:
Patch #947190 (Redesign) - Part 2, thanks to Michael Keck (mkkeck).
* libraries/functions.js: Bugfix for (un)check all features if
$cfg['ModifyAtLeft'] and $cfg['ModifyAtRight'] are enabled both, thanks
to Michael Keck (mkkeck).
2004-05-14 Michal Čihař <michal@cihar.com> 2004-05-14 Michal Čihař <michal@cihar.com>
* libraries/auth/cookie.auth.lib.php: Use one cookie set for each server, * libraries/auth/cookie.auth.lib.php: Use one cookie set for each server,
not just one global (patch #952917, bug #687009). not just one global (patch #952917, bug #687009).

176
db_details.php
View File

@@ -48,19 +48,38 @@ $auto_sel = ($cfg['TextareaAutoSelect']
&& !(PMA_USR_OS == 'Win' && PMA_USR_BROWSER_AGENT == 'OPERA' && PMA_USR_BROWSER_VER >= 7)) && !(PMA_USR_OS == 'Win' && PMA_USR_BROWSER_AGENT == 'OPERA' && PMA_USR_BROWSER_VER >= 7))
? "\n" . ' onfocus="if (typeof(document.layers) == \'undefined\' || typeof(textarea_selected) == \'undefined\') {textarea_selected = 1; this.form.elements[\'sql_query\'].select();}"' ? "\n" . ' onfocus="if (typeof(document.layers) == \'undefined\' || typeof(textarea_selected) == \'undefined\') {textarea_selected = 1; this.form.elements[\'sql_query\'].select();}"'
: ''; : '';
// added by mkkeck
$strErrorUploadDir = '';
// is needed to check if an error in $cfg['UploadDir'] (or this dir not exist)
// for better administration
$strHiddenFields = ' <input type="hidden" name="is_js_confirmed" value="0" />' ."\n"
. ' ' .PMA_generate_common_hidden_inputs($db) . "\n"
. ' <input type="hidden" name="pos" value="0" />' . "\n"
. ' <input type="hidden" name="goto" value="db_details.php" />' . "\n"
. ' <input type="hidden" name="zero_rows" value="' . htmlspecialchars($strSuccess) . '" />' . "\n"
. ' <input type="hidden" name="prev_sql_query" value="' . ((!empty($query_to_display)) ? htmlspecialchars($query_to_display) : '') . '" />' . "\n";
?> ?>
<!-- Query box, sql file loader and bookmark support --> <!-- Query box, sql file loader and bookmark support -->
<a name="querybox"></a> <a name="querybox"></a>
<form method="post" action="read_dump.php"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; echo "\n"; ?> <table border="0" cellpadding="2" cellspacing="0">
<form method="post" action="read_dump.php"
onsubmit="return checkSqlQuery(this)"> onsubmit="return checkSqlQuery(this)">
<input type="hidden" name="is_js_confirmed" value="0" /> <tr><td class="tblHeaders" colspan="2">
<?php echo PMA_generate_common_hidden_inputs($db); ?> <?php
<input type="hidden" name="pos" value="0" /> echo $strHiddenFields;
<input type="hidden" name="goto" value="db_details.php" /> // if you want navigation:
<input type="hidden" name="zero_rows" value="<?php echo htmlspecialchars($strSuccess); ?>" /> $strDBLink = '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . $header_url_qry . '&amp;db=' . urlencode($db) . '">'
<input type="hidden" name="prev_sql_query" value="<?php echo ((!empty($query_to_display)) ? htmlspecialchars($query_to_display) : ''); ?>" /> . htmlspecialchars($db) . '</a>';
<?php echo sprintf($strRunSQLQuery, htmlspecialchars($db)) . ' ' . PMA_showMySQLDocu('Reference', 'SELECT'); ?>&nbsp;:<br /> // else use
<div style="margin-bottom: 5px"> // $strDBLink = htmlspecialchars($db);
echo '&nbsp;' . sprintf($strRunSQLQuery, $strDBLink) . ':&nbsp;' . PMA_showMySQLDocu('Reference', 'SELECT');
?>
</td></tr>
<tr align="center" bgcolor="<?php echo $cfg['BgcolorOne']; ?>"><td colspan="2">
<textarea name="sql_query" cols="<?php echo $cfg['TextareaCols'] * 2; ?>" rows="<?php echo $cfg['TextareaRows']; ?>" dir="<?php echo $text_dir; ?>"<?php echo $auto_sel; ?>> <textarea name="sql_query" cols="<?php echo $cfg['TextareaCols'] * 2; ?>" rows="<?php echo $cfg['TextareaRows']; ?>" dir="<?php echo $text_dir; ?>"<?php echo $auto_sel; ?>>
<?php <?php
if (!empty($query_to_display)) { if (!empty($query_to_display)) {
@@ -68,48 +87,60 @@ if (!empty($query_to_display)) {
} else { } else {
echo htmlspecialchars(str_replace('%d', PMA_backquote($db), $cfg['DefaultQueryDatabase'])); echo htmlspecialchars(str_replace('%d', PMA_backquote($db), $cfg['DefaultQueryDatabase']));
} }
?></textarea><br /> ?></textarea>
<input type="checkbox" name="show_query" value="1" id="checkbox_show_query" checked="checked" />&nbsp; </td></tr>
<label for="checkbox_show_query"><?php echo $strShowThisQuery; ?></label><br /> <tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>">
</div> <td>
<input type="checkbox" name="show_query" value="1" id="checkbox_show_query" checked="checked" />
<label for="checkbox_show_query"><?php echo $strShowThisQuery; ?></label>
</td>
<td align="right"><input type="submit" name="SQL" value="<?php echo $strGo; ?>" /></td>
</tr>
<?php <?php
// loic1: displays import dump feature only if file upload available // loic1: displays import dump feature only if file upload available
if ($is_upload) { if ($is_upload) {
echo ' <i>' . $strOr . '</i> ' . $strLocationTextfile . '&nbsp;:<br />' . "\n"; ?>
?> <tr><td colspan="2"><img src="images/spacer.png" width="1" height="1" border="0" alt="" /></td></tr>
<div style="margin-bottom: 5px"> <tr>
<input type="file" name="sql_file" class="textfield" />&nbsp;<?php echo PMA_displayMaximumUploadSize($max_upload_size);?><br /> <td colspan="2" class="tblHeaders">
<?php <?php
echo ' <i>&nbsp;' . $strOr . '</i>' . "\n";
?>
</td>
</tr>
<tr><td colspan="2" bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"><b>&nbsp;<?php echo $strLocationTextfile . ':'; ?></b></td></tr>
<tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>">
<td colspan="2" align="center">
<input type="file" name="sql_file" class="textfield" />&nbsp;
<?php
echo PMA_displayMaximumUploadSize($max_upload_size) . '<br />';
// some browsers should respect this :) // some browsers should respect this :)
echo ' ' . PMA_generateHiddenMaxFileSize($max_upload_size) . "\n"; echo ' ' . PMA_generateHiddenMaxFileSize($max_upload_size) . "\n";
$is_gzip = ($cfg['GZipDump'] && @function_exists('gzopen')); $is_gzip = ($cfg['GZipDump'] && @function_exists('gzopen'));
$is_bzip = ($cfg['BZipDump'] && @function_exists('bzdecompress')); $is_bzip = ($cfg['BZipDump'] && @function_exists('bzdecompress'));
if ($is_bzip || $is_gzip) { if ($is_bzip || $is_gzip) {
echo ' ' . $strCompression . ':' . "\n" echo ' </td>' . "\n"
. ' <input type="radio" id="radio_sql_file_compression_auto" name="sql_file_compression" value="" checked="checked" />' . "\n" . '</tr>' . "\n"
. ' <label for="radio_sql_file_compression_auto">' . $strAutodetect . '</label>&nbsp;&nbsp;&nbsp;' . "\n" . '<tr bgcolor="' . $cfg['BgcolorOne'] . '">' . "\n"
. ' <input type="radio" id="radio_sql_file_compression_plain" name="sql_file_compression" value="text/plain" />' . "\n" . ' <td colspan="2">' . "\n";
. ' <label for="radio_sql_file_compression_plain">' . $strNone . '</label>&nbsp;&nbsp;&nbsp;' . "\n"; echo ' &nbsp;&nbsp;' . $strCompression . ':<br />&nbsp;&nbsp;&nbsp;' . "\n"
. ' <input type="radio" id="radio_sql_file_compression_auto" name="sql_file_compression" value="" checked="checked" /><label for="radio_sql_file_compression_auto">' . $strAutodetect . '</label>&nbsp;&nbsp;' . "\n"
. ' <input type="radio" id="radio_sql_file_compression_plain" name="sql_file_compression" value="text/plain" /><label for="radio_sql_file_compression_plain">' . $strNone . '</label>&nbsp;&nbsp' . "\n";
if ($is_gzip) { if ($is_gzip) {
echo ' <input type="radio" id="radio_sql_file_compression_gzip" name="sql_file_compression" value="application/x-gzip" />' . "\n" echo ' <input type="radio" id="radio_sql_file_compression_gzip" name="sql_file_compression" value="application/x-gzip" /><label for="radio_sql_file_compression_gzip">' . $strGzip . '</label>&nbsp;&nbsp;' . "\n";
. ' <label for="radio_sql_file_compression_gzip">' . $strGzip . '</label>&nbsp;&nbsp;&nbsp;' . "\n";
} }
if ($is_bzip) { if ($is_bzip) {
echo ' <input type="radio" id="radio_sql_file_compression_bzip" name="sql_file_compression" value="application/x-bzip" />' . "\n" echo ' <input type="radio" id="radio_sql_file_compression_bzip" name="sql_file_compression" value="application/x-bzip" /><label for="radio_sql_file_compression_bzip">' . $strBzip . '</label>&nbsp;&nbsp;' . "\n";
. ' <label for="radio_sql_file_compression_bzip">' . $strBzip . '</label>&nbsp;&nbsp;&nbsp;' . "\n";
} }
} else { } else {
echo ' <input type="hidden" name="sql_file_compression" value="text/plain" />' . "\n";
}
?> ?>
</div> <input type="hidden" name="sql_file_compression" value="text/plain" />
</td>
</tr>
<?php <?php
}
} // end if (is upload) } // end if (is upload)
echo "\n";
// web-server upload directory // web-server upload directory
$is_upload_dir = false; $is_upload_dir = false;
if (!empty($cfg['UploadDir'])) { if (!empty($cfg['UploadDir'])) {
if (substr($cfg['UploadDir'], -1) != '/') { if (substr($cfg['UploadDir'], -1) != '/') {
@@ -122,8 +153,16 @@ if (!empty($cfg['UploadDir'])) {
if ($is_first == 0) { if ($is_first == 0) {
$is_upload_dir = true; $is_upload_dir = true;
echo "\n"; echo "\n";
echo ' <i>' . $strOr . '</i> ' . $strWebServerUploadDirectory . '&nbsp;:<br />' . "\n"; echo ' <tr><td colspan=2" bgcolor="' . $cfg['BgcolorTwo'] . '">' . "\n";
echo ' <div style="margin-bottom: 5px">' . "\n"; echo ' &nbsp;<b>' . $strWebServerUploadDirectory . ':</b>&nbsp;' . "\n";
echo ' </td></tr>' . "\n";
echo ' <tr bgcolor="' . $cfg['BgcolorOne'] . '"><td colspan="2">' . "\n";
// add 2004-05-08 by mkkeck
// todo: building a php script for indexing files in UploadDir
//if ($cfg['UploadDirIndex']) {
// echo '&nbsp;<a href="' . $cfg['UploadDir'] . '" target="_blank">' . $cfg['UploadDir'] . '</a>&nbsp;';
//}
// end indexing
echo ' <select size="1" name="sql_localfile">' . "\n"; echo ' <select size="1" name="sql_localfile">' . "\n";
echo ' <option value="" selected="selected"></option>' . "\n"; echo ' <option value="" selected="selected"></option>' . "\n";
} // end if (is_first) } // end if (is_first)
@@ -133,24 +172,33 @@ if (!empty($cfg['UploadDir'])) {
} // end while } // end while
if ($is_first > 0) { if ($is_first > 0) {
echo ' </select>' . "\n" echo ' </select>' . "\n"
. ' </div>' . "\n\n"; . ' </td>'
. ' </tr>' . "\n\n";
} // end if (isfirst > 0) } // end if (isfirst > 0)
@closedir($handle); @closedir($handle);
$strErrorUploadDir=''; // please see 'else {' below ;)
} }
else { else {
echo ' <div style="margin-bottom: 5px">' . "\n"; // modified by mkkeck 2004-05-08
echo ' <font color="red">' . $strError . '</font><br />' . "\n"; // showing UploadDir Error at the end of all option for SQL-Queries
echo ' ' . $strWebServerUploadDirectoryError . "\n"; $strErrorUploadDir = ' <tr><td colspan="2"><img src="images/spacer.png" width="1" height="1" border="0" alt="" /></td></tr>' . "\n";
echo ' </div>' . "\n"; $strErrorUploadDir.= ' <tr><td colspan="2" class="tblHeadError">';
if($cfg['PropertiesIconic']){
$strErrorUploadDir.= '<img src="./images/s_error.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />';
}
$strErrorUploadDir.= ' ' . $strError . '' . "\n";
$strErrorUploadDir.= '</td><tr>';
$strErrorUploadDir.= '<td colspan="2" class="tblError">';
$strErrorUploadDir.= ' &nbsp;' . wordwrap($strWebServerUploadDirectoryError,80,'<br />&nbsp;') . "\n";
$strErrorUploadDir.= ' </td></tr>' . "\n";
} }
} // end if (web-server upload directory) } // end if (web-server upload directory)
// Charset conversion options // Charset conversion options
if ($is_upload || $is_upload_dir) { if ($is_upload || $is_upload_dir) {
if ($cfg['AllowAnywhereRecoding'] && $allow_recoding) { if ($cfg['AllowAnywhereRecoding'] && $allow_recoding) {
echo ' <div style="margin-bottom: 5px">' . "\n"; echo ' <tr bgcolor="' .$cfg['BgcolorTwo'] . '"><td>' . "\n";
$temp_charset = reset($cfg['AvailableCharsets']); $temp_charset = reset($cfg['AvailableCharsets']);
echo $strCharsetOfFile . "\n" echo '&nbsp;' . $strCharsetOfFile . "\n"
. ' <select name="charset_of_file" size="1">' . "\n" . ' <select name="charset_of_file" size="1">' . "\n"
. ' <option value="' . $temp_charset . '"'; . ' <option value="' . $temp_charset . '"';
if ($temp_charset == $charset) { if ($temp_charset == $charset) {
@@ -165,39 +213,57 @@ if ($is_upload || $is_upload_dir) {
echo '>' . $temp_charset . '</option>' . "\n"; echo '>' . $temp_charset . '</option>' . "\n";
} }
echo ' </select><br />' . "\n" . ' '; echo ' </select><br />' . "\n" . ' ';
echo ' </div>' . "\n"; echo ' </td>' . "\n";
echo ' <td align="right"><input type="submit" name="SQL" value="' . $strGo . '" /></td>' . "\n";
echo ' </tr>' . "\n";
}else{
echo ' <tr bgcolor="' . $cfg['BgcolorTwo'] . '"><td align="right" colspan="2"><input type="submit" name="SQL" value="' . $strGo . '" /></td></tr>' . "\n\n";
} // end if (recoding) } // end if (recoding)
} }
// Bookmark Support // Bookmark Support
if ($cfg['Bookmark']['db'] && $cfg['Bookmark']['table']) { if ($cfg['Bookmark']['db'] && $cfg['Bookmark']['table']) {
if (($bookmark_list = PMA_listBookmarks($db, $cfg['Bookmark'])) && count($bookmark_list) > 0) { if (($bookmark_list = PMA_listBookmarks($db, $cfg['Bookmark'])) && count($bookmark_list) > 0) {
echo " <i>$strOr</i> $strBookmarkQuery&nbsp;:<br />\n"; echo ' <tr><td colspan="2"><img src="./images/spacer.png" width="1" height="1" border="0" alt="" /></td></tr>' . "\n";
echo ' <div style="margin-bottom: 5px">' . "\n"; echo ' <tr><td colspan="2" class="tblHeaders">&nbsp;<i>' . $strOr . '</i></td></tr>' . "\n";
echo ' <tr bgcolor="' . $cfg['BgcolorOne'] . '"><td colspan="2">' . "\n";
echo ' <b>' . $strBookmarkQuery . ':</b>&nbsp;' . "\n";
echo ' <select name="id_bookmark">' . "\n"; echo ' <select name="id_bookmark">' . "\n";
echo ' <option value=""></option>' . "\n"; echo ' <option value=""></option>' . "\n";
foreach($bookmark_list AS $key => $value) { foreach($bookmark_list AS $key => $value) {
echo ' <option value="' . htmlspecialchars($value) . '">' . htmlspecialchars($key) . '</option>' . "\n"; echo ' <option value="' . htmlspecialchars($value) . '">' . htmlspecialchars($key) . '</option>' . "\n";
} }
echo ' </select>' . "<br />\n"; echo ' </select>' . "\n";
echo ' ' . $strVar . ' (<a href="./Documentation.html#faqbookmark" target="documentation">' . $strDocu . '</a>): <input type="text" name="bookmark_variable" class="textfield" size="10" />' . "\n"; echo ' </td></tr><tr bgcolor="' . $cfg['BgcolorOne'] . '"><td colspan="2">';
echo ' ' . $strVar . ' ';
if($cfg['ReplaceHelpImg']){
echo '<a href="./Documentation.html#faqbookmark" target="documentation">'
. '<img src="./images/b_help.png" border="0" width="11" height="11" align="absmiddle" alt="' . $strDocu . '" /></a>';
}else{
echo '(<a href="./Documentation.html#faqbookmark" target="documentation">' . $strDocu . '</a>):&nbsp;';
}
echo ' <input type="text" name="bookmark_variable" class="textfield" size="10" />' . "\n";
echo ' </td></tr><tr bgcolor="' . $cfg['BgcolorOne'] . '"><td>';
echo ' <input type="radio" name="action_bookmark" value="0" id="radio_bookmark0" checked="checked" style="vertical-align: middle" /><label for="radio_bookmark0">' . $strSubmit . '</label>' . "\n"; echo ' <input type="radio" name="action_bookmark" value="0" id="radio_bookmark0" checked="checked" style="vertical-align: middle" /><label for="radio_bookmark0">' . $strSubmit . '</label>' . "\n";
echo ' &nbsp;<input type="radio" name="action_bookmark" value="1" id="radio_bookmark1" style="vertical-align: middle" /><label for="radio_bookmark1">' . $strBookmarkView . '</label>' . "\n"; echo ' &nbsp;<input type="radio" name="action_bookmark" value="1" id="radio_bookmark1" style="vertical-align: middle" /><label for="radio_bookmark1">' . $strBookmarkView . '</label>' . "\n";
echo ' &nbsp;<input type="radio" name="action_bookmark" value="2" id="radio_bookmark2" style="vertical-align: middle" /><label for="radio_bookmark2">' . $strDelete . '</label>' . "\n"; echo ' &nbsp;<input type="radio" name="action_bookmark" value="2" id="radio_bookmark2" style="vertical-align: middle" /><label for="radio_bookmark2">' . $strDelete . '</label>' . "\n";
echo ' <br />' . "\n"; echo ' </td>' . "\n";
echo ' </div>' . "\n"; echo ' <td align="right"><input type="submit" name="SQL" value="' . $strGo . '" /></td>';
} echo ' </tr>' . "\n";
}
} }
// Encoding setting form appended by Y.Kawada // Encoding setting form appended by Y.Kawada
if (function_exists('PMA_set_enc_form')) { if (function_exists('PMA_set_enc_form')) {
echo PMA_set_enc_form(' '); echo PMA_set_enc_form(' ');
} }
// modified by mkkeck 2004-05-08
// showing UploadDir Error at the end of all option for SQL-Queries
if ($strErrorUploadDir!='') {
echo "\n\n" . '<!-- UploadDir not found -->' . "\n" . $strErrorUploadDir . "\n\n";
}
?> ?>
<input type="submit" name="SQL" value="<?php echo $strGo; ?>" />
</form> </form>
</table>
<?php <?php
/** /**
* Displays the footer * Displays the footer

2
db_details_structure.php
View File

@@ -244,7 +244,7 @@ else {
?> ?>
<table cellspacing="0" cellpadding="0" border="0"> <table cellspacing="0" cellpadding="0" border="0">
<tr> <tr>
<td valign="top"> <td valign="top" bgcolor="#cc0000">
<?php <?php
} }

BIN
images/b_dbstatistics.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 263 B

BIN
images/b_tbloptimize.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 300 B

BIN
images/b_usradd.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 523 B

BIN
images/b_usrcheck.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 400 B

BIN
images/b_usrdrop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 438 B

BIN
images/b_usredit.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 493 B

65
libraries/display_tbl.lib.php
View File

@@ -208,7 +208,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $encoded_query)
?> ?>
<!-- Navigation bar --> <!-- Navigation bar -->
<table border="0"> <table border="0" cellpadding="2" cellspacing="0">
<tr> <tr>
<?php <?php
// Move to the beginning or to the previous page // Move to the beginning or to the previous page
@@ -597,7 +597,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
if (isset($GLOBALS['printview']) && $GLOBALS['printview'] == '1') { if (isset($GLOBALS['printview']) && $GLOBALS['printview'] == '1') {
echo 'border="1" cellpadding="2" cellspacing="0"'; echo 'border="1" cellpadding="2" cellspacing="0"';
} else { } else {
echo 'border="' . $GLOBALS['cfg']['Border'] . '" cellpadding="5"'; echo 'border="' . $GLOBALS['cfg']['Border'] . '" cellpadding="2" cellspacing="1"';
} }
echo '>' . "\n"; echo '>' . "\n";
if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') { if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
@@ -637,7 +637,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
?> ?>
<td colspan="<?php echo $fields_cnt; ?>" align="center"> <td colspan="<?php echo $fields_cnt; ?>" align="center">
<a href="<?php echo $text_url; ?>"> <a href="<?php echo $text_url; ?>">
<img src="./images/<?php echo (($dontlimitchars) ? 'partialtext' : 'fulltext'); ?>.png" border="0" width="50" height="20" alt="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" title="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" /></a> <img src="./images/s_<?php echo (($dontlimitchars) ? 'partialtext' : 'fulltext'); ?>.png" border="0" width="50" height="20" alt="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" title="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" /></a>
</td> </td>
</tr> </tr>
@@ -650,7 +650,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
<tr> <tr>
<td colspan="<?php echo $num_rows + floor($num_rows/$repeat_cells) + 1; ?>" align="center"> <td colspan="<?php echo $num_rows + floor($num_rows/$repeat_cells) + 1; ?>" align="center">
<a href="<?php echo $text_url; ?>"> <a href="<?php echo $text_url; ?>">
<img src="./images/<?php echo (($dontlimitchars) ? 'partialtext' : 'fulltext'); ?>.png" border="0" width="50" height="20" alt="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" title="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" /></a> <img src="./images/s_<?php echo (($dontlimitchars) ? 'partialtext' : 'fulltext'); ?>.png" border="0" width="50" height="20" alt="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" title="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" /></a>
</td> </td>
</tr> </tr>
<?php <?php
@@ -666,14 +666,14 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
?> ?>
<td<?php echo $colspan; ?> align="center"> <td<?php echo $colspan; ?> align="center">
<a href="<?php echo $text_url; ?>"> <a href="<?php echo $text_url; ?>">
<img src="./images/<?php echo (($dontlimitchars) ? 'partialtext' : 'fulltext'); ?>.png" border="0" width="50" height="20" alt="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" title="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" /></a> <img src="./images/s_<?php echo (($dontlimitchars) ? 'partialtext' : 'fulltext'); ?>.png" border="0" width="50" height="20" alt="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" title="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" /></a>
</td> </td>
<?php <?php
} // end horizontal/horizontalflipped mode } // end horizontal/horizontalflipped mode
else { else {
$vertical_display['textbtn'] = ' <td' . $rowspan . ' align="center" valign="middle">' . "\n" $vertical_display['textbtn'] = ' <td' . $rowspan . ' align="center" valign="middle">' . "\n"
. ' <a href="' . $text_url . '">' . "\n" . ' <a href="' . $text_url . '">' . "\n"
. ' <img src="./images/' . (($dontlimitchars) ? 'partialtext' : 'fulltext') . '.png" border="0" width="50" height="20" alt="' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '" title="' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '" /></a>' . "\n" . ' <img src="./images/s_' . (($dontlimitchars) ? 'partialtext' : 'fulltext') . '.png" border="0" width="50" height="20" alt="' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '" title="' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '" /></a>' . "\n"
. ' </td>' . "\n"; . ' </td>' . "\n";
} // end vertical mode } // end vertical mode
} }
@@ -802,11 +802,11 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
} }
else if (preg_match('@[[:space:]]ASC$@i', $sort_expression)) { else if (preg_match('@[[:space:]]ASC$@i', $sort_expression)) {
$sort_order .= ' DESC'; $sort_order .= ' DESC';
$order_img = '&nbsp;<img src="./images/asc_order.png" border="0" width="7" height="7" alt="'. $GLOBALS['strAscending'] . '" title="'. $GLOBALS['strAscending'] . '" />'; $order_img = '&nbsp;<img src="./images/s_asc.png" border="0" width="11" height="9" alt="'. $GLOBALS['strAscending'] . '" title="'. $GLOBALS['strAscending'] . '" />';
} }
else if (preg_match('@[[:space:]]DESC$@i', $sort_expression)) { else if (preg_match('@[[:space:]]DESC$@i', $sort_expression)) {
$sort_order .= ' ASC'; $sort_order .= ' ASC';
$order_img = '&nbsp;<img src="./images/desc_order.png" border="0" width="7" height="7" alt="'. $GLOBALS['strDescending'] . '" title="'. $GLOBALS['strDescending'] . '" />'; $order_img = '&nbsp;<img src="./images/s_desc.png" border="0" width="11" height="9" alt="'. $GLOBALS['strDescending'] . '" title="'. $GLOBALS['strDescending'] . '" />';
} }
if (preg_match('@(.*)([[:space:]](LIMIT (.*)|PROCEDURE (.*)|FOR UPDATE|LOCK IN SHARE MODE))@i', $unsorted_sql_query, $regs3)) { if (preg_match('@(.*)([[:space:]](LIMIT (.*)|PROCEDURE (.*)|FOR UPDATE|LOCK IN SHARE MODE))@i', $unsorted_sql_query, $regs3)) {
$sorted_sql_query = $regs3[1] . $sort_order . $regs3[2]; $sorted_sql_query = $regs3[1] . $sort_order . $regs3[2];
@@ -884,14 +884,14 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
?> ?>
<td<?php echo $colspan; ?> align="center"> <td<?php echo $colspan; ?> align="center">
<a href="<?php echo $text_url; ?>"> <a href="<?php echo $text_url; ?>">
<img src="./images/<?php echo (($dontlimitchars) ? 'partialtext' : 'fulltext'); ?>.png" border="0" width="50" height="20" alt="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" title="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" /></a> <img src="./images/s_<?php echo (($dontlimitchars) ? 'partialtext' : 'fulltext'); ?>.png" border="0" width="50" height="20" alt="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" title="<?php echo (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']); ?>" /></a>
</td> </td>
<?php <?php
} // end horizontal/horizontalflipped mode } // end horizontal/horizontalflipped mode
else { else {
$vertical_display['textbtn'] = ' <td' . $rowspan . ' align="center" valign="middle">' . "\n" $vertical_display['textbtn'] = ' <td' . $rowspan . ' align="center" valign="middle">' . "\n"
. ' <a href="' . $text_url . '">' . "\n" . ' <a href="' . $text_url . '">' . "\n"
. ' <img src="./images/' . (($dontlimitchars) ? 'partialtext' : 'fulltext') . '.png" border="0" width="50" height="20" alt="' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '" title="' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '" /></a>' . "\n" . ' <img src="./images/s_' . (($dontlimitchars) ? 'partialtext' : 'fulltext') . '.png" border="0" width="50" height="20" alt="' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '" title="' . (($dontlimitchars) ? $GLOBALS['strPartialText'] : $GLOBALS['strFullText']) . '" /></a>' . "\n"
. ' </td>' . "\n"; . ' </td>' . "\n";
} // end vertical mode } // end vertical mode
} }
@@ -1106,7 +1106,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
if ($GLOBALS['cfg']['PropertiesIconic'] == FALSE) { if ($GLOBALS['cfg']['PropertiesIconic'] == FALSE) {
$edit_str = $GLOBALS['strEdit']; $edit_str = $GLOBALS['strEdit'];
} 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="16" height="16" src="images/b_edit.png" alt="' . $GLOBALS['strEdit'] . '" title="' . $GLOBALS['strEdit'] . '" border="0" />';
if ($propicon == 'both') { if ($propicon == 'both') {
$edit_str .= '&nbsp;' . $GLOBALS['strEdit'] . '</div>'; $edit_str .= '&nbsp;' . $GLOBALS['strEdit'] . '</div>';
} }
@@ -1125,7 +1125,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
if ($GLOBALS['cfg']['PropertiesIconic'] == FALSE) { if ($GLOBALS['cfg']['PropertiesIconic'] == FALSE) {
$bookmark_go .= $GLOBALS['strExecuteBookmarked']; $bookmark_go .= $GLOBALS['strExecuteBookmarked'];
} 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="16" height="16" src="images/b_bookmark.png" alt="' . $GLOBALS['strExecuteBookmarked'] . '" title="' . $GLOBALS['strExecuteBookmarked'] . '" border="0" />';
if ($propicon == 'both') { if ($propicon == 'both') {
$bookmark_go .= '&nbsp;' . $GLOBALS['strExecuteBookmarked'] . '</div>'; $bookmark_go .= '&nbsp;' . $GLOBALS['strExecuteBookmarked'] . '</div>';
} }
@@ -1155,7 +1155,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
if ($GLOBALS['cfg']['PropertiesIconic'] == FALSE) { if ($GLOBALS['cfg']['PropertiesIconic'] == FALSE) {
$del_str = $GLOBALS['strDelete']; $del_str = $GLOBALS['strDelete'];
} 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="16" height="16" src="images/b_drop.png" alt="' . $GLOBALS['strDelete'] . '" title="' . $GLOBALS['strDelete'] . '" border="0" />';
if ($propicon == 'both') { if ($propicon == 'both') {
$del_str .= '&nbsp;' . $GLOBALS['strDelete'] . '</div>'; $del_str .= '&nbsp;' . $GLOBALS['strDelete'] . '</div>';
} }
@@ -1174,7 +1174,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
if ($GLOBALS['cfg']['PropertiesIconic'] == FALSE) { if ($GLOBALS['cfg']['PropertiesIconic'] == FALSE) {
$del_str = $GLOBALS['strKill']; $del_str = $GLOBALS['strKill'];
} 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="16" height="16" src="images/b_drop.png" alt="' . $GLOBALS['strKill'] . '" title="' . $GLOBALS['strKill'] . '" border="0" />';
if ($propicon == 'both') { if ($propicon == 'both') {
$del_str .= '&nbsp;' . $GLOBALS['strKill'] . '</div>'; $del_str .= '&nbsp;' . $GLOBALS['strKill'] . '</div>';
} }
@@ -1184,6 +1184,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
// 1.3 Displays the links at left if required // 1.3 Displays the links at left if required
if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] if ($GLOBALS['cfg']['ModifyDeleteAtLeft']
&& ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped')) { && ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped')) {
$doWriteModifyAt = 'left';
require('./libraries/display_tbl_links.lib.php'); require('./libraries/display_tbl_links.lib.php');
} // end if (1.3) } // end if (1.3)
echo (($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') ? "\n" : ''); echo (($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') ? "\n" : '');
@@ -1204,7 +1205,8 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
$column_style = ''; $column_style = '';
} }
$column_style .= ' onmousedown="if (document.getElementById(\'id_rows_to_delete' . $row_no . '\')) { document.getElementById(\'id_rows_to_delete' . $row_no . '\').checked = (document.getElementById(\'id_rows_to_delete' . $row_no . '\').checked ? false : true); }" '; //$column_style .= ' onmousedown="if (document.getElementById(\'id_rows_to_delete' . $row_no . '\')) { document.getElementById(\'id_rows_to_delete' . $row_no . '\').checked = (document.getElementById(\'id_rows_to_delete' . $row_no . '\').checked ? false : true); }" ';
$column_style .= ' onmousedown="setCheckboxColumn(\'id_rows_to_delete' . $row_no . '\');" ';
// garvin: Wrap MIME-transformations. [MIME] // garvin: Wrap MIME-transformations. [MIME]
$default_function = 'default_function'; // default_function $default_function = 'default_function'; // default_function
@@ -1446,6 +1448,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
// 3. Displays the modify/delete links on the right if required // 3. Displays the modify/delete links on the right if required
if ($GLOBALS['cfg']['ModifyDeleteAtRight'] if ($GLOBALS['cfg']['ModifyDeleteAtRight']
&& ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped')) { && ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped')) {
$doWriteModifyAt = 'right';
require('./libraries/display_tbl_links.lib.php'); require('./libraries/display_tbl_links.lib.php');
} // end if (3) } // end if (3)
@@ -1466,15 +1469,19 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
if (!empty($del_url) && $is_display['del_lnk'] != 'kp') { if (!empty($del_url) && $is_display['del_lnk'] != 'kp') {
$vertical_display['row_delete'][$row_no] .= ' <td width="10" align="center" valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n" $vertical_display['row_delete'][$row_no] .= ' <td align="center" valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n"
. ' <input type="checkbox" id="id_rows_to_delete' . $row_no . '" name="rows_to_delete[' . $uva_condition . ']" value="' . $del_query . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' . "\n" // . ' <input type="checkbox" id="id_rows_to_delete' . $row_no . '%s" name="rows_to_delete[' . $uva_condition . ']" value="' . $del_query . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' . "\n"
. ' <input type="checkbox" id="id_rows_to_delete' . $row_no . '%s" name="rows_to_delete[' . $uva_condition . ']"'
. ' onclick="copyCheckboxesRange(\'rowsDeleteForm\', \'id_rows_to_delete' . $row_no . '\',\'%s\');"'
. ' value="' . $del_query . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' . "\n"
. ' </td>' . "\n"; . ' </td>' . "\n";
} else { } else {
unset($vertical_display['row_delete'][$row_no]); unset($vertical_display['row_delete'][$row_no]);
} }
if (isset($edit_url)) { if (isset($edit_url)) {
$vertical_display['edit'][$row_no] .= ' <td width="10" align="center" valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n" $vertical_display['edit'][$row_no] .= ' <td align="center" valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n"
. PMA_linkOrButton($edit_url, $edit_str, '', FALSE) . PMA_linkOrButton($edit_url, $edit_str, '', FALSE)
. $bookmark_go . $bookmark_go
. ' </td>' . "\n"; . ' </td>' . "\n";
@@ -1483,7 +1490,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
} }
if (isset($del_url)) { if (isset($del_url)) {
$vertical_display['delete'][$row_no] .= ' <td width="10" align="center" valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n" $vertical_display['delete'][$row_no] .= ' <td align="center" valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n"
. PMA_linkOrButton($del_url, $del_str, (isset($js_conf) ? $js_conf : ''), FALSE) . PMA_linkOrButton($del_url, $del_str, (isset($js_conf) ? $js_conf : ''), FALSE)
. ' </td>' . "\n"; . ' </td>' . "\n";
} else { } else {
@@ -1529,7 +1536,8 @@ function PMA_displayVerticalTable()
echo '<td>&nbsp;</td>' . "\n"; echo '<td>&nbsp;</td>' . "\n";
} }
echo $val; // echo $val; //
echo preg_replace("/%s/","",$val);
$foo_counter++; $foo_counter++;
} // end while } // end while
echo '</tr>' . "\n"; echo '</tr>' . "\n";
@@ -1619,7 +1627,8 @@ function PMA_displayVerticalTable()
echo '<td>&nbsp;</td>' . "\n"; echo '<td>&nbsp;</td>' . "\n";
} }
echo $val; // echo $val; //
echo preg_replace("/%s/","r",$val);
$foo_counter++; $foo_counter++;
} // end while } // end while
echo '</tr>' . "\n"; echo '</tr>' . "\n";
@@ -1826,7 +1835,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
$delete_text = $is_display['del_lnk'] == 'dr' ? $GLOBALS['strDelete'] : $GLOBALS['strKill']; $delete_text = $is_display['del_lnk'] == 'dr' ? $GLOBALS['strDelete'] : $GLOBALS['strKill'];
$propicon = (string)$GLOBALS['cfg']['PropertiesIconic']; $propicon = (string)$GLOBALS['cfg']['PropertiesIconic'];
?> ?>
&nbsp;&nbsp;<img src="./images/arrow_<?php echo $GLOBALS['text_dir']; ?>.gif" border="0" width="38" height="22" alt="<?php echo $GLOBALS['strWithChecked']; ?>" /> &nbsp;&nbsp;<img src="./images/arrow_<?php echo $GLOBALS['text_dir']; ?>.png" border="0" width="38" height="22" alt="<?php echo $GLOBALS['strWithChecked']; ?>" />
<a href="<?php echo $text_url . '&amp;checkall=1'; ?>" onclick="setCheckboxesRange('rowsDeleteForm', true, 'id_rows_to_delete', 0, '<?php echo $num_rows; ?>'); return false;"> <a href="<?php echo $text_url . '&amp;checkall=1'; ?>" onclick="setCheckboxesRange('rowsDeleteForm', true, 'id_rows_to_delete', 0, '<?php echo $num_rows; ?>'); return false;">
<?php echo $GLOBALS['strCheckAll']; ?></a> <?php echo $GLOBALS['strCheckAll']; ?></a>
&nbsp;/&nbsp; &nbsp;/&nbsp;
@@ -1840,23 +1849,23 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
/* IE has trouble with <button> */ /* IE has trouble with <button> */
if (PMA_USR_BROWSER_AGENT != 'IE') { if (PMA_USR_BROWSER_AGENT != 'IE') {
echo ' <button class="mult_submit" type="submit" name="submit_mult" value="row_edit" title="' . $GLOBALS['strEdit'] . '">' . "\n" echo ' <button class="mult_submit" type="submit" name="submit_mult" value="row_edit" title="' . $GLOBALS['strEdit'] . '">' . "\n"
. '<img src="./images/button_edit.png" title="' . $GLOBALS['strEdit'] . '" alt="' . $GLOBALS['strEdit'] . '" width="12" height="13" />' . (($propicon == 'both') ? '&nbsp;' . $GLOBALS['strEdit'] : '') . "\n" . '<img src="./images/b_edit.png" title="' . $GLOBALS['strEdit'] . '" alt="' . $GLOBALS['strEdit'] . '" width="16" height="16" align="absmiddle" />' . (($propicon == 'both') ? '&nbsp;' . $GLOBALS['strEdit'] : '') . "\n"
. '</button>'; . '</button>';
echo '&nbsp;<button class="mult_submit" type="submit" name="submit_mult" value="row_delete" title="' . $delete_text . '">' . "\n" echo '&nbsp;<button class="mult_submit" type="submit" name="submit_mult" value="row_delete" title="' . $delete_text . '">' . "\n"
. '<img src="./images/button_drop.png" title="' . $delete_text . '" alt="' . $delete_text . '" width="12" height="13" />' . (($propicon == 'both') ? '&nbsp;' . $delete_text : '') . "\n" . '<img src="./images/b_drop.png" title="' . $delete_text . '" alt="' . $delete_text . '" width="16" height="16" align="absmiddle" />' . (($propicon == 'both') ? '&nbsp;' . $delete_text : '') . "\n"
. '</button>'; . '</button>';
if ($analyzed_sql[0]['querytype'] == 'SELECT') { if ($analyzed_sql[0]['querytype'] == 'SELECT') {
echo '&nbsp;<button class="mult_submit" type="submit" name="submit_mult" value="row_export" title="' . $GLOBALS['strExport'] . '">' . "\n" echo '&nbsp;<button class="mult_submit" type="submit" name="submit_mult" value="row_export" title="' . $GLOBALS['strExport'] . '">' . "\n"
. '<img src="./images/button_export.png" title="' . $GLOBALS['strExport'] . '" alt="' . $GLOBALS['strExport'] . '" width="12" height="13" />' . (($propicon == 'both') ? '&nbsp;' . $GLOBALS['strExport'] : '') . "\n" . '<img src="./images/b_tblexport.png" title="' . $GLOBALS['strExport'] . '" alt="' . $GLOBALS['strExport'] . '" width="16" height="16" align="absmiddle" />' . (($propicon == 'both') ? '&nbsp;' . $GLOBALS['strExport'] : '') . "\n"
. '</button>'; . '</button>';
} }
} else { } else {
echo ' <input type="image" name="submit_mult_edit" value="row_edit" title="' . $GLOBALS['strEdit'] . '" src="./images/button_edit.png" />' . (($propicon == 'both') ? '&nbsp;' . $GLOBALS['strEdit'] : ''); echo ' <input type="image" name="submit_mult_edit" value="row_edit" title="' . $GLOBALS['strEdit'] . '" src="./images/b_edit.png" />' . (($propicon == 'both') ? '&nbsp;' . $GLOBALS['strEdit'] : '');
echo '&nbsp;<input type="image" name="submit_mult" value="row_delete" title="' . $delete_text . '" src="./images/button_drop.png" />' . (($propicon == 'both') ? '&nbsp;' . $delete_text : ''); echo '&nbsp;<input type="image" name="submit_mult" value="row_delete" title="' . $delete_text . '" src="./images/b_drop.png" />' . (($propicon == 'both') ? '&nbsp;' . $delete_text : '');
if ($analyzed_sql[0]['querytype'] == 'SELECT') { if ($analyzed_sql[0]['querytype'] == 'SELECT') {
echo '&nbsp;<input type="image" name="submit_mult_export" value="row_export" title="' . $GLOBALS['strExport'] . '" src="./images/button_export.png" />' . (($propicon == 'both') ? '&nbsp;' . $GLOBALS['strExport'] : ''); echo '&nbsp;<input type="image" name="submit_mult_export" value="row_export" title="' . $GLOBALS['strExport'] . '" src="./images/b_tblexport.png" />' . (($propicon == 'both') ? '&nbsp;' . $GLOBALS['strExport'] : '');
} }
} }
echo "\n"; echo "\n";

60
libraries/display_tbl_links.lib.php
View File

@@ -2,20 +2,50 @@
/* $Id$ */ /* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4: // vim: expandtab sw=4 ts=4 sts=4:
if (!empty($del_url) && $is_display['del_lnk'] != 'kp') { // modified 2004-05-08 by Michael Keck <mail_at_michaelkeck_dot_de>
echo ' <td width="10" align="center" valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n" // - bugfix for select all checkboxes
. ' <input type="checkbox" id="id_rows_to_delete' . $row_no . '" name="rows_to_delete[' . $uva_condition . ']" value="' . $del_query . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' . "\n" // - copy right to left (or left to right) if user click on a check box
. ' </td>' . "\n"; // - reversed the right modify links: 1. drop, 2. edit, 3. checkbox
} // - also changes made in libraries/functions.js
if (!empty($edit_url)) {
echo ' <td width="10" align="center" valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n" if ( $doWriteModifyAt == 'left' ){
. PMA_linkOrButton($edit_url, $edit_str, '', FALSE)
. $bookmark_go if (!empty($del_url) && $is_display['del_lnk'] != 'kp') {
. ' </td>' . "\n"; echo ' <td width="16" align="center" valign="top" bgcolor="' . $bgcolor . '">' . "\n"
} . ' <input type="checkbox" id="id_rows_to_delete' . $row_no . '" name="rows_to_delete[' . $uva_condition . ']"'
if (!empty($del_url)) { . ' onclick="copyCheckboxesRange(\'rowsDeleteForm\', \'id_rows_to_delete' . $row_no . '\',\'l\');"'
echo ' <td width="10" align="center" valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n" . ' value="' . $del_query . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' . "\n"
. PMA_linkOrButton($del_url, $del_str, (isset($js_conf) ? $js_conf : ''), FALSE) . ' </td>' . "\n";
. ' </td>' . "\n"; }
if (!empty($edit_url)) {
echo ' <td width="16" align="center" valign="top" bgcolor="' . $bgcolor . '">' . "\n"
. PMA_linkOrButton($edit_url, $edit_str, '', FALSE)
. $bookmark_go
. ' </td>' . "\n";
}
if (!empty($del_url)) {
echo ' <td width="16" align="center" valign="top" bgcolor="' . $bgcolor . '">' . "\n"
. PMA_linkOrButton($del_url, $del_str, (isset($js_conf) ? $js_conf : ''), FALSE)
. ' </td>' . "\n";
}
} else if ($doWriteModifyAt == 'right') {
if (!empty($del_url)) {
echo ' <td width="16" align="center" valign="top" bgcolor="' . $bgcolor . '">' . "\n"
. PMA_linkOrButton($del_url, $del_str, (isset($js_conf) ? $js_conf : ''), FALSE)
. ' </td>' . "\n";
}
if (!empty($edit_url)) {
echo ' <td width="16" align="center" valign="top" bgcolor="' . $bgcolor . '">' . "\n"
. PMA_linkOrButton($edit_url, $edit_str, '', FALSE)
. $bookmark_go
. ' </td>' . "\n";
}
if (!empty($del_url) && $is_display['del_lnk'] != 'kp') {
echo ' <td width="16" align="center" valign="top" bgcolor="' . $bgcolor . '">' . "\n"
. ' <input type="checkbox" id="id_rows_to_delete' . $row_no . 'r" name="rows_to_delete[' . $uva_condition . ']"'
. ' onclick="copyCheckboxesRange(\'rowsDeleteForm\', \'id_rows_to_delete' . $row_no . '\',\'r\');"'
. ' value="' . $del_query . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' . "\n"
. ' </td>' . "\n";
}
} }
?> ?>

59
libraries/functions.js
View File

@@ -571,7 +571,10 @@ function setVerticalPointer(theRow, theRowNum, theAction, theDefaultColor1, theD
newColor = thePointerColor; newColor = thePointerColor;
} else if (theAction == 'click' && theMarkColor != '') { } else if (theAction == 'click' && theMarkColor != '') {
newColor = theMarkColor; newColor = theMarkColor;
marked_row[theRowNum] = true; // marked_row[theRowNum] = true;
marked_row[theRowNum] = (typeof(marked_row[theRowNum]) == 'undefined' || !marked_row[theRowNum])
? true
: null;
} }
} }
// 4.1.2 Current color is the pointer one // 4.1.2 Current color is the pointer one
@@ -586,7 +589,10 @@ function setVerticalPointer(theRow, theRowNum, theAction, theDefaultColor1, theD
} }
else if (theAction == 'click' && theMarkColor != '') { else if (theAction == 'click' && theMarkColor != '') {
newColor = theMarkColor; newColor = theMarkColor;
marked_row[theRowNum] = true; // marked_row[theRowNum] = true;
marked_row[theRowNum] = (typeof(marked_row[theRowNum]) == 'undefined' || !marked_row[theRowNum])
? true
: null;
} }
} }
// 4.1.3 Current color is the marker one // 4.1.3 Current color is the marker one
@@ -657,17 +663,64 @@ function setCheckboxes(the_form, do_check)
* *
* @return boolean always true * @return boolean always true
*/ */
// modified 2004-05-08 by Michael Keck <mail_at_michaelkeck_dot_de>
// - set the other checkboxes (if available) too
function setCheckboxesRange(the_form, do_check, basename, min, max) function setCheckboxesRange(the_form, do_check, basename, min, max)
{ {
for (var i = min; i < max; i++) { for (var i = min; i < max; i++) {
if (typeof(document.forms[the_form].elements[basename + i]) != 'undefined') { if (typeof(document.forms[the_form].elements[basename + i]) != 'undefined') {
document.forms[the_form].elements[basename + i].checked = do_check; document.forms[the_form].elements[basename + i].checked = do_check;
} }
if (typeof(document.forms[the_form].elements[basename + i + 'r']) != 'undefined') {
document.forms[the_form].elements[basename + i + 'r'].checked = do_check;
}
} }
return true; return true;
} // end of the 'setCheckboxesRange()' function } // end of the 'setCheckboxesRange()' function
// added 2004-05-08 by Michael Keck <mail_at_michaelkeck_dot_de>
// copy the checked from left to right or from right to left
// so it's easier for users to see, if $cfg['ModifyAtRight']=true, what they've checked ;)
function copyCheckboxesRange(the_form, the_name, the_clicked)
{
if (typeof(document.forms[the_form].elements[the_name]) != 'undefined' && typeof(document.forms[the_form].elements[the_name + 'r']) != 'undefined') {
if (the_clicked !== 'r') {
if (document.forms[the_form].elements[the_name].checked == true) {
document.forms[the_form].elements[the_name + 'r'].checked = true;
}else {
document.forms[the_form].elements[the_name + 'r'].checked = false;
}
} else if (the_clicked == 'r') {
if (document.forms[the_form].elements[the_name + 'r'].checked == true) {
document.forms[the_form].elements[the_name].checked = true;
}else {
document.forms[the_form].elements[the_name].checked = false;
}
}
}
}
// added 2004-05-08 by Michael Keck <mail_at_michaelkeck_dot_de>
// - this was directly written to each td, so why not a function ;)
// setCheckboxColumn(\'id_rows_to_delete' . $row_no . ''\');
function setCheckboxColumn(theCheckbox){
if (document.getElementById(theCheckbox)) {
document.getElementById(theCheckbox).checked = (document.getElementById(theCheckbox).checked ? false : true);
if (document.getElementById(theCheckbox + 'r')) {
document.getElementById(theCheckbox + 'r').checked = document.getElementById(theCheckbox).checked;
}
} else {
if (document.getElementById(theCheckbox + 'r')) {
document.getElementById(theCheckbox + 'r').checked = (document.getElementById(theCheckbox +'r').checked ? false : true);
if (document.getElementById(theCheckbox)) {
document.getElementById(theCheckbox).checked = document.getElementById(theCheckbox + 'r').checked;
}
}
}
}
/** /**
* Checks/unchecks all options of a <select> element * Checks/unchecks all options of a <select> element

52
sql.php
View File

@@ -203,7 +203,7 @@ if ($do_confirm) {
if ($is_drop_database) { if ($is_drop_database) {
echo $strDropDatabaseStrongWarning . '<br />' . "\n"; echo $strDropDatabaseStrongWarning . '<br />' . "\n";
} }
echo $strDoYouReally . '&nbsp;:<br />' . "\n"; echo $strDoYouReally . ':<br />' . "\n";
echo '<tt>' . htmlspecialchars($stripped_sql_query) . '</tt>&nbsp;?<br/>' . "\n"; echo '<tt>' . htmlspecialchars($stripped_sql_query) . '</tt>&nbsp;?<br/>' . "\n";
?> ?>
<form action="sql.php" method="post"> <form action="sql.php" method="post">
@@ -217,8 +217,8 @@ if ($do_confirm) {
<input type="hidden" name="cpurge" value="<?php echo isset($cpurge) ? $cpurge : ''; ?>" /> <input type="hidden" name="cpurge" value="<?php echo isset($cpurge) ? $cpurge : ''; ?>" />
<input type="hidden" name="purgekey" value="<?php echo isset($purgekey) ? $purgekey : ''; ?>" /> <input type="hidden" name="purgekey" value="<?php echo isset($purgekey) ? $purgekey : ''; ?>" />
<input type="hidden" name="show_query" value="<?php echo isset($show_query) ? $show_query : ''; ?>" /> <input type="hidden" name="show_query" value="<?php echo isset($show_query) ? $show_query : ''; ?>" />
<input type="submit" name="btnDrop" value="<?php echo $strYes; ?>" /> <input type="submit" name="btnDrop" value="<?php echo $strYes; ?>" style="font-weight: bold; color: #ffffff; background-color: #009900; width:80px;" />
<input type="submit" name="btnDrop" value="<?php echo $strNo; ?>" /> <input type="submit" name="btnDrop" value="<?php echo $strNo; ?>" style="font-weight: bold; color: #ffffff; background-color: #CC0000; width:80px;" />
</form> </form>
<?php <?php
echo "\n"; echo "\n";
@@ -669,7 +669,7 @@ else {
if ($disp_mode[6] == '1' || $disp_mode[9] == '1') { if ($disp_mode[6] == '1' || $disp_mode[9] == '1') {
echo "\n"; echo "\n";
echo '<p>' . "\n"; echo '<hr />' . "\n";
// Displays "Insert a new row" link if required // Displays "Insert a new row" link if required
if ($disp_mode[6] == '1') { if ($disp_mode[6] == '1') {
@@ -692,9 +692,9 @@ else {
. '&amp;goto=' . urlencode($lnk_goto); . '&amp;goto=' . urlencode($lnk_goto);
echo ' <!-- Insert a new row -->' . "\n" echo ' <!-- Insert a new row -->' . "\n"
. ' <a href="tbl_change.php' . $url_query . '">' . $strInsertNewRow . '</a>'; . ' <a href="tbl_change.php' . $url_query . '">' . ($cfg['PropertiesIconic'] ? '<img src="./images/b_insrow.png" border="0" height="16" width="16" align="absmiddle" hspace="2" />' : '') . $strInsertNewRow . '</a>';
if ($disp_mode[9] == '1') { if ($disp_mode[9] == '1') {
echo '<br />'; echo '&nbsp;&nbsp;';
} }
echo "\n"; echo "\n";
} // end insert new row } // end insert new row
@@ -712,16 +712,20 @@ else {
echo ' <!-- Print view -->' . "\n" echo ' <!-- Print view -->' . "\n"
. ' <a href="sql.php' . $url_query . ' <a href="sql.php' . $url_query
. ((isset($dontlimitchars) && $dontlimitchars == '1') ? '&amp;dontlimitchars=1' : '') . ((isset($dontlimitchars) && $dontlimitchars == '1') ? '&amp;dontlimitchars=1' : '')
. '" target="print_view">' . $strPrintView . '</a>' . "\n"; . '" target="print_view">'
. ($cfg['PropertiesIconic'] ? '<img src="./images/b_print.png" border="0" height="16" width="16" align="absmiddle" hspace="2" />' : '')
. $strPrintView . '</a>' . "\n";
if (!$dontlimitchars) { if (!$dontlimitchars) {
echo ' <br />' . "\n" echo ' &nbsp;&nbsp;' . "\n"
. ' <a href="sql.php' . $url_query . ' <a href="sql.php' . $url_query
. '&amp;dontlimitchars=1' . '&amp;dontlimitchars=1'
. '" target="print_view">' . $strPrintViewFull . '</a>' . "\n"; . '" target="print_view">'
. ($cfg['PropertiesIconic'] ? '<img src="./images/b_print.png" border="0" height="16" width="16" align="absmiddle" hspace="2" />' : '')
. $strPrintViewFull . '</a>&nbsp;&nbsp;' . "\n";
} }
} // end displays "printable view" } // end displays "printable view"
echo '</p>' . "\n"; echo "\n";
} }
// Export link // Export link
@@ -735,10 +739,12 @@ else {
$single_table = ''; $single_table = '';
} }
echo ' <!-- Export -->' . "\n" echo ' <!-- Export -->' . "\n"
. ' <a href="tbl_properties_export.php' . $url_query . ' &nbsp;&nbsp;<a href="tbl_properties_export.php' . $url_query
. '&amp;unlim_num_rows=' . $unlim_num_rows . '&amp;unlim_num_rows=' . $unlim_num_rows
. $single_table . $single_table
. '">' . $strExport . '</a>' . "\n"; . '">'
. ($cfg['PropertiesIconic'] ? '<img src="./images/b_tblexport.png" border="0" height="16" width="16" align="absmiddle" hspace="2" />' : '')
. $strExport . '</a>' . "\n";
} }
// Bookmark Support if required // Bookmark Support if required
@@ -758,24 +764,36 @@ else {
. '&amp;id_bookmark=1'; . '&amp;id_bookmark=1';
?> ?>
<!-- Bookmark the query --> <!-- Bookmark the query -->
<form action="sql.php" method="post" onsubmit="return emptyFormElements(this, 'fields[label]');">
<?php <?php
echo "\n"; echo "\n";
if ($disp_mode[3] == '1') { if ($disp_mode[3] == '1') {
echo ' <i>' . $strOr . '</i>' . "\n"; echo ' <i>' . $strOr . '</i>' . "\n";
} }else echo '<br /><br />';
?> ?>
<br /><br /> <table border="0" cellpadding="2" cellspacing="0">
<tr><td class="tblHeaders" colspan="2"><?php
echo ($cfg['PropertiesIconic'] ? '<img src="images/b_bookmark.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />' : '')
. $strBookmarkThis;
?></td></tr>
<form action="sql.php" method="post" onsubmit="return emptyFormElements(this, 'fields[label]');">
<tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>"><td>
<?php echo $strBookmarkLabel; ?>: <?php echo $strBookmarkLabel; ?>:
<?php echo PMA_generate_common_hidden_inputs(); ?> <?php echo PMA_generate_common_hidden_inputs(); ?>
<input type="hidden" name="goto" value="<?php echo $goto; ?>" /> <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
<input type="hidden" name="fields[dbase]" value="<?php echo htmlspecialchars($db); ?>" /> <input type="hidden" name="fields[dbase]" value="<?php echo htmlspecialchars($db); ?>" />
<input type="hidden" name="fields[user]" value="<?php echo $cfg['Bookmark']['user']; ?>" /> <input type="hidden" name="fields[user]" value="<?php echo $cfg['Bookmark']['user']; ?>" />
<input type="hidden" name="fields[query]" value="<?php echo urlencode(isset($complete_query) ? $complete_query : $sql_query); ?>" /> <input type="hidden" name="fields[query]" value="<?php echo urlencode(isset($complete_query) ? $complete_query : $sql_query); ?>" />
</td><td>
<input type="text" name="fields[label]" value="" /> <input type="text" name="fields[label]" value="" />
<input type="checkbox" name="bkm_all_users" id="bkm_all_users" value="true" /><label for="bkm_all_users"><?php echo $strBookmarkAllUsers; ?></label> </td></tr>
<tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>"><td align="right" valign="top">
<input type="checkbox" name="bkm_all_users" id="bkm_all_users" value="true" /></td>
<td><label for="bkm_all_users"><?php echo $strBookmarkAllUsers; ?></label></td>
</tr>
<tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>"><td colspan="2" align="right">
<input type="submit" name="store_bkm" value="<?php echo $strBookmarkThis; ?>" /> <input type="submit" name="store_bkm" value="<?php echo $strBookmarkThis; ?>" />
</form> </td></tr>
</form></table>
<?php <?php
} // end bookmark support } // end bookmark support

90
tbl_indexes.php
View File

@@ -277,8 +277,10 @@ else if (!defined('PMA_IDX_INCLUDED')
?> ?>
<!-- Build index form --> <!-- Build index form -->
<form action="tbl_indexes.php" method="post" name="index_frm" <table border="0" cellpadding="2" cellspacing="1">
<form action="./tbl_indexes.php" method="post" name="index_frm"
onsubmit="if (typeof(this.elements['index'].disabled) != 'undefined') {this.elements['index'].disabled = false}"> onsubmit="if (typeof(this.elements['index'].disabled) != 'undefined') {this.elements['index'].disabled = false}">
<tr><th class="tblHeaders" colspan="2">
<?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
<?php <?php
if (isset($create_index)) { if (isset($create_index)) {
@@ -287,19 +289,23 @@ else if (!defined('PMA_IDX_INCLUDED')
echo "\n"; echo "\n";
?> ?>
<input type="hidden" name="old_index" value="<?php echo (isset($create_index) ? '' : htmlspecialchars($old_index)); ?>" /> <input type="hidden" name="old_index" value="<?php echo (isset($create_index) ? '' : htmlspecialchars($old_index)); ?>" />
<b><?php echo '------ ' . (isset($create_index) ? $strCreateIndexTopic : $strModifyIndexTopic) . ' ------'; ?></b> <?php echo ' ' . (isset($create_index) ? $strCreateIndexTopic : $strModifyIndexTopic) . ' '; ?>
<br /><br /> </th></tr>
<table border="0">
<tr> <tr>
<td><?php echo $strIndexName; ?>&nbsp;</td> <td align="right"><b><?php echo $strIndexName; ?></b>&nbsp;</th>
<td> <td>
<input type="text" name="index" value="<?php echo htmlspecialchars($index); ?>" class="textfield" onfocus="this.select()" /> <input type="text" name="index" value="<?php echo htmlspecialchars($index); ?>" size="25" onfocus="this.select()" />
&nbsp;<?php echo $strPrimaryKeyWarning . "\n"; ?>
</td> </td>
</tr> </tr>
<tr><td align="right"><?php
if($cfg['ErrorIconic']){
echo '<img src="./images/s_warn.png" width="16" height="16" border="0" alt="Attention" />';
}
?></td><td><?php echo $strPrimaryKeyWarning . "\n"; ?></td></tr>
<tr> <tr>
<td><?php echo $strIndexType; ?>&nbsp;</td> <td align="right"><b><?php echo $strIndexType; ?></b>&nbsp;</td>
<td> <td>
<select name="index_type" onchange="return checkIndexName()"> <select name="index_type" onchange="return checkIndexName()">
<?php <?php
@@ -319,13 +325,12 @@ else if (!defined('PMA_IDX_INCLUDED')
} // end if... else... } // end if... else...
} // end for } // end for
?> ?>
</select>&nbsp; </select>
<?php echo PMA_showMySQLDocu('Reference', 'ALTER_TABLE') . "\n"; ?> <?php echo PMA_showMySQLDocu('Reference', 'ALTER_TABLE') . "\n"; ?>
</td> </td>
</tr> </tr>
</table><br />
<table border="<?php echo $cfg['Border']; ?>" cellpadding="5"> <tr><td valign="top" align="right"><b><?php echo $strFields; ?> :</b>&nbsp;</td><td><table border="<?php echo $cfg['Border']; ?>" cellpadding="2" cellspacing="1">
<tr> <tr>
<th><?php echo $strField; ?></th> <th><?php echo $strField; ?></th>
<th><?php echo $strSize; ?></th> <th><?php echo $strSize; ?></th>
@@ -369,11 +374,7 @@ else if (!defined('PMA_IDX_INCLUDED')
echo "\n"; echo "\n";
?> ?>
</table><br /> <tr><td colspan="2"><?php
<input type="submit" name="do_save_data" value="<?php echo $strSave; ?>" /><br />
<?php
echo "\n"; echo "\n";
if (isset($added_fields)) { if (isset($added_fields)) {
echo ' <input type="hidden" name="prev_add_fields" value="' . $added_fields . '" />'; echo ' <input type="hidden" name="prev_add_fields" value="' . $added_fields . '" />';
@@ -381,22 +382,31 @@ else if (!defined('PMA_IDX_INCLUDED')
if (isset($idx_num_fields)) { if (isset($idx_num_fields)) {
echo ' <input type="hidden" name="idx_num_fields" value="' . $idx_num_fields . '" />' . "\n"; echo ' <input type="hidden" name="idx_num_fields" value="' . $idx_num_fields . '" />' . "\n";
} }
echo ' <hr /><br />' . "\n"; echo ' ' . "\n";
echo ' ' . sprintf($strAddToIndex, '<input type="text" name="added_fields" size="4" value="1" class="textfield" onfocus="this.select()" />') . "\n"; echo ' ' . sprintf($strAddToIndex, '<input type="text" name="added_fields" size="2" value="1" onfocus="this.select()" style="vertical-align: middle;" />') . "\n";
echo ' &nbsp;<input type="submit" name="add_fields" value="' . $strGo . '" onclick="return checkFormElementInRange(this.form, \'added_fields\', 1)" />' . "\n"; echo ' &nbsp;<input type="submit" name="add_fields" value="' . $strGo . '" onclick="return checkFormElementInRange(this.form, \'added_fields\', 1)" style="vertical-align: middle;" />' . "\n";
?></td>
</tr>
</table></td></tr>
<tr><td colspan="2" class="tblFooters" align="center">
<input type="submit" name="do_save_data" value="<?php echo $strSave; ?>" /></td></tr>
</form>
</table><?php
} else { } else {
/** /**
* Display indexes * Display indexes
*/ */
?> ?>
<!-- Indexes form --> <!-- Indexes form -->
<form action="tbl_indexes.php" method="post"> <table border="0" cellpadding="2" cellspacing="1">
<form action="./tbl_indexes.php" method="post">
<tr><td class="tblHeaders" colspan="7">
<?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
<?php <?php
echo "\n"; echo "\n";
echo ' ' . $strIndexes . '&nbsp;:' . "\n"; echo ' ' . $strIndexes . ':' . "\n";
echo ' ' . PMA_showMySQLDocu('MySQL_Optimisation', 'Optimising_Database_Structure') . '<br />' ."\n"; echo ' ' . PMA_showMySQLDocu('MySQL_Optimisation', 'Optimising_Database_Structure') . "\n";
?></td></tr><?php
$edit_link_text = ''; $edit_link_text = '';
$drop_link_text = ''; $drop_link_text = '';
@@ -404,21 +414,22 @@ 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/b_edit.png" width="16" height="16" hspace="2" 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/b_drop.png" width="16" height="16" hspace="2" border="0" title="' . $strDrop . '" alt="' . $strDrop . '">';
} }
//print_r($cfg['PropertiesIconic']);
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 = '<div class="nowrap">' . $edit_link_text . '</div>'; $edit_link_text = '<nobr>' . $edit_link_text . '</nobr>';
$drop_link_text = '<div class="nowrap">' . $drop_link_text . '</div>'; $drop_link_text = '<nobr>' . $drop_link_text . '</nobr>';
} }
if ($idx_cnt > 0) { if ($idx_cnt > 0) {
?> ?>
<table border="<?php echo $cfg['Border']; ?>"> <!--table border="<?php echo $cfg['Border']; ?>" cellpadding="2" cellspacing="1"-->
<tr> <tr>
<th><?php echo $strKeyname; ?></th> <th><?php echo $strKeyname; ?></th>
<th><?php echo $strType; ?></th> <th><?php echo $strType; ?></th>
@@ -492,26 +503,29 @@ else if (!defined('PMA_IDX_INCLUDED')
} // end while } // end while
} // end while } // end while
?> ?>
</table><br /> <!--/table><br /-->
<?php <?php
echo "\n\n"; echo "\n\n";
} // end display indexes } // end display indexes
else { else {
// none indexes // none indexes
echo "\n" . ' <br />' . "\n"; echo "\n" . ' <tr><td colspan=7" align="center">' . "\n";
echo ' <i>' . $strNoIndex . '</i><br /><br />' . "\n\n"; if($cfg['ErrorIconic']){
echo '<img src="./images/s_warn.png" width="16" height="16" border="0" alt="Warning" hspace="2" align="absmiddle" />';
}
echo ' <b>' . $strNoIndex . '</b></td></tr>' . "\n\n";
} }
echo ' ' . sprintf($strCreateIndex, '<input type="text" size="4" name="idx_num_fields" value="1" class="textfield" />') . "\n"; echo '<tr><td colspan="7" class="tblFooters" nowrap="nowrap" align="center"> '
echo ' &nbsp;<input type="submit" name="create_index" value="' . $strGo . '" onclick="return checkFormElementInRange(this.form, \'idx_num_fields\', 1)" />' . "\n"; . sprintf($strCreateIndex, '<input type="text" size="2" name="idx_num_fields" value="1" style="vertical-align: middle;" />') . "\n";
echo ' '; echo ' &nbsp;<input type="submit" name="create_index" value="' . $strGo . '" onclick="return checkFormElementInRange(this.form, \'idx_num_fields\', 1)" style="vertical-align: middle;" />' . "\n";
echo '</td></tr> ';
?>
</form></table>
<?php
} // end display indexes } // end display indexes
?>
</form>
<?php
/** /**
* Displays the footer * Displays the footer
*/ */

194
tbl_properties_structure.php
View File

@@ -76,7 +76,7 @@ $fields_cnt = PMA_DBI_num_rows($fields_rs);
<form method="post" action="tbl_properties_structure.php" name="fieldsForm"> <form method="post" action="tbl_properties_structure.php" name="fieldsForm">
<?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
<table border="<?php echo $cfg['Border']; ?>"> <table border="<?php echo $cfg['Border']; ?>" cellpadding="2" cellspacing="1">
<tr> <tr>
<td></td> <td></td>
<th>&nbsp;<?php echo $strField; ?>&nbsp;</th> <th>&nbsp;<?php echo $strField; ?>&nbsp;</th>
@@ -231,17 +231,18 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
$iconic_spacer = ''; $iconic_spacer = '';
} }
$titles['Change'] = $iconic_spacer . '<img hspace="7" width="12" height="13" src="images/button_edit.png" alt="' . $strChange . '" title="' . $strChange . '" border="0" />'; // images replaced 2004-05-08 by mkkeck
$titles['Drop'] = $iconic_spacer . '<img hspace="7" width="11" height="12" src="images/button_drop.png" alt="' . $strDrop . '" title="' . $strDrop . '" border="0" />'; $titles['Change'] = $iconic_spacer . '<img hspace="2" width="16" height="16" src="images/b_edit.png" alt="' . $strChange . '" title="' . $strChange . '" border="0" />';
$titles['NoDrop'] = $iconic_spacer . '<img hspace="7" width="11" height="13" src="images/button_drop.png" alt="' . $strDrop . '" title="' . $strDrop . '" border="0" />'; $titles['Drop'] = $iconic_spacer . '<img hspace="2" width="16" height="16" src="images/b_drop.png" alt="' . $strDrop . '" title="' . $strDrop . '" border="0" />';
$titles['Primary'] = $iconic_spacer . '<img hspace="7" width="11" height="13" src="images/button_primary.png" alt="' . $strPrimary . '" title="' . $strPrimary . '" border="0" />'; $titles['NoDrop'] = $iconic_spacer . '<img hspace="2" width="16" height="16" src="images/b_drop.png" alt="' . $strDrop . '" title="' . $strDrop . '" border="0" />';
$titles['Index'] = $iconic_spacer . '<img hspace="7" width="11" height="13" src="images/button_index.png" alt="' . $strIndex . '" title="' . $strIndex . '" border="0" />'; $titles['Primary'] = $iconic_spacer . '<img hspace="2" width="16" height="16" src="images/b_primary.png" alt="' . $strPrimary . '" title="' . $strPrimary . '" border="0" />';
$titles['Unique'] = $iconic_spacer . '<img hspace="7" width="11" height="13" src="images/button_unique.png" alt="' . $strUnique . '" title="' . $strUnique . '" border="0" />'; $titles['Index'] = $iconic_spacer . '<img hspace="2" width="16" height="16" src="images/b_index.png" alt="' . $strIndex . '" title="' . $strIndex . '" border="0" />';
$titles['IdxFulltext'] = $iconic_spacer . '<img hspace="7" width="11" height="13" src="images/button_fulltext.png" alt="' . $strIdxFulltext . '" title="' . $strIdxFulltext . '" border="0" />'; $titles['Unique'] = $iconic_spacer . '<img hspace="2" width="16" height="16" src="images/b_unique.png" alt="' . $strUnique . '" title="' . $strUnique . '" border="0" />';
$titles['NoPrimary'] = $iconic_spacer . '<img hspace="7" width="11" height="13" src="images/button_noprimary.png" alt="' . $strPrimary . '" title="' . $strPrimary . '" border="0" />'; $titles['IdxFulltext'] = $iconic_spacer . '<img hspace="2" width="16" height="16" src="images/b_ftext.png" alt="' . $strIdxFulltext . '" title="' . $strIdxFulltext . '" border="0" />';
$titles['NoIndex'] = $iconic_spacer . '<img hspace="7" width="11" height="13" src="images/button_noindex.png" alt="' . $strIndex . '" title="' . $strIndex . '" border="0" />'; $titles['NoPrimary'] = $iconic_spacer . '<img hspace="2" width="16" height="16" src="images/bd_primary.png" alt="' . $strPrimary . '" title="' . $strPrimary . '" border="0" />';
$titles['NoUnique'] = $iconic_spacer . '<img hspace="7" width="11" height="13" src="images/button_nounique.png" alt="' . $strUnique . '" title="' . $strUnique . '" border="0" />'; $titles['NoIndex'] = $iconic_spacer . '<img hspace="2" width="16" height="16" src="images/bd_index.png" alt="' . $strIndex . '" title="' . $strIndex . '" border="0" />';
$titles['NoIdxFulltext'] = $iconic_spacer . '<img hspace="7" width="11" height="13" src="images/button_nofulltext.png" alt="' . $strIdxFulltext . '" title="' . $strIdxFulltext . '" border="0" />'; $titles['NoUnique'] = $iconic_spacer . '<img hspace="2" width="16" height="16" src="images/bd_unique.png" alt="' . $strUnique . '" title="' . $strUnique . '" border="0" />';
$titles['NoIdxFulltext'] = $iconic_spacer . '<img hspace="2" width="16" height="16" src="images/bd_ftext.png" alt="' . $strIdxFulltext . '" title="' . $strIdxFulltext . '" border="0" />';
if ($propicon == 'both') { if ($propicon == 'both') {
$titles['Change'] .= '&nbsp;' . $strChange . '</div>'; $titles['Change'] .= '&nbsp;' . $strChange . '</div>';
@@ -283,7 +284,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
<td <?php echo $click_mouse; ?> bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"><?php if (isset($row['Default'])) echo $row['Default']; ?>&nbsp;</td> <td <?php echo $click_mouse; ?> bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"><?php if (isset($row['Default'])) echo $row['Default']; ?>&nbsp;</td>
<td <?php echo $click_mouse; ?> bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"><?php echo $row['Extra']; ?>&nbsp;</td> <td <?php echo $click_mouse; ?> bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"><?php echo $row['Extra']; ?>&nbsp;</td>
<td align="center" bgcolor="<?php echo $bgcolor; ?>"> <td align="center" bgcolor="<?php echo $bgcolor; ?>">
<a href="tbl_alter.php?<?php echo $url_query; ?>&amp;field=<?php echo $field_encoded; ?>"> <a href="tbl_alter.php?<?php echo $url_query; ?>&field=<?php echo $field_encoded; ?>">
<?php echo $titles['Change']; ?></a> <?php echo $titles['Change']; ?></a>
</td> </td>
<td align="center" bgcolor="<?php echo $bgcolor; ?>"> <td align="center" bgcolor="<?php echo $bgcolor; ?>">
@@ -292,7 +293,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
if ($fields_cnt > 1) { if ($fields_cnt > 1) {
echo "\n"; echo "\n";
?> ?>
<a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP ' . PMA_backquote($row['Field'])); ?>&amp;cpurge=1&amp;purgekey=<?php echo urlencode($row['Field']); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strFieldHasBeenDropped, htmlspecialchars($row['Field']))); ?>" <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP ' . PMA_backquote($row['Field'])); ?>&cpurge=1&purgekey=<?php echo urlencode($row['Field']); ?>&zero_rows=<?php echo urlencode(sprintf($strFieldHasBeenDropped, htmlspecialchars($row['Field']))); ?>"
onclick="return confirmLink(this, 'ALTER TABLE <?php echo PMA_jsFormat($table); ?> DROP <?php echo PMA_jsFormat($row['Field']); ?>')"> onclick="return confirmLink(this, 'ALTER TABLE <?php echo PMA_jsFormat($table); ?> DROP <?php echo PMA_jsFormat($row['Field']); ?>')">
<?php echo $titles['Drop']; ?></a> <?php echo $titles['Drop']; ?></a>
<?php <?php
@@ -309,7 +310,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
} else { } else {
echo "\n"; echo "\n";
?> ?>
<a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP PRIMARY KEY, ADD PRIMARY KEY(' . $primary . PMA_backquote($row['Field']) . ')'); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strAPrimaryKey, htmlspecialchars($row['Field']))); ?>" <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP PRIMARY KEY, ADD PRIMARY KEY(' . $primary . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf($strAPrimaryKey, htmlspecialchars($row['Field']))); ?>"
onclick="return confirmLink(this, 'ALTER TABLE <?php echo PMA_jsFormat($table); ?> DROP PRIMARY KEY, ADD PRIMARY KEY(<?php echo PMA_jsFormat($row['Field']); ?>)')"> onclick="return confirmLink(this, 'ALTER TABLE <?php echo PMA_jsFormat($table); ?> DROP PRIMARY KEY, ADD PRIMARY KEY(<?php echo PMA_jsFormat($row['Field']); ?>)')">
<?php echo $titles['Primary']; ?></a> <?php echo $titles['Primary']; ?></a>
<?php <?php
@@ -324,7 +325,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
} else { } else {
echo "\n"; echo "\n";
?> ?>
<a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD INDEX(' . PMA_backquote($row['Field']) . ')'); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strAnIndex ,htmlspecialchars($row['Field']))); ?>"> <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD INDEX(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf($strAnIndex ,htmlspecialchars($row['Field']))); ?>">
<?php echo $titles['Index']; ?></a> <?php echo $titles['Index']; ?></a>
<?php <?php
} }
@@ -338,7 +339,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
} else { } else {
echo "\n"; echo "\n";
?> ?>
<a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD UNIQUE(' . PMA_backquote($row['Field']) . ')'); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strAnIndex , htmlspecialchars($row['Field']))); ?>"> <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD UNIQUE(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf($strAnIndex , htmlspecialchars($row['Field']))); ?>">
<?php echo $titles['Unique']; ?></a> <?php echo $titles['Unique']; ?></a>
<?php <?php
} }
@@ -351,7 +352,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
echo "\n"; echo "\n";
?> ?>
<td align="center" bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"> <td align="center" bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap">
<a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD FULLTEXT(' . PMA_backquote($row['Field']) . ')'); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strAnIndex , htmlspecialchars($row['Field']))); ?>"> <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD FULLTEXT(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf($strAnIndex , htmlspecialchars($row['Field']))); ?>">
<?php echo $titles['IdxFulltext']; ?></a> <?php echo $titles['IdxFulltext']; ?></a>
</td> </td>
<?php <?php
@@ -397,19 +398,19 @@ if ($cfg['PropertiesIconic']) {
/* IE has trouble with <button> */ /* IE has trouble with <button> */
if (PMA_USR_BROWSER_AGENT != 'IE') { if (PMA_USR_BROWSER_AGENT != 'IE') {
echo '<button class="mult_submit" type="submit" name="submit_mult" value="' . $strChange . '" title="' . $strChange . '">' . "\n" echo '<button class="mult_submit" type="submit" name="submit_mult" value="' . $strChange . '" title="' . $strChange . '">' . "\n"
. '<img src="./images/button_edit.png" title="' . $strChange . '" alt="' . $strChange . '" width="12" height="13" />' . (($propicon == 'both') ? '&nbsp;' . $strChange : '') . "\n" . '<img src="./images/b_edit.png" title="' . $strChange . '" alt="' . $strChange . '" width="16" height="16" />' . (($propicon == 'both') ? '&nbsp;' . $strChange : '') . "\n"
. '</button>' . "\n"; . '</button>' . "\n";
} else { } else {
echo ' <input type="image" name="submit_mult_change" value="' .$strChange . '" title="' . $strChange . '" src="./images/button_edit.png" />' . (($propicon == 'both') ? '&nbsp;' . $strChange : '') . "\n"; echo ' <input type="image" name="submit_mult_change" value="' .$strChange . '" title="' . $strChange . '" src="./images/b_edit.png" />' . (($propicon == 'both') ? '&nbsp;' . $strChange : '') . "\n";
} }
// Drop button if there is at least two fields // Drop button if there is at least two fields
if ($fields_cnt > 1) { if ($fields_cnt > 1) {
if (PMA_USR_BROWSER_AGENT != 'IE') { if (PMA_USR_BROWSER_AGENT != 'IE') {
echo ' <button class="mult_submit" type="submit" name="submit_mult" value="' . $strDrop . '" title="' . $strDrop . '">' . "\n" echo ' <button class="mult_submit" type="submit" name="submit_mult" value="' . $strDrop . '" title="' . $strDrop . '">' . "\n"
. '<img src="./images/button_drop.png" title="' . $strDrop . '" alt="' . $strDrop . '" width="11" height="13" />' . (($propicon == 'both') ? '&nbsp;' . $strDrop : '') . "\n" . '<img src="./images/b_drop.png" title="' . $strDrop . '" alt="' . $strDrop . '" width="16" height="16" />' . (($propicon == 'both') ? '&nbsp;' . $strDrop : '') . "\n"
. '</button>' . "\n"; . '</button>' . "\n";
} else { } else {
echo ' <input type="image" name="submit_mult_drop" value="' .$strDrop . '" title="' . $strDrop . '" src="./images/button_drop.png" />' . (($propicon == 'both') ? '&nbsp;' . $strDrop : '') . "\n"; echo ' <input type="image" name="submit_mult_drop" value="' .$strDrop . '" title="' . $strDrop . '" src="./images/b_drop.png" />' . (($propicon == 'both') ? '&nbsp;' . $strDrop : '') . "\n";
} }
} }
} else { } else {
@@ -428,9 +429,78 @@ if ($cfg['PropertiesIconic']) {
</td> </td>
</tr> </tr>
</table> </table>
</form> </form>
<hr />
<?php
/**
* Work on the table
*/
?>
<!-- TABLE WORK -->
<table border="0" cellpadding="2" cellspacing="0">
<tr><td>
<!-- Printable view of the table -->
<a href="tbl_printview.php?<?php echo $url_query; ?>"><?php
if($cfg['PropertiesIconic']){
echo '<img src="./images/b_print.png" border="0" hspace="2" align="absmiddle" width="16" height="16" />';
}
echo $strPrintView;
?></a>&nbsp;&nbsp;
<?php
if ($cfg['Server']['relation']) {
?>
<!-- Work on Relations -->
<a href="tbl_relation.php?<?php echo $url_query; ?>"><?php
if($cfg['PropertiesIconic']){
echo '<img src="./images/b_relations.png" border="0" hspace="2" align="absmiddle" width="16" height="16" />';
}
echo $strRelationView;
?></a>&nbsp;&nbsp;
<?php
}
?>
<!-- Let MySQL propose the optimal structure -->
<a href="sql.php?<?php echo $url_query; ?>&amp;session_max_rows=all&amp;sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table) . ' PROCEDURE ANALYSE()'); ?>"><?php
if($cfg['PropertiesIconic']){
echo '<img src="./images/b_tblanalyse.png" border="0" hspace="2" align="absmiddle" width="16" height="16" />';
}
echo $strStructPropose;
?></a><?php
echo PMA_showMySQLDocu('Extending_MySQL', 'procedure_analyse') . "\n";
?>
</td></tr>
<!-- Add some new fields -->
<form method="post" action="tbl_addfield.php"
onsubmit="return checkFormElementInRange(this, 'num_fields', 1)">
<tr><td>
<?php
echo PMA_generate_common_hidden_inputs($db, $table);
if ($cfg['PropertiesIconic']) {
echo '<img src="./images/b_insrow.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />';
}
echo $strAddNewField . ':&nbsp;';
?>
<input type="text" name="num_fields" size="2" maxlength="2" value="1" style="vertical-align: middle" onfocus="this.select()" />
<select name="after_field" style="vertical-align: middle">
<option value="--end--"><?php echo $strAtEndOfTable; ?></option>
<option value="--first--"><?php echo $strAtBeginningOfTable; ?></option>
<optgroup label="<?php printf($strAfter, ''); ?>" title="<?php printf($strAfter, ''); ?>">
<?php
foreach($aryFields AS $junk => $fieldname) {
echo ' <option value="' . htmlspecialchars($fieldname) . '">' . htmlspecialchars($fieldname) . '</option>' . "\n";
}
unset($aryFields);
?>
</optgroup>
</select>
<input type="submit" value="<?php echo $strGo; ?>" style="vertical-align: middle" />
</td></tr></form>
</table>
<hr />
<?php <?php
/** /**
@@ -452,7 +522,6 @@ echo "\n\n";
*/ */
?> ?>
<!-- Indexes, space usage and row statistics --> <!-- Indexes, space usage and row statistics -->
<br />
<table border="0" cellspacing="0" cellpadding="0"> <table border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<td valign="top"> <td valign="top">
@@ -503,9 +572,9 @@ if ($cfg['ShowStats']) {
<!-- Space usage --> <!-- Space usage -->
<td width="20">&nbsp;</td> <td width="20">&nbsp;</td>
<td valign="top"> <td valign="top">
<?php echo $strSpaceUsage . '&nbsp;:' . "\n"; ?>
<a name="showusage"></a> <a name="showusage"></a>
<table border="<?php echo $cfg['Border']; ?>"> <table border="<?php echo $cfg['Border']; ?>" cellpadding="2" cellspacing="1">
<tr><td class="tblHeaders" colspan="3"><?php echo $strSpaceUsage . ':&nbsp;' . "\n"; ?></td></tr>
<tr> <tr>
<th><?php echo $strType; ?></th> <th><?php echo $strType; ?></th>
<th colspan="2" align="center"><?php echo $strUsage; ?></th> <th colspan="2" align="center"><?php echo $strUsage; ?></th>
@@ -556,8 +625,13 @@ if ($cfg['ShowStats']) {
echo "\n"; echo "\n";
?> ?>
<tr> <tr>
<td colspan="3" align="center"> <td colspan="3" align="center" bgcolor="<?php echo $cfg['BgcolorTwo']; ?>">
[<a href="sql.php?<?php echo $url_query; ?>&amp;pos=0&amp;sql_query=<?php echo urlencode('OPTIMIZE TABLE ' . PMA_backquote($table)); ?>"><?php echo $strOptimizeTable; ?></a>] <a href="sql.php?<?php echo $url_query; ?>&pos=0&sql_query=<?php echo urlencode('OPTIMIZE TABLE ' . PMA_backquote($table)); ?>"><?php
if ($cfg['PropertiesIconic']) {
echo '<img src="./images/b_tbloptimize.png" width="16" height="16" border="0" hspace="2" align="absmiddle" alt="' . $strOptimizeTable. '" />';
}
echo $strOptimizeTable;
?></a>
</td> </td>
</tr> </tr>
<?php <?php
@@ -570,8 +644,8 @@ if ($cfg['ShowStats']) {
<!-- Rows Statistic --> <!-- Rows Statistic -->
<td width="20">&nbsp;</td> <td width="20">&nbsp;</td>
<td valign="top"> <td valign="top">
<?php echo $strRowsStatistic . '&nbsp;:' . "\n"; ?> <table border="<?php echo $cfg['Border']; ?>" cellpadding="2" cellspacing="1">
<table border="<?php echo $cfg['Border']; ?>"> <tr><td class="tblHeaders" colspan="2"><?php echo $strRowsStatistic . ':&nbsp;' . "\n"; ?></td></tr>
<tr> <tr>
<th><?php echo $strStatement; ?></th> <th><?php echo $strStatement; ?></th>
<th align="center"><?php echo $strValue; ?></th> <th align="center"><?php echo $strValue; ?></th>
@@ -718,73 +792,13 @@ echo "\n";
</tr> </tr>
</table> </table>
<hr /> <hr />
<?php
/**
* Work on the table
*/
?>
<!-- TABLE WORK -->
<ul>
<!-- Printable view of the table -->
<li>
<a href="tbl_printview.php?<?php echo $url_query; ?>"><?php echo $strPrintView; ?></a>
</li>
<!-- Add some new fields -->
<li>
<form method="post" action="tbl_addfield.php"
onsubmit="return checkFormElementInRange(this, 'num_fields', 1)">
<?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
<?php echo $strAddNewField; ?>&nbsp;:
<input type="text" name="num_fields" size="2" maxlength="2" value="1" class="textfield" style="vertical-align: middle" onfocus="this.select()" />
<select name="after_field" style="vertical-align: middle">
<option value="--end--"><?php echo $strAtEndOfTable; ?></option>
<option value="--first--"><?php echo $strAtBeginningOfTable; ?></option>
<?php
foreach($aryFields AS $junk => $fieldname) {
echo ' <option value="' . htmlspecialchars($fieldname) . '">' . sprintf($strAfter, htmlspecialchars($fieldname)) . '</option>' . "\n";
}
unset($aryFields);
?>
</select>
<input type="submit" value="<?php echo $strGo; ?>" style="vertical-align: middle" />
</form>
</li>
<?php
if ($cfg['Server']['relation']) {
?>
<!-- Work on Relations -->
<li>
<a href="tbl_relation.php?<?php echo $url_query; ?>"><?php echo $strRelationView; ?></a>
</li>
<?php
}
echo "\n";
?>
<!-- Let MySQL propose the optimal structure -->
<li>
<a href="sql.php?<?php echo $url_query; ?>&amp;session_max_rows=all&amp;sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table) . ' PROCEDURE ANALYSE()'); ?>">
<?php echo $strStructPropose; ?></a>
<?php echo PMA_showMySQLDocu('Extending_MySQL', 'procedure_analyse') . "\n"; ?>
</li>
<?php <?php
/** /**
* Query box, bookmark, insert data from textfile * Query box, bookmark, insert data from textfile
*/ */
$goto = 'tbl_properties_structure.php'; $goto = 'tbl_properties_structure.php';
require('./tbl_query_box.php'); require('./tbl_query_box.php');
?>
</ul>
<?php
/** /**
* Displays the footer * Displays the footer
*/ */

63
tbl_query_box.php
View File

@@ -89,21 +89,20 @@ if ($cfg['QueryFrame'] && (!$cfg['QueryFrameJS'] && !$db || ($cfg['QueryFrameJS'
} }
$form_items = 0; $form_items = 0;
?><table border="0" cellpadding="0" cellspacing="0"><tr><td>
<?php
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">
<!-- <!--
document.writeln('<form method="post" target="phpmain' + <?php echo ((isset($is_inside_querywindow) && $is_inside_querywindow == TRUE) ? 'opener.' : '');?>parent.frames.queryframe.document.hashform.hash.value + '" action="read_dump.php"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?> onsubmit="return checkSqlQuery(this)" name="sqlform">'); document.writeln('<form method="post" target="phpmain' + <?php echo ((isset($is_inside_querywindow) && $is_inside_querywindow == TRUE) ? 'opener.' : '');?>parent.frames.queryframe.document.hashform.hash.value + '" action="read_dump.php"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?> onsubmit="return checkSqlQuery(this)" name="sqlform">');
//--> //-->
</script> </script><noscript>
<noscript>
<form method="post" target="phpmain<?php echo md5($cfg['PmaAbsoluteUri']); ?>" action="read_dump.php"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?> name="sqlform"> <form method="post" target="phpmain<?php echo md5($cfg['PmaAbsoluteUri']); ?>" action="read_dump.php"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?> name="sqlform">
</noscript> </noscript>
<?php <?php
} else { } else {
?> ?>
<li>
<form method="post" action="read_dump.php"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?> onsubmit="return checkSqlQuery(this)" name="sqlform"> <form method="post" action="read_dump.php"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?> onsubmit="return checkSqlQuery(this)" name="sqlform">
<?php <?php
} }
@@ -127,12 +126,18 @@ if (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE) {
} }
?> ?>
<a name="querybox"></a> <a name="querybox"></a>
<table cellpadding="1" cellspacing="1"> <table border="0" cellpadding="2" cellspacing="0">
<tr> <tr class="tblHeaders">
<td> <td nowrap="nowrap">
<?php echo sprintf($strRunSQLQuery, htmlspecialchars($db)) . $queryframe_db_list . (isset($is_inside_querywindow) ? '<br />' : ' ') . PMA_showMySQLDocu('Reference', 'SELECT'); ?> <?php
<br /> echo sprintf($strRunSQLQuery, htmlspecialchars($db)) . $queryframe_db_list . PMA_showMySQLDocu('Reference', 'SELECT'); ?>
<textarea name="sql_query" rows="<?php echo $cfg['TextareaRows']; ?>" cols="<?php echo (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE ? ceil($cfg['TextareaCols'] * 1.25) : $cfg['TextareaCols'] * 2); ?>" dir="<?php echo $text_dir; ?>"<?php echo $auto_sel; ?>> </td>
<?php if (isset($table) && $fields_cnt > 0) { ?>
<td nowrap="nowrap">&nbsp;&nbsp;&nbsp;</td><td nowrap="nowrap"><?php echo $strFields; ?>&nbsp;:</td>
<?php } ?>
</tr>
<tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>">
<td valign="top"><textarea name="sql_query" rows="<?php echo $cfg['TextareaRows']; ?>" cols="<?php echo (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE ? ceil($cfg['TextareaCols'] * 1.25) : $cfg['TextareaCols'] * 2); ?>" dir="<?php echo $text_dir; ?>"<?php echo $auto_sel; ?>>
<?php <?php
if (!empty($query_to_display)) { if (!empty($query_to_display)) {
echo htmlspecialchars($query_to_display); echo htmlspecialchars($query_to_display);
@@ -141,11 +146,17 @@ if (!empty($query_to_display)) {
} else { } else {
echo htmlspecialchars(str_replace('%d', PMA_backquote($db), $cfg['DefaultQueryDatabase'])); echo htmlspecialchars(str_replace('%d', PMA_backquote($db), $cfg['DefaultQueryDatabase']));
} }
?></textarea> ?></textarea></td>
</td> <?php if (isset($table) && $fields_cnt > 0) { ?>
<?php if (isset($table) && $fields_cnt > 0) { ?> <td valign="middle"><?php
<td align="center" valign="top"><?php echo (isset($is_inside_querywindow) ? '<br />' : '') . $strFields; ?>:<br /> if ($cfg['PropertiesIconic']) {
<select name="dummy" size="4" multiple="multiple"> echo '<input type="button" name="insert" value="<<" onclick="insertValueQuery()" title="' . $strInsert. '" />';
} else {
echo '<input type="button" name="insert" value="' . $strInsert . '" onclick="insertValueQuery()" />';
}
?></td>
<td valign="top">
<select name="dummy" size="<?php echo $cfg['TextareaRows']; ?>" multiple="multiple" class="textfield">
<?php <?php
echo "\n"; echo "\n";
for ($i = 0 ; $i < $fields_cnt; $i++) { for ($i = 0 ; $i < $fields_cnt; $i++) {
@@ -153,19 +164,19 @@ if (!empty($query_to_display)) {
. '<option value="' . PMA_backquote(htmlspecialchars($fields_list[$i])) . '">' . htmlspecialchars($fields_list[$i]) . '</option>' . "\n"; . '<option value="' . PMA_backquote(htmlspecialchars($fields_list[$i])) . '">' . htmlspecialchars($fields_list[$i]) . '</option>' . "\n";
} }
?> ?>
</select><br /><br /> </select>
<input type="button" name="insert" value="<?php echo($strInsert); ?>" onclick="insertValueQuery()" />
</td> </td>
<?php <?php
} }
?> ?>
</tr> </tr>
</table> <tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>"><td>
<input type="checkbox" name="show_query" value="1" id="checkbox_show_query" checked="checked" />&nbsp; <input type="checkbox" name="show_query" value="1" id="checkbox_show_query" checked="checked" />&nbsp;<label for="checkbox_show_query"><?php echo $strShowThisQuery; ?></label>
<label for="checkbox_show_query"><?php echo $strShowThisQuery; ?></label><br />
<?php <?php
if (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE) { if (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE) {
?> ?>
<br />
<script type="text/javascript"> <script type="text/javascript">
document.writeln('<input type="checkbox" name="LockFromUpdate" value="1" id="checkbox_lock" />&nbsp;'); document.writeln('<input type="checkbox" name="LockFromUpdate" value="1" id="checkbox_lock" />&nbsp;');
document.writeln(' <label for="checkbox_lock"><?php echo $strQueryWindowLock; ?></label><br />'); document.writeln(' <label for="checkbox_lock"><?php echo $strQueryWindowLock; ?></label><br />');
@@ -175,6 +186,8 @@ if (!empty($query_to_display)) {
$form_items++; $form_items++;
?> ?>
</td><td colspan="2" align="right"><input type="submit" name="SQL" value="<?php echo $strGo; ?>" /></td></tr>
</table>
<?php <?php
} else { } else {
?> ?>
@@ -380,9 +393,9 @@ if (!isset($is_inside_querywindow) || (isset($is_inside_querywindow) && $is_insi
} }
} }
?> ?>
</form> </form></td></tr></table>
<?php <?php
if (!isset($is_inside_querywindow) || !$is_inside_querywindow) echo "</li>\n"; //if (!isset($is_inside_querywindow) || !$is_inside_querywindow) echo "</li>\n";
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 != '') {
@@ -390,7 +403,7 @@ if (!isset($is_inside_querywindow) ||
$ldi_target = 'ldi_table.php?' . $url_query . (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE ? '&amp;focus_querywindow=true' : ''); $ldi_target = 'ldi_table.php?' . $url_query . (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE ? '&amp;focus_querywindow=true' : '');
if ($is_upload && isset($db) && isset($table)) { if ($is_upload && isset($db) && isset($table)) {
if (!isset($is_inside_querywindow) || !$is_inside_querywindow) echo "<li>\n"; //if (!isset($is_inside_querywindow) || !$is_inside_querywindow) echo "<li>\n";
?> ?>
<!-- Insert a text file --> <!-- Insert a text file -->
<?php <?php
@@ -421,7 +434,7 @@ if (!isset($is_inside_querywindow) ||
<a href="<?php echo $ldi_target; ?>"><?php echo $strInsertTextfiles; ?></a> <a href="<?php echo $ldi_target; ?>"><?php echo $strInsertTextfiles; ?></a>
</noscript> </noscript>
<?php <?php
if (!isset($is_inside_querywindow) || !$is_inside_querywindow) echo "</li>\n"; //if (!isset($is_inside_querywindow) || !$is_inside_querywindow) echo "</li>\n";
} }
} }
echo "\n"; echo "\n";