From ea0f5f5a9a03da1237575436717d5c9526deb058 Mon Sep 17 00:00:00 2001 From: Mike Beck Date: Fri, 14 Jun 2002 11:35:52 +0000 Subject: [PATCH] Bugfixing tbl_qbe: array with tablenames should be unique SQL without a select will not work --- ChangeLog | 8 +++++++- config.inc.php3 | 6 +++++- lang/albanian.inc.php3 | 1 + lang/arabic.inc.php3 | 1 + lang/brazilian_portuguese.inc.php3 | 1 + lang/bulgarian-koi8.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/croatian-iso8859-2.inc.php3 | 1 + lang/croatian-win1250.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/estonian.inc.php3 | 1 + lang/finnish.inc.php3 | 1 + lang/french.inc.php3 | 1 + lang/galician.inc.php3 | 1 + lang/georgian.inc.php3 | 1 + lang/german.inc.php3 | 3 +-- lang/greek.inc.php3 | 1 + lang/hebrew.inc.php3 | 1 + lang/hungarian.inc.php3 | 1 + lang/indonesian.inc.php3 | 1 + lang/italian.inc.php3 | 1 + lang/japanese-euc.inc.php3 | 1 + lang/japanese-sjis.inc.php3 | 1 + lang/korean.inc.php3 | 1 + lang/latvian.inc.php3 | 1 + lang/lithuanian.inc.php3 | 1 + lang/norwegian.inc.php3 | 1 + lang/polish.inc.php3 | 1 + lang/portuguese.inc.php3 | 1 + lang/romanian.inc.php3 | 1 + lang/russian-koi8.inc.php3 | 1 + lang/russian-win1251.inc.php3 | 1 + lang/serbian-win1250.inc.php3 | 1 + lang/slovak-iso.inc.php3 | 1 + lang/slovak-win1250.inc.php3 | 1 + lang/spanish.inc.php3 | 1 + lang/swedish.inc.php3 | 1 + lang/thai.inc.php3 | 1 + lang/turkish.inc.php3 | 1 + lang/ukrainian-win1251.inc.php3 | 1 + tbl_qbe.php3 | 17 +++++++++++++++-- 48 files changed, 72 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4863ecf194..90f50ae5f4 100755 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,13 @@ phpMyAdmin - Changelog $Id$ $Source$ - +2002-06-14 Mike Beck + * tbl_qbe: Bugfixing + - Don't try to use a generated SQL Statement without + a SELECT (if none of the Columns is marked as display + this could happen) + - if no LEFT JOINS are generated make sure that the + array containing tablenames is unique 2002-06-12 Alexander M. Turek * lang/turkish.inc.php3: Updates, thanks again to Bora Alioglu . diff --git a/config.inc.php3 b/config.inc.php3 index a5e2558fa3..add2cea551 100755 --- a/config.inc.php3 +++ b/config.inc.php3 @@ -51,7 +51,9 @@ $cfg['Servers'][$i]['only_db'] = ''; // If set to a db-name, only // It may also be an array // of db-names $cfg['Servers'][$i]['verbose'] = ''; // Verbose name for this host - leave blank to show the hostname -$cfg['Servers'][$i]['bookmarkdb'] = ''; // Bookmark db - leave blank for no bookmark support + +$cfg['Servers'][$i]['pmadb'] = ''; // Database used for Relation, Bookmark and PDF Features + // - leave blank for no support $cfg['Servers'][$i]['bookmarktable'] = ''; // Bookmark table - leave blank for no bookmark support $cfg['Servers'][$i]['relation'] = ''; // table to describe the relation between links (see doc) // - leave blank for no relation-links support @@ -59,6 +61,8 @@ $cfg['Servers'][$i]['table_info'] = ''; // table to describe the dis // - leave blank for no display fields support $cfg['Servers'][$i]['table_coords'] = ''; // table to describe the tables position for the PDF // schema - leave blank for no PDF schema support +$cfg['Servers'][$i]['column_comments']=''; // table to store columncomments + // - leave blank if you don't want to use this $cfg['Servers'][$i]['pdf_pages'] = ''; // table to describe pages of relationpdf $cfg['Servers'][$i]['AllowDeny']['order'] // Host authentication order, leave blank to not use = ''; diff --git a/lang/albanian.inc.php3 b/lang/albanian.inc.php3 index 25e30a19a4..f4263b1397 100644 --- a/lang/albanian.inc.php3 +++ b/lang/albanian.inc.php3 @@ -399,4 +399,5 @@ $strZip = '"kompresuar me zip"'; $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/arabic.inc.php3 b/lang/arabic.inc.php3 index 3339442d45..b7a9bffcdf 100644 --- a/lang/arabic.inc.php3 +++ b/lang/arabic.inc.php3 @@ -400,4 +400,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/brazilian_portuguese.inc.php3 b/lang/brazilian_portuguese.inc.php3 index d7cb46136e..6724554d08 100644 --- a/lang/brazilian_portuguese.inc.php3 +++ b/lang/brazilian_portuguese.inc.php3 @@ -398,4 +398,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/bulgarian-koi8.inc.php3 b/lang/bulgarian-koi8.inc.php3 index e331d7d6d2..b4e66bf18e 100644 --- a/lang/bulgarian-koi8.inc.php3 +++ b/lang/bulgarian-koi8.inc.php3 @@ -399,4 +399,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/bulgarian-win1251.inc.php3 b/lang/bulgarian-win1251.inc.php3 index 50e9fce69e..096ae6ce63 100644 --- a/lang/bulgarian-win1251.inc.php3 +++ b/lang/bulgarian-win1251.inc.php3 @@ -399,4 +399,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/catala.inc.php3 b/lang/catala.inc.php3 index 6adf4c3bda..06df677479 100644 --- a/lang/catala.inc.php3 +++ b/lang/catala.inc.php3 @@ -394,4 +394,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3 index adcc080a27..f4c3df5e5e 100644 --- a/lang/chinese_big5.inc.php3 +++ b/lang/chinese_big5.inc.php3 @@ -401,4 +401,5 @@ $strSelectTables = 'Select Tables'; $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3 index 154d0b3ec6..281c82fbac 100644 --- a/lang/chinese_gb.inc.php3 +++ b/lang/chinese_gb.inc.php3 @@ -401,4 +401,5 @@ $strSelectTables = 'Select Tables'; $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/croatian-iso8859-2.inc.php3 b/lang/croatian-iso8859-2.inc.php3 index 6815910942..93878bcbfd 100644 --- a/lang/croatian-iso8859-2.inc.php3 +++ b/lang/croatian-iso8859-2.inc.php3 @@ -399,4 +399,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/croatian-win1250.inc.php3 b/lang/croatian-win1250.inc.php3 index c3aba0316f..37d5e369c9 100644 --- a/lang/croatian-win1250.inc.php3 +++ b/lang/croatian-win1250.inc.php3 @@ -399,4 +399,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/czech-iso.inc.php3 b/lang/czech-iso.inc.php3 index 96b0713c79..16296f9148 100644 --- a/lang/czech-iso.inc.php3 +++ b/lang/czech-iso.inc.php3 @@ -399,4 +399,5 @@ $strZip = '"zazipov $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/czech-win1250.inc.php3 b/lang/czech-win1250.inc.php3 index 678a7cce0c..84ad41e383 100644 --- a/lang/czech-win1250.inc.php3 +++ b/lang/czech-win1250.inc.php3 @@ -399,4 +399,5 @@ $strZip = '"zazipov $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/danish.inc.php3 b/lang/danish.inc.php3 index 3e8c765f70..b4ee8e8b2b 100644 --- a/lang/danish.inc.php3 +++ b/lang/danish.inc.php3 @@ -393,4 +393,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/dutch.inc.php3 b/lang/dutch.inc.php3 index 4027ba6b4a..459481e66b 100644 --- a/lang/dutch.inc.php3 +++ b/lang/dutch.inc.php3 @@ -396,4 +396,5 @@ $strZip = '"Gezipt"'; // To translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/english.inc.php3 b/lang/english.inc.php3 index 4523df1b38..efba255dda 100644 --- a/lang/english.inc.php3 +++ b/lang/english.inc.php3 @@ -392,4 +392,5 @@ $strWrongUser = 'Wrong username/password. Access denied.'; $strYes = 'Yes'; $strZip = '"zipped"'; +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/estonian.inc.php3 b/lang/estonian.inc.php3 index 857e2f51e2..d04eb2d76a 100644 --- a/lang/estonian.inc.php3 +++ b/lang/estonian.inc.php3 @@ -394,4 +394,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/finnish.inc.php3 b/lang/finnish.inc.php3 index cafd224708..349360d7d1 100644 --- a/lang/finnish.inc.php3 +++ b/lang/finnish.inc.php3 @@ -398,4 +398,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/french.inc.php3 b/lang/french.inc.php3 index 6aee72d575..5f867d1844 100644 --- a/lang/french.inc.php3 +++ b/lang/french.inc.php3 @@ -393,4 +393,5 @@ $strYes = 'Oui'; $strZip = '"zippé"'; $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/galician.inc.php3 b/lang/galician.inc.php3 index d794f45ec1..9a9d566984 100644 --- a/lang/galician.inc.php3 +++ b/lang/galician.inc.php3 @@ -398,4 +398,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/georgian.inc.php3 b/lang/georgian.inc.php3 index c5c8e5d747..28fbdb67fb 100644 --- a/lang/georgian.inc.php3 +++ b/lang/georgian.inc.php3 @@ -403,4 +403,5 @@ $strPrimaryKeyName = 'The name of the primary key must be... PRIMARY!'; $strPrimaryKeyWarning = '("PRIMARY" must be the name of and only of a primary key!)'; $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/german.inc.php3 b/lang/german.inc.php3 index 6b1c0df25c..a60039dd7f 100644 --- a/lang/german.inc.php3 +++ b/lang/german.inc.php3 @@ -400,6 +400,5 @@ $strWrongUser = 'Falscher Benutzername/Kennwort. Zugriff verweigert.'; $strYes = 'Ja'; $strZip = 'Zip komprimiert'; - -// To translate +$strHaveToShow = 'Bitte wählen Sie mindestens eine anzuzeigende Spalte'; ?> diff --git a/lang/greek.inc.php3 b/lang/greek.inc.php3 index 2755a030e2..53cf8bbd28 100644 --- a/lang/greek.inc.php3 +++ b/lang/greek.inc.php3 @@ -395,4 +395,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/hebrew.inc.php3 b/lang/hebrew.inc.php3 index 072ad200ea..9540a0bda1 100644 --- a/lang/hebrew.inc.php3 +++ b/lang/hebrew.inc.php3 @@ -394,4 +394,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/hungarian.inc.php3 b/lang/hungarian.inc.php3 index b5987e61ff..eb575eb995 100644 --- a/lang/hungarian.inc.php3 +++ b/lang/hungarian.inc.php3 @@ -397,4 +397,5 @@ $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
diff --git a/lang/indonesian.inc.php3 b/lang/indonesian.inc.php3 index 68ae1adf71..754277cec4 100644 --- a/lang/indonesian.inc.php3 +++ b/lang/indonesian.inc.php3 @@ -396,4 +396,5 @@ $strZip = '"Dikompress dengan Zip"'; $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/italian.inc.php3 b/lang/italian.inc.php3 index 3c1773fd14..6f2178977f 100644 --- a/lang/italian.inc.php3 +++ b/lang/italian.inc.php3 @@ -400,4 +400,5 @@ $strZip = '"compresso con zip"'; // To translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/japanese-euc.inc.php3 b/lang/japanese-euc.inc.php3 index 9882fd434e..e2bc44c667 100644 --- a/lang/japanese-euc.inc.php3 +++ b/lang/japanese-euc.inc.php3 @@ -404,4 +404,5 @@ $strXkana = ' $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/japanese-sjis.inc.php3 b/lang/japanese-sjis.inc.php3 index 82b2f6e529..4e3a773478 100644 --- a/lang/japanese-sjis.inc.php3 +++ b/lang/japanese-sjis.inc.php3 @@ -403,4 +403,5 @@ $strXkana = ' // To translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/korean.inc.php3 b/lang/korean.inc.php3 index d0fd66172f..8e26f94bc7 100644 --- a/lang/korean.inc.php3 +++ b/lang/korean.inc.php3 @@ -395,4 +395,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/latvian.inc.php3 b/lang/latvian.inc.php3 index e01747b76f..f0b39bd2c5 100644 --- a/lang/latvian.inc.php3 +++ b/lang/latvian.inc.php3 @@ -398,4 +398,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/lithuanian.inc.php3 b/lang/lithuanian.inc.php3 index 8de883e1cc..2d97785c83 100644 --- a/lang/lithuanian.inc.php3 +++ b/lang/lithuanian.inc.php3 @@ -395,4 +395,5 @@ $strNotSet = '%s table not found or not set in %s'; //to translate $strReferentialIntegrity = 'Check referential integrity:'; $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/norwegian.inc.php3 b/lang/norwegian.inc.php3 index e5108795ff..c57e05ab6c 100644 --- a/lang/norwegian.inc.php3 +++ b/lang/norwegian.inc.php3 @@ -397,4 +397,5 @@ $strZip = 'Komprimert (zip)'; $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/polish.inc.php3 b/lang/polish.inc.php3 index f54ae63a36..fc3b8591f1 100644 --- a/lang/polish.inc.php3 +++ b/lang/polish.inc.php3 @@ -395,4 +395,5 @@ $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
diff --git a/lang/portuguese.inc.php3 b/lang/portuguese.inc.php3 index bd57762f0c..3a88d8d207 100644 --- a/lang/portuguese.inc.php3 +++ b/lang/portuguese.inc.php3 @@ -401,4 +401,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/romanian.inc.php3 b/lang/romanian.inc.php3 index 6b16debac7..5c889bd4d4 100644 --- a/lang/romanian.inc.php3 +++ b/lang/romanian.inc.php3 @@ -395,4 +395,5 @@ $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
diff --git a/lang/russian-koi8.inc.php3 b/lang/russian-koi8.inc.php3 index 0d8c5197ee..0a81ea4ced 100644 --- a/lang/russian-koi8.inc.php3 +++ b/lang/russian-koi8.inc.php3 @@ -399,4 +399,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/russian-win1251.inc.php3 b/lang/russian-win1251.inc.php3 index 1b9c836fb9..9141251599 100644 --- a/lang/russian-win1251.inc.php3 +++ b/lang/russian-win1251.inc.php3 @@ -399,4 +399,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/serbian-win1250.inc.php3 b/lang/serbian-win1250.inc.php3 index 89f397936a..0683fb19f1 100644 --- a/lang/serbian-win1250.inc.php3 +++ b/lang/serbian-win1250.inc.php3 @@ -400,4 +400,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/slovak-iso.inc.php3 b/lang/slovak-iso.inc.php3 index 0b99719484..c4be730b91 100644 --- a/lang/slovak-iso.inc.php3 +++ b/lang/slovak-iso.inc.php3 @@ -398,4 +398,5 @@ $strStructPropose = 'Propose table structure'; $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/slovak-win1250.inc.php3 b/lang/slovak-win1250.inc.php3 index 56a9936876..c52fcc67fe 100644 --- a/lang/slovak-win1250.inc.php3 +++ b/lang/slovak-win1250.inc.php3 @@ -397,4 +397,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/spanish.inc.php3 b/lang/spanish.inc.php3 index 69f92fde3e..7b95788f38 100644 --- a/lang/spanish.inc.php3 +++ b/lang/spanish.inc.php3 @@ -392,4 +392,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/swedish.inc.php3 b/lang/swedish.inc.php3 index be9e18c9bc..13d3ae6c32 100644 --- a/lang/swedish.inc.php3 +++ b/lang/swedish.inc.php3 @@ -394,4 +394,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/thai.inc.php3 b/lang/thai.inc.php3 index ae3232af26..52500744c8 100644 --- a/lang/thai.inc.php3 +++ b/lang/thai.inc.php3 @@ -404,4 +404,5 @@ $strSelectTables = 'Select Tables'; //to translate $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/turkish.inc.php3 b/lang/turkish.inc.php3 index ea3e32c6b0..ea1de55e88 100644 --- a/lang/turkish.inc.php3 +++ b/lang/turkish.inc.php3 @@ -394,4 +394,5 @@ $strZip = '"ziplenmi $strStructPropose = 'Propose table structure'; // just no translation for $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/lang/ukrainian-win1251.inc.php3 b/lang/ukrainian-win1251.inc.php3 index f2120b16a6..0888b1bdd4 100644 --- a/lang/ukrainian-win1251.inc.php3 +++ b/lang/ukrainian-win1251.inc.php3 @@ -394,4 +394,5 @@ $strZip = ' $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; //to translate $strNotSet = '%s table not found or not set in %s'; //to translate $strMissingBracket = 'Missing Bracket'; //to translate +$strHaveToShow = 'You have to choose at least one Column to display'; //to translate ?> diff --git a/tbl_qbe.php3 b/tbl_qbe.php3 index 2a1904b900..acb9ccec9c 100755 --- a/tbl_qbe.php3 +++ b/tbl_qbe.php3 @@ -13,7 +13,7 @@ require('./libraries/common.lib.php3'); /** * A query has been submitted -> executes it, else displays the headers */ -if (isset($submit_sql)) { +if (isset($submit_sql) && eregi('^SELECT',$encoded_sql_query)) { $goto = 'db_details.php3'; $zero_rows = htmlspecialchars($strSuccess); $sql_query = urldecode($encoded_sql_query); @@ -26,7 +26,9 @@ if (isset($submit_sql)) { include('./header.inc.php3'); } - +if(isset($submit_sql) && !eregi('^SELECT',$encoded_sql_query)) { + echo '

' . $strHaveToShow . '

'; +} /** * Initializes some variables */ @@ -896,6 +898,17 @@ if (isset($Field) && count($Field) > 0) { } // end rel work and $alltabs > 0 if (empty($qry_from) && count($alltabs)) { + // there might be more than one mentioning of the table in here + // as array_unique is only PHP4 we have to do this by hand + $_temp = array(); + while (list($k, $v) = each ($alltabs)) { + $_temp[$v] = 1; + } + unset($alltabs); + $alltabs = array(); + while (list($k, $v) = each ($_temp)) { + $alltabs[] = $k; + } $qry_from = implode(', ', $alltabs); }