From 3513a3fe2fd14fed6bce22b3d77bc13b88ad47c2 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 5 Aug 2002 20:06:09 +0000
Subject: [PATCH] from Loic

---
 ChangeLog                    |  4 ++++
 ldi_check.php3               | 10 ++++++----
 libraries/sqlparser.lib.php3 |  4 ++--
 tbl_indexes.php3             |  9 +++++----
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e8f23c074..c2038a846 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-08-05 Loïc Chapeaux  <lolo@phpheaven.net>
+    * tbl_indexes.php3, ldi_check.php3, libraries/sqlparser.lib.php3:
+      coding standard
+
 2002-08-05 Alexander M. Turek  <rabus@users.sourceforge.net>
     * translators.html: Added a small note in order to avoid annoying emails.
     * lang/slovenian-*.inc.php3: Updates, thanks again to Kositer Uros (urosh).
diff --git a/ldi_check.php3 b/ldi_check.php3
index a06e787b3..b74c3d057 100755
--- a/ldi_check.php3
+++ b/ldi_check.php3
@@ -29,8 +29,9 @@ if (isset($btnLDI) && ($textfile != 'none')) {
         $replace = '';
     }
 
-error_reporting(E_ALL);
-chmod($textfile, 0644);
+    error_reporting(E_ALL);
+    chmod($textfile, 0644);
+
     // Kanji encoding convert appended by Y.Kawada
     if (function_exists('PMA_kanji_file_conv')) {
         $textfile         = PMA_kanji_file_conv($textfile, $knjenc, isset($xkana) ? $xkana : '');
@@ -93,13 +94,14 @@ chmod($textfile, 0644);
     } else {
         $sql_query = $query;
     }
-    // Set an empty sub_part to avoid an undefined variable.
+
+	// Set an empty sub_part to avoid an undefined variable.
     // We could also rename the ldi* scripts
     // to tbl_properties_ldi* to improve consistency with the other sub-pages.
     //
     // The $goto in ldi_table.php3 is set to tbl_properties.php3 but maybe
     // if would be better to Browse the latest inserted data.
-    $sub_part='';
+    $sub_part = '';
     include('./sql.php3');
 }
 
diff --git a/libraries/sqlparser.lib.php3 b/libraries/sqlparser.lib.php3
index 34f63e615..8437253ab 100644
--- a/libraries/sqlparser.lib.php3
+++ b/libraries/sqlparser.lib.php3
@@ -180,10 +180,10 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
 
                     // Checks for MySQL escaping using a \
                     // And checks for ANSI escaping using the $quotetype character
-                    if ( ($pos < $len) && PMA_STR_charIsEscaped($sql, $pos)) {
+                    if (($pos < $len) && PMA_STR_charIsEscaped($sql, $pos)) {
                         $pos ++;
                         continue;
-                    } else if ( ($pos+1 < $len) && ($sql[$pos] == $quotetype) && ($sql[$pos + 1] == $quotetype)) {
+                    } else if (($pos + 1 < $len) && ($sql[$pos] == $quotetype) && ($sql[$pos + 1] == $quotetype)) {
                         $pos = $pos + 2;
                         continue;
                     } else {
diff --git a/tbl_indexes.php3 b/tbl_indexes.php3
index d729cc734..13be7810a 100644
--- a/tbl_indexes.php3
+++ b/tbl_indexes.php3
@@ -1,6 +1,7 @@
 <?php
 /* $Id$ */
 
+
 /**
  * Gets some core libraries
  */
@@ -180,9 +181,9 @@ if (!defined('PMA_IDX_INCLUDED')
          PMA_mysqlDie($strCantRenameIdxToPrimary, '', FALSE, $err_url);
     }
 
-// $sql_query is the one displayed in the query box, don't use it when 
-// you need to generate a query in this script
 
+    // $sql_query is the one displayed in the query box, don't use it when you
+    // need to generate a query in this script
     $local_query         = 'ALTER TABLE ' . PMA_backquote($table);
 
     // Drops the old index
@@ -190,7 +191,7 @@ if (!defined('PMA_IDX_INCLUDED')
         if ($old_index == 'PRIMARY') {
             $local_query .= ' DROP PRIMARY KEY,';
         } else {
-             $local_query .= ' DROP INDEX ' . PMA_backquote($old_index) .',';
+            $local_query .= ' DROP INDEX ' . PMA_backquote($old_index) .',';
         }
     } // end if
 
@@ -223,7 +224,7 @@ if (!defined('PMA_IDX_INCLUDED')
         $local_query .= $index_fields . ')';
     }
 
-    $result    = PMA_mysql_query($local_query) or PMA_mysqlDie('', '', FALSE, $err_url);
+    $result    = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, FALSE, $err_url);
     $message   = $strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenAltered;
 
     include('./tbl_properties.php3');