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

for Loic

Browse Source
This commit is contained in:
Marc Delisle
2002-09-04 12:28:51 +00:00
parent e015449e22
commit b425190f45
2 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2002-09-04 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* tbl_change.php3: protect with backquotes
2002-09-03 Marc Delisle <lem9@users.sourceforge.net> 2002-09-03 Marc Delisle <lem9@users.sourceforge.net>
* tbl_change.php3: drop-down for foreign keys, patch 603939, * tbl_change.php3: drop-down for foreign keys, patch 603939,
thanks to markus at noga.de thanks to markus at noga.de

49
tbl_change.php3
View File

@@ -138,7 +138,7 @@ else
// <markus@noga.de> // <markus@noga.de>
// retrieve keys into foreign fields, if any // retrieve keys into foreign fields, if any
$cfgRelation = PMA_getRelationsParam(); $cfgRelation = PMA_getRelationsParam();
$foreigners = PMA_getForeigners($db,$table); $foreigners = PMA_getForeigners($db, $table);
/** /**
* Displays the form * Displays the form
@@ -370,38 +370,37 @@ for ($i = 0; $i < $fields_cnt; $i++) {
// selection box for foreign keys // selection box for foreign keys
// lem9: array_key_exists() only in PHP >= 4.1.0 // lem9: array_key_exists() only in PHP >= 4.1.0
// if(array_key_exists($field,$foreigners)) { // if (array_key_exists($field, $foreigners)) {
if (isset($foreigners[$field])) { if (isset($foreigners[$field])) {
$foreigner =$foreigners[$field]; $foreigner = $foreigners[$field];
$foreign_db =$foreigner['foreign_db']; $foreign_db = $foreigner['foreign_db'];
$foreign_table =$foreigner['foreign_table']; $foreign_table = $foreigner['foreign_table'];
$foreign_field =$foreigner['foreign_field']; $foreign_field = $foreigner['foreign_field'];
$foreign_display=PMA_getDisplayField($foreign_db,$foreign_table); $foreign_display = PMA_getDisplayField($foreign_db, $foreign_table);
// FIXME: not using foreign_db $dispsql = 'SELECT ' . PMA_backquote($foreign_field) . ', ' . PMA_backquote($foreign_display)
$dispsql= "SELECT $foreign_field,$foreign_display FROM $foreign_table"; . ' FROM ' . PMA_backquote($foreign_db) . '.' . PMA_backquote($foreign_table);
// lem9: put a LIMIT in case of big foreign table (looking for better
// solution, maybe a configurable limit, or a message?)
$dispsql .= ' LIMIT 100';
$disp = PMA_mysql_query($dispsql);
// lem9: put a LIMIT in case of big foreign table (looking for better echo ' <td bgcolor="' . $bgcolor . '">' . "\n";
// solution, maybe a configurable limit, or a message?) echo ' <select name="fields[' . urlencode($field) . ']">' . "\n";
$dispsql .= " LIMIT 100";
$disp = PMA_mysql_query($dispsql);
echo '<td bgcolor="$bgcolor">' . "\n";
echo ' <select name="fields[' . urlencode($field) . ']">' . "\n";
while ($relrow = @PMA_mysql_fetch_array($disp)) { while ($relrow = @PMA_mysql_fetch_array($disp)) {
$key =$relrow[$foreign_field]; $key = $relrow[$foreign_field];
$value=$relrow[$foreign_display]; $value = $relrow[$foreign_display];
echo ' <option value="' . $key. '"'; echo ' <option value="' . urlencode($key) . '"';
if ($key == $data) { if ($key == $data) {
echo ' selected="selected" '; echo ' selected="selected"';
} // end if } // end if
echo '>' . $key . '-' . $value. '</option>' . "\n"; echo '>' . htmlspecialchars($key) . '-' . htmlspecialchars($value) . '</option>' . "\n";
} // end while } // end while
echo ' </select>' . "\n"; echo ' </select>' . "\n";
echo '</td>' . "\n"; echo ' </td>' . "\n";
} else }
else if (strstr($row_table_def['True_Type'], 'text')) {
if (strstr($row_table_def['True_Type'], 'text')) {
?> ?>
<td bgcolor="<?php echo $bgcolor; ?>"> <td bgcolor="<?php echo $bgcolor; ?>">
<?php echo $backup_field . "\n"; ?> <?php echo $backup_field . "\n"; ?>