This commit is contained in:
Marc Delisle
2002-04-29 16:39:15 +00:00
parent 7ae0a1262b
commit fda3941f2e
48 changed files with 143 additions and 79 deletions

View File

@@ -12,6 +12,9 @@ $Source$
2002-04-29 Marc Delisle <lem9@users.sourceforge.net>
* tbl_qbe.php3: corrections from Mike Beck for better joints
when more than one table is the master in a relation
* tbl_properties_links.php3, tbl_properties_operations.php3,
new tbl_properties_options.php3, lang/*: new Options page
(will grow when Feature request 441716 is done)
2002-04-28 Marc Delisle <lem9@users.sourceforge.net>
* tbl_properties.php3, new tbl_properties_common.php3:

View File

@@ -358,4 +358,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -356,4 +356,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -357,4 +357,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -357,4 +357,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -352,4 +352,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -354,4 +354,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -350,4 +350,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -357,4 +357,5 @@ $strLinksTo = 'Links to';
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -357,4 +357,5 @@ $strLinksTo = 'Links to';
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -353,4 +353,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -352,4 +352,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -351,4 +351,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -349,4 +349,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -219,6 +219,7 @@ $strOperations = 'Operations';
$strOptimizeTable = 'Optimize table';
$strOptionalControls = 'Optional. Controls how to write or read special characters.';
$strOptionally = 'OPTIONALLY';
$strOptions = 'Options';
$strOr = 'Or';
$strOverhead = 'Overhead';

View File

@@ -352,4 +352,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -356,4 +356,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -219,6 +219,7 @@ $strOperations = 'Op
$strOptimizeTable = 'Optimiser la table';
$strOptionalControls = 'Optionnel. Indique le caract<63>re qui permet d\'enlever l\'effet des caract<63>res sp<73>ciaux.';
$strOptionally = 'OPTIONNEL';
$strOptions = 'Options';
$strOr = 'Ou';
$strOverhead = 'Perte';

View File

@@ -356,4 +356,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -361,4 +361,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -352,4 +352,5 @@ $strYes = 'Ja';
$strZip = '"Zip komprimiert"';
// To translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -353,4 +353,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -352,4 +352,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -354,4 +354,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -351,4 +351,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -359,4 +359,5 @@ $strZip = '"compresso con zip"';
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
?>
$strOptions = 'Options'; //to translate
?>

View File

@@ -361,4 +361,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -361,4 +361,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -353,4 +353,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -356,4 +356,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -352,4 +352,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -356,4 +356,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -352,4 +352,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -359,4 +359,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -352,4 +352,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -357,4 +357,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -357,4 +357,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -358,4 +358,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -355,4 +355,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -355,4 +355,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -350,4 +350,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -352,4 +352,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -358,4 +358,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -352,4 +352,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -352,4 +352,5 @@ $strLinksTo = 'Links to'; //to translate
$strExport = 'Export'; //to translate
$strOperations = 'Operations'; //to translate
$strExportToXML = 'Export to XML format'; //to translate
$strOptions = 'Options'; //to translate
?>

View File

@@ -7,6 +7,7 @@
*/
$lnk3 = '<a href="tbl_properties_export.php3?' . $url_query . '">';
$lnk5 = '<a href="tbl_properties_operations.php3?' . $url_query . '">';
$lnk6 = '<a href="tbl_properties_options.php3?' . $url_query . '">';
if ($num_rows > 0) {
$lnk1 = '<a href="sql.php3?' . $url_query
@@ -45,7 +46,9 @@ if ($num_rows > 0) {
[ <?php echo $lnk3 . "\n"; ?>
<b><?php echo $strExport; ?></b><?php if ($lnk3) echo '</a>'; ?> ]&nbsp;&nbsp;&nbsp;
[ <?php echo $lnk5 . "\n"; ?>
<b><?php echo $strOperations; ?></b><?php if ($lnk5) echo '</a>'; ?> ]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<b><?php echo $strOperations; ?></b><?php if ($lnk5) echo '</a>'; ?> ]&nbsp;&nbsp;&nbsp;
[ <?php echo $lnk6 . "\n"; ?>
<b><?php echo $strOptions; ?></b><?php if ($lnk6) echo '</a>'; ?> ]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
[ <a href="sql.php3?<?php echo ereg_replace('tbl_properties.php3$', 'db_details.php3', $url_query); ?>&amp;back=tbl_properties.php3&amp;reload=1&amp;sql_query=<?php echo urlencode('DROP TABLE ' . PMA_backquote($table)); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strTableHasBeenDropped, htmlspecialchars($table))); ?>"
onclick="return confirmLink(this, 'DROP TABLE <?php echo PMA_jsFormat($table); ?>')">
<b><?php echo $strDrop; ?></b></a> ]

View File

@@ -272,83 +272,6 @@ else if (PMA_MYSQL_INT_VERSION >= 32306
echo "\n";
} // end 3.23.06 < MySQL < 3.23.22
if (PMA_MYSQL_INT_VERSION >= 32322) {
?>
<!-- Table comments -->
<li>
<form method="post" action="tbl_properties.php3">
<input type="hidden" name="server" value="<?php echo $server; ?>" />
<input type="hidden" name="lang" value="<?php echo $lang; ?>" />
<input type="hidden" name="db" value="<?php echo $db; ?>" />
<input type="hidden" name="table" value="<?php echo $table; ?>" />
<?php echo $strTableComments; ?>&nbsp;:&nbsp;
<input type="hidden" name="prev_comment" value="<?php echo urlencode($show_comment); ?>" />&nbsp;
<input type="text" name="comment" maxlength="60" size="30" value="<?php echo str_replace('"', '&quot;', $show_comment); ?>" class="textfield" style="vertical-align: middle" onfocus="this.select()" />&nbsp;
<input type="submit" name="submitcomment" value="<?php echo $strGo; ?>" style="vertical-align: middle" />
</form>
</li>
<!-- Table type -->
<?php
// modify robbat2 code - staybyte - 11. June 2001
$query = 'SHOW VARIABLES LIKE \'have_%\'';
$result = mysql_query($query);
if ($result != FALSE && mysql_num_rows($result) > 0) {
while ($tmp = mysql_fetch_array($result)) {
if (isset($tmp['Variable_name'])) {
switch ($tmp['Variable_name']) {
case 'have_bdb':
if ($tmp['Value'] == 'YES') {
$tbl_bdb = TRUE;
}
break;
case 'have_gemini':
if ($tmp['Value'] == 'YES') {
$tbl_gemini = TRUE;
}
break;
case 'have_innodb':
if ($tmp['Value'] == 'YES') {
$tbl_innodb = TRUE;
}
break;
case 'have_isam':
if ($tmp['Value'] == 'YES') {
$tbl_isam = TRUE;
}
break;
} // end switch
} // end if isset($tmp['Variable_name'])
} // end while
} // end if $result
mysql_free_result($result);
echo "\n";
?>
<li>
<form method="post" action="tbl_properties.php3">
<input type="hidden" name="server" value="<?php echo $server; ?>" />
<input type="hidden" name="lang" value="<?php echo $lang; ?>" />
<input type="hidden" name="db" value="<?php echo $db; ?>" />
<input type="hidden" name="table" value="<?php echo $table; ?>" />
<?php echo $strTableType; ?>&nbsp;:&nbsp;
<select name="tbl_type" style="vertical-align: middle">
<option value="MYISAM"<?php if ($tbl_type == 'MYISAM') echo ' selected="selected"'; ?>>MyISAM</option>
<option value="HEAP"<?php if ($tbl_type == 'HEAP') echo ' selected="selected"'; ?>>Heap</option>
<?php if (isset($tbl_bdb)) { ?><option value="BDB"<?php if ($tbl_type == 'BERKELEYDB') echo ' selected="selected"'; ?>>Berkeley DB</option><?php } ?>
<?php if (isset($tbl_gemini)) { ?><option value="GEMINI"<?php if ($tbl_type == 'GEMINI') echo ' selected="selected"'; ?>>Gemini</option><?php } ?>
<?php if (isset($tbl_innodb)) { ?><option value="INNODB"<?php if ($tbl_type == 'INNODB') echo ' selected="selected"'; ?>>INNO DB</option><?php } ?>
<?php if (isset($tbl_isam)) { ?><option value="ISAM"<?php if ($tbl_type == 'ISAM') echo ' selected="selected"'; ?>>ISAM</option><?php } ?>
<option value="MERGE"<?php if ($tbl_type == 'MRG_MYISAM') echo ' selected="selected"'; ?>>Merge</option>
</select>&nbsp;
<input type="submit" name="submittype" value="<?php echo $strGo; ?>" style="vertical-align: middle" />&nbsp;
<?php echo PMA_showDocuShort('T/a/Table_types.html') . "\n"; ?>
</form>
</li>
<?php
echo "\n";
} // end MySQL >= 3.23.22
// Referential integrity check
if (!empty($cfg['Server']['relation'])) {

91
tbl_properties_options.php3 Executable file
View File

@@ -0,0 +1,91 @@
<?php
/* $Id$ */
require('./tbl_properties_common.php3');
require('./tbl_properties_table_info.php3');
if (PMA_MYSQL_INT_VERSION >= 32322) {
?>
<ul>
<!-- Table comments -->
<li>
<form method="post" action="tbl_properties.php3">
<input type="hidden" name="server" value="<?php echo $server; ?>" />
<input type="hidden" name="lang" value="<?php echo $lang; ?>" />
<input type="hidden" name="db" value="<?php echo $db; ?>" />
<input type="hidden" name="table" value="<?php echo $table; ?>" />
<?php echo $strTableComments; ?>&nbsp;:&nbsp;
<input type="hidden" name="prev_comment" value="<?php echo urlencode($show_comment); ?>" />&nbsp;
<input type="text" name="comment" maxlength="60" size="30" value="<?php echo str_replace('"', '&quot;', $show_comment); ?>" class="textfield" style="vertical-align: middle" onfocus="this.select()" />&nbsp;
<input type="submit" name="submitcomment" value="<?php echo $strGo; ?>" style="vertical-align: middle" />
</form>
</li>
<!-- Table type -->
<?php
// modify robbat2 code - staybyte - 11. June 2001
$query = 'SHOW VARIABLES LIKE \'have_%\'';
$result = mysql_query($query);
if ($result != FALSE && mysql_num_rows($result) > 0) {
while ($tmp = mysql_fetch_array($result)) {
if (isset($tmp['Variable_name'])) {
switch ($tmp['Variable_name']) {
case 'have_bdb':
if ($tmp['Value'] == 'YES') {
$tbl_bdb = TRUE;
}
break;
case 'have_gemini':
if ($tmp['Value'] == 'YES') {
$tbl_gemini = TRUE;
}
break;
case 'have_innodb':
if ($tmp['Value'] == 'YES') {
$tbl_innodb = TRUE;
}
break;
case 'have_isam':
if ($tmp['Value'] == 'YES') {
$tbl_isam = TRUE;
}
break;
} // end switch
} // end if isset($tmp['Variable_name'])
} // end while
} // end if $result
mysql_free_result($result);
echo "\n";
?>
<li>
<form method="post" action="tbl_properties.php3">
<input type="hidden" name="server" value="<?php echo $server; ?>" />
<input type="hidden" name="lang" value="<?php echo $lang; ?>" />
<input type="hidden" name="db" value="<?php echo $db; ?>" />
<input type="hidden" name="table" value="<?php echo $table; ?>" />
<?php echo $strTableType; ?>&nbsp;:&nbsp;
<select name="tbl_type" style="vertical-align: middle">
<option value="MYISAM"<?php if ($tbl_type == 'MYISAM') echo ' selected="selected"'; ?>>MyISAM</option>
<option value="HEAP"<?php if ($tbl_type == 'HEAP') echo ' selected="selected"'; ?>>Heap</option>
<?php if (isset($tbl_bdb)) { ?><option value="BDB"<?php if ($tbl_type == 'BERKELEYDB') echo ' selected="selected"'; ?>>Berkeley DB</option><?php } ?>
<?php if (isset($tbl_gemini)) { ?><option value="GEMINI"<?php if ($tbl_type == 'GEMINI') echo ' selected="selected"'; ?>>Gemini</option><?php } ?>
<?php if (isset($tbl_innodb)) { ?><option value="INNODB"<?php if ($tbl_type == 'INNODB') echo ' selected="selected"'; ?>>INNO DB</option><?php } ?>
<?php if (isset($tbl_isam)) { ?><option value="ISAM"<?php if ($tbl_type == 'ISAM') echo ' selected="selected"'; ?>>ISAM</option><?php } ?>
<option value="MERGE"<?php if ($tbl_type == 'MRG_MYISAM') echo ' selected="selected"'; ?>>Merge</option>
</select>&nbsp;
<input type="submit" name="submittype" value="<?php echo $strGo; ?>" style="vertical-align: middle" />&nbsp;
<?php echo PMA_showDocuShort('T/a/Table_types.html') . "\n"; ?>
</form>
</li>
<?php
echo "\n";
} // end MySQL >= 3.23.22
/**
* Displays the footer
*/
echo "\n";
require('./footer.inc.php3');
?>