From 5dbcad6527eda2c231c201febcd4be4fae6d526e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= <lolo@phpheaven.net>
Date: Fri, 4 Oct 2002 08:28:34 +0000
Subject: [PATCH] require musn't be used inside conditional statements

---
 ChangeLog       |  4 ++++
 tbl_change.php3 |  2 +-
 tbl_select.php3 | 49 +++++++++++++++++++++----------------------------
 3 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 323104571..3ca3fedad 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-10-03 Loï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>
     * tbl_select.php3, tbl_change.php3,
       new libraries/get_foreign.lib.php3: drop-down of foreign keys
diff --git a/tbl_change.php3 b/tbl_change.php3
index 1b1226e72..551a0ebe9 100755
--- a/tbl_change.php3
+++ b/tbl_change.php3
@@ -392,7 +392,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
     // The value column (depends on type)
     // ----------------
 
-    require('./libraries/get_foreign.lib.php3');
+    include('./libraries/get_foreign.lib.php3');
 
     if (isset($disp) && $disp) {
         ?>
diff --git a/tbl_select.php3 b/tbl_select.php3
index df2f87e22..4e9b50815 100755
--- a/tbl_select.php3
+++ b/tbl_select.php3
@@ -138,36 +138,29 @@ if (!isset($param) || $param[0] == '') {
                     </select>
                 </td>
                 <td bgcolor="<?php echo $bgcolor; ?>">
-                    <?php
-    // <markus@noga.de>
-    $field=$fields_list[$i];
+            <?php
+            // <markus@noga.de>
+            $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
-
-        while ($relrow = @PMA_mysql_fetch_array($disp)) {
-            $key   = $relrow[$foreign_field];
-            $value = (($foreign_display != FALSE) ? '-' . htmlspecialchars($relrow[$foreign_display]) : '');
-            echo '                  <option value="' . urlencode($key) . '">'.
-                 htmlspecialchars($key) . $value . '</option>' . "\n";
-        } // end while
-        ?>
-                    </select>
-        <?php
-    } else {
-                    ?>
- <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="types[]" value="<?php echo $fields_type[$i]; ?>" />
+            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)) {
+                    $key   = $relrow[$foreign_field];
+                    $value = (($foreign_display != FALSE) ? '-' . htmlspecialchars($relrow[$foreign_display]) : '');
+                    echo '                        <option value="' . urlencode($key) . '">'
+                         . htmlspecialchars($key) . $value . '</option>' . "\n";
+                } // end while
+                echo '                    </select>' . "\n";
+            } else {
+                echo '                    <input type="text" name="fields[]" size="40" class="textfield" />' . "\n";
+            }
+            ?>
+                    <input type="hidden" name="names[]" value="<?php echo urlencode($fields_list[$i]); ?>" />
+                    <input type="hidden" name="types[]" value="<?php echo $fields_type[$i]; ?>" />
                 </td>
             </tr>
             <?php