From fd1e71809f81f41988179be50c7000b0cff8827f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= Date: Wed, 8 Aug 2001 15:36:40 +0000 Subject: [PATCH] applied patch #443230 (Display order in tbl_select.php3) --- ChangeLog | 2 ++ lang/brazilian_portuguese.inc.php3 | 1 + lang/bulgarian-win1251.inc.php3 | 1 + lang/catala.inc.php3 | 1 + lang/chinese_big5.inc.php3 | 1 + lang/chinese_gb.inc.php3 | 1 + lang/czech-iso.inc.php3 | 1 + lang/czech-win1250.inc.php3 | 1 + lang/danish.inc.php3 | 1 + lang/dutch.inc.php3 | 1 + lang/english.inc.php3 | 1 + lang/french.inc.php3 | 1 + lang/german.inc.php3 | 1 + lang/italian.inc.php3 | 1 + lang/japanese.inc.php3 | 1 + lang/korean.inc.php3 | 1 + lang/norwegian.inc.php3 | 1 + lang/polish.inc.php3 | 1 + lang/portuguese.inc.php3 | 1 + lang/russian-koi8.inc.php3 | 1 + lang/russian-win1251.inc.php3 | 1 + lang/slovak-iso.inc.php3 | 1 + lang/spanish.inc.php3 | 1 + lang/swedish.inc.php3 | 1 + lang/thai.inc.php3 | 1 + tbl_select.php3 | 28 +++++++++++++++++++++++----- 26 files changed, 49 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44767925d..ed0452c36 100755 --- a/ChangeLog +++ b/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 * tbl_replace.php3: remove warning in a new row if a 'set' field is not diff --git a/lang/brazilian_portuguese.inc.php3 b/lang/brazilian_portuguese.inc.php3 index 9fcd4d988..ca602bf65 100644 --- a/lang/brazilian_portuguese.inc.php3 +++ b/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'; diff --git a/lang/bulgarian-win1251.inc.php3 b/lang/bulgarian-win1251.inc.php3 index e3842736f..ebb624647 100644 --- a/lang/bulgarian-win1251.inc.php3 +++ b/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'; diff --git a/lang/catala.inc.php3 b/lang/catala.inc.php3 index 0fce9cf24..01985894d 100644 --- a/lang/catala.inc.php3 +++ b/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 '; diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3 index 6894f7c0f..83f972dc5 100644 --- a/lang/chinese_big5.inc.php3 +++ b/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 diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3 index 8624b7bfe..4c2fb2fcc 100644 --- a/lang/chinese_gb.inc.php3 +++ b/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'; diff --git a/lang/czech-iso.inc.php3 b/lang/czech-iso.inc.php3 index bbd8ce1b8..466984041 100644 --- a/lang/czech-iso.inc.php3 +++ b/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 '; diff --git a/lang/czech-win1250.inc.php3 b/lang/czech-win1250.inc.php3 index 12785a54f..9039b54d9 100644 --- a/lang/czech-win1250.inc.php3 +++ b/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 '; diff --git a/lang/danish.inc.php3 b/lang/danish.inc.php3 index 88fa425dd..7e20a0579 100644 --- a/lang/danish.inc.php3 +++ b/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 '; diff --git a/lang/dutch.inc.php3 b/lang/dutch.inc.php3 index 7aacdb0e2..d14de4a49 100644 --- a/lang/dutch.inc.php3 +++ b/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'; diff --git a/lang/english.inc.php3 b/lang/english.inc.php3 index 95d016505..e89dc4304 100644 --- a/lang/english.inc.php3 +++ b/lang/english.inc.php3 @@ -81,6 +81,7 @@ $strDelPassMessage = 'You have deleted the password for'; $strDescending = 'Desending'; $strDisableMagicQuotes = 'Warning: 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 '; diff --git a/lang/french.inc.php3 b/lang/french.inc.php3 index eb04e557e..ef65d0322 100644 --- a/lang/french.inc.php3 +++ b/lang/french.inc.php3 @@ -81,6 +81,7 @@ $strDelPassMessage = 'Vous avez effac $strDescending = 'Décroissant'; $strDisableMagicQuotes = 'Attention: Vous avez positionné magic_quotes_gpc dans la configuration de PHP. Cette version de PhpMyAdmin ne peut fonctionner correctement avec. Veuillez vous référer au paragraphe traitant de la configration dans la documentation de PHP pour positionner cette variable à off.'; $strDisplay = 'Montrer'; +$strDisplayOrder = 'Ordre d\'affichage :'; $strDoAQuery = 'Recherche par valeur (passepartout: "%")'; $strDocu = 'Documentation'; $strDoYouReally = 'Voulez-vous vraiment effectuer '; diff --git a/lang/german.inc.php3 b/lang/german.inc.php3 index b9286b673..0d8ab373a 100644 --- a/lang/german.inc.php3 +++ b/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 !'; ?> diff --git a/lang/italian.inc.php3 b/lang/italian.inc.php3 index 8519f76f8..ba491ed91 100644 --- a/lang/italian.inc.php3 +++ b/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 '; diff --git a/lang/japanese.inc.php3 b/lang/japanese.inc.php3 index 2269f71e4..2011740f6 100644 --- a/lang/japanese.inc.php3 +++ b/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'; diff --git a/lang/korean.inc.php3 b/lang/korean.inc.php3 index 3023520a8..5348a3ad2 100644 --- a/lang/korean.inc.php3 +++ b/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'; diff --git a/lang/norwegian.inc.php3 b/lang/norwegian.inc.php3 index cec5f4944..5890602cb 100644 --- a/lang/norwegian.inc.php3 +++ b/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'; diff --git a/lang/polish.inc.php3 b/lang/polish.inc.php3 index f54c17a3c..42880584c 100644 --- a/lang/polish.inc.php3 +++ b/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 '; diff --git a/lang/portuguese.inc.php3 b/lang/portuguese.inc.php3 index c9c4779ca..e7b9daf98 100644 --- a/lang/portuguese.inc.php3 +++ b/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'; diff --git a/lang/russian-koi8.inc.php3 b/lang/russian-koi8.inc.php3 index 7abd1b8cf..447e4635c 100644 --- a/lang/russian-koi8.inc.php3 +++ b/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'; diff --git a/lang/russian-win1251.inc.php3 b/lang/russian-win1251.inc.php3 index 3ac0d4429..664c13528 100644 --- a/lang/russian-win1251.inc.php3 +++ b/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'; diff --git a/lang/slovak-iso.inc.php3 b/lang/slovak-iso.inc.php3 index baa97cdb3..b1a3e72c3 100644 --- a/lang/slovak-iso.inc.php3 +++ b/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 diff --git a/lang/spanish.inc.php3 b/lang/spanish.inc.php3 index 4dd3ffa9b..d9848ea7c 100644 --- a/lang/spanish.inc.php3 +++ b/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'; diff --git a/lang/swedish.inc.php3 b/lang/swedish.inc.php3 index 51d37c0f1..84c9c5929 100644 --- a/lang/swedish.inc.php3 +++ b/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'; diff --git a/lang/thai.inc.php3 b/lang/thai.inc.php3 index 40f96a128..b23d6569f 100644 --- a/lang/thai.inc.php3 +++ b/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'; diff --git a/tbl_select.php3 b/tbl_select.php3 index a78e03791..387902034 100755 --- a/tbl_select.php3 +++ b/tbl_select.php3 @@ -53,14 +53,11 @@ if (!isset($param) || $param[0] == '') {
  • -

      -
    -
    • -
  • -
    +

    + ' . $strOr . ' ' . $strDoAQuery; ?>
    @@ -88,6 +85,24 @@ if (!isset($param) || $param[0] == '') { ?>

    • +
  • +
    + + +   + +

    +
    •      @@ -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)