applied patch #443230 (Display order in tbl_select.php3)

ChangeLog

@@ -13,6 +13,8 @@ $Source$
 	* lib.inc.php3:
         - line 947: fix a bug when primary key values contain slashes.
         - merged patch #443393.
+	* tbl_select.php3, lang/*: applied patch #443230 (Display order in
+	  tbl_select.php3).
 
 2001-08-08  Steve Alberty  <alberty@neptunlabs.de>
 	* tbl_replace.php3: remove warning in a new row if a 'set' field is not

lang/brazilian_portuguese.inc.php3

@@ -281,6 +281,7 @@ $strGzip = '"gzipped"';  //to translate
 
 // To translate
 $strAffectedRows = 'Affected rows:';
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strNbRecords = 'no. of records';

lang/bulgarian-win1251.inc.php3

@@ -281,6 +281,7 @@ $strGzip = '"gzipped"';  //to translate
 
 // To translate
 $strAffectedRows = 'Affected rows:';
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strNbRecords = 'no. of records';

lang/catala.inc.php3

@@ -279,6 +279,7 @@ $strYes = 'Si';
 
 // To translate
 $strAffectedRows = 'Affected rows:';
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strQueryOnDb = 'SQL-query on database ';

lang/chinese_big5.inc.php3

@@ -281,6 +281,7 @@ $strYes = '
 
 // To translate
 $strAffectedRows = ' Rows affected: ';  //to translate
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strQueryOnDb = ' SQL-query on database ';  //to translate

lang/chinese_gb.inc.php3

@@ -281,6 +281,7 @@ $strGzip = '"gzipped"';  //to translate
 
 // To translate
 $strAffectedRows = 'Affected rows:';
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strNbRecords = 'no. of records';

lang/czech-iso.inc.php3

@@ -280,6 +280,7 @@ $strYes = 'Ano';
 
 // To translate
 $strAffectedRows = 'Affected rows:';
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strQueryOnDb = 'SQL-query on database ';

lang/czech-win1250.inc.php3

@@ -280,6 +280,7 @@ $strYes = 'Ano';
 
 // To translate
 $strAffectedRows = 'Affected rows:';
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strQueryOnDb = 'SQL-query on database ';

lang/danish.inc.php3

@@ -280,6 +280,7 @@ $strYes = 'Ja';
 
 // To translate
 $strAffectedRows = 'Affected rows:';
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strQueryOnDb = 'SQL-query on database ';

lang/dutch.inc.php3

@@ -281,6 +281,7 @@ $strGzip = '"gzipped"';  //to translate
 
 // To translate
 $strAffectedRows = 'Affected rows:';
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strNbRecords = 'no. of records';

lang/english.inc.php3

@@ -81,6 +81,7 @@ $strDelPassMessage = 'You have deleted the password for';
 $strDescending = 'Desending';
 $strDisableMagicQuotes = '<b>Warning:</b> You have enabled magic_quotes_gpc in your PHP configuration. This version of PhpMyAdmin cannot work properly with it. Please have a look at the configuration section of the PHP manual for information on how to disable it.';
 $strDisplay = 'Display';
+$strDisplayOrder = 'Display order:';
 $strDoAQuery = 'Do a "query by example" (wildcard: "%")';
 $strDocu = 'Documentation';
 $strDoYouReally = 'Do you really want to ';

lang/french.inc.php3

@@ -81,6 +81,7 @@ $strDelPassMessage = 'Vous avez effac
 $strDescending = 'D<>croissant';
 $strDisableMagicQuotes = '<b>Attention:</b> Vous avez positionn<6E> magic_quotes_gpc dans la configuration de PHP. Cette version de PhpMyAdmin ne peut fonctionner correctement avec. Veuillez vous r<>f<EFBFBD>rer au paragraphe traitant de la configration dans la documentation de PHP pour positionner cette variable <20> off.';
 $strDisplay = 'Montrer';
+$strDisplayOrder = 'Ordre d\'affichage :';
 $strDoAQuery = 'Recherche par valeur (passepartout: "%")';
 $strDocu = 'Documentation';
 $strDoYouReally = 'Voulez-vous vraiment effectuer ';

lang/german.inc.php3

@@ -283,5 +283,6 @@ $strWrongUser = 'Falscher Benutzername/Passwort. Zugriff verweigert.';
 $strYes = 'Ja';
 
 // To translate
+$strDisplayOrder = 'Display order:';
 $strFormEmpty = 'Missing value in the form !';
 ?>

lang/italian.inc.php3

@@ -281,6 +281,7 @@ $strYes = ' Si ';
 
 // To translate
 $strAffectedRows = 'Affected rows:';
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strQueryOnDb = 'SQL-query on database ';

lang/japanese.inc.php3

@@ -281,6 +281,7 @@ $strGzip = '"gzipped"';  //to translate
 
 // To translate
 $strAffectedRows = 'Affected rows:';
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strNbRecords = 'no. of records';

lang/korean.inc.php3

@@ -281,6 +281,7 @@ $strGzip = '"gzipped"';  //to translate
 
 // To translate
 $strAffectedRows = 'Affected rows:';
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strNbRecords = 'no. of records';

lang/norwegian.inc.php3

@@ -281,6 +281,7 @@ $strGzip = '"gzipped"';  //to translate
 
 // To translate
 $strAffectedRows = 'Affected rows:';
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strNbRecords = 'no. of records';

lang/polish.inc.php3

@@ -280,6 +280,7 @@ $strYes = 'Tak';
 
 // To translate
 $strAffectedRows = 'Affected rows:';
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strQueryOnDb = 'SQL-query on database ';

lang/portuguese.inc.php3

@@ -281,6 +281,7 @@ $strGzip = '"gzipped"';  //to translate
 
 // To translate
 $strAffectedRows = 'Affected rows:';
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strNbRecords = 'no. of records';

lang/russian-koi8.inc.php3

@@ -281,6 +281,7 @@ $strGzip = '"gzipped"';  //to translate
 
 // To translate
 $strAffectedRows = 'Affected rows:';
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strNbRecords = 'no. of records';

lang/russian-win1251.inc.php3

@@ -281,6 +281,7 @@ $strGzip = '"gzipped"';  //to translate
 
 // To translate
 $strAffectedRows = 'Affected rows:';
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strNbRecords = 'no. of records';

lang/slovak-iso.inc.php3

@@ -280,6 +280,7 @@ $strYes = '
 
 // To translate
 $strAffectedRows = ' Rows affected: ';  //to translate
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strQueryOnDb = ' SQL-query on database ';  //to translate

lang/spanish.inc.php3

@@ -283,6 +283,7 @@ $strGzip = '"gzipped"';  //to translate
 
 // To translate
 $strAffectedRows = 'Rows affected: ';
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strOffSet = 'offset';

lang/swedish.inc.php3

@@ -281,6 +281,7 @@ $strGzip = '"gzipped"';  //to translate
 
 // To translate
 $strAffectedRows = 'Affected rows:';
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strNbRecords = 'no. of records';

lang/thai.inc.php3

@@ -281,6 +281,7 @@ $strGzip = '"gzipped"';  //to translate
 
 // To translate
 $strAffectedRows = 'Affected rows:';
+$strDisplayOrder = 'Display order:';
 $strFieldsEmpty = ' The field count is empty! ';  //to translate
 $strFormEmpty = 'Missing value in the form !';
 $strNbRecords = 'no. of records';

tbl_select.php3

@@ -53,14 +53,11 @@ if (!isset($param) || $param[0] == '') {
             </div>
         </li>
         <li>
-            <div style="margin-bottom: 10px">
             <?php echo $strAddSearchConditions; ?><br />
             <input type="text" name="where" />&nbsp;
             <?php print show_docu("manual_Reference.html#Functions") . "\n"; ?>
-            </div>
+            <br /><br />
-        </li>
+            <?php echo '<i>' . $strOr . '</i> ' . $strDoAQuery; ?><br />
-        <li>
-            <?php echo $strDoAQuery; ?><br />
             <table border="<?php echo $cfgBorder; ?>">
             <tr>
                 <th><?php echo $strField; ?></th>
@@ -88,6 +85,24 @@ if (!isset($param) || $param[0] == '') {
         ?>
             </table><br />
         </li>
+        <li>
+            <?php echo $strDisplayOrder; ?><br />
+            <select name="orderField" style="vertical-align: middle">
+                <option value="--nil--"></option>
+        <?php
+        echo "\n";
+        for ($i = 0; $i < mysql_num_fields($result); $i++) {
+            $field = mysql_field_name($result, $i);
+            echo '                ';
+            echo '<option value="' . urlencode($field) . '">' . htmlspecialchars($field) . '</option>' . "\n";
+        } // end for
+        ?>
+            </select>
+            <input type="radio" name="order" value="ASC" checked="checked" />
+            <?php echo $strAscending; ?>&nbsp;
+            <input type="radio" name="order" value="DESC" />
+            <?php echo $strDescending; ?><br /><br />
+        </li>
     </ul>
 
     &nbsp;&nbsp;&nbsp;&nbsp;
@@ -151,6 +166,9 @@ else {
             } // end if
         } // end for
     } // end if
+    if ($orderField != '--nil--') {
+        $sql_query .= ' ORDER BY ' . backquote(urldecode($orderField)) . ' ' . $order;
+    } // end if
 
     $url_query = 'lang=' . $lang
                . '&server=' . urlencode($server)