patch #2498350 [cleanup] XHTML cleanup

Gemorroj · Jan 13, 2009 · bd3595f · bd3595f
1 parent dd89801
commit bd3595f
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -18,6 +18,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
   thanks to Bryce Thornton - brycethornton
 - patch #2486825 [lang] Wrong string in setup script hints,
   thanks to Isaac Bennetch - ibennetch
+- patch #2498350 [cleanup] XHTML cleanup, thanks to Virsacer - virsacer 
 
 3.1.3.0 (not yet released)
 + [lang] Turkish update, thanks to Burak Yavuz

diff --git a/db_qbe.php b/db_qbe.php
@@ -167,8 +167,8 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
 }
 
 ?>
-<fieldset>
 <form action="db_qbe.php" method="post">
+<fieldset>
 <table class="data" style="width: 100%;">
 <tr class="odd noclick">
     <th><?php echo $strField; ?>:</th>

diff --git a/db_search.php b/db_search.php
@@ -350,7 +350,7 @@ function PMA_getSearchSqls($table, $field, $search_str, $search_option)
         </td>
     </tr>
     <tr><td align="right" valign="bottom">
-            <?php echo $alter_select; ?></td></tr>
+            <?php echo $alter_select; ?></td>
     </tr>
     <tr><td align="right">
             <?php echo $GLOBALS['strSearchInField']; ?></td>

diff --git a/db_structure.php b/db_structure.php
@@ -165,7 +165,7 @@ function PMA_SortableTableHeader($title, $sort)
 
     $url = 'db_structure.php'.PMA_generate_common_url($_url_params);
     // We set the position back to 0 every time they sort.
-    $url .= "&pos=0&sort=$sort&sort_order=$sort_order";
+    $url .= "&amp;pos=0&amp;sort=$sort&amp;sort_order=$sort_order";
 
     return PMA_linkOrButton($url, $title . $order_img, $order_link_params);
 }

diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php
@@ -49,7 +49,6 @@
 <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
 <title><?php echo $strSQLResult; ?> - phpMyAdmin <?php echo PMA_VERSION ?></title>
 <link rel="stylesheet" type="text/css" href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=print&amp;nocache=<?php echo $_SESSION['PMA_Config']->getThemeUniqueValue(); ?>" />
-</style>
 </head>
 
 <body bgcolor="#ffffff">

diff --git a/server_privileges.php b/server_privileges.php
@@ -1549,7 +1549,8 @@ function PMA_displayLoginInformationFields($mode = 'new')
                    . '    </fieldset>' . "\n"
                    . '    <fieldset id="fieldset_delete_user_footer" class="tblFooters">' . "\n"
                    . '        <input type="submit" name="delete" value="' . $GLOBALS['strGo'] . '" id="buttonGo" />' . "\n"
-                   . '    </fieldset>' . "\n";
+                   . '    </fieldset>' . "\n"
+                   . '</form>' . "\n";
             } else {
 
                 unset ($row);
@@ -1559,7 +1560,6 @@ function PMA_displayLoginInformationFields($mode = 'new')
                    . '            ' . $GLOBALS['strAddUser'] . '</a>' . "\n"
                    . '    </fieldset>' . "\n";
             } // end if (display overview)
-            echo '</form>' . "\n";
             $flushnote = new PMA_Message('strFlushPrivilegesNote', PMA_Message::NOTICE);
             $flushnote->addParam('<a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;flush_privileges=1">', false);
             $flushnote->addParam('</a>', false);

diff --git a/view_create.php b/view_create.php
@@ -168,9 +168,9 @@
                 if (in_array($option, $view['with'])) {
                     echo ' checked="checked"';
                 }
-                echo ' id="view_with_' . htmlspecialchars($option) . '"';
+                echo ' id="view_with_' . str_replace(' ', '_', htmlspecialchars($option)) . '"';
                 echo ' value="' . htmlspecialchars($option) . '" />';
-                echo '<label for="view_with_' . htmlspecialchars($option) . '">';
+                echo '<label for="view_with_' . str_replace(' ', '_', htmlspecialchars($option)) . '">';
                 echo htmlspecialchars($option) . '</label>';
             }
             ?>