From a1f45b7b784de54ee0fb3c3d5db25fd7c7789554 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 23 Sep 2002 16:02:38 +0000
Subject: [PATCH] for Loic

---
 ChangeLog                      |  5 +++--
 libraries/display_tbl.lib.php3 | 28 ++++++++++++++--------------
 tbl_change.php3                | 14 +++++++-------
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5f62f87fe1..ff67a0e9e5 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,8 +5,8 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
-2002-09-22 Loïc Chapeaux  <lolo@phpheaven.net>
-    * libraries/sqlparser.lib.php3: coding standards
+2002-09-23 Loïc Chapeaux  <lolo@phpheaven.net>
+    * libraries/display_tbl.lib.php3, tbl_change.php3: coding standards
 
 2002-09-23 Michal Cihar  <nijel@users.sourceforge.net>
     * libraries/sqlparser.lib.php3: fix for #613102 (ALTER TABLE:missing
@@ -14,6 +14,7 @@ $Source$
     
 2002-09-22 Loïc Chapeaux  <lolo@phpheaven.net>
     * tbl_relation.php3: fix fox #611519 (slash in comment)
+    * libraries/sqlparser.lib.php3: coding standards
     
 2002-09-21 Alexander M. Turek  <rabus@users.sourceforge.net>
     * lang/german-*.inc.php3: Updates.
diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3
index 81558de636..19409bdf87 100644
--- a/libraries/display_tbl.lib.php3
+++ b/libraries/display_tbl.lib.php3
@@ -718,26 +718,26 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
     function PMA_linkOrButton($url, $message, $js_conf)
     {
         if (strlen($url) <= 2047) {
-            $onclick_url    = (empty($js_conf) ? '' : ' onclick="return confirmLink(this, \'' . $js_conf . '\')"');
-            $linkOrButton =  '        <a href="' . $url . '"' . $onclick_url . '>' . "\n"
-                 . '            ' . $message . '</a>' . "\n";
+            $onclick_url        = (empty($js_conf) ? '' : ' onclick="return confirmLink(this, \'' . $js_conf . '\')"');
+            $link_or_button     = '        <a href="' . $url . '"' . $onclick_url . '>' . "\n"
+                                . '           ' . $message . '</a>' . "\n";
         }
         else {
-            $edit_url_parts = parse_url($url);
-            $query_parts    = explode('&', $edit_url_parts['query']);
-            $linkOrButton   = '        <form action="' 
-                            . $edit_url_parts['path']
-                            . '" method="post">' . "\n";
+            $edit_url_parts     = parse_url($url);
+            $query_parts        = explode('&', $edit_url_parts['query']);
+            $link_or_button     = '        <form action="'
+                                . $edit_url_parts['path']
+                                . '" method="post">' . "\n";
             reset ($query_parts);
-            while (list(, $query_pair) = each ($query_parts)) {
+            while (list(, $query_pair) = each($query_parts)) {
                 list($eachvar, $eachval) = explode('=', $query_pair);
-                $linkOrButton .= '            <input type="hidden" name="' . str_replace('amp;', '', $eachvar) . '" value="' . urldecode($eachval) . '" />' . "\n";
+                $link_or_button .= '            <input type="hidden" name="' . str_replace('amp;', '', $eachvar) . '" value="' . urldecode($eachval) . '" />' . "\n";
             } // end while
-            $linkOrButton   .= '            <input type="submit" value="' 
-                            . $message . '" />' . "\n" . '</form>' . "\n";
+            $link_or_button     .= '            <input type="submit" value="'
+                                . $message . '" />' . "\n" . '</form>' . "\n";
         } // end if... else...
 
-        return $linkOrButton;
+        return $link_or_button;
     } // end of the 'PMA_linkOrButton()' function
 
 
@@ -1188,7 +1188,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
 
             if (isset($edit_url)) {
                 $vertical_display['edit'][$row_no]   .= '    <td bgcolor="' . $bgcolor . '">' . "\n"
-                                                     . PMA_linkOrButton($edit_url, $edit_str, '') 
+                                                     . PMA_linkOrButton($edit_url, $edit_str, '')
                                                      .  '    </td>' . "\n";
             }
 
diff --git a/tbl_change.php3 b/tbl_change.php3
index 5086471fd8..bf15e92fef 100755
--- a/tbl_change.php3
+++ b/tbl_change.php3
@@ -223,7 +223,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
     // lem9:  but do not put here the current datetime if there is a default
     //        value (the real default value will be set in the
     //        Default value logic below)
-    if (($row_table_def['Type'] == 'datetime')
+    if ($row_table_def['Type'] == 'datetime'
         && (!isset($row_table_def['Default']))) {
         // INSERT case
         if ($insert_mode) {
@@ -429,16 +429,16 @@ for ($i = 0; $i < $fields_cnt; $i++) {
     if (isset($disp) && $disp) {
         ?>
         <td bgcolor="<?php echo $bgcolor; ?>">
-            <?php echo $backup_field . "\n"; ?>
-            <input type="hidden" name="fields[<?php echo urlencode($field); ?>]" value="$foreign$" tabindex="<?php echo $i+1; ?>" />
-            <select name="field_<?php echo md5($field); ?>[]" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>')" tabindex="<?php echo $i+1; ?>">
-                <option value=""></option>
+        <?php echo $backup_field . "\n"; ?>
+        <input type="hidden" name="fields[<?php echo urlencode($field); ?>]" value="$foreign$" tabindex="<?php echo $i+1; ?>" />
+        <select name="field_<?php echo md5($field); ?>[]" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>')" tabindex="<?php echo $i+1; ?>">
+            <option value=""></option>
         <?php
-
+        echo "\n";
         while ($relrow = @PMA_mysql_fetch_array($disp)) {
             $key   = $relrow[$foreign_field];
             $value = (($foreign_display != FALSE) ? '&nbsp;-&nbsp;' . htmlspecialchars($relrow[$foreign_display]) : '');
-            echo '              <option value="' . htmlspecialchars($key) . '"';
+            echo '            <option value="' . htmlspecialchars($key) . '"';
             if ($key == $data) {
                echo ' selected="selected"';
             } // end if
-- 
2.11.4.GIT