beautify the code and the results of the patch #484112

db_details.php3

@@ -327,6 +327,8 @@ else if (PMA_MYSQL_INT_VERSION >= 32300) {
         <input type="submit" name="submit_mult" value="<?php echo $strDrop; ?>" />
         &nbsp;<i><?php echo $strOr; ?></i>&nbsp;
         <input type="submit" name="submit_mult" value="<?php echo $strEmpty; ?>" />
+        &nbsp;<i><?php echo $strOr; ?></i>&nbsp;
+        <input type="submit" name="submit_mult" value="<?php echo $strPrintView; ?>" />
     </td>
 </tr>
 </table>
@@ -450,27 +452,6 @@ if ($num_tables > 0) {
     <!-- Printable view of a table -->
     <li>
         <div style="margin-bottom: 10px"><a href="db_printview.php3?<?php echo $url_query; ?>"><?php echo $strPrintView; ?></a></div>
-
-<?php // Add by Moosh 
-?> 
-    <FORM method="post" action="tbl_printview.php3?lang=<?php echo $lang; ?>&server=<?php echo $server; ?>&db=<?php echo $db; ?>&goto=db_details.php3" > 
-     <select name="tables[]" size="5" multiple="multiple"> 
-     <?php 
-         $i = 0; 
-         echo "\n"; 
-         while ($i < $num_tables) { 
-             $table = ((PMA_MYSQL_INT_VERSION >= 32300) ? 
-		$tables[$i]['Name'] : $tables[$i]); 
-             echo ' <option value="' . $table . '">' . $table . '</option>' . "\n"; 
-             $i++; 
-         } 
-     echo "</select>";
-     echo "<input type=\"submit\" value=\"" . $GLOBALS['strGo'] . "\" />";
-     echo "</FORM>"; 
-
-// end of Add by Moosh 
-
-   ?> 
     </li>
     <?php
 }
@@ -506,6 +487,7 @@ if ($is_upload) {
     ?>
             <div style="margin-bottom: 5px">
             <input type="file" name="sql_file" /><br />
+            </div>
     <?php
 } // end if
 echo "\n";

mult_submits.inc.php3

@@ -3,7 +3,7 @@
 
 
 /**
- * Confirmation form
+ * Confirmation form if required or include of other scripts
  */
 if (!empty($submit_mult)
     && (!empty($selected_db) || !empty($selected_tbl) || !empty($selected_fld))) {
@@ -15,8 +15,13 @@ if (!empty($submit_mult)
         $selected     = $selected_db;
         $what         = 'drop_db';
     } else if (!empty($selected_tbl)) {
+    	if ($submit_mult == $strPrintView) {
+            include('./tbl_printview.php3');
+            exit();
+        } else {    
             $selected = $selected_tbl;
             $what     = (($submit_mult == $strDrop) ? 'drop_tbl' : 'empty_tbl');
+        }
     } else {
         $selected     = $selected_fld;
         if ($submit_mult == $strDrop) {

tbl_printview.php3

@@ -5,18 +5,27 @@
 /**
  * Gets the variables sent or posted to this script, then displays headers
  */
-require('./libraries/grab_globals.lib.php3');
+if (!isset($selected_tbl)) {
-require('./header.inc.php3');
+    include('./libraries/grab_globals.lib.php3');
+    include('./header.inc.php3');
+}
 
 
 /**
  * Defines the url to return to in case of error in a sql statement
  */
+if (isset($table)) {
     $err_url = 'tbl_properties.php3'
              . '?lang=' . $lang
              . '&server=' . $server
              . '&db=' . urlencode($db)
              . '&table=' . urlencode($table);
+} else {
+    $err_url = 'db_details.php3'
+             . '?lang=' . $lang
+             . '&server=' . $server
+             . '&db=' . urlencode($db);
+}
 
 
 /**
@@ -24,33 +33,30 @@ $err_url = 'tbl_properties.php3'
  */
 mysql_select_db($db);
 
-// add by Moosh 
 
-if (is_array($tables)) 
+/**
-{ $lesTables =$tables; 
+ * Multi-tables printview thanks to Christophe Gesch<63> from the "MySQL Form
-} else 
+ * Generator for PHPMyAdmin" (http://sourceforge.net/projects/phpmysqlformgen/)
-    { if (isset($tables)) 
+ */
-      { $lesTables = explode("|",$tables); 
+if (is_array($selected_tbl)) {
-       } 
+    $the_tables   = $selected_tbl;
-      if (isset($table)) 
+} else if (isset($table)) {
-      { $lesTables[] = $table; 
+    $the_tables[] = $table; 
-        } 
 }
+$multi_tables     = (count($the_tables) > 1);
 
-$multiTable = 0; 
+if ($multi_tables) {
-if (sizeof($lesTables)> 1) 
+    while (list($key, $table) = each($the_tables)) {
-   { $multiTable = 1; 
+        echo '[' . $table . '] ';
-      while ( list( $key, $table ) = each($lesTables)) 
-            { echo '['.$table. ']'; 
     }
-      } 
+} // end if
-      reset($lesTables); 
+reset($the_tables);
-      while ( list( $key, $table ) = each($lesTables)) 
-          { 
-          if ($multiTable) echo '<div style="page-break-after: 
-                        always;"><H1>'.$table. '</H1>'; 
 
-          //end of add by Moosh 
+while (list($key, $table) = each($the_tables)) {
+    if ($multi_tables) {
+        echo '<div style="page-break-after: always;">' . "\n";
+        echo '<h1>' . $table . '</h1>' . "\n";
+    } // end if
 
     /**
      * Gets table informations
@@ -84,7 +90,8 @@ $indexes      = array();
     $lastIndex    = '';
     $indexes_info = array();
     $indexes_data = array();
-$pk_array     = array(); // will be use to emphasis prim. keys in the table view
+    $pk_array     = array(); // will be use to emphasis prim. keys in the table
+                             // view
     while ($row = mysql_fetch_array($result)) {
         // Backups the list of primary keys
         if ($row['Key_name'] == 'PRIMARY') {
@@ -223,6 +230,7 @@ $index_count = (isset($indexes))
                  ? count($indexes)
                  : 0;
     if ($index_count > 0) {
+    	echo "\n";
         ?>
 <br /><br />
 
@@ -282,6 +290,7 @@ if ($index_count > 0) {
                 }
             } // end while
         } // end while
+        echo "\n";
         ?>
 </table>
         <?php
@@ -474,20 +483,18 @@ if ($cfgShowStats) {
         } // end if (PMA_MYSQL_INT_VERSION >= 32303 && $nonisam == FALSE)
     } // end if ($cfgShowStats)
 
-//ajout Moosh 
+    echo "\n";
-
+    if ($multi_tables) {
-
- if ($multiTable) 
- { //nettoyer les valeurs 
         unset($ret_keys);
         unset($num_rows);
         unset($show_comment);
+        echo '</div>' . "\n";
+        echo '<hr />' . "\n";
+    } // end if
+
+} // end while
 
-    echo '</DIV><HR>'; 
- } 
-} 
 
-//fin ajout Moosh 
 
 /**
  * Displays the footer