for Loic

2002-07-29 16:11:30 +00:00
parent 1369befc9d
commit f3dc6788a6
5 changed files with 45 additions and 30 deletions
--- a/9
+++ b/9
@@ -5,6 +5,15 @@ phpMyAdmin - Changelog
 $Id$
 $Source$

+2002-07-29 Lo<4C>c Chapeaux  <lolo@phpheaven.net>
+    * tbl_change.php3, line 203: fixed an xhtml bug (#587974) thanks to
+      Christophe Jaillet <tititou at users.sourceforge.net>
+    * libraries/sqlparser.lib.php3: fixed parse errors (bug #588010)
+      thanks to Nagi Peters <nagipeters at users.sourceforge.net> and
+      coding standards.
+    * Documentation.html: coding standards.
+    * libraries/relation.lib.php3: beautified generated page.
+
 2002-07-28 Marc Delisle  <lem9@users.sourceforge.net>
    * lang/romanian update, thanks to Valics Lehel
    * lang/polish update, thanks to Jakub Wilk
--- a/Documentation.html
+++ b/Documentation.html
@@ -1681,8 +1681,8 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
 </p>

 <p>
-    <b>[3.2] When dumping a large table in compressed mode, I get a memory limit
-       error or a time limit error.</b>
+    <b>[3.2] When dumping a large table in compressed mode, I get a memory
+       limit error or a time limit error.</b>
    <br />
    As of version 2.2.4, we build the compressed dump in memory, so large
    tables dumps may hang. The only alternative we can think about (using
--- a/libraries/relation.lib.php3
+++ b/libraries/relation.lib.php3
@@ -149,36 +149,42 @@ if (!defined('PMA_RELATION_LIB_INCLUDED')){
            $disabled = '<font color="red">'   . $GLOBALS['strDisabled'] . '</font>';

            echo '<table>' . "\n";
-            echo '<tr><th align="left">PMA Database ... </th><td align="right">'
+            echo '    <tr><th align="left">PMA Database ... </th><td align="right">'
                 . (($cfg['Server']['pmadb'] == FALSE) ? sprintf($shit, 'pmadb') : $hit)
                 . '</td></tr>' . "\n";
-            echo '<tr><th align="left">relation Table ... </th><td align="right">'
+            echo '    <tr><td>&nbsp;</td></tr>' . "\n";
+
+            echo '    <tr><th align="left">relation Table ... </th><td align="right">'
                 . ((isset($cfgRelation['relation'])) ? $hit : sprintf($shit, 'relation'))
                 . '</td></tr>' . "\n";
-            echo '<tr><td colspan=2 align="center">'. $GLOBALS['strGeneralRelationFeat'] . ': '
+            echo '    <tr><td colspan=2 align="center">'. $GLOBALS['strGeneralRelationFeat'] . ': '
                 . (($cfgRelation['relwork'] == TRUE) ? $enabled :  $disabled)
                 . '</td></tr>' . "\n";
+            echo '    <tr><td>&nbsp;</td></tr>' . "\n";

-            echo '<tr><th align="left">table_info   ... </th><td align="right">'
+            echo '    <tr><th align="left">table_info   ... </th><td align="right">'
                 . (($cfgRelation['displaywork'] == FALSE) ? sprintf($shit, 'table_info') : $hit)
                 . '</td></tr>' . "\n";
-            echo '<tr><td colspan=2 align="center">' . $GLOBALS['strDisplayFeat'] . ': '
+            echo '    <tr><td colspan=2 align="center">' . $GLOBALS['strDisplayFeat'] . ': '
                 . (($cfgRelation['displaywork'] == TRUE) ? $enabled : $disabled)
                 . '</td></tr>' . "\n";
+            echo '    <tr><td>&nbsp;</td></tr>' . "\n";

-            echo '<tr><th align="left">table_coords ... </th><td align="right">'
+            echo '    <tr><th align="left">table_coords ... </th><td align="right">'
                 . ((isset($cfgRelation['table_coords'])) ? $hit : sprintf($shit, 'table_coords'))
                 . '</td></tr>' . "\n";
-            echo '<tr><th align="left">pdf_pages ... </th><td align="right">'
+            echo '    <tr><th align="left">pdf_pages ... </th><td align="right">'
                 . ((isset($cfgRelation['pdf_pages'])) ? $hit : sprintf($shit, 'table_coords'))
                 . '</td></tr>' . "\n";
-            echo '<tr><td colspan=2 align="center">' . $GLOBALS['strCreatePdfFeat'] . ': '
+            echo '    <tr><td colspan=2 align="center">' . $GLOBALS['strCreatePdfFeat'] . ': '
                 . (($cfgRelation['pdfwork'] == TRUE) ? $enabled : $disabled)
                 . '</td></tr>' . "\n";
-            echo '<tr><th align="left">column_comments ... </th><td align="right">'
+            echo '    <tr><td>&nbsp;</td></tr>' . "\n";
+
+            echo '    <tr><th align="left">column_comments ... </th><td align="right">'
                 . ((isset($cfgRelation['column_comments'])) ? $hit : sprintf($shit, 'col_com'))
                 . '</td></tr>' . "\n";
-            echo '<tr><td colspan=2 align="center">' . $GLOBALS['strColComFeat'] . ': '
+            echo '    <tr><td colspan=2 align="center">' . $GLOBALS['strColComFeat'] . ': '
                 . (($cfgRelation['commwork'] == TRUE) ? $enabled : $disabled)
                 . '</td></tr>' . "\n";
            echo '</table>' . "\n";
--- a/libraries/sqlparser.lib.php3
+++ b/libraries/sqlparser.lib.php3
@@ -178,12 +178,12 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
                        break;
                    }

-                    // Check for MySQL escaping using a \
-                    // And check for ANSI escaping using the $quotetype character
-                    if (PMA_STR_charIsEscaped($sql, $pos) ) {
+                    // Checks for MySQL escaping using a \
+                    // And checks for ANSI escaping using the $quotetype character
+                    if (PMA_STR_charIsEscaped($sql, $pos)) {
                        $pos ++;
                        continue;
-                    } else if (($sql[$pos] == $quotetype) && ($sql[$pos+1] == $quotetype)) {
+                    } else if (($sql[$pos] == $quotetype) && ($sql[$pos + 1] == $quotetype)) {
                        $pos = $pos + 2;
                        continue;
                    } else {
@@ -567,7 +567,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
            'PROCEDURE',
            'REFERENCES',
            'UNIQUE',
-            'USE',
+            'USE'
        );
        // $keywords_with_brackets_2before_cnt = count($keywords_with_brackets_2before);
        $keywords_with_brackets_2before_cnt        = 9;
@@ -684,7 +684,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
                    if ($infunction == TRUE) {
                        $functionlevel--;
                        $after     .= ' ';
-                        $before .= ' ';
+                        $before    .= ' ';
                    } else {
                        $indent--;
                        $before    .= '</div>';
@@ -696,14 +696,14 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
                        $after     .= ' ';
                    }
                    if ($typearr[1] == 'alpha_columnType') {
-                        $before .= ' ';
+                        $before    .= ' ';
                    }
                    break;
                case 'alpha_reservedWord':
                    $upper         = $arr[$i]['data'];
                    if ((($typearr[1] != 'alpha_reservedWord')
                        || (($typearr[1] == 'alpha_reservedWord')
-                            && PMA_STR_binarySearchInArr(strtoupper($arr[$i-1]['data']), $keywords_no_newline, $keywords_no_newline_cnt)))
+                            && PMA_STR_binarySearchInArr(strtoupper($arr[$i - 1]['data']), $keywords_no_newline, $keywords_no_newline_cnt)))
                        && ($typearr[1] != 'punct_level_plus')
                        && (!PMA_STR_binarySearchInArr($upper, $keywords_no_newline, $keywords_no_newline_cnt))) {
                        $before    .= $space_alpha_reserved_word;
--- a/tbl_change.php3
+++ b/tbl_change.php3
@@ -200,7 +200,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
    <tr>
        <th colspan="5" align="right">
            <input type="submit" value="<?php echo $strGo; ?>" tabindex="<?php echo $fields_cnt+6; ?>" />&nbsp;
-        </td>
+        </th>
    </tr>
        <?php
    } // end if