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

require musn't be used inside conditional statements

Browse Source
This commit is contained in:
Loïc Chapeaux
2002-10-04 08:28:34 +00:00
parent 53df7ad4fa
commit 5dbcad6527
3 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2002-10-03 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* tbl_select.php3, tbl_change.php3: require musn't be used inside
conditional statements.
2002-10-03 Marc Delisle <lem9@users.sourceforge.net> 2002-10-03 Marc Delisle <lem9@users.sourceforge.net>
* tbl_select.php3, tbl_change.php3, * tbl_select.php3, tbl_change.php3,
new libraries/get_foreign.lib.php3: drop-down of foreign keys new libraries/get_foreign.lib.php3: drop-down of foreign keys

2
tbl_change.php3
View File

@@ -392,7 +392,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
// The value column (depends on type) // The value column (depends on type)
// ---------------- // ----------------
require('./libraries/get_foreign.lib.php3'); include('./libraries/get_foreign.lib.php3');
if (isset($disp) && $disp) { if (isset($disp) && $disp) {
?> ?>

25
tbl_select.php3
View File

@@ -142,28 +142,21 @@ if (!isset($param) || $param[0] == '') {
// <markus@noga.de> // <markus@noga.de>
$field = $fields_list[$i]; $field = $fields_list[$i];
require('./libraries/get_foreign.lib.php3'); include('./libraries/get_foreign.lib.php3');
if($foreigners && isset($foreigners[$field]) &&
isset($disp) && $disp) {
?>
<select name="fields[]">
<option value=""></option>
<?php
echo "\n";
if ($foreigners && isset($foreigners[$field]) && isset($disp) && $disp) {
echo ' <select name="fields[]">' . "\n";
echo ' <option value=""></option>' . "\n";
while ($relrow = @PMA_mysql_fetch_array($disp)) { while ($relrow = @PMA_mysql_fetch_array($disp)) {
$key = $relrow[$foreign_field]; $key = $relrow[$foreign_field];
$value = (($foreign_display != FALSE) ? '-' . htmlspecialchars($relrow[$foreign_display]) : ''); $value = (($foreign_display != FALSE) ? '-' . htmlspecialchars($relrow[$foreign_display]) : '');
echo ' <option value="' . urlencode($key) . '">'. echo ' <option value="' . urlencode($key) . '">'
htmlspecialchars($key) . $value . '</option>' . "\n"; . htmlspecialchars($key) . $value . '</option>' . "\n";
} // end while } // end while
?> echo ' </select>' . "\n";
</select>
<?php
} else { } else {
?> echo ' <input type="text" name="fields[]" size="40" class="textfield" />' . "\n";
<input type="text" name="fields[]" size="40" class="textfield" />
<?php
} }
?> ?>
<input type="hidden" name="names[]" value="<?php echo urlencode($fields_list[$i]); ?>" /> <input type="hidden" name="names[]" value="<?php echo urlencode($fields_list[$i]); ?>" />