diff options
| -rwxr-xr-x | ChangeLog | 4 | ||||
| -rw-r--r-- | db_datadict.php | 2 | ||||
| -rw-r--r-- | db_details.php | 3 | ||||
| -rw-r--r-- | db_details_importdocsql.php | 14 | ||||
| -rw-r--r-- | db_details_links.php | 2 | ||||
| -rw-r--r-- | db_details_qbe.php | 6 | ||||
| -rw-r--r-- | db_details_structure.php | 183 | ||||
| -rw-r--r-- | db_search.php | 12 | ||||
| -rw-r--r-- | header.inc.php | 2 | ||||
| -rw-r--r-- | index.php | 24 | ||||
| -rw-r--r-- | ldi_table.php | 5 | ||||
| -rw-r--r-- | left.php | 5 | ||||
| -rw-r--r-- | libraries/display_export.lib.php | 99 | ||||
| -rw-r--r-- | pdf_pages.php | 52 | ||||
| -rw-r--r-- | queryframe.php | 12 | ||||
| -rw-r--r-- | read_dump.php | 2 | ||||
| -rw-r--r-- | server_links.inc.php | 2 | ||||
| -rw-r--r-- | server_privileges.php | 42 | ||||
| -rw-r--r-- | tbl_change.php | 17 | ||||
| -rw-r--r-- | tbl_printview.php | 10 | ||||
| -rw-r--r-- | tbl_properties_links.php | 2 | ||||
| -rw-r--r-- | tbl_properties_operations.php | 39 | ||||
| -rw-r--r-- | tbl_properties_structure.php | 36 | ||||
| -rw-r--r-- | tbl_query_box.php | 28 | ||||
| -rw-r--r-- | tbl_select.php | 8 | ||||
| -rw-r--r-- | user_password.php | 6 |
26 files changed, 274 insertions, 343 deletions
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2004-10-08 Garvin Hicking <pma@supergarv.de> + * lots of files: Adjusted superfluous spaces, added + more CSS-ID attributes for better themeability. + 2004-10-04 Michal Čihař <michal@cihar.com> * tbl_query_box.php: Reenabled %f substitution. diff --git a/db_datadict.php b/db_datadict.php index 50f7b19e3d..ab42e6dc08 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -153,7 +153,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { * Displays the comments of the table if MySQL >= 3.23 */ if (!empty($show_comment)) { - echo $strTableComments . ' : ' . $show_comment . '<br /><br />'; + echo $strTableComments . ': ' . $show_comment . '<br /><br />'; } /** diff --git a/db_details.php b/db_details.php index 830af4140a..c11c921e7b 100644 --- a/db_details.php +++ b/db_details.php @@ -88,8 +88,7 @@ if (!empty($query_to_display)) { </td></tr> <tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> <td> - <input type="checkbox" name="show_query" value="1" id="checkbox_show_query" checked="checked" /> - <label for="checkbox_show_query"><?php echo $strShowThisQuery; ?></label> + <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> diff --git a/db_details_importdocsql.php b/db_details_importdocsql.php index 0103be0b20..3b9ad746fd 100644 --- a/db_details_importdocsql.php +++ b/db_details_importdocsql.php @@ -239,7 +239,7 @@ if (isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir'])) { // garvin: displays import dump feature only if file upload available if ($is_upload) { echo '<br /><br />'; - echo ' <i>' . $strOr . '</i> ' . $strLocationTextfile . ' :<br />' . "\n"; + echo ' <i>' . $strOr . '</i> ' . $strLocationTextfile . ':<br />' . "\n"; ?> <div style="margin-bottom: 5px"> <input type="file" name="sql_file" class="textfield" /><br /> @@ -266,17 +266,13 @@ if (isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir'])) { $is_bzip = ($cfg['BZipDump'] && @function_exists('bzdecompress')); if ($is_bzip || $is_gzip) { echo ' ' . $strCompression . ':' . "\n" - . ' <input type="radio" id="radio_sql_file_compression_auto" name="sql_file_compression" value="" checked="checked" />' . "\n" - . ' <label for="radio_sql_file_compression_auto">' . $strAutodetect . '</label> ' . "\n" - . ' <input type="radio" id="radio_sql_file_compression_plain" name="sql_file_compression" value="text/plain" />' . "\n" - . ' <label for="radio_sql_file_compression_plain">' . $strNone . '</label> ' . "\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> ' . "\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> ' . "\n"; if ($is_gzip) { - echo ' <input type="radio" id="radio_sql_file_compression_gzip" name="sql_file_compression" value="application/x-gzip" />' . "\n" - . ' <label for="radio_sql_file_compression_gzip">' . $strGzip . '</label> ' . "\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> ' . "\n"; } if ($is_bzip) { - echo ' <input type="radio" id="radio_sql_file_compression_bzip" name="sql_file_compression" value="application/x-bzip" />' . "\n" - . ' <label for="radio_sql_file_compression_bzip">' . $strBzip . '</label> ' . "\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> ' . "\n"; } } else { echo ' <input type="hidden" name="sql_file_compression" value="text/plain" />' . "\n"; diff --git a/db_details_links.php b/db_details_links.php index 027431407e..c20eba6a6c 100644 --- a/db_details_links.php +++ b/db_details_links.php @@ -63,7 +63,7 @@ else { if ($cfg['LightTabs']) { echo ' '; } else { - echo '<table border="0" cellspacing="0" cellpadding="0" width="100%">' . "\n" + echo '<table border="0" cellspacing="0" cellpadding="0" width="100%" id="topmenu">' . "\n" . ' <tr>' . "\n" . ' <td class="nav" align="left" nowrap="nowrap" valign="bottom">' . ' <table border="0" cellpadding="0" cellspacing="0"><tr>' diff --git a/db_details_qbe.php b/db_details_qbe.php index 87d5ed77b3..870aa67fe0 100644 --- a/db_details_qbe.php +++ b/db_details_qbe.php @@ -395,7 +395,7 @@ for ($y = 0; $y <= $row; $y++) { <input type="checkbox" name="InsRow[<?php echo $w; ?>]" /> </td> <td align="<?php echo $cell_align_right; ?>"> - <b><?php echo $strAnd; ?> :</b> + <b><?php echo $strAnd; ?>:</b> </td> <td> <input type="radio" name="AndOrRow[<?php echo $w; ?>]" value="and"<?php echo $chk['and']; ?> /> @@ -629,7 +629,7 @@ for ($x = 0; $x < $col; $x++) { <option value="1">1</option> <option value="2">2</option> <option value="3">3</option> - </select> + </select> </td> <td width="10"> </td> <td nowrap="nowrap"><?php echo $strAddDeleteColumn; ?>: @@ -1061,7 +1061,7 @@ if (!empty($qry_orderby)) { <!-- Execute a query --> <td align="right" class="tblHeaders"><input type="submit" name="submit_sql" value="<?php echo $strRunQuery; ?>" /></td> </tr> -</table> +</table> </form> <?php /** diff --git a/db_details_structure.php b/db_details_structure.php index bd9b527891..d2c7623934 100644 --- a/db_details_structure.php +++ b/db_details_structure.php @@ -768,34 +768,44 @@ if ($num_tables > 0 } // end if ?> </table> + +<form method="post" action="pdf_schema.php"> <?php // is this OK to check for 'class' support? if ($num_tables > 0) { $takeaway = $url_query . '&table=' . urlencode($table); } + if (($cfgRelation['pdfwork'] && $num_tables > 0) || -($num_tables > 0 - && $cfgRelation['relwork'] && $cfgRelation['commwork'] - && isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir']) - ) -) { ?><hr /><table border="0" cellpadding="2" cellspacing="0"><?php } + ($num_tables > 0 + && $cfgRelation['relwork'] && $cfgRelation['commwork'] + && isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir']) + )) { ?> +<hr /><table border="0" cellpadding="2" cellspacing="0"> +<?php +} -if ($cfgRelation['pdfwork'] && $num_tables > 0) { - ?> +if ($cfgRelation['pdfwork'] && $num_tables > 0) { ?> <!-- Work on PDF Pages --> - <tr><td colspan="3" class="tblHeaders"> - <?php + <tr> + <td colspan="3" class="tblHeaders"> + <?php if ($cfg['PropertiesIconic']) { echo '<img src="' . $pmaThemeImage . 'b_pdfdoc.png" border="0" width="16" height="16" hspace="2" align="middle" />'; - } -?>PDF</td></tr><tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> - <td colspan="3"><?php - echo '<a href="pdf_pages.php?' . $takeaway . '">'; - if ($cfg['PropertiesIconic']) { - echo '<img src="' . $pmaThemeImage . 'b_edit.png" border="0" width="16" height="16" hspace="2" align="middle" />'; - } - echo ''. $strEditPDFPages . '</a>'; - ?></td></tr> + } ?>PDF</td> + </tr> + + <tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> + <td colspan="3"> + <?php + echo '<a href="pdf_pages.php?' . $takeaway . '">'; + if ($cfg['PropertiesIconic']) { + echo '<img src="' . $pmaThemeImage . 'b_edit.png" border="0" width="16" height="16" hspace="2" align="middle" />'; + } + echo ''. $strEditPDFPages . '</a>'; + ?> + </td> + </tr> <!-- PDF schema --> <?php @@ -804,62 +814,47 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { $test_query = 'SELECT * FROM ' . PMA_backquote($cfgRelation['pdf_pages']) . ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''; $test_rs = PMA_query_as_cu($test_query, NULL, PMA_DBI_QUERY_STORE); - if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) { - echo "\n"; - ?> - <form method="post" action="pdf_schema.php"> - <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"><td colspan="3"> -<?php + + if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) { ?> + <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"> + <td colspan="3"> + <?php echo PMA_generate_common_hidden_inputs($db); if ($cfg['PropertiesIconic']) { echo '<img src="' . $pmaThemeImage . 'b_view.png" border="0" width="16" height="16" hspace="2" align="middle" />'; } - echo $strDisplayPDF; -?>: </td></tr> - <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"><td width="20"> </td><td colspan="2"> - <?php echo $strPageNumber; ?> - <select name="pdf_page_number"> - <?php - while ($pages = @PMA_DBI_fetch_assoc($test_rs)) { - echo "\n" . ' ' - . '<option value="' . $pages['page_nr'] . '">' . $pages['page_nr'] . ': ' . $pages['page_descr'] . '</option>'; - } // end while - PMA_DBI_free_result($test_rs); - unset($test_rs); - echo "\n"; - ?> - </select></td></tr> - <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"> - <td width="20"> </td><td width="20" valign="top"> - <input type="checkbox" name="show_grid" id="show_grid_opt" /></td><td> - <label for="show_grid_opt"><?php echo $strShowGrid; ?></label></td></tr> - <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"> - <td width="20"> </td><td width="20" valign="top"> - <input type="checkbox" name="show_color" id="show_color_opt" checked="checked" /></td><td> - <label for="show_color_opt"><?php echo $strShowColor; ?></label></td></tr> - <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"> - <td width="20"> </td><td width="20" valign="top"> - <input type="checkbox" name="show_table_dimension" id="show_table_dim_opt" /></td><td> - <label for="show_table_dim_opt"><?php echo $strShowTableDimension; ?></label></td></tr> - <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"> - <td width="20"> </td><td width="20" valign="top"> - <input type="checkbox" name="all_tab_same_wide" id="all_tab_same_wide" /></td><td> - <label for="all_tab_same_wide"><?php echo wordwrap($strAllTableSameWidth,55,'<br />'); ?></label></td></tr> - <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"> - <td width="20"> </td><td width="20" valign="top"> - <input type="checkbox" name="with_doc" id="with_doc" checked="checked" /></td><td> - <label for="with_doc"><?php echo $strDataDict; ?></label></td></tr> - <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"> - <td width="20"> </td><td colspan="2"> - <?php echo $strShowDatadictAs; ?> - <select name="orientation"> + echo $strDisplayPDF; ?>: + </td> + </tr> + + <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"> + <td width="20"> </td> + <td colspan="2"> + <label for="pdf_page_number_opt"><?php echo $strPageNumber; ?></label> + <select name="pdf_page_number" id="pdf_page_number_opt"> + <?php + while ($pages = @PMA_DBI_fetch_assoc($test_rs)) { + echo ' <option value="' . $pages['page_nr'] . '">' . $pages['page_nr'] . ': ' . $pages['page_descr'] . '</option>' . "\n"; + } // end while + PMA_DBI_free_result($test_rs); + unset($test_rs); + ?> + </select><br /> + + <input type="checkbox" name="show_grid" id="show_grid_opt" /><label for="show_grid_opt"><?php echo $strShowGrid; ?></label><br /> + <input type="checkbox" name="show_color" id="show_color_opt" checked="checked" /><label for="show_color_opt"><?php echo $strShowColor; ?></label><br /> + <input type="checkbox" name="show_table_dimension" id="show_table_dim_opt" /><label for="show_table_dim_opt"><?php echo $strShowTableDimension; ?></label><br /> + <input type="checkbox" name="all_tab_same_wide" id="all_tab_same_wide" /><label for="all_tab_same_wide"><?php echo $strAllTableSameWidth; ?></label><br /> + <input type="checkbox" name="with_doc" id="with_doc" checked="checked" /><label for="with_doc"><?php echo $strDataDict; ?></label><br /> + + <label for="orientation_opt"><?php echo $strShowDatadictAs; ?></label> + <select name="orientation" id="orientation_opt"> <option value="L"><?php echo $strLandscape;?></option> <option value="P"><?php echo $strPortrait;?></option> - </select></td></tr> - <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"> - <td width="20"> </td><td colspan="2"> - <?php echo $strPaperSize; ?> - <select name="paper"> + </select><br /> + + <label for="paper_opt"><?php echo $strPaperSize; ?></label> + <select name="paper" id="paper_opt"> <?php foreach ($cfg['PDFPageSizes'] AS $key => $val) { echo '<option value="' . $val . '"'; @@ -869,17 +864,19 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { echo ' >' . $val . '</option>' . "\n"; } ?> - </select></td></tr> - <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"> - <td width="20"> </td><td colspan="3" align="right"> - <input type="submit" value="<?php echo $strGo; ?>" /></td> - </form></tr> - <tr><td colspan="3"><img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" width="1" height="1" border="0" alt="" /></td></tr> + </select> + </td> + </tr> + + <tr bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"> + <td width="20"> </td> + <td colspan="3" align="right"> <input type="submit" value="<?php echo $strGo; ?>" /></td> + </tr> + <tr> + <td colspan="3"><img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" width="1" height="1" border="0" alt="" /></td> + </tr> <?php } // end if -?> - -<?php } // end if if ($num_tables > 0 @@ -888,23 +885,29 @@ if ($num_tables > 0 ) { ?> <!-- import docSQL files --> - <tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>"><td colspan="3"><?php - echo '<a href="db_details_importdocsql.php?' . $takeaway . '">'; - if ($cfg['PropertiesIconic']) { - echo '<img src="' . $pmaThemeImage . 'b_docsql.png" border="0" width="16" height="16" hspace="2" align="middle" />'; - } - echo $strImportDocSQL . '</a>'; - ?> - </td></tr> + <tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> + <td colspan="3"> + <?php + echo '<a href="db_details_importdocsql.php?' . $takeaway . '">'; + if ($cfg['PropertiesIconic']) { + echo '<img src="' . $pmaThemeImage . 'b_docsql.png" border="0" width="16" height="16" hspace="2" align="middle" />'; + } + echo $strImportDocSQL . '</a>'; + ?> + </td> + </tr> <?php } echo "\n"; if (($cfgRelation['pdfwork'] && $num_tables > 0) || -($num_tables > 0 - && $cfgRelation['relwork'] && $cfgRelation['commwork'] - && isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir']) - ) -) { ?></table><?php } + ($num_tables > 0 + && $cfgRelation['relwork'] && $cfgRelation['commwork'] + && isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir']) + )) { ?> +</table> +</form> +<?php +} /** * Displays the footer diff --git a/db_search.php b/db_search.php index d35d30c3bf..c95593d00d 100644 --- a/db_search.php +++ b/db_search.php @@ -296,14 +296,10 @@ if (empty($search_option)) { <?php echo $strSearchType; ?> </td> <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> - <input type="radio" id="search_option_1" name="search_option" value="1"<?php if ($search_option == 1) echo ' checked="checked"'; ?> /> - <label for="search_option_1"><?php echo $strSearchOption1; ?></label> *<br /> - <input type="radio" id="search_option_2" name="search_option" value="2"<?php if ($search_option == 2) echo ' checked="checked"'; ?> /> - <label for="search_option_2"><?php echo $strSearchOption2; ?></label> *<br /> - <input type="radio" id="search_option_3" name="search_option" value="3"<?php if ($search_option == 3) echo ' checked="checked"'; ?> /> - <label for="search_option_3"><?php echo $strSearchOption3; ?></label><br /> - <input type="radio" id="search_option_4" name="search_option" value="4"<?php if ($search_option == 4) echo ' checked="checked"'; ?> /> - <label for="search_option_4"><?php echo $strSearchOption4; ?></label><?php echo PMA_showMySQLDocu('Regexp', 'Regexp'); ?><br /> + <input type="radio" id="search_option_1" name="search_option" value="1"<?php if ($search_option == 1) echo ' checked="checked"'; ?> /><label for="search_option_1"><?php echo $strSearchOption1; ?></label> *<br /> + <input type="radio" id="search_option_2" name="search_option" value="2"<?php if ($search_option == 2) echo ' checked="checked"'; ?> /><label for="search_option_2"><?php echo $strSearchOption2; ?></label> *<br /> + <input type="radio" id="search_option_3" name="search_option" value="3"<?php if ($search_option == 3) echo ' checked="checked"'; ?> /><label for="search_option_3"><?php echo $strSearchOption3; ?></label><br /> + <input type="radio" id="search_option_4" name="search_option" value="4"<?php if ($search_option == 4) echo ' checked="checked"'; ?> /><label for="search_option_4"><?php echo $strSearchOption4; ?></label><?php echo PMA_showMySQLDocu('Regexp', 'Regexp'); ?><br /> <br /> * <?php echo $strSplitWordsWithSpace . "\n"; ?> </td> diff --git a/header.inc.php b/header.inc.php index 6b2c520d96..242242c77b 100644 --- a/header.inc.php +++ b/header.inc.php @@ -152,7 +152,7 @@ if (empty($GLOBALS['is_header_sent'])) { */ if (PMA_DISPLAY_HEADING) { - echo '<table border="0" cellpadding="0" cellspacing="0">' . "\n" + echo '<table border="0" cellpadding="0" cellspacing="0" id="serverinfo">' . "\n" . ' <tr>' . "\n"; $header_url_qry = '?' . PMA_generate_common_url(); $server_info = (!empty($cfg['Server']['verbose']) @@ -79,14 +79,14 @@ $query_frame_height = 0; if ($cfg['LeftDisplayLogo'] && @file_exists($logo_image)) { $tmp_imgsize = @getimagesize($logo_image); $query_frame_height = ($tmp_imgsize[1] + 60); - // increase the height to take into account font size differences in + // increase the height to take into account font size differences in // theme 'original'? (TODO: improve with a parameter in layout.inc.php) $query_frame_height += ((!isset($GLOBALS['theme']) || $GLOBALS['theme']=='original') ? 25 : 0); } if ($query_frame_height == 0) { $query_frame_height = 60; } -// increase the height to take into account font size differences in +// increase the height to take into account font size differences in // theme 'original'? (TODO: improve with a parameter in layout.inc.php) $query_frame_height += ((!isset($GLOBALS['theme']) || $GLOBALS['theme']=='original') ? 20 : 10); @@ -114,10 +114,10 @@ if ($cfg['QueryFrame']) { echo '<!--' . "\n"; echo ' document.writeln(\'<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*" border="1" frameborder="1" framespacing="0" name="mainFrameset" id="mainFrameset">\');' . "\n"; echo ' document.writeln(\' <frameset rows="' . $query_frame_height . ', *" framespacing="0" frameborder="0" border="0" name="leftFrameset" id="leftFrameset">\');' . "\n"; - echo ' document.writeln(\' <frame src="queryframe.php?' . $url_query . '&hash=' . $phpmain_hash . $phpmain_hash_js . '" name="queryframe" frameborder="0" scrolling="no" />\');' . "\n"; - echo ' document.writeln(\' <frame src="left.php?' . $url_query . '&hash=' . $phpmain_hash . $phpmain_hash_js . '" name="nav" frameborder="0" />\');' . "\n"; + echo ' document.writeln(\' <frame src="queryframe.php?' . $url_query . '&hash=' . $phpmain_hash . $phpmain_hash_js . '" name="queryframe" frameborder="0" scrolling="no" id="leftQueryframe" />\');' . "\n"; + echo ' document.writeln(\' <frame src="left.php?' . $url_query . '&hash=' . $phpmain_hash . $phpmain_hash_js . '" name="nav" frameborder="0" id="leftFrame" />\');' . "\n"; echo ' document.writeln(\' </frameset>\');' . "\n"; - echo ' document.writeln(\' <frame src="' . (empty($db) ? $cfg['DefaultTabServer'] : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . $phpmain_hash_js . '" border="0" frameborder="0" style="border-left: 1px solid #000000;" />\');' . "\n"; + echo ' document.writeln(\' <frame src="' . (empty($db) ? $cfg['DefaultTabServer'] : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . $phpmain_hash_js . '" border="0" frameborder="0" style="border-left: 1px solid #000000;" id="rightFrame" />\');' . "\n"; echo ' document.writeln(\' <noframes>\');' . "\n"; echo ' document.writeln(\' <body bgcolor="#FFFFFF">\');' . "\n"; echo ' document.writeln(\' <p>' . str_replace("'", "\'", $strNoFrames) . '</p>\');' . "\n"; @@ -129,19 +129,19 @@ if ($cfg['QueryFrame']) { echo "\n"; echo '<noscript>' . "\n"; } - + echo '<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*" border="1" frameborder="1" framespacing="0" name="mainFrameset" id="mainFrameset">' . "\n"; echo ' <frameset rows="' . $query_frame_height . ', *" framespacing="0" frameborder="0" border="0" name="leftFrameset" id="leftFrameset">' . "\n"; - echo ' <frame src="queryframe.php?' . $url_query . '&hash=' . $phpmain_hash . '" name="queryframe" frameborder="0" scrolling="no" />' . "\n"; - echo ' <frame src="left.php?' . $url_query . '&hash=' . $phpmain_hash . '" name="nav" frameborder="0" />' . "\n"; + echo ' <frame src="queryframe.php?' . $url_query . '&hash=' . $phpmain_hash . '" name="queryframe" frameborder="0" scrolling="no" id="leftQueryframe" />' . "\n"; + echo ' <frame src="left.php?' . $url_query . '&hash=' . $phpmain_hash . '" name="nav" frameborder="0" id="leftFrame" />' . "\n"; echo ' </frameset>' . "\n"; - echo ' <frame src="' . (empty($db) ? $cfg['DefaultTabServer'] : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . '" frameborder="0" />' . "\n"; + echo ' <frame src="' . (empty($db) ? $cfg['DefaultTabServer'] : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . '" frameborder="0" id="rightFrame" />' . "\n"; } else { - echo '<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*" border="1" frameborder="1" framespacing="0">' . "\n"; - echo ' <frame src="left.php?' . $url_query . '&hash=' . $phpmain_hash . '" name="nav" frameborder="0" />' . "\n"; - echo ' <frame src="' . (empty($db) ? $cfg['DefaultTabServer'] : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . '" frameborder="1" />' . "\n"; + echo '<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*" border="1" frameborder="1" framespacing="0" id="leftFrameset" >' . "\n"; + echo ' <frame src="left.php?' . $url_query . '&hash=' . $phpmain_hash . '" name="nav" frameborder="0" id="leftFrame" />' . "\n"; + echo ' <frame src="' . (empty($db) ? $cfg['DefaultTabServer'] : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . '" id="rightFrame" frameborder="1" />' . "\n"; } ?> diff --git a/ldi_table.php b/ldi_table.php index d3b4488c1a..39d65410f0 100644 --- a/ldi_table.php +++ b/ldi_table.php @@ -47,7 +47,7 @@ if (!empty($cfg['UploadDir'])) { if ($is_first == 0) { $is_upload_dir = true; echo "<br />\n"; - echo ' <i>' . $strOr . '</i> ' . $strWebServerUploadDirectory . ' : ' . "\n"; + echo ' <i>' . $strOr . '</i> ' . $strWebServerUploadDirectory . ': ' . "\n"; echo ' <div style="margin-bottom: 5px">' . "\n"; echo ' <select size="1" name="local_textfile">' . "\n"; echo ' <option value="" selected="selected"></option>' . "\n"; @@ -112,8 +112,7 @@ echo "\n"; <td><?php echo $strFieldsEnclosedBy; ?></td> <td> <input type="text" name="enclosed" size="1" maxlength="1" value=""" /> - <input type="checkbox" name="enclose_option" value="OPTIONALLY" id="checkbox_enclose_option" /> - <label for="checkbox_enclose_option"><?php echo $strOptionally; ?></label> + <input type="checkbox" name="enclose_option" value="OPTIONALLY" id="checkbox_enclose_option" /><label for="checkbox_enclose_option"><?php echo $strOptionally; ?></label> </td> <td><?php echo $strOftenQuotation; ?></td> </tr> @@ -337,7 +337,7 @@ echo "\n"; ?> </head> -<body bgcolor="<?php echo $cfg['LeftBgColor']; ?>"> +<body bgcolor="<?php echo $cfg['LeftBgColor']; ?>" id="body_leftFrame"> <?php if ($cfg['LeftDisplayLogo'] && !$cfg['QueryFrame']) { @@ -410,6 +410,7 @@ if (!$cfg['QueryFrame']) { ?> <!-- Databases and tables list --> +<div id="left_tableList"> <?php // Don't display expansible/collapsible database info if: // 1. $server == 0 (no server selected) @@ -925,7 +926,7 @@ setTimeout('check_queryframe_reload()', 1000); } } ?> - +</div> </body> </html> diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index ea8cd35202..3259f78486 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -186,11 +186,9 @@ if (isset($sql_query)) { <tr> <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> <?php echo $strAddHeaderComment; ?>: <input type="text" name="header_comment" value="<?php echo $cfg['Export']['sql_header_comment']; ?>" class="textfield" size="30" style="vertical-align: middle" /><br /> - <input type="checkbox" name="use_transaction" value="yes" id="checkbox_use_transaction" <?php PMA_exportCheckboxCheck('sql_use_transaction'); ?> style="vertical-align: middle" /> - <label for="checkbox_use_transaction"><?php echo $strEncloseInTransaction; ?></label><br /> + <input type="checkbox" name="use_transaction" value="yes" id="checkbox_use_transaction" <?php PMA_exportCheckboxCheck('sql_use_transaction'); ?> style="vertical-align: middle" /><label for="checkbox_use_transaction"><?php echo $strEncloseInTransaction; ?></label><br /> - <input type="checkbox" name="disable_fk" value="yes" id="checkbox_disable_fk" <?php PMA_exportCheckboxCheck('sql_disable_fk'); ?> style="vertical-align: middle" /> - <label for="checkbox_disable_fk"><?php echo $strDisableForeignChecks; ?></label><br /> + <input type="checkbox" name="disable_fk" value="yes" id="checkbox_disable_fk" <?php PMA_exportCheckboxCheck('sql_disable_fk'); ?> style="vertical-align: middle" /><label for="checkbox_disable_fk"><?php echo $strDisableForeignChecks; ?></label><br /> </td> </tr> <?php @@ -200,8 +198,7 @@ if ($export_type == 'server') { <tr> <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> <b><?php echo $strDatabaseExportOptions; ?>:</b><br /> - <input type="checkbox" name="drop_database" value="yes" id="checkbox_drop_database" <?php PMA_exportCheckboxCheck('sql_drop_database'); ?> style="vertical-align: middle" /> - <label for="checkbox_drop_database"><?php echo $strAddDropDatabase; ?></label> + <input type="checkbox" name="drop_database" value="yes" id="checkbox_drop_database" <?php PMA_exportCheckboxCheck('sql_drop_database'); ?> style="vertical-align: middle" /><label for="checkbox_drop_database"><?php echo $strAddDropDatabase; ?></label> </td> </tr> @@ -211,42 +208,33 @@ if (!$hide_structure) { ?> <!-- For structure --> <tr> <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> - <input type="checkbox" name="sql_structure" value="structure" id="checkbox_sql_structure" <?php PMA_exportCheckboxCheck('sql_structure'); ?> onclick="if (!this.checked && !getElement('checkbox_sql_data').checked) return false; else return true;" /> - <label for="checkbox_sql_structure"><b><?php echo $strStructure; ?>:</b></label><br /> + <input type="checkbox" name="sql_structure" value="structure" id="checkbox_sql_structure" <?php PMA_exportCheckboxCheck('sql_structure'); ?> onclick="if (!this.checked && !getElement('checkbox_sql_data').checked) return false; else return true;" /><label for="checkbox_sql_structure"><b><?php echo $strStructure; ?>:</b></label><br /> - <input type="checkbox" name="drop" value="1" id="checkbox_dump_drop" <?php PMA_exportCheckboxCheck('sql_drop_table'); ?> style="vertical-align: middle" /> - <label for="checkbox_dump_drop"><?php echo $strStrucDrop; ?></label><br /> + <input type="checkbox" name="drop" value="1" id="checkbox_dump_drop" <?php PMA_exportCheckboxCheck('sql_drop_table'); ?> style="vertical-align: middle" /><label for="checkbox_dump_drop"><?php echo $strStrucDrop; ?></label><br /> - <input type="checkbox" name="if_not_exists" value="1" id="checkbox_dump_if_not_exists" <?php PMA_exportCheckboxCheck('sql_if_not_exists'); ?> style="vertical-align: middle" /> - <label for="checkbox_dump_if_not_exists"><?php echo $strAddIfNotExists; ?></label><br /> + <input type="checkbox" name="if_not_exists" value="1" id="checkbox_dump_if_not_exists" <?php PMA_exportCheckboxCheck('sql_if_not_exists'); ?> style="vertical-align: middle" /><label for="checkbox_dump_if_not_exists"><?php echo $strAddIfNotExists; ?></label><br /> - <input type="checkbox" name="auto_increment" value="1" id="checkbox_auto_increment" <?php PMA_exportCheckboxCheck('sql_auto_increment'); ?> style="vertical-align: middle" /> - <label for="checkbox_auto_increment"><?php echo $strAddAutoIncrement; ?></label><br /> + <input type="checkbox" name="auto_increment" value="1" id="checkbox_auto_increment" <?php PMA_exportCheckboxCheck('sql_auto_increment'); ?> style="vertical-align: middle" /><label for="checkbox_auto_increment"><?php echo $strAddAutoIncrement; ?></label><br /> - <input type="checkbox" name="use_backquotes" value="1" id="checkbox_dump_use_backquotes" <?php PMA_exportCheckboxCheck('sql_backquotes'); ?> style="vertical-align: middle" /> - <label for="checkbox_dump_use_backquotes"><?php echo $strUseBackquotes; ?></label><br /> + <input type="checkbox" name="use_backquotes" value="1" id="checkbox_dump_use_backquotes" <?php PMA_exportCheckboxCheck('sql_backquotes'); ?> style="vertical-align: middle" /><label for="checkbox_dump_use_backquotes"><?php echo $strUseBackquotes; ?></label><br /> <b><?php echo $strAddIntoComments; ?></b><br /> - <input type="checkbox" name="sql_dates" value="yes" id="checkbox_sql_dates" <?php PMA_exportCheckboxCheck('sql_dates'); ?> style="vertical-align: middle" /> - <label for="checkbox_sql_dates"><?php echo $strCreationDates; ?></label><br /> + <input type="checkbox" name="sql_dates" value="yes" id="checkbox_sql_dates" <?php PMA_exportCheckboxCheck('sql_dates'); ?> style="vertical-align: middle" /><label for="checkbox_sql_dates"><?php echo $strCreationDates; ?></label><br /> <?php if (!empty($cfgRelation['relation'])) { ?> - <input type="checkbox" name="sql_relation" value="yes" id="checkbox_sql_use_relation" <?php PMA_exportCheckboxCheck('sql_relation'); ?> style="vertical-align: middle" /> - <label for="checkbox_sql_use_relation"><?php echo $strRelations; ?></label><br /> + <input type="checkbox" name="sql_relation" value="yes" id="checkbox_sql_use_relation" <?php PMA_exportCheckboxCheck('sql_relation'); ?> style="vertical-align: middle" /><label for="checkbox_sql_use_relation"><?php echo $strRelations; ?></label><br /> <?php } // end relation if (!empty($cfgRelation['commwork'])) { ?> - <input type="checkbox" name="sql_comments" value="yes" id="checkbox_sql_use_comments" <?php PMA_exportCheckboxCheck('sql_comments'); ?> style="vertical-align: middle" /> - <label for="checkbox_sql_use_comments"><?php echo $strComments; ?></label><br /> + <input type="checkbox" name="sql_comments" value="yes" id="checkbox_sql_use_comments" <?php PMA_exportCheckboxCheck('sql_comments'); ?> style="vertical-align: middle" /><label for="checkbox_sql_use_comments"><?php echo $strComments; ?></label><br /> <?php } // end comments if ($cfgRelation['mimework']) { ?> - <input type="checkbox" name="sql_mime" value="yes" id="checkbox_sql_use_mime" <?php PMA_exportCheckboxCheck('sql_mime'); ?> style="vertical-align: middle" /> - <label for="checkbox_sql_use_mime"><?php echo $strMIME_MIMEtype; ?></label><br /> + <input type="checkbox" name="sql_mime" value="yes" id="checkbox_sql_use_mime" <?php PMA_exportCheckboxCheck('sql_mime'); ?> style="vertical-align: middle" /><label for="checkbox_sql_use_mime"><?php echo $strMIME_MIMEtype; ?></label><br /> <?php } // end MIME ?> @@ -259,26 +247,19 @@ if (!$hide_structure) { ?> <!-- For data --> <tr> <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> - <input type="checkbox" name="sql_data" value="data" id="checkbox_sql_data" <?php PMA_exportCheckboxCheck('sql_data'); ?> onclick="if (!this.checked && (!getElement('checkbox_sql_structure') || !getElement('checkbox_sql_structure').checked)) return false; else return true;" style="vertical-align: middle" /> - <label for="checkbox_sql_data"><b><?php echo $strData; ?>:</b></label><br /> + <input type="checkbox" name="sql_data" value="data" id="checkbox_sql_data" <?php PMA_exportCheckboxCheck('sql_data'); ?> onclick="if (!this.checked && (!getElement('checkbox_sql_structure') || !getElement('checkbox_sql_structure').checked)) return false; else return true;" style="vertical-align: middle" /><label for="checkbox_sql_data"><b><?php echo $strData; ?>:</b></label><br /> - <input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" <?php PMA_exportCheckboxCheck('sql_columns'); ?> style="vertical-align: middle" /> - <label for="checkbox_dump_showcolumns"><?php echo $strCompleteInserts; ?></label><br /> + <input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" <?php PMA_exportCheckboxCheck('sql_columns'); ?> style="vertical-align: middle" /><label for="checkbox_dump_showcolumns"><?php echo $strCompleteInserts; ?></label><br /> - <input type="checkbox" name="extended_ins" value="yes" id="checkbox_dump_extended_ins" <?php PMA_exportCheckboxCheck('sql_extended'); ?> style="vertical-align: middle" /> - <label for="checkbox_dump_extended_ins"><?php echo $strExtendedInserts; ?></label><br /> + <input type="checkbox" name="extended_ins" value="yes" id="checkbox_dump_extended_ins" <?php PMA_exportCheckboxCheck('sql_extended'); ?> style="vertical-align: middle" /><label for="checkbox_dump_extended_ins"><?php echo $strExtendedInserts; ?></label><br /> - <input type="checkbox" name="delayed" value="yes" id="checkbox_dump_delayed" <?php PMA_exportCheckboxCheck('sql_delayed'); ?> style="vertical-align: middle" /> - <label for="checkbox_dump_delayed"><?php echo $strDelayedInserts; ?></label><br /> + <input type="checkbox" name="delayed" value="yes" id="checkbox_dump_delayed" <?php PMA_exportCheckboxCheck('sql_delayed'); ?> style="vertical-align: middle" /><label for="checkbox_dump_delayed"><?php echo $strDelayedInserts; ?></label><br /> - <input type="checkbox" name="sql_ignore" value="yes" id="checkbox_dump_ignore" <?php PMA_exportCheckboxCheck('sql_ignore'); ?> style="vertical-align: middle" /> - <label for="checkbox_dump_ignore"><?php echo $strIgnoreInserts; ?></label><br /> + <input type="checkbox" name="sql_ignore" value="yes" id="checkbox_dump_ignore" <?php PMA_exportCheckboxCheck('sql_ignore'); ?> style="vertical-align: middle" /><label for="checkbox_dump_ignore"><?php echo $strIgnoreInserts; ?></label><br /> - <input type="checkbox" name="hexforbinary" value="yes" id="checkbox_hexforbinary" <?php PMA_exportCheckboxCheck('sql_hex_for_binary'); ?> style="vertical-align: middle" /> - <label for="checkbox_hexforbinary"><?php echo $strHexForBinary; ?></label><br /> + <input type="checkbox" name="hexforbinary" value="yes" id="checkbox_hexforbinary" <?php PMA_exportCheckboxCheck('sql_hex_for_binary'); ?> style="vertical-align: middle" /><label for="checkbox_hexforbinary"><?php echo $strHexForBinary; ?></label><br /> - <label for="select_sql_type"><?php echo $strSQLExportType; ?>: </label> - <select name="sql_type" id="select_sql_type" style="vertical-align: middle"> + <label for="select_sql_type"><?php echo $strSQLExportType; ?>: </label><select name="sql_type" id="select_sql_type" style="vertical-align: middle"> <option value="insert"<?php echo $cfg['Export']['sql_type'] == 'insert' ? ' selected="selected"' : ''; ?>>INSERT</option> <option value="update"<?php echo $cfg['Export']['sql_type'] == 'update' ? ' selected="selected"' : ''; ?>>UPDATE</option> <option value="replace"<?php echo $cfg['Export']['sql_type'] == 'replace' ? ' selected="selected"' : ''; ?>>REPLACE</option> @@ -297,8 +278,7 @@ if (!$hide_structure) { ?> <tr><th align="left"><?php echo $strLaTeXOptions; ?></th></tr> <tr> <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> - <input type="checkbox" name="latex_caption" value="yes" id="checkbox_latex_show_caption" <?php PMA_exportCheckboxCheck('latex_caption'); ?> style="vertical-align: middle" /> - <label for="checkbox_latex_show_caption"><?php echo $strLatexIncludeCaption; ?></label><br /> + <input type="checkbox" name="latex_caption" value="yes" id="checkbox_latex_show_caption" <?php PMA_exportCheckboxCheck('latex_caption'); ?> style="vertical-align: middle" /><label for="checkbox_latex_show_caption"><?php echo $strLatexIncludeCaption; ?></label><br /> </td> </tr> @@ -306,8 +286,7 @@ if (!$hide_structure) { ?> <!-- For structure --> <tr> <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> - <input type="checkbox" name="latex_structure" value="structure" id="checkbox_latex_structure" <?php PMA_exportCheckboxCheck('latex_structure'); ?> onclick="if (!this.checked && !getElement('checkbox_latex_data').checked) return false; else return true;" style="vertical-align: middle" /> - <label for="checkbox_latex_structure"><b><?php echo $strStructure; ?></b></label><br /> + <input type="checkbox" name="latex_structure" value="structure" id="checkbox_latex_structure" <?php PMA_exportCheckboxCheck('latex_structure'); ?> onclick="if (!this.checked && !getElement('checkbox_latex_data').checked) return false; else return true;" style="vertical-align: middle" /><label for="checkbox_latex_structure"><b><?php echo $strStructure; ?></b></label><br /> <table border="0" cellspacing="1" cellpadding="0"> <tr> <td> </td> @@ -334,20 +313,17 @@ if (!$hide_structure) { ?> <?php if (!empty($cfgRelation['relation'])) { ?> - <input type="checkbox" name="latex_relation" value="yes" id="checkbox_latex_use_relation" <?php PMA_exportCheckboxCheck('latex_relation'); ?> style="vertical-align: middle" /> - <label for="checkbox_latex_use_relation"><?php echo $strRelations; ?></label><br /> + <input type="checkbox" name="latex_relation" value="yes" id="checkbox_latex_use_relation" <?php PMA_exportCheckboxCheck('latex_relation'); ?> style="vertical-align: middle" /><label for="checkbox_latex_use_relation"><?php echo $strRelations; ?></label><br /> <?php } // end relation if ($cfgRelation['commwork']) { ?> - <input type="checkbox" name="latex_comments" value="yes" id="checkbox_latex_use_comments" <?php PMA_exportCheckboxCheck('latex_comments'); ?> style="vertical-align: middle" /> - <label for="checkbox_latex_use_comments"><?php echo $strComments; ?></label><br /> + <input type="checkbox" name="latex_comments" value="yes" id="checkbox_latex_use_comments" <?php PMA_exportCheckboxCheck('latex_comments'); ?> style="vertical-align: middle" /><label for="checkbox_latex_use_comments"><?php echo $strComments; ?></label><br /> <?php } // end comments if ($cfgRelation['mimework']) { ?> - <input type="checkbox" name="latex_mime" value="yes" id="checkbox_latex_use_mime" <?php PMA_exportCheckboxCheck('latex_mime'); ?> style="vertical-align: middle" /> - <label for="checkbox_latex_use_mime"><?php echo $strMIME_MIMEtype; ?></label><br /> + <input type="checkbox" name="latex_mime" value="yes" id="checkbox_latex_use_mime" <?php PMA_exportCheckboxCheck('latex_mime'); ?> style="vertical-align: middle" /><label for="checkbox_latex_use_mime"><?php echo $strMIME_MIMEtype; ?></label><br /> <?php } // end MIME ?> @@ -359,10 +335,8 @@ if (!$hide_structure) { ?> <!-- For data --> <tr> <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> - <input type="checkbox" name="latex_data" value="data" id="checkbox_latex_data" <?php PMA_exportCheckboxCheck('latex_data'); ?> onclick="if (!this.checked && (!getElement('checkbox_latex_structure') || !getElement('checkbox_latex_structure').checked)) return false; else return true;" style="vertical-align: middle" /> - <label for="checkbox_latex_data"><b><?php echo $strData; ?>:</b></label><br /> - <input type="checkbox" name="latex_showcolumns" value="yes" id="ch_latex_showcolumns" <?php PMA_exportCheckboxCheck('latex_columns'); ?> style="vertical-align: middle" /> - <label for="ch_latex_showcolumns"><?php echo $strColumnNames; ?></label><br /> + <input type="checkbox" name="latex_data" value="data" id="checkbox_latex_data" <?php PMA_exportCheckboxCheck('latex_data'); ?> onclick="if (!this.checked && (!getElement('checkbox_latex_structure') || !getElement('checkbox_latex_structure').checked)) return false; else return true;" style="vertical-align: middle" /><label for="checkbox_latex_data"><b><?php echo $strData; ?>:</b></label><br /> + <input type="checkbox" name="latex_showcolumns" value="yes" id="ch_latex_showcolumns" <?php PMA_exportCheckboxCheck('latex_columns'); ?> style="vertical-align: middle" /><label for="ch_latex_showcolumns"><?php echo $strColumnNames; ?></label><br /> <table border="0" cellspacing="1" cellpadding="0"> <tr> <td> </td> @@ -448,8 +422,7 @@ if (!$hide_structure) { ?> </td> </tr> </table> - <input type="checkbox" name="showcsvnames" value="yes" id="checkbox_dump_showcsvnames" <?php PMA_exportCheckboxCheck('csv_columns'); ?> style="vertical-align: middle" /> - <label for="checkbox_dump_showcsvnames"><?php echo $strPutColNames; ?></label> + <input type="checkbox" name="showcsvnames" value="yes" id="checkbox_dump_showcsvnames" <?php PMA_exportCheckboxCheck('csv_columns'); ?> style="vertical-align: middle" /><label for="checkbox_dump_showcsvnames"><?php echo $strPutColNames; ?></label> </td> </tr> </table> @@ -474,8 +447,7 @@ if (!$hide_structure) { ?> </tr> <tr> <td colspan="2"> - <input type="checkbox" name="showexcelnames" value="yes" id="checkbox_dump_showexcelnames" <?php PMA_exportCheckboxCheck('excel_columns'); ?> style="vertical-align: middle" /> - <label for="checkbox_dump_showexcelnames"><?php echo $strPutColNames; ?></label> + <input type="checkbox" name="showexcelnames" value="yes" id="checkbox_dump_showexcelnames" <?php PMA_exportCheckboxCheck('excel_columns'); ?> style="vertical-align: middle" /><label for="checkbox_dump_showexcelnames"><?php echo $strPutColNames; ?></label> </td> </tr> <tr> @@ -519,8 +491,7 @@ if (!$hide_structure) { ?> </tr> <tr> <td> - <input type="checkbox" name="xls_shownames" value="yes" id="checkbox_dump_xls_shownames" <?php PMA_exportCheckboxCheck('xls_columns'); ?> /> - <label for="checkbox_dump_xls_shownames"><?php echo $strPutColNames; ?></label> + <input type="checkbox" name="xls_shownames" value="yes" id="checkbox_dump_xls_shownames" <?php PMA_exportCheckboxCheck('xls_columns'); ?> /><label for="checkbox_dump_xls_shownames"><?php echo $strPutColNames; ?></label> </td> </tr> </table> @@ -565,17 +536,14 @@ if (isset($table) && !empty($table) && !isset($num_tables)) { <table width="100%" border="0" cellpadding="3" cellspacing="1"> <tr> <th align="left"> - <input type="checkbox" name="asfile" value="sendit" id="checkbox_dump_asfile" <?php PMA_exportCheckboxCheck('asfile'); ?> style="vertical-align: middle" /> - <label for="checkbox_dump_asfile"><b><?php echo $strSend; ?></b></label> + <input type="checkbox" name="asfile" value="sendit" id="checkbox_dump_asfile" <?php PMA_exportCheckboxCheck('asfile'); ?> style="vertical-align: middle" /><label for="checkbox_dump_asfile"><b><?php echo $strSend; ?></b></label> </th> </tr> <tr> <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> <?php if (isset($cfg['SaveDir']) && !empty($cfg['SaveDir'])) { ?> - <input type="checkbox" name="onserver" value="saveit" id="checkbox_dump_onserver" onclick="getElement('checkbox_dump_asfile').checked = true;" <?php PMA_exportCheckboxCheck('onserver'); ?> style="vertical-align: middle" /> - <label for="checkbox_dump_onserver"><?php echo sprintf($strSaveOnServer, htmlspecialchars($cfg['SaveDir'])); ?></label>,<br /> - <input type="checkbox" name="onserverover" value="saveitover" id="checkbox_dump_onserverover" onclick="getElement('checkbox_dump_onserver').checked = true;getElement('checkbox_dump_asfile').checked = true;" <?php PMA_exportCheckboxCheck('onserver_overwrite'); ?> style="vertical-align: middle" /> - <label for="checkbox_dump_onserverover"><?php echo $strOverwriteExisting; ?></label> + <input type="checkbox" name="onserver" value="saveit" id="checkbox_dump_onserver" onclick="getElement('checkbox_dump_asfile').checked = true;" <?php PMA_exportCheckboxCheck('onserver'); ?> style="vertical-align: middle" /><label for="checkbox_dump_onserver"><?php echo sprintf($strSaveOnServer, htmlspecialchars($cfg['SaveDir'])); ?></label>,<br /> + <input type="checkbox" name="onserverover" value="saveitover" id="checkbox_dump_onserverover" onclick="getElement('checkbox_dump_onserver').checked = true;getElement('checkbox_dump_asfile').checked = true;" <?php PMA_exportCheckboxCheck('onserver_overwrite'); ?> style="vertical-align: middle" /><label for="checkbox_dump_onserverover"><?php echo $strOverwriteExisting; ?></label> <br /> <?php } ?> @@ -605,8 +573,7 @@ if (isset($table) && !empty($table) && !isset($num_tables)) { echo '" '; ?> style="vertical-align: middle" /> ( - <input type="checkbox" name="remember_template" id="checkbox_remember_template" <?php PMA_exportCheckboxCheck('remember_file_template'); ?> style="vertical-align: middle" /> - <label for="checkbox_remember_template"><?php echo $strFileNameTemplateRemember; ?></label> + <input type="checkbox" name="remember_template" id="checkbox_remember_template" <?php PMA_exportCheckboxCheck('remember_file_template'); ?> style="vertical-align: middle" /><label for="checkbox_remember_template"><?php echo $strFileNameTemplateRemember; ?></label> )* <?php diff --git a/pdf_pages.php b/pdf_pages.php index 0e05762cfc..f08f8128df 100644 --- a/pdf_pages.php +++ b/pdf_pages.php @@ -17,7 +17,7 @@ require_once('./libraries/relation.lib.php'); $cfgRelation = PMA_getRelationsParam(); // This is to avoid "Command out of sync" errors. Before switching this to -// a value of 0 (for MYSQLI_USE_RESULT), please check the logic +// a value of 0 (for MYSQLI_USE_RESULT), please check the logic // to free results wherever needed. $query_default_option = PMA_DBI_QUERY_STORE; @@ -254,9 +254,9 @@ if ($cfgRelation['pdfwork']) { echo "\n"; ?> </select> - <input type="radio" name="action_choose" value="0" id="radio_choose0" checked="checked" style="vertical-align: middle" /> <label for="radio_choose0"> + <input type="radio" name="action_choose" value="0" id="radio_choose0" checked="checked" style="vertical-align: middle" /><label for="radio_choose0"> <?php echo $strEdit; ?> </label> - <input type="radio" name="action_choose" value="1" id="radio_choose1" style="vertical-align: middle" /> <label for="radio_choose1"> + <input type="radio" name="action_choose" value="1" id="radio_choose1" style="vertical-align: middle" /><label for="radio_choose1"> <?php echo $strDelete; ?> </label> <input type="submit" value="<?php echo $strGo; ?>" /> @@ -482,45 +482,43 @@ function resetDrag() { <form method="post" action="pdf_schema.php" name="pdfoptions"> <?php echo PMA_generate_common_hidden_inputs($db); ?> <input type="hidden" name="pdf_page_number" value="<?php echo $chpage; ?>" /> - <?php echo $strDisplayPDF; ?> :<br /> - <input type="checkbox" name="show_grid" id="show_grid_opt" /> - <label for="show_grid_opt"><?php echo $strShowGrid; ?></label><br /> - <input type="checkbox" name="show_color" id="show_color_opt" checked="checked" /> - <label for="show_color_opt"><?php echo $strShowColor; ?></label><br /> - <input type="checkbox" name="show_table_dimension" id="show_table_dim_opt" /> - <label for="show_table_dim_opt"><?php echo $strShowTableDimension; ?></label><br /> - <input type="checkbox" name="all_tab_same_wide" id="all_tab_same_wide" /> - <label for="all_tab_same_wide"><?php echo $strAllTableSameWidth; ?></label><br /> - <input type="checkbox" name="with_doc" id="with_doc" checked="checked" /> - <label for="with_doc"><?php echo $strDataDict; ?></label> <br /> - <?php echo $strShowDatadictAs; ?> - <select name="orientation" <?php echo ($cfg['WYSIWYG-PDF'] ? 'onchange="refreshDragOption(\'pdflayout\');"' : ''); ?>> + + <?php echo $strDisplayPDF; ?>: <br /> + <input type="checkbox" name="show_grid" id="show_grid_opt" /><label for="show_grid_opt"><?php echo $strShowGrid; ?></label><br /> + <input type="checkbox" name="show_color" id="show_color_opt" checked="checked" /><label for="show_color_opt"><?php echo $strShowColor; ?></label><br /> + <input type="checkbox" name="show_table_dimension" id="show_table_dim_opt" /><label for="show_table_dim_opt"><?php echo $strShowTableDimension; ?></label><br /> + <input type="checkbox" name="all_tab_same_wide" id="all_tab_same_wide" /><label for="all_tab_same_wide"><?php echo $strAllTableSameWidth; ?></label><br /> + <input type="checkbox" name="with_doc" id="with_doc" checked="checked" /><label for="with_doc"><?php echo $strDataDict; ?></label> + <br /> + <label for="orientation_opt"><?php echo $strShowDatadictAs; ?></label> + <select id="orientation_opt" name="orientation" <?php echo ($cfg['WYSIWYG-PDF'] ? 'onchange="refreshDragOption(\'pdflayout\');"' : ''); ?>> <option value="L"><?php echo $strLandscape;?></option> <option value="P"><?php echo $strPortrait;?></option> </select><br /> - <?php echo $strPaperSize; ?> - <select name="paper" <?php echo ($cfg['WYSIWYG-PDF'] ? 'onchange="refreshDragOption(\'pdflayout\');"' : ''); ?>> + + <label for="paper_opt"><?php echo $strPaperSize; ?></label> + <select id="paper_opt" name="paper" <?php echo ($cfg['WYSIWYG-PDF'] ? 'onchange="refreshDragOption(\'pdflayout\');"' : ''); ?>> <?php - foreach ($cfg['PDFPageSizes'] AS $key => $val) { - echo '<option value="' . $val . '"'; - if ($val == $cfg['PDFDefaultPageSize']) { - echo ' selected="selected"'; + foreach ($cfg['PDFPageSizes'] AS $key => $val) { + echo '<option value="' . $val . '"'; + if ($val == $cfg['PDFDefaultPageSize']) { + echo ' selected="selected"'; + } + echo ' >' . $val . '</option>' . "\n"; } - echo ' >' . $val . '</option>' . "\n"; - } ?> </select><br /> <input type="submit" value="<?php echo $strGo; ?>" /> </form> - <?php +<?php if ((isset($showwysiwyg) && $showwysiwyg == '1')) { - ?> +?> <script type="text/javascript"> <!-- ToggleDragDrop('pdflayout'); // --> </script> - <?php +<?php } } // end if } // end if ($cfgRelation['pdfwork']) diff --git a/queryframe.php b/queryframe.php index f33738d576..0c53f88dd2 100644 --- a/queryframe.php +++ b/queryframe.php @@ -145,7 +145,7 @@ function set_focus_to_nav() { ?> </head> -<body bgcolor="<?php echo $cfg['LeftBgColor']; ?>"<?php echo ((isset($js_frame_onload) && $js_frame_onload!='') ? $js_frame_onload : ''); ?>> +<body id="body_queryFrame" bgcolor="<?php echo $cfg['LeftBgColor']; ?>"<?php echo ((isset($js_frame_onload) && $js_frame_onload!='') ? $js_frame_onload : ''); ?>> <div id="qfcontainer"> <?php if ($cfg['LeftDisplayLogo']) { @@ -154,7 +154,7 @@ if ($cfg['LeftDisplayLogo']) { <?php if (@file_exists($pmaThemeImage . 'logo_left.png')) { ?> - + <div align="center"> <a href="http://www.phpmyadmin.net" target="_blank"><img src="<?php echo '' . $pmaThemeImage . 'logo_left.png'; ?>" alt="phpMyAdmin" vspace="3" border="0" /></a> </div> @@ -165,7 +165,7 @@ if ($cfg['LeftDisplayLogo']) { . '<img src="' . $GLOBALS['pmaThemeImage'] . 'pma_logo2.png' .'" alt="phpMyAdmin" border="0" />' . '</a></div>' . "\n"; } - echo '<hr />'; + echo '<hr id="hr_first" />'; } // end of display logo if ($cfg['MainPageIconic']) { @@ -237,7 +237,7 @@ if ($cfg['MainPageIconic']) { ?> </div> - <hr /> + <hr id="hr_second" /> <?php if ($cfg['LeftDisplayServers']){ @@ -371,7 +371,7 @@ if ($num_dbs > 1) { if (!empty($num_tables)) { echo ' ' - . '<option value="' . htmlspecialchars($db) . '"' . $selected . '>' + . '<option value="' . htmlspecialchars($db) . '"' . $selected . '>' . ($db_tooltip != '' && $cfg['ShowTooltipAliasDB'] ? htmlspecialchars($db_tooltip) : htmlspecialchars($db)) . ' (' . $num_tables . ')</option>' . "\n"; } else { echo ' ' @@ -387,7 +387,7 @@ if ($num_dbs > 1) { </td> </tr> </table> - <hr /> + <hr id="hr_third" /> <?php } // end if LeftFrameLight } // end if num_db > 1 diff --git a/read_dump.php b/read_dump.php index f03dfb0a0a..f84378b5d5 100644 --- a/read_dump.php +++ b/read_dump.php @@ -411,7 +411,7 @@ if (!empty($id_bookmark) && $action_bookmark == 2) { $message = $strNoQuery; } } else if ($sql_query_cpy == '') { - $message = "$strSuccess :<br />$strTheContent ($pieces_count $strInstructions) "; + $message = "$strSuccess:<br />$strTheContent ($pieces_count $strInstructions) "; } else { $message = $strSuccess; } diff --git a/server_links.inc.php b/server_links.inc.php index 8dd7caedef..0f724a4aa9 100644 --- a/server_links.inc.php +++ b/server_links.inc.php @@ -44,7 +44,7 @@ if (!empty($message)) { if ($cfg['LightTabs']) { echo ' '; } else { - echo '<table border="0" cellspacing="0" cellpadding="0" width="100%">' . "\n" + echo '<table border="0" cellspacing="0" cellpadding="0" width="100%" id="topmenu">' . "\n" . ' <tr>' . "\n" . ' <td class="nav" align="left" nowrap="nowrap" valign="bottom">' . ' <table border="0" cellpadding="0" cellspacing="0"><tr>' diff --git a/server_privileges.php b/server_privileges.php index c0415991a6..5d35514317 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -28,7 +28,7 @@ if (!empty($pred_tablename)) { if (!$is_superuser) { require('./server_links.inc.php'); echo '<h2>' . "\n" - . ' ' . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="'. $GLOBALS['pmaThemeImage'] . 'b_usrlist.png" border="0" hspace="2" align="middle" />' : '') + . ' ' . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="'. $GLOBALS['pmaThemeImage'] . 'b_usrlist.png" border="0" hspace="2" align="middle" />' : '') . ' ' . $strPrivileges . "\n" . '</h2>' . "\n" . $strNoPrivileges . "\n"; @@ -255,8 +255,7 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE, $indent = } echo $spaces . ' </select><br />' . "\n" . $spaces . ' <i>' . $GLOBALS['strOr'] . '</i><br />' . "\n" - . $spaces . ' <input type="checkbox" name="Select_priv_none" id="checkbox_Select_priv_none" title="' . $GLOBALS['strNone'] . '" />' . "\n" - . $spaces . ' <label for="checkbox_Select_priv_none">' . $GLOBALS['strNone'] . '</label>' . "\n" + . $spaces . ' <input type="checkbox" name="Select_priv_none" id="checkbox_Select_priv_none" title="' . $GLOBALS['strNone'] . '" /><label for="checkbox_Select_priv_none">' . $GLOBALS['strNone'] . '</label>' . "\n" . $spaces . ' </td>' . "\n" . $spaces . ' <td bgcolor="' . $cfg['BgcolorTwo'] . '" rowspan="' . $rowspan . '" valign="top">' . "\n" . $spaces . ' <select name="Insert_priv[]" multiple="multiple">' . "\n"; @@ -269,8 +268,7 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE, $indent = } echo $spaces . ' </select><br />' . "\n" . $spaces . ' <i>' . $GLOBALS['strOr'] . '</i><br />' . "\n" - . $spaces . ' <input type="checkbox" name="Insert_priv_none" id="checkbox_Insert_priv_none" title="' . $GLOBALS['strNone'] . '" />' . "\n" - . $spaces . ' <label for="checkbox_Insert_priv_none">' . $GLOBALS['strNone'] . '</label>' . "\n" + . $spaces . ' <input type="checkbox" name="Insert_priv_none" id="checkbox_Insert_priv_none" title="' . $GLOBALS['strNone'] . '" /><label for="checkbox_Insert_priv_none">' . $GLOBALS['strNone'] . '</label>' . "\n" . $spaces . ' </td>' . "\n" . $spaces . ' <td bgcolor="' . $cfg['BgcolorTwo'] . '" rowspan="' . $rowspan . '" valign="top">' . "\n" . $spaces . ' <select name="Update_priv[]" multiple="multiple">' . "\n"; @@ -283,8 +281,7 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE, $indent = } echo $spaces . ' </select><br />' . "\n" . $spaces . ' <i>' . $GLOBALS['strOr'] . '</i><br />' . "\n" - . $spaces . ' <input type="checkbox" name="Update_priv_none" id="checkbox_Update_priv_none" title="' . $GLOBALS['strNone'] . '" />' . "\n" - . $spaces . ' <label for="checkbox_Update_priv_none">' . $GLOBALS['strNone'] . '</label>' . "\n" + . $spaces . ' <input type="checkbox" name="Update_priv_none" id="checkbox_Update_priv_none" title="' . $GLOBALS['strNone'] . '" /><label for="checkbox_Update_priv_none">' . $GLOBALS['strNone'] . '</label>' . "\n" . $spaces . ' </td>' . "\n" . $spaces . ' <td bgcolor="' . $cfg['BgcolorTwo'] . '" rowspan="' . $rowspan . '" valign="top">' . "\n" . $spaces . ' <select name="References_priv[]" multiple="multiple">' . "\n"; @@ -297,8 +294,7 @@ function PMA_displayPrivTable($db = '*', $table = '*', $submit = TRUE, $indent = } echo $spaces . ' </select><br />' . "\n" . $spaces . ' <i>' . $GLOBALS['strOr'] . '</i><br />' . "\n" - . $spaces . ' <input type="checkbox" name="References_priv_none" id="checkbox_References_priv_none" title="' . $GLOBALS['strNone'] . '" />' . "\n" - . $spaces . ' <label for="checkbox_References_priv_none">' . $GLOBALS['strNone'] . '</label>' . "\n" + . $spaces . ' <input type="checkbox" name="References_priv_none" id="checkbox_References_priv_none" title="' . $GLOBALS['strNone'] . '" /><label for="checkbox_References_priv_none">' . $GLOBALS['strNone'] . '</label>' . "\n" . $spaces . ' </td>' . "\n"; unset($rowspan); list($current_grant, $current_grant_value) = each($row); @@ -537,7 +533,7 @@ function PMA_displayLoginInformationFields($mode = 'new', $indent = 0) . $spaces . ' <input type="password" name="pma_pw2" id="text_pma_pw2" class="textfield" title="' . $GLOBALS['strReType'] . '" onchange="pred_password.value = \'userdefined\';" />' . "\n" . $spaces . ' </td>' . "\n" . $spaces . '</tr>' . "\n"; -} // end of the 'PMA_displayUserAndHostFields()' function +} // end of the 'PMA_displayUserAndHostFields()' function /** @@ -642,7 +638,7 @@ if (!empty($adduser_submit) || !empty($change_copy)) { $message = $strAddUserMessage; } else { $queries[] = $real_sql_query; - // we put the query containing the hidden password in + // we put the query containing the hidden password in // $queries_for_display, at the same position occupied // by the real query in $queries $tmp_count = count($queries); @@ -912,7 +908,7 @@ if (empty($adduser) && empty($checkprivs)) { if (!isset($username)) { // No username is given --> display the overview echo '<h2>' . "\n" - . ' ' . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="'. $GLOBALS['pmaThemeImage'] . 'b_usrlist.png" border="0" hspace="2" align="middle" />' : '') + . ' ' . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="'. $GLOBALS['pmaThemeImage'] . 'b_usrlist.png" border="0" hspace="2" align="middle" />' : '') . $strUserOverview . "\n" . '</h2>' . "\n"; $oldPrivTables = FALSE; @@ -1000,15 +996,15 @@ if (empty($adduser) && empty($checkprivs)) { . ' </tr>' . "\n" . ' </table>' . "\n" . ' <br /><table border="0" cellpading="3" cellspacing="0">' . "\n" - . ' <tr bgcolor="' . $cfg['BgcolorOne'] . '"><td ' + . ' <tr bgcolor="' . $cfg['BgcolorOne'] . '"><td ' . ($cfg['PropertiesIconic'] ? 'colspan="3"><b><a href="server_privileges.php?' . $url_query . '&adduser=1"><img src="' . $pmaThemeImage . 'b_usradd.png" width="16" height="16" hspace="2" border="0" align="middle" />' : 'width="20" nowrap="nowrap" align="center" valign="top"><b>•</b></td><td><b><a href="server_privileges.php?' . $url_query . '&adduser=1">' ). "\n" . ' ' . $strAddUser . '</a></b>' . "\n" . ' ' . "\n" . ' </td></tr>' . "\n" . ' <tr><td colspan="2"></td></tr>' - . ' <tr bgcolor="' . $cfg['BgcolorOne'] . '"><td ' + . ' <tr bgcolor="' . $cfg['BgcolorOne'] . '"><td ' . ($cfg['PropertiesIconic'] ? 'colspan="3"><b><img src="' . $pmaThemeImage . 'b_usrdrop.png" width="16" height="16" hspace="2" border="0" align="middle" />' : 'width="20" nowrap="nowrap" align="center" valign="top"><b>•</b></td><td><b>' ). "\n" . ' <b>' . $strRemoveSelectedUsers . '</b>' . "\n" - . ' </td></tr>' . "\n" + . ' </td></tr>' . "\n" . ' <tr bgcolor="' . $cfg['BgcolorOne'] . '"><td width="16" class="nowrap"> </td><td valign="top"><input type="radio" title="' . $strJustDelete . ' ' . $strJustDeleteDescr . '" name="mode" id="radio_mode_1" value="1" checked="checked" /></td>' . "\n" . ' <td><label for="radio_mode_1" title="' . $strJustDelete . ' ' . $strJustDeleteDescr . '">' . "\n" . ' ' . $strJustDelete . "\n" @@ -1268,23 +1264,19 @@ if (empty($adduser) && empty($checkprivs)) { PMA_displayLoginInformationFields('change', 3); echo ' </table>' . "\n" . ' ' . $strChangeCopyMode . '<br />' . "\n" - . ' <input type="radio" name="mode" value="4" id="radio_mode_4" checked="checked" />' . "\n" - . ' <label for="radio_mode_4">' . "\n" + . ' <input type="radio" name="mode" value="4" id="radio_mode_4" checked="checked" /><label for="radio_mode_4">' . "\n" . ' ' . $strChangeCopyModeCopy . "\n" . ' </label>' . "\n" . ' <br />' . "\n" - . ' <input type="radio" name="mode" value="1" id="radio_mode_1" />' . "\n" - . ' <label for="radio_mode_1">' . "\n" + . ' <input type="radio" name="mode" value="1" id="radio_mode_1" /><label for="radio_mode_1">' . "\n" . ' ' . $strChangeCopyModeJustDelete . "\n" . ' </label>' . "\n" . ' <br />' . "\n" - . ' <input type="radio" name="mode" value="2" id="radio_mode_2" />' . "\n" - . ' <label for="radio_mode_2">' . "\n" + . ' <input type="radio" name="mode" value="2" id="radio_mode_2" /><label for="radio_mode_2">' . "\n" . ' ' . $strChangeCopyModeRevoke . "\n" . ' </label>' . "\n" . ' <br />' . "\n" - . ' <input type="radio" name="mode" value="3" id="radio_mode_3" />' . "\n" - . ' <label for="radio_mode_3">' . "\n" + . ' <input type="radio" name="mode" value="3" id="radio_mode_3" /><label for="radio_mode_3">' . "\n" . ' ' . $strChangeCopyModeDeleteAndReload . "\n" . ' </label>' . "\n" . ' <br />' . "\n" @@ -1352,9 +1344,9 @@ if (empty($adduser) && empty($checkprivs)) { $no = PMA_convert_using('N', 'quoted'); - $list_of_privileges = PMA_convert_using('Select_priv') . ' AS Select_priv, ' . PMA_convert_using('Insert_priv') . ' AS Insert_priv, ' . PMA_convert_using('Update_priv') . ' AS Update_priv, ' . PMA_convert_using('Delete_priv') . ' AS Delete_priv, ' . PMA_convert_using('Create_priv') . ' AS Create_priv, ' . PMA_convert_using('Drop_priv') . ' AS Drop_priv, ' . PMA_convert_using('Grant_priv') . ' AS Grant_priv, '. PMA_convert_using('References_priv') . ' AS References_priv'; + $list_of_privileges = PMA_convert_using('Select_priv') . ' AS Select_priv, ' . PMA_convert_using('Insert_priv') . ' AS Insert_priv, ' . PMA_convert_using('Update_priv') . ' AS Update_priv, ' . PMA_convert_using('Delete_priv') . ' AS Delete_priv, ' . PMA_convert_using('Create_priv') . ' AS Create_priv, ' . PMA_convert_using('Drop_priv') . ' AS Drop_priv, ' . PMA_convert_using('Grant_priv') . ' AS Grant_priv, '. PMA_convert_using('References_priv') . ' AS References_priv'; - $list_of_compared_privileges = PMA_convert_using('Select_priv') . ' = ' . $no . ' AND ' . PMA_convert_using('Insert_priv') . ' = ' . $no . ' AND ' . PMA_convert_using('Update_priv') . ' = ' . $no . ' AND ' . PMA_convert_using('Delete_priv') . ' = ' . $no . ' AND ' . PMA_convert_using('Create_priv') . ' = ' . $no . ' AND ' . PMA_convert_using('Drop_priv') . ' = ' . $no . ' AND ' . PMA_convert_using('Grant_priv') . ' = ' . $no . ' AND ' . PMA_convert_using('References_priv') . ' = ' . $no; + $list_of_compared_privileges = PMA_convert_using('Select_priv') . ' = ' . $no . ' AND ' . PMA_convert_using('Insert_priv') . ' = ' . $no . ' AND ' . PMA_convert_using('Update_priv') . ' = ' . $no . ' AND ' . PMA_convert_using('Delete_priv') . ' = ' . $no . ' AND ' . PMA_convert_using('Create_priv') . ' = ' . $no . ' AND ' . PMA_convert_using('Drop_priv') . ' = ' . $no . ' AND ' . PMA_convert_using('Grant_priv') . ' = ' . $no . ' AND ' . PMA_convert_using('References_priv') . ' = ' . $no; $sql_query = '(SELECT ' . PMA_convert_using('User') . ' AS User,' . PMA_convert_using('Host') . ' AS Host,' . PMA_convert_using('Db') . ' AS Db,' . $list_of_privileges . ' FROM `db` WHERE ' . PMA_convert_using($checkprivs, 'quoted') . ' LIKE ' . PMA_convert_using('Db') . ' AND NOT (' . $list_of_compared_privileges. ')) UNION (SELECT ' . PMA_convert_using('User') . ' AS User, ' . PMA_convert_using('Host') . ' AS Host, ' . PMA_convert_using('*', 'quoted') . ' AS Db, ' . $list_of_privileges . ' FROM `user` WHERE NOT (' . $list_of_compared_privileges . ')) ORDER BY User ASC, Host ASC, Db ASC;'; $res = PMA_DBI_query($sql_query); diff --git a/tbl_change.php b/tbl_change.php index f8a28cd850..f9aaf299b4 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -298,7 +298,7 @@ foreach ($loop_array AS $vrowcount => $vrow) { // Array ( [Field] => d [Type] => datetime [Null] => YES [Key] => [Extra] => [True_Type] => datetime ) // but, look what we get if we switch to iso: (Default is NULL) // Array ( [Field] => d [Type] => datetime [Null] => YES [Key] => [Default] => [Extra] => [True_Type] => datetime ) - // so I force a NULL into it (I don't think it's possible + // so I force a NULL into it (I don't think it's possible // to have an empty default value for DATETIME) // then, the "if" after this one will work if ($row_table_def['Type'] == 'datetime' @@ -628,8 +628,8 @@ foreach ($loop_array AS $vrowcount => $vrow) { && isset($row_table_def['Default']) && $enum_atom == $row_table_def['Default'])) { echo ' checked="checked"'; } - echo 'tabindex="' . ($tabindex + $tab3) . '" />' . "\n"; - echo ' <label for="field_' . ($tabindex + $tab3) . '_3_' . $j . '">' . htmlspecialchars($enum_atom) . '</label>' . "\n"; + echo 'tabindex="' . ($tabindex + $tab3) . '" />'; + echo '<label for="field_' . ($tabindex + $tab3) . '_3_' . $j . '">' . htmlspecialchars($enum_atom) . '</label>' . "\n"; } // end for } // end else @@ -748,7 +748,7 @@ foreach ($loop_array AS $vrowcount => $vrow) { if (is_file($cfg['UploadDir'] . $file) && !PMA_checkFileExtensions($file, '.sql')) { if ($is_first == 0) { echo "<br />\n"; - echo ' <i>' . $strOr . '</i>' . ' ' . $strWebServerUploadDirectory . ' :<br />' . "\n"; + echo ' <i>' . $strOr . '</i>' . ' ' . $strWebServerUploadDirectory . ':<br />' . "\n"; echo ' <select size="1" name="fields_uploadlocal_' . urlencode($field) . $vkey . '">' . "\n"; echo ' <option value="" selected="selected"></option>' . "\n"; } // end if (is_first) @@ -862,17 +862,14 @@ if (!empty($disp_message)) { <b>-- <?php echo $strAnd; ?> --</b> </td> <td valign="middle" nowrap="nowrap"> - <input type="radio" name="after_insert" value="back" id="radio_after_insert_back" <?php echo $checked_after_insert_back; ?> tabindex="<?php echo ($tabindex + $tab3 + 3); ?>" style="vertical-align: middle" /> - <label for="radio_after_insert_back"><?php echo $strAfterInsertBack; ?></label><br /> + <input type="radio" name="after_insert" value="back" id="radio_after_insert_back" <?php echo $checked_after_insert_back; ?> tabindex="<?php echo ($tabindex + $tab3 + 3); ?>" style="vertical-align: middle" /><label for="radio_after_insert_back"><?php echo $strAfterInsertBack; ?></label><br /> <b><?php echo $strOr; ?></b><br /> - <input type="radio" name="after_insert" value="new_insert" id="radio_after_insert_new_insert"<?php echo $checked_after_insert_new_insert; ?> tabindex="<?php echo ($tabindex + $tab3 + 4); ?>" style="vertical-align: middle" /> - <label for="radio_after_insert_new_insert"><?php echo $strAfterInsertNewInsert; ?></label><br /> + <input type="radio" name="after_insert" value="new_insert" id="radio_after_insert_new_insert"<?php echo $checked_after_insert_new_insert; ?> tabindex="<?php echo ($tabindex + $tab3 + 4); ?>" style="vertical-align: middle" /><label for="radio_after_insert_new_insert"><?php echo $strAfterInsertNewInsert; ?></label><br /> <?php if (isset($primary_key)) { ?> <b><?php echo $strOr; ?></b><br /> - <input type="radio" name="after_insert" value="same_insert" id="radio_after_insert_same_insert"<?php echo $checked_after_insert_new_insert; ?> tabindex="<?php echo ($tabindex + $tab3+ 5); ?>" style="vertical-align: middle" /> - <label for="radio_after_insert_same_insert"><?php echo $strAfterInsertSame; ?></label> + <input type="radio" name="after_insert" value="same_insert" id="radio_after_insert_same_insert"<?php echo $checked_after_insert_new_insert; ?> tabindex="<?php echo ($tabindex + $tab3+ 5); ?>" style="vertical-align: middle" /><label for="radio_after_insert_same_insert"><?php echo $strAfterInsertSame; ?></label> <?php } ?> </td> </tr> diff --git a/tbl_printview.php b/tbl_printview.php index b63f6609a8..647481a8d5 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -58,7 +58,7 @@ if ($multi_tables) { $tbl_list .= (empty($tbl_list) ? '' : ', ') . PMA_backquote(urldecode($table)); } - echo '<b>'. $strShowTables . ' : ' . $tbl_list . '</b>' . "\n"; + echo '<b>'. $strShowTables . ': ' . $tbl_list . '</b>' . "\n"; echo '<hr />' . "\n"; } // end if @@ -155,7 +155,7 @@ foreach ($the_tables AS $key => $table) { * Displays the comments of the table if MySQL >= 3.23 */ if (!empty($show_comment)) { - echo $strTableComments . ' : ' . $show_comment . '<br /><br />'; + echo $strTableComments . ': ' . $show_comment . '<br /><br />'; } /** @@ -301,7 +301,7 @@ foreach ($the_tables AS $key => $table) { <br /><br /> <!-- Indexes --> - <big><?php echo $strIndexes . ' :'; ?></big> + <big><?php echo $strIndexes . ':'; ?></big> <table bordercolorlight="black" border="border" style="border-collapse: collapse; background-color: white"> <tr> <th><?php echo $strKeyname; ?></th> @@ -406,7 +406,7 @@ foreach ($the_tables AS $key => $table) { <!-- Space usage --> <td class="print" valign="top"> - <big><?php echo $strSpaceUsage . ' :'; ?></big> + <big><?php echo $strSpaceUsage . ':'; ?></big> <table width="100%" bordercolorlight="black" border="border" style="border-collapse: collapse; background-color: white"> <tr> <th><?php echo $strType; ?></th> @@ -462,7 +462,7 @@ foreach ($the_tables AS $key => $table) { <!-- Rows Statistic --> <td valign="top"> - <big><?php echo $strRowsStatistic . ' :'; ?></big> + <big><?php echo $strRowsStatistic . ':'; ?></big> <table width=100% bordercolorlight="black" border="border" style="border-collapse: collapse; background-color: white"> <tr> <th><?php echo $strStatement; ?></th> diff --git a/tbl_properties_links.php b/tbl_properties_links.php index 97990bf10e..189ffb26fc 100644 --- a/tbl_properties_links.php +++ b/tbl_properties_links.php @@ -68,7 +68,7 @@ $class7 = 'Drop'; if ($cfg['LightTabs']) { echo ' '; } else { - echo '<table border="0" cellspacing="0" cellpadding="0" width="100%">' . "\n" + echo '<table border="0" cellspacing="0" cellpadding="0" width="100%" id="topmenu">' . "\n" . ' <tr>' . "\n" . ' <td class="nav" align="left" nowrap="nowrap" valign="bottom">' . ' <table border="0" cellpadding="0" cellspacing="0"><tr>' diff --git a/tbl_properties_operations.php b/tbl_properties_operations.php index 3eb47fd8b4..d33773441c 100644 --- a/tbl_properties_operations.php +++ b/tbl_properties_operations.php @@ -106,7 +106,7 @@ unset($result); if (PMA_MYSQL_INT_VERSION >= 32334) { ?> <!-- Order the table --> - + <form method="post" action="tbl_properties_operations.php"> <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <tr> @@ -218,32 +218,25 @@ for ($i = 0; $i < $num_dbs; $i++) { </tr> <tr> <td nowrap="nowrap" bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> - <input type="radio" name="what" value="structure" id="radio_copy_structure" style="vertical-align: middle" /> - <label for="radio_copy_structure"><?php echo $strStrucOnly; ?></label> <br /> - <input type="radio" name="what" value="data" id="radio_copy_data" checked="checked" style="vertical-align: middle" /> - <label for="radio_copy_data"><?php echo $strStrucData; ?></label> <br /> - <input type="radio" name="what" value="dataonly" id="radio_copy_dataonly" style="vertical-align: middle" /> - <label for="radio_copy_dataonly"><?php echo $strDataOnly; ?></label> <br /> - - <input type="checkbox" name="drop_if_exists" value="true" id="checkbox_drop" style="vertical-align: middle" /> - <label for="checkbox_drop"><?php echo $strStrucDrop; ?></label> <br /> - <input type="checkbox" name="auto_increment" value="1" id="checkbox_auto_increment" style="vertical-align: middle" /> - <label for="checkbox_auto_increment"><?php echo $strAddAutoIncrement; ?></label><br /> + <input type="radio" name="what" value="structure" id="radio_copy_structure" style="vertical-align: middle" /><label for="radio_copy_structure"><?php echo $strStrucOnly; ?></label> <br /> + <input type="radio" name="what" value="data" id="radio_copy_data" checked="checked" style="vertical-align: middle" /><label for="radio_copy_data"><?php echo $strStrucData; ?></label> <br /> + <input type="radio" name="what" value="dataonly" id="radio_copy_dataonly" style="vertical-align: middle" /><label for="radio_copy_dataonly"><?php echo $strDataOnly; ?></label> <br /> + + <input type="checkbox" name="drop_if_exists" value="true" id="checkbox_drop" style="vertical-align: middle" /><label for="checkbox_drop"><?php echo $strStrucDrop; ?></label> <br /> + <input type="checkbox" name="auto_increment" value="1" id="checkbox_auto_increment" style="vertical-align: middle" /><label for="checkbox_auto_increment"><?php echo $strAddAutoIncrement; ?></label><br /> <?php // display "Add constraints" choice only if there are // foreign keys if (PMA_getForeigners($db, $table, '', 'innodb')) { ?> - <input type="checkbox" name="constraints" value="1" id="checkbox_constraints" style="vertical-align: middle" /> - <label for="checkbox_constraints"><?php echo $strAddConstraints; ?></label><br /> + <input type="checkbox" name="constraints" value="1" id="checkbox_constraints" style="vertical-align: middle" /><label for="checkbox_constraints"><?php echo $strAddConstraints; ?></label><br /> <?php } // endif if (isset($_COOKIE) && isset($_COOKIE['pma_switch_to_new']) && $_COOKIE['pma_switch_to_new'] == 'true') { $pma_switch_to_new = 'true'; } ?> - <input type="checkbox" name="switch_to_new" value="true" id="checkbox_switch"<?php echo ((isset($pma_switch_to_new) && $pma_switch_to_new == 'true') ? ' checked="checked"' : ''); ?> style="vertical-align: middle" /> - <label for="checkbox_switch"><?php echo $strSwitchToTable; ?></label> + <input type="checkbox" name="switch_to_new" value="true" id="checkbox_switch"<?php echo ((isset($pma_switch_to_new) && $pma_switch_to_new == 'true') ? ' checked="checked"' : ''); ?> style="vertical-align: middle" /><label for="checkbox_switch"><?php echo $strSwitchToTable; ?></label> </td> <td align="<?php echo $cell_align_right; ?>" valign="bottom" bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> <input type="submit" name="submit_copy" value="<?php echo $strGo; ?>" /> @@ -262,7 +255,7 @@ for ($i = 0; $i < $num_dbs; $i++) { <tr> <th colspan="2" class="tblHeaders" align="left"> <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> - <?php echo $strTableComments; ?> : + <?php echo $strTableComments; ?>: <?php $comment = ereg_replace('; InnoDB free:.*$' , '', ereg_replace('^InnoDB free:.*$', '', $show_comment)); ?> <input type="hidden" name="prev_comment" value="<?php echo urlencode($comment); ?>" /> </th> @@ -398,22 +391,18 @@ for ($i = 0; $i < $num_dbs; $i++) { <tr> <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> <input type="checkbox" name="pack_keys" id="pack_keys_opt" - <?php echo (isset($pack_keys) && $pack_keys == 1) ? ' checked="checked"' : ''; ?> style="vertical-align: middle" /> - <label for="pack_keys_opt">pack_keys</label><br /> + <?php echo (isset($pack_keys) && $pack_keys == 1) ? ' checked="checked"' : ''; ?> style="vertical-align: middle" /><label for="pack_keys_opt">pack_keys</label><br /> <?php if ($tbl_type == 'MYISAM') { ?> <input type="checkbox" name="checksum" id="checksum_opt" - <?php echo (isset($checksum) && $checksum == 1) ? ' checked="checked"' : ''; ?> style="vertical-align: middle" /> - <label for="checksum_opt">checksum</label><br /> + <?php echo (isset($checksum) && $checksum == 1) ? ' checked="checked"' : ''; ?> style="vertical-align: middle" /><label for="checksum_opt">checksum</label><br /> <input type="checkbox" name="delay_key_write" id="delay_key_write_opt" - <?php echo (isset($delay_key_write) && $delay_key_write == 1) ? ' checked="checked"' : ''; ?> style="vertical-align: middle" /> - <label for="delay_key_write_opt">delay_key_write</label><br /> + <?php echo (isset($delay_key_write) && $delay_key_write == 1) ? ' checked="checked"' : ''; ?> style="vertical-align: middle" /><label for="delay_key_write_opt">delay_key_write</label><br /> <input type="text" name="auto_increment" id="auto_increment_opt" class="textfield" - <?php echo (isset($auto_increment) && !empty($auto_increment) ? ' value="' . $auto_increment . '"' : ''); ?> style="width: 30px; vertical-align: middle" /> - <label for="auto_increment_opt">auto_increment</label> + <?php echo (isset($auto_increment) && !empty($auto_increment) ? ' value="' . $auto_increment . '"' : ''); ?> style="width: 30px; vertical-align: middle" /> <label for="auto_increment_opt">auto_increment</label> </td> <?php } // end if (MYISAM) diff --git a/tbl_properties_structure.php b/tbl_properties_structure.php index b35335367a..687b9f4a9d 100644 --- a/tbl_properties_structure.php +++ b/tbl_properties_structure.php @@ -455,9 +455,9 @@ if ($cfg['PropertiesIconic']) { if ($cfg['PropertiesIconic']) { echo '<img src="' . $pmaThemeImage . 'b_print.png" border="0" hspace="2" align="middle" width="16" height="16" alt="' . $strPrintView . '"/>'; } - echo $strPrintView; + echo $strPrintView; ?></a> - + <?php // if internal relations are available, or the table type is INNODB // ($tbl_type comes from tbl_properties_table_info.php) @@ -480,35 +480,29 @@ if ($cfg['Server']['relation'] || $tbl_type=="INNODB") { echo '<img src="' . $pmaThemeImage . 'b_tblanalyse.png" border="0" hspace="2" align="middle" width="16" height="16" alt="' . $strStructPropose . '" />'; } echo $strStructPropose; -?></a><?php +?></a><?php echo PMA_showMySQLDocu('Extending_MySQL', 'procedure_analyse') . "\n"; ?><br /> <!-- Add some new fields --> <form method="post" action="tbl_addfield.php" onsubmit="return checkFormElementInRange(this, 'num_fields', 1)"> - <?php + <?php echo PMA_generate_common_hidden_inputs($db, $table); if ($cfg['PropertiesIconic']) { echo '<img src="' . $pmaThemeImage . 'b_insrow.png" width="16" height="16" border="0" hspace="2" align="middle" alt="' . $strAddNewField . '"/>'; } echo sprintf($strAddFields, '<input type="text" name="num_fields" size="2" maxlength="2" value="1" style="vertical-align: middle" onfocus="this.select()" />'); ?> - - <input type="radio" name="field_where" id="radio_field_where_last" value="last" checked="checked" /> - <label for="radio_field_where_last"><?php echo $strAtEndOfTable; ?></label> - <input type="radio" name="field_where" id="radio_field_where_first" value="first" /> - <label for="radio_field_where_first"><?php echo $strAtBeginningOfTable; ?></label> - <input type="radio" name="field_where" id="radio_field_where_after" value="after" /> -<?php -$fieldOptions = '</label><select name="after_field" style="vertical-align: middle" onclick="this.form.field_where[2].checked=true" onchange="this.form.field_where[2].checked=true">'; -foreach ($aryFields AS $fieldname) { -$fieldOptions .= '<option value="' . htmlspecialchars($fieldname) . '">' . htmlspecialchars($fieldname) . '</option>' . "\n"; -} -unset($aryFields); -$fieldOptions .= '</select><label for="radio_field_where_after">'; -?> - <?php - echo str_replace('<label for="radio_field_where_after"></label>', '', '<label for="radio_field_where_after">' . sprintf($strAfter, $fieldOptions) . '</label>') . "\n"; + <input type="radio" name="field_where" id="radio_field_where_last" value="last" checked="checked" /><label for="radio_field_where_last"><?php echo $strAtEndOfTable; ?></label> + <input type="radio" name="field_where" id="radio_field_where_first" value="first" /><label for="radio_field_where_first"><?php echo $strAtBeginningOfTable; ?></label> + <input type="radio" name="field_where" id="radio_field_where_after" value="after" /><?php + $fieldOptions = '</label><select name="after_field" style="vertical-align: middle" onclick="this.form.field_where[2].checked=true" onchange="this.form.field_where[2].checked=true">'; + foreach ($aryFields AS $fieldname) { + $fieldOptions .= '<option value="' . htmlspecialchars($fieldname) . '">' . htmlspecialchars($fieldname) . '</option>' . "\n"; + } + unset($aryFields); + $fieldOptions .= '</select><label for="radio_field_where_after">'; + echo str_replace('<label for="radio_field_where_after"></label>', '', '<label for="radio_field_where_after">' . sprintf($strAfter, $fieldOptions) . '</label>') . "\n"; ?> <input type="submit" value="<?php echo $strGo; ?>" style="vertical-align: middle" /> </form> @@ -639,7 +633,7 @@ if ($cfg['ShowStats']) { ?> <tr> <td colspan="3" align="center" bgcolor="<?php echo $cfg['BgcolorTwo']; ?>"> - <a href="sql.php?<?php echo $url_query; ?>&pos=0&sql_query=<?php echo urlencode('OPTIMIZE TABLE ' . PMA_backquote($table)); ?>"><?php + <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="' . $pmaThemeImage . 'b_tbloptimize.png" width="16" height="16" border="0" hspace="2" align="middle" alt="' . $strOptimizeTable. '" />'; } diff --git a/tbl_query_box.php b/tbl_query_box.php index 38db1698aa..499cd45893 100644 --- a/tbl_query_box.php +++ b/tbl_query_box.php @@ -116,7 +116,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow) . ' action="read_dump.php"' . ($is_upload ? ' enctype="multipart/form-data"' : '' ) . ' name="sqlform">' . "\n" . ' </noscript>'; } else { -?> +?> <form method="post" action="read_dump.php"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?> onsubmit="return checkSqlQuery(this)" name="sqlform"> <?php } @@ -179,8 +179,8 @@ if (!isset($is_inside_querywindow) || echo '<input type="button" name="insert" value="' . $strInsert . '" onclick="insertValueQuery()" />'; } ?> - </td> - <td valign="top"> + </td> + <td valign="top"> <select name="dummy" size="<?php echo $cfg['TextareaRows']; ?>" multiple="multiple" class="textfield"> <?php echo "\n"; @@ -189,7 +189,7 @@ if (!isset($is_inside_querywindow) || . '<option value="' . PMA_backquote(htmlspecialchars($fields_list[$i])) . '">' . htmlspecialchars($fields_list[$i]) . '</option>' . "\n"; } ?> - </select> + </select> </td> <?php } @@ -197,15 +197,13 @@ if (!isset($is_inside_querywindow) || </tr> <tr bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> <td<?php if ($queryframe_tdcolspan != '') { echo ' colspan="2"'; } //echo $queryframe_tdcolspan; ?>> - <input type="checkbox" name="show_query" value="1" id="checkbox_show_query" checked="checked" /> - <label for="checkbox_show_query"><?php echo $strShowThisQuery; ?></label> + <input type="checkbox" name="show_query" value="1" id="checkbox_show_query" checked="checked" /><label for="checkbox_show_query"><?php echo $strShowThisQuery; ?></label> <?php if (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE) { ?> <br /> <script type="text/javascript"> - document.writeln('<input type="checkbox" name="LockFromUpdate" value="1" id="checkbox_lock" /> '); - document.writeln(' <label for="checkbox_lock"><?php echo $strQueryWindowLock; ?></label><br />'); + document.writeln('<input type="checkbox" name="LockFromUpdate" value="1" id="checkbox_lock" /><label for="checkbox_lock"><?php echo $strQueryWindowLock; ?></label><br />'); </script> <?php } @@ -232,8 +230,8 @@ if ($is_upload && (!isset($is_inside_querywindow) || <tr> <td class="tblHeaders"<?php echo $queryframe_thcolspan; ?>> <?php - echo ' ' - . ((isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && $querydisplay_tab == 'full') || !isset($is_inside_querywindow) ? '<i>' . $strOr . '</i>' : '') + echo ' ' + . ((isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && $querydisplay_tab == 'full') || !isset($is_inside_querywindow) ? '<i>' . $strOr . '</i>' : '') . ' ' . $strLocationTextfile . ': ' . "\n"; ?> </td> @@ -271,7 +269,7 @@ if ($is_upload && (!isset($is_inside_querywindow) || . '<label for="radio_sql_file_compression_gzip">' . $strGzip . '</label> ' . "\n"; } if ($is_bzip) { - echo ' <input type="radio" id="radio_sql_file_compression_bzip" name="sql_file_compression" value="application/x-bzip" />' + 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> ' . "\n"; } } else { @@ -411,7 +409,7 @@ if (($is_upload || $is_upload_dir) && } echo ' <tr bgcolor="' . $cfg['BgcolorTwo'] . '">' . "\n" . ' <td align="right"' . $queryframe_thcolspan . '><input type="submit" name="SQL" value="' . $strGo . '" /></td>' . "\n" - . ' </tr>' . "\n\n"; + . ' </tr>' . "\n\n"; } // Bookmark Support @@ -436,7 +434,7 @@ if (!isset($is_inside_querywindow) || echo ' <option value="' . $value . '">' . htmlspecialchars($key) . '</option>' . "\n"; } echo ' </select>' . " \n"; - echo ' ' . $strVar; + echo ' ' . $strVar; echo ' ' . $cfg['ReplaceHelpImg'] ? '<a href="./Documentation.html#faqbookmark" target="documentation"><img src="' . $pmaThemeImage . 'b_help.png" width="11" height="11" align="middle" alt="' . $strDocu . '" hspace="2" border="0" /></a>' : '(<a href="./Documentation.html#faqbookmark" target="documentation">' . $strDocu . '</a>)'; echo ': <input type="text" name="bookmark_variable" class="textfield" size="10" style="vertical-align: middle" /><br />' . "\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"; @@ -500,7 +498,7 @@ if ($upload_dir_error!='') { ?> </table> </form> - + <?php //if (!isset($is_inside_querywindow) || !$is_inside_querywindow) echo "</li>\n"; if (!isset($is_inside_querywindow) || @@ -545,7 +543,7 @@ if (!isset($is_inside_querywindow) || <noscript> <a href="<?php echo $ldi_target; ?>"><?php - echo $imgInsertTextfiles . $strInsertTextfiles; + echo $imgInsertTextfiles . $strInsertTextfiles; ?></a> </noscript> <?php diff --git a/tbl_select.php b/tbl_select.php index 94a9bfbfd0..0822efb6c3 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -131,7 +131,7 @@ function PMA_tbl_select_operator(f, index, multiple) { </select> </td> <td valign="bottom" bgcolor="<?php echo $cfg['BgcolorOne']; ?>"> - <input type="checkbox" name="distinct" value="DISTINCT" id="oDistinct" /> <label for="oDistinct">DISTINCT</label> + <input type="checkbox" name="distinct" value="DISTINCT" id="oDistinct" /><label for="oDistinct">DISTINCT</label> </td> </tr> </table> @@ -169,10 +169,8 @@ function PMA_tbl_select_operator(f, index, multiple) { } // end for ?> </select><br /> - <input type="radio" name="order" value="ASC" checked="checked" id="sortASC" /> - <label for="sortASC"><?php echo $strAscending; ?></label><br /> - <input type="radio" name="order" value="DESC" id="sortDESC" /> - <label for="sortDESC"><?php echo $strDescending; ?></label> + <input type="radio" name="order" value="ASC" checked="checked" id="sortASC" /><label for="sortASC"><?php echo $strAscending; ?></label><br /> + <input type="radio" name="order" value="DESC" id="sortDESC" /><label for="sortDESC"><?php echo $strDescending; ?></label> </td> </tr> </table> diff --git a/user_password.php b/user_password.php index 429b86eb34..3531078e34 100644 --- a/user_password.php +++ b/user_password.php @@ -95,7 +95,7 @@ echo '<h1>' . $strChangePassword . '</h1>' . "\n\n"; // Displays an error message if required if (!empty($error_msg)) { - echo '<p><b>' . $strError . ' : ' . $error_msg . '</b></p>' . "\n"; + echo '<p><b>' . $strError . ': ' . $error_msg . '</b></p>' . "\n"; } // loic1: autocomplete feature of IE kills the "onchange" event handler and it @@ -118,12 +118,12 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5) <tr> <td> <input type="radio" name="nopass" value="0" checked="checked " /> - <?php echo $GLOBALS['strPassword']; ?> : + <?php echo $GLOBALS['strPassword']; ?>: </td> <td> <input type="password" name="pma_pw" size="10" class="textfield" <?php echo $chg_evt_handler; ?>="nopass[1].checked = true" /> - <?php echo $GLOBALS['strReType']; ?> : + <?php echo $GLOBALS['strReType']; ?>: <input type="password" name="pma_pw2" size="10" class="textfield" <?php echo $chg_evt_handler; ?>="nopass[1].checked = true" /> </td> </tr> |