those operations do not make sense on information_schema

This commit is contained in:
Marc Delisle
2005-07-22 16:26:49 +00:00
parent dba40399cb
commit 064568ff4a
2 changed files with 67 additions and 53 deletions

View File

@@ -8,6 +8,8 @@ $Source$
2005-07-22 Marc Delisle <lem9@users.sourceforge.net> 2005-07-22 Marc Delisle <lem9@users.sourceforge.net>
* db_details_structure.php: table creation should not be possible * db_details_structure.php: table creation should not be possible
in information_schema in information_schema
* db_operations.php: those operations do not make sense on
information_schema
2005-07-21 Marc Delisle <lem9@users.sourceforge.net> 2005-07-21 Marc Delisle <lem9@users.sourceforge.net>
* libraries/auth/cookie.auth.lib.php: bug #1240880, XSS on the * libraries/auth/cookie.auth.lib.php: bug #1240880, XSS on the

View File

@@ -134,6 +134,13 @@ if (empty($is_info)) {
if (PMA_MYSQL_INT_VERSION >= 40101) { if (PMA_MYSQL_INT_VERSION >= 40101) {
$db_collation = PMA_getDbCollation($db); $db_collation = PMA_getDbCollation($db);
} }
if (PMA_MYSQL_INT_VERSION < 50002 || (PMA_MYSQL_INT_VERSION >= 50002 && $db != 'information_schema')) {
$is_information_schema = FALSE;
} else {
$is_information_schema = TRUE;
}
if (!$is_information_schema) {
?> ?>
<table border="0" cellpadding="2" cellspacing="0"> <table border="0" cellpadding="2" cellspacing="0">
@@ -164,8 +171,9 @@ echo ' ' . '<input type="text" name="num_fields" size="2" class="tex
echo ' </td>'; echo ' </td>';
echo ' <td align="right">'; echo ' <td align="right">';
echo ' ' . '&nbsp;<input type="submit" value="' . $strGo . '" />' . "\n"; echo ' ' . '&nbsp;<input type="submit" value="' . $strGo . '" />' . "\n";
echo ' </td> </tr>'; echo ' </td> </tr>' . "\n";
echo ' </form>'; echo ' </form>' . "\n";
echo '</table>' . "\n";
echo '<table border="0" cellpadding="2" cellspacing="0">'; echo '<table border="0" cellpadding="2" cellspacing="0">';
if ($cfgRelation['commwork']) { if ($cfgRelation['commwork']) {
@@ -287,10 +295,14 @@ if ($num_tables > 0
} // end if } // end if
?> ?>
</table> </table>
<?php
} // end if (!$is_information_schema)
// not sure about leaving the PDF dialog for information_schema
?>
<form method="post" action="pdf_schema.php"> <form method="post" action="pdf_schema.php">
<?php <?php
// is this OK to check for 'class' support?
if ($num_tables > 0) { if ($num_tables > 0) {
$takeaway = $url_query . '&amp;table=' . urlencode($table); $takeaway = $url_query . '&amp;table=' . urlencode($table);
} }