diff --git a/ChangeLog b/ChangeLog index a1a8cb13e..ec35f47d4 100755 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,9 @@ $Source$ 2002-05-31 Alexander M. Turek * lang/german.inc.php3: Small corrections. + * sql.php3, header_printview.inc.php3, libraries/display_tbl.inc.php3, + lang/*.inc.php3: Implemented one part of feature #472038: + Print view for SQL query results. 2002-05-30 Alexander M. Turek * lang/albanian.inc.php3: Updates, thanks again to diff --git a/header_printview.inc.php3 b/header_printview.inc.php3 new file mode 100644 index 000000000..5392b52a7 --- /dev/null +++ b/header_printview.inc.php3 @@ -0,0 +1,78 @@ + + + + + +<?php echo $strSQLResult; ?> - phpMyAdmin <?php echo PMA_VERSION ?> + + + + + +

+

+ :
+ :
+ :
+ : phpMyAdmin
+ : ; +

+ diff --git a/lang/albanian.inc.php3 b/lang/albanian.inc.php3 index b2f9deb15..69ce547c4 100644 --- a/lang/albanian.inc.php3 +++ b/lang/albanian.inc.php3 @@ -389,4 +389,6 @@ $strYes = ' Po '; $strZip = '"kompresuar me zip"'; // To translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/arabic.inc.php3 b/lang/arabic.inc.php3 index 79b31b262..372f2a891 100644 --- a/lang/arabic.inc.php3 +++ b/lang/arabic.inc.php3 @@ -390,4 +390,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/brazilian_portuguese.inc.php3 b/lang/brazilian_portuguese.inc.php3 index cd3dce32d..c6b95236c 100644 --- a/lang/brazilian_portuguese.inc.php3 +++ b/lang/brazilian_portuguese.inc.php3 @@ -388,4 +388,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/bulgarian-koi8.inc.php3 b/lang/bulgarian-koi8.inc.php3 index 8d8e9dd91..844e1a8d6 100644 --- a/lang/bulgarian-koi8.inc.php3 +++ b/lang/bulgarian-koi8.inc.php3 @@ -389,4 +389,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/bulgarian-win1251.inc.php3 b/lang/bulgarian-win1251.inc.php3 index d531c17a6..f2100118d 100644 --- a/lang/bulgarian-win1251.inc.php3 +++ b/lang/bulgarian-win1251.inc.php3 @@ -389,4 +389,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/catala.inc.php3 b/lang/catala.inc.php3 index f95f3d019..5217a8ac3 100644 --- a/lang/catala.inc.php3 +++ b/lang/catala.inc.php3 @@ -384,4 +384,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3 index 0c85c8dad..52329e06e 100644 --- a/lang/chinese_big5.inc.php3 +++ b/lang/chinese_big5.inc.php3 @@ -390,4 +390,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3 index 9dcb7605f..34485b958 100644 --- a/lang/chinese_gb.inc.php3 +++ b/lang/chinese_gb.inc.php3 @@ -390,4 +390,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/croatian-iso8859-2.inc.php3 b/lang/croatian-iso8859-2.inc.php3 index 809a2a663..3ce7e2d1b 100644 --- a/lang/croatian-iso8859-2.inc.php3 +++ b/lang/croatian-iso8859-2.inc.php3 @@ -389,4 +389,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/croatian-win1250.inc.php3 b/lang/croatian-win1250.inc.php3 index 47deef3e9..9e02b009b 100644 --- a/lang/croatian-win1250.inc.php3 +++ b/lang/croatian-win1250.inc.php3 @@ -389,4 +389,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/czech-iso.inc.php3 b/lang/czech-iso.inc.php3 index 35e2e011a..65269a64a 100644 --- a/lang/czech-iso.inc.php3 +++ b/lang/czech-iso.inc.php3 @@ -69,7 +69,7 @@ $strCantRenameIdxToPrimary = 'Index nem $strCardinality = 'Mohutnost'; $strCarriage = 'Návrat vozíku (CR): \\r'; $strChange = 'Změnit'; -$strChangeDisplay = 'Zvolte které sloupce zobrazit'; +$strChangeDisplay = 'Zvolte které sloupce zobrazit'; $strChangePassword = 'Změnit heslo'; $strCheckAll = 'Zaškrtnout vše'; $strCheckDbPriv = 'Zkontrolovat oprávnění pro databázi'; @@ -105,7 +105,7 @@ $strDeleteUserMessage = 'Byl smaz $strDescending = 'Sestupně'; $strDisplay = 'Zobrazit'; $strDisplayOrder = 'Seřadit podle:'; -$strDisplayPDF = 'Zobrazit jako schéma v PDF'; +$strDisplayPDF = 'Zobrazit jako schéma v PDF'; $strDoAQuery = 'Provést "dotaz podle příkladu" (zástupný znak: "%")'; $strDocu = 'Dokumentace'; $strDoYouReally = 'Opravdu si přejete vykonat příkaz'; @@ -124,7 +124,7 @@ $strEmptyResultSet = 'MySQL vr $strEnd = 'Konec'; $strEnglishPrivileges = 'Poznámka: názvy oprávnění v MySQL jsou uváděny anglicky'; $strError = 'Chyba'; -$strExplain = 'Vysvětlit SQL (EXPLAIN)'; +$strExplain = 'Vysvětlit SQL (EXPLAIN)'; $strExport = 'Export'; $strExportToXML = 'Export do XML'; $strExtendedInserts = 'Rozšířené inserty'; @@ -215,7 +215,7 @@ $strNoIndexPartsDefined = ' $strNoModification = 'Žádná změna'; $strNone = 'Žádný'; $strNoPassword = 'Žádné heslo'; -$strNoPhp = 'Bez PHP kódu'; +$strNoPhp = 'Bez PHP kódu'; $strNoPrivileges = 'Žádná oprávnění'; $strNoQuery = 'Žádný SQL dotaz!'; $strNoRights = 'Nemáte dostatečná práva na provedení této akce!'; @@ -236,14 +236,14 @@ $strOptions = 'Vlastnosti'; $strOr = 'nebo'; $strOverhead = 'Navíc'; -$strPageNumber = 'Strana číslo:'; +$strPageNumber = 'Strana číslo:'; $strPartialText = 'Zkrácené texty'; $strPassword = 'Heslo'; $strPasswordEmpty = 'Heslo je prázdné!'; $strPasswordNotSame = 'Hesla nejsou stejná!'; -$strPdfInvalidPageNum = 'Nedefinované číslo stránky v PDF!'; -$strPdfInvalidTblName = 'Tabulka "%s" neexistuje!'; -$strPhp = 'Zobrazit PHP kód'; +$strPdfInvalidPageNum = 'Nedefinované číslo stránky v PDF!'; +$strPdfInvalidTblName = 'Tabulka "%s" neexistuje!'; +$strPhp = 'Zobrazit PHP kód'; $strPHPVersion = 'Verze PHP'; $strPmaDocumentation = 'Dokumentace phpMyAdmina'; $strPmaUriError = 'Parametr $cfg[\'PmaAbsoluteUri\'] MUSÍ být nastaveno v konfiguračním souboru!'; @@ -294,7 +294,7 @@ $strRunQuery = 'Prov $strRunSQLQuery = 'Spustit SQL dotaz(y) na databázi %s'; $strSave = 'Ulož'; -$strScaleFactorSmall = 'Měřítko je příliš malé, aby se schéma vešlo na jednu stránku'; +$strScaleFactorSmall = 'Měřítko je příliš malé, aby se schéma vešlo na jednu stránku'; $strSearch = 'Vyhledávání'; $strSearchFormTitle = 'Vyhledávání v databázi'; $strSearchInTables = 'V tabulkách:'; @@ -316,12 +316,12 @@ $strServerVersion = 'Verze MySQL'; $strSetEnumVal = 'Pokud je sloupec typu "enum" nebo "set", zadávejte hodnoty v následujícím formátu: \'a\',\'b\',\'c\'...
Pokud potřebujete zadat zpětné lomítko ("\") nebo jednoduché uvozovky ("\'") mezi těmito hodnotami, napište před ně zpětné lomítko (příklad: \'\\\\xyz\' nebo \'a\\\'b\').'; $strShow = 'Zobrazit'; $strShowAll = 'Zobrazit vše'; -$strShowColor = 'Barevné šipky'; +$strShowColor = 'Barevné šipky'; $strShowCols = 'Zobrazit sloupce'; -$strShowGrid = 'Zobrazit mřížku'; +$strShowGrid = 'Zobrazit mřížku'; $strShowingRecords = 'Zobrazeny záznamy'; $strShowPHPInfo = 'Zobrazit informace o PHP'; -$strShowTableDimension = 'Rozměry tabulek'; +$strShowTableDimension = 'Rozměry tabulek'; $strShowTables = 'Zobrazit tabulky'; $strShowThisQuery = 'Zobrazit zde tento dotaz znovu'; $strSingly = '(po jednom)'; @@ -337,7 +337,7 @@ $strStrucData = 'Strukturu a data'; $strStrucDrop = 'Přidej \'DROP TABLE\''; $strStrucExcelCSV = 'CSV data pro Ms Excel'; $strStrucOnly = 'Pouze strukturu'; -$strStructPropose = 'Navrhnout strukturu tabulky'; +$strStructPropose = 'Navrhnout strukturu tabulky'; $strStructure = 'Struktura'; $strSubmit = 'Odešli'; $strSuccess = 'Tvůj SQL-dotaz byl úspěšně vykonán'; @@ -389,4 +389,6 @@ $strZip = '"zazipov // To translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/czech-win1250.inc.php3 b/lang/czech-win1250.inc.php3 index 0d1d76d7c..19e0619e1 100644 --- a/lang/czech-win1250.inc.php3 +++ b/lang/czech-win1250.inc.php3 @@ -69,7 +69,7 @@ $strCantRenameIdxToPrimary = 'Index nem $strCardinality = 'Mohutnost'; $strCarriage = 'Návrat vozíku (CR): \\r'; $strChange = 'Změnit'; -$strChangeDisplay = 'Zvolte které sloupce zobrazit'; +$strChangeDisplay = 'Zvolte které sloupce zobrazit'; $strChangePassword = 'Změnit heslo'; $strCheckAll = 'Zaškrtnout vše'; $strCheckDbPriv = 'Zkontrolovat oprávnění pro databázi'; @@ -105,7 +105,7 @@ $strDeleteUserMessage = 'Byl smaz $strDescending = 'Sestupně'; $strDisplay = 'Zobrazit'; $strDisplayOrder = 'Seřadit podle:'; -$strDisplayPDF = 'Zobrazit jako schéma v PDF'; +$strDisplayPDF = 'Zobrazit jako schéma v PDF'; $strDoAQuery = 'Provést "dotaz podle příkladu" (zástupný znak: "%")'; $strDocu = 'Dokumentace'; $strDoYouReally = 'Opravdu si přejete vykonat příkaz'; @@ -124,7 +124,7 @@ $strEmptyResultSet = 'MySQL vr $strEnd = 'Konec'; $strEnglishPrivileges = 'Poznámka: názvy oprávnění v MySQL jsou uváděny anglicky'; $strError = 'Chyba'; -$strExplain = 'Vysvětlit SQL (EXPLAIN)'; +$strExplain = 'Vysvětlit SQL (EXPLAIN)'; $strExport = 'Export'; $strExportToXML = 'Export do XML'; $strExtendedInserts = 'Rozšířené inserty'; @@ -215,7 +215,7 @@ $strNoIndexPartsDefined = ' $strNoModification = 'Žádná změna'; $strNone = 'Žádný'; $strNoPassword = 'Žádné heslo'; -$strNoPhp = 'Bez PHP kódu'; +$strNoPhp = 'Bez PHP kódu'; $strNoPrivileges = 'Žádná oprávnění'; $strNoQuery = 'Žádný SQL dotaz!'; $strNoRights = 'Nemáte dostatečná práva na provedení této akce!'; @@ -236,14 +236,14 @@ $strOptions = 'Vlastnosti'; $strOr = 'nebo'; $strOverhead = 'Navíc'; -$strPageNumber = 'Strana číslo:'; +$strPageNumber = 'Strana číslo:'; $strPartialText = 'Zkrácené texty'; $strPassword = 'Heslo'; $strPasswordEmpty = 'Heslo je prázdné!'; $strPasswordNotSame = 'Hesla nejsou stejná!'; -$strPdfInvalidPageNum = 'Nedefinované číslo stránky v PDF!'; -$strPdfInvalidTblName = 'Tabulka "%s" neexistuje!'; -$strPhp = 'Zobrazit PHP kód'; +$strPdfInvalidPageNum = 'Nedefinované číslo stránky v PDF!'; +$strPdfInvalidTblName = 'Tabulka "%s" neexistuje!'; +$strPhp = 'Zobrazit PHP kód'; $strPHPVersion = 'Verze PHP'; $strPmaDocumentation = 'Dokumentace phpMyAdmina'; $strPmaUriError = 'Parametr $cfg[\'PmaAbsoluteUri\'] MUSÍ být nastaveno v konfiguračním souboru!'; @@ -294,7 +294,7 @@ $strRunQuery = 'Prov $strRunSQLQuery = 'Spustit SQL dotaz(y) na databázi %s'; $strSave = 'Ulož'; -$strScaleFactorSmall = 'Měřítko je příliš malé, aby se schéma vešlo na jednu stránku'; +$strScaleFactorSmall = 'Měřítko je příliš malé, aby se schéma vešlo na jednu stránku'; $strSearch = 'Vyhledávání'; $strSearchFormTitle = 'Vyhledávání v databázi'; $strSearchInTables = 'V tabulkách:'; @@ -316,12 +316,12 @@ $strServerVersion = 'Verze MySQL'; $strSetEnumVal = 'Pokud je sloupec typu "enum" nebo "set", zadávejte hodnoty v následujícím formátu: \'a\',\'b\',\'c\'...
Pokud potřebujete zadat zpětné lomítko ("\") nebo jednoduché uvozovky ("\'") mezi těmito hodnotami, napište před ně zpětné lomítko (příklad: \'\\\\xyz\' nebo \'a\\\'b\').'; $strShow = 'Zobrazit'; $strShowAll = 'Zobrazit vše'; -$strShowColor = 'Barevné šipky'; +$strShowColor = 'Barevné šipky'; $strShowCols = 'Zobrazit sloupce'; -$strShowGrid = 'Zobrazit mřížku'; +$strShowGrid = 'Zobrazit mřížku'; $strShowingRecords = 'Zobrazeny záznamy'; $strShowPHPInfo = 'Zobrazit informace o PHP'; -$strShowTableDimension = 'Rozměry tabulek'; +$strShowTableDimension = 'Rozměry tabulek'; $strShowTables = 'Zobrazit tabulky'; $strShowThisQuery = 'Zobrazit zde tento dotaz znovu'; $strSingly = '(po jednom)'; @@ -337,7 +337,7 @@ $strStrucData = 'Strukturu a data'; $strStrucDrop = 'Přidej \'DROP TABLE\''; $strStrucExcelCSV = 'CSV data pro Ms Excel'; $strStrucOnly = 'Pouze strukturu'; -$strStructPropose = 'Navrhnout strukturu tabulky'; +$strStructPropose = 'Navrhnout strukturu tabulky'; $strStructure = 'Struktura'; $strSubmit = 'Odešli'; $strSuccess = 'Tvůj SQL-dotaz byl úspěšně vykonán'; @@ -389,4 +389,6 @@ $strZip = '"zazipov // To translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/danish.inc.php3 b/lang/danish.inc.php3 index 8abc6331c..1e843fe49 100644 --- a/lang/danish.inc.php3 +++ b/lang/danish.inc.php3 @@ -383,4 +383,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/dutch.inc.php3 b/lang/dutch.inc.php3 index 1d1124ada..2cfb16d4b 100644 --- a/lang/dutch.inc.php3 +++ b/lang/dutch.inc.php3 @@ -383,4 +383,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/english.inc.php3 b/lang/english.inc.php3 index 2125d746c..516691b7d 100644 --- a/lang/english.inc.php3 +++ b/lang/english.inc.php3 @@ -140,6 +140,7 @@ $strFullText = 'Full Texts'; $strFunction = 'Function'; $strGenTime = 'Generation Time'; +$strGenBy = 'Generated by'; $strGo = 'Go'; $strGrants = 'Grants'; $strGzip = '"gzipped"'; @@ -327,6 +328,7 @@ $strSpaceUsage = 'Space usage'; $strSplitWordsWithSpace = 'Words are splitted by a space character (" ").'; $strSQL = 'SQL'; $strSQLQuery = 'SQL-query'; +$strSQLResult = 'SQL result'; $strStatement = 'Statements'; $strStrucCSV = 'CSV data'; $strStrucData = 'Structure and data'; diff --git a/lang/estonian.inc.php3 b/lang/estonian.inc.php3 index c7f38ab5c..0bad0b07c 100644 --- a/lang/estonian.inc.php3 +++ b/lang/estonian.inc.php3 @@ -384,4 +384,6 @@ $strZip = '"zipitud"'; // To translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/finnish.inc.php3 b/lang/finnish.inc.php3 index 10503d017..2499aae06 100644 --- a/lang/finnish.inc.php3 +++ b/lang/finnish.inc.php3 @@ -388,4 +388,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/french.inc.php3 b/lang/french.inc.php3 index e58d9ebf4..9fbf581ec 100644 --- a/lang/french.inc.php3 +++ b/lang/french.inc.php3 @@ -140,6 +140,7 @@ $strFullText = 'Textes complets'; $strFunction = 'Fonction'; $strGenTime = 'Généré le '; +$strGenBy = 'Généré par'; $strGo = 'Exécuter'; $strGrants = 'Autres privilčges'; $strGzip = '"gzippé"'; @@ -327,6 +328,7 @@ $strSpaceUsage = 'Espace utilis $strSplitWordsWithSpace = 'Séparer les mots par un espace (" ").'; $strSQL = 'SQL'; $strSQLQuery = 'requęte SQL'; +$strSQLResult = 'Resultat de la requęte SQL'; $strStatement = 'Information'; $strStrucCSV = 'Données CSV'; $strStrucData = 'Structure et données'; diff --git a/lang/galician.inc.php3 b/lang/galician.inc.php3 index 18895e19a..3f537882a 100644 --- a/lang/galician.inc.php3 +++ b/lang/galician.inc.php3 @@ -388,4 +388,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/georgian.inc.php3 b/lang/georgian.inc.php3 index 37ebb5bcb..e4d9c5bdd 100644 --- a/lang/georgian.inc.php3 +++ b/lang/georgian.inc.php3 @@ -347,23 +347,6 @@ $strOptions = 'Options'; //to translate $strStructure = 'Structure'; //to translate $strRelationView = 'Relation view'; //to translate $strSQL = 'SQL'; //to translate - -// For indexes -$strAddToIndex = 'Add to index  %s column(s)'; -$strCantRenameIdxToPrimary = 'Can\'t rename index to PRIMARY!'; -$strCardinality = 'Cardinality'; -$strCreateIndex = 'Create an index on %s columns'; -$strCreateIndexTopic = 'Create a new index'; -$strIdxFulltext = 'Fulltext'; -$strIndexHasBeenDropped = 'Index %s has been dropped'; -$strIndexName = 'Index name :'; -$strIndexType = 'Index type :'; -$strModifyIndexTopic = 'Modify an index'; -$strNoIndex = 'No index defined!'; -$strNoIndexPartsDefined = 'No index parts defined!'; -$strPrimaryKeyHasBeenDropped = 'The primary key has been dropped'; -$strPrimaryKeyName = 'The name of the primary key must be... PRIMARY!'; -$strPrimaryKeyWarning = '("PRIMARY" must be the name of and only of a primary key!)'; $strLinkNotFound = 'Link not found'; //to translate $strConfigureTableCoord = 'Please configure the coordinates for table %s'; //to translate $strScaleFactorSmall = 'The scale factor is too small to fit the schema on one page'; //to translate @@ -393,4 +376,23 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate + +// For indexes +$strAddToIndex = 'Add to index  %s column(s)'; +$strCantRenameIdxToPrimary = 'Can\'t rename index to PRIMARY!'; +$strCardinality = 'Cardinality'; +$strCreateIndex = 'Create an index on %s columns'; +$strCreateIndexTopic = 'Create a new index'; +$strIdxFulltext = 'Fulltext'; +$strIndexHasBeenDropped = 'Index %s has been dropped'; +$strIndexName = 'Index name :'; +$strIndexType = 'Index type :'; +$strModifyIndexTopic = 'Modify an index'; +$strNoIndex = 'No index defined!'; +$strNoIndexPartsDefined = 'No index parts defined!'; +$strPrimaryKeyHasBeenDropped = 'The primary key has been dropped'; +$strPrimaryKeyName = 'The name of the primary key must be... PRIMARY!'; +$strPrimaryKeyWarning = '("PRIMARY" must be the name of and only of a primary key!)'; ?> diff --git a/lang/german.inc.php3 b/lang/german.inc.php3 index b178ac94e..89916ec9f 100644 --- a/lang/german.inc.php3 +++ b/lang/german.inc.php3 @@ -85,7 +85,7 @@ $strCreateNewTable = 'Neue Tabelle in Datenbank %s erstellen'; $strCriteria = 'Kriterium'; $strData = 'Daten'; -$strDatabase = 'Datenbank '; +$strDatabase = 'Datenbank'; $strDatabaseHasBeenDropped = 'Datenbank %s wurde gelöscht.'; $strDatabases = 'Datenbanken'; $strDatabasesStats = 'Statistiken über alle Datenbanken'; @@ -140,6 +140,7 @@ $strFullText = 'vollst $strFunction = 'Funktion'; $strGenTime = 'Erstellungszeit'; +$strGenBy = 'Erstellt von'; $strGo = 'OK'; $strGrants = 'Rechte'; $strGzip = '"GZip komprimiert"'; @@ -327,6 +328,7 @@ $strSpaceUsage = 'Speicherplatzverbrauch'; $strSplitWordsWithSpace = 'Die Wörter werden durch Leerzeichen (" ") getrennt.'; $strSQL = 'SQL'; $strSQLQuery = 'SQL-Befehl'; +$strSQLResult = 'SQL-Abfrageergebnis'; $strStatement = 'Angaben'; $strStrucCSV = 'CSV-Daten'; $strStrucData = 'Struktur und Daten'; diff --git a/lang/greek.inc.php3 b/lang/greek.inc.php3 index f3b2c2d36..ff2298998 100644 --- a/lang/greek.inc.php3 +++ b/lang/greek.inc.php3 @@ -385,4 +385,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/hebrew.inc.php3 b/lang/hebrew.inc.php3 index 7d0e68fd0..4a5675e78 100644 --- a/lang/hebrew.inc.php3 +++ b/lang/hebrew.inc.php3 @@ -384,4 +384,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/hungarian.inc.php3 b/lang/hungarian.inc.php3 index ba8b9adf8..4474af92b 100644 --- a/lang/hungarian.inc.php3 +++ b/lang/hungarian.inc.php3 @@ -384,4 +384,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/indonesian.inc.php3 b/lang/indonesian.inc.php3 index ad251c7ff..905e3a935 100644 --- a/lang/indonesian.inc.php3 +++ b/lang/indonesian.inc.php3 @@ -385,4 +385,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/italian.inc.php3 b/lang/italian.inc.php3 index 0c4dc487e..8ff2801db 100644 --- a/lang/italian.inc.php3 +++ b/lang/italian.inc.php3 @@ -390,5 +390,7 @@ $strYes = ' Si '; $strZip = '"compresso con zip"'; // To translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/japanese-euc.inc.php3 b/lang/japanese-euc.inc.php3 index 74eeb3286..95222427b 100644 --- a/lang/japanese-euc.inc.php3 +++ b/lang/japanese-euc.inc.php3 @@ -393,4 +393,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/japanese-sjis.inc.php3 b/lang/japanese-sjis.inc.php3 index bf33d17b7..2d23c1d06 100644 --- a/lang/japanese-sjis.inc.php3 +++ b/lang/japanese-sjis.inc.php3 @@ -393,4 +393,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/korean.inc.php3 b/lang/korean.inc.php3 index ca3e1a93d..1420bd09d 100644 --- a/lang/korean.inc.php3 +++ b/lang/korean.inc.php3 @@ -385,4 +385,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/latvian.inc.php3 b/lang/latvian.inc.php3 index d178a8328..caee27432 100644 --- a/lang/latvian.inc.php3 +++ b/lang/latvian.inc.php3 @@ -388,4 +388,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/lithuanian.inc.php3 b/lang/lithuanian.inc.php3 index c5fa0e39f..0501a105b 100644 --- a/lang/lithuanian.inc.php3 +++ b/lang/lithuanian.inc.php3 @@ -384,4 +384,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/norwegian.inc.php3 b/lang/norwegian.inc.php3 index 78e42de25..780d877d7 100644 --- a/lang/norwegian.inc.php3 +++ b/lang/norwegian.inc.php3 @@ -388,4 +388,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/polish.inc.php3 b/lang/polish.inc.php3 index 1063f47a0..1b179cc7f 100644 --- a/lang/polish.inc.php3 +++ b/lang/polish.inc.php3 @@ -384,4 +384,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/portuguese.inc.php3 b/lang/portuguese.inc.php3 index 99b8ac8b4..1060dce7d 100644 --- a/lang/portuguese.inc.php3 +++ b/lang/portuguese.inc.php3 @@ -391,4 +391,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/romanian.inc.php3 b/lang/romanian.inc.php3 index e85ac92f9..0eee04b28 100644 --- a/lang/romanian.inc.php3 +++ b/lang/romanian.inc.php3 @@ -385,4 +385,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/russian-koi8.inc.php3 b/lang/russian-koi8.inc.php3 index e5173ec81..9ff85b9b8 100644 --- a/lang/russian-koi8.inc.php3 +++ b/lang/russian-koi8.inc.php3 @@ -389,4 +389,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/russian-win1251.inc.php3 b/lang/russian-win1251.inc.php3 index de850bbe8..c97666906 100644 --- a/lang/russian-win1251.inc.php3 +++ b/lang/russian-win1251.inc.php3 @@ -389,4 +389,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/serbian-win1250.inc.php3 b/lang/serbian-win1250.inc.php3 index 946a2e526..6ca2c17e4 100644 --- a/lang/serbian-win1250.inc.php3 +++ b/lang/serbian-win1250.inc.php3 @@ -390,4 +390,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/slovak-iso.inc.php3 b/lang/slovak-iso.inc.php3 index 24b3dec26..2dedb60f5 100644 --- a/lang/slovak-iso.inc.php3 +++ b/lang/slovak-iso.inc.php3 @@ -387,4 +387,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/slovak-win1250.inc.php3 b/lang/slovak-win1250.inc.php3 index cbe04349c..a2dd4439f 100644 --- a/lang/slovak-win1250.inc.php3 +++ b/lang/slovak-win1250.inc.php3 @@ -387,4 +387,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/spanish.inc.php3 b/lang/spanish.inc.php3 index f6026bcb0..921b055ba 100644 --- a/lang/spanish.inc.php3 +++ b/lang/spanish.inc.php3 @@ -382,4 +382,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/swedish.inc.php3 b/lang/swedish.inc.php3 index b06fd6ced..cbf2b3235 100644 --- a/lang/swedish.inc.php3 +++ b/lang/swedish.inc.php3 @@ -384,4 +384,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/thai.inc.php3 b/lang/thai.inc.php3 index 2e9cb79c1..0f6def316 100644 --- a/lang/thai.inc.php3 +++ b/lang/thai.inc.php3 @@ -391,4 +391,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/turkish.inc.php3 b/lang/turkish.inc.php3 index abb02f0d4..eeaedcbc5 100644 --- a/lang/turkish.inc.php3 +++ b/lang/turkish.inc.php3 @@ -384,4 +384,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/lang/ukrainian-win1251.inc.php3 b/lang/ukrainian-win1251.inc.php3 index 56c8efab5..fbe5bf052 100644 --- a/lang/ukrainian-win1251.inc.php3 +++ b/lang/ukrainian-win1251.inc.php3 @@ -384,4 +384,6 @@ $strExplain = 'Explain SQL Code'; //to translate $strPhp = 'Create PHP Code'; //to translate $strNoPhp = 'without PHP Code'; //to translate $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; //to translate +$strGenBy = 'Generated by'; //to translate +$strSQLResult = 'SQL result'; //to translate ?> diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3 index cc2cc8603..1af9abd23 100644 --- a/libraries/display_tbl.lib.php3 +++ b/libraries/display_tbl.lib.php3 @@ -64,14 +64,26 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ $do_display['ins_row'] = (string) $the_disp_mode[6]; $do_display['bkm_form'] = (string) $the_disp_mode[7]; $do_display['text_btn'] = (string) $the_disp_mode[8]; + $do_display['pview_lnk'] = (string) $the_disp_mode[9]; // 2. Display mode is not "false for all elements" -> updates the // display mode - if ($the_disp_mode != 'nnnn00000') { + if ($the_disp_mode != 'nnnn000000') { + // 2.0 Print view -> set all elements to FALSE! + if (isset($GLOBALS['printview']) && $GLOBALS['printview'] == '1') { + $do_display['edit_lnk'] = 'nn'; // no edit link + $do_display['del_lnk'] = 'nn'; // no delete link + $do_display['sort_lnk'] = (string) '0'; + $do_display['nav_bar'] = (string) '0'; + $do_display['ins_row'] = (string) '0'; + $do_display['bkm_form'] = (string) '0'; + $do_display['text_btn'] = (string) '0'; + $do_display['pview_lnk'] = (string) '0'; + } // 2.1 Statement is a "SELECT COUNT", a // "CHECK/ANALYZE/REPAIR/OPTIMIZE", an "EXPLAIN" one or // contains a "PROC ANALYSE" part - if ($GLOBALS['is_count'] || $GLOBALS['is_analyse'] || $GLOBALS['is_maint'] || $GLOBALS['is_explain']) { + else if ($GLOBALS['is_count'] || $GLOBALS['is_analyse'] || $GLOBALS['is_maint'] || $GLOBALS['is_explain']) { $do_display['edit_lnk'] = 'nn'; // no edit link $do_display['del_lnk'] = 'nn'; // no delete link $do_display['sort_lnk'] = (string) '0'; @@ -79,6 +91,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ $do_display['ins_row'] = (string) '0'; $do_display['bkm_form'] = (string) '1'; $do_display['text_btn'] = (string) '0'; + $do_display['pview_lnk'] = (string) '1'; } // 2.2 Statement is a "SHOW..." else if ($GLOBALS['is_show']) { @@ -99,6 +112,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ $do_display['ins_row'] = (string) '0'; $do_display['bkm_form'] = (string) '1'; $do_display['text_btn'] = (string) '0'; + $do_display['pview_lnk'] = (string) '1'; } // 2.3 Other statements (ie "SELECT" ones) -> updates // $do_display['edit_lnk'], $do_display['del_lnk'] and @@ -130,6 +144,8 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ break; } } // end if (2.3.2) + // 2.3.3 Always display print view link + $do_display['pview_lnk'] = (string) '1'; $prev_table = $fields_meta[$i]->table; } // end for } // end if..elseif...else (2.1 -> 2.3) @@ -765,17 +781,23 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ echo '' . "\n"; } // end if - $bgcolor = ($row_no % 2) ? $GLOBALS['cfg']['BgcolorOne'] : $GLOBALS['cfg']['BgcolorTwo']; + if (isset($GLOBALS['printview']) && ($GLOBALS['printview'] == '1')) { + $bgcolor = '#ffffff'; + } else { + $bgcolor = ($row_no % 2) ? $GLOBALS['cfg']['BgcolorOne'] : $GLOBALS['cfg']['BgcolorTwo']; + } if ($disp_direction == 'horizontal') { // loic1: pointer code part $on_mouse = ''; - if ($GLOBALS['cfg']['BrowsePointerColor'] != '') { - $on_mouse = ' onmouseover="setPointer(this, ' . $row_no . ', \'over\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\')"' - . ' onmouseout="setPointer(this, ' . $row_no . ', \'out\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\')"'; - } - if ($GLOBALS['cfg']['BrowseMarkerColor'] != '') { - $on_mouse .= ' onmousedown="setPointer(this, ' . $row_no . ', \'click\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\')"'; + if (!isset($GLOBALS['printview']) || ($GLOBALS['printview'] != '1')) { + if ($GLOBALS['cfg']['BrowsePointerColor'] != '') { + $on_mouse = ' onmouseover="setPointer(this, ' . $row_no . ', \'over\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\')"' + . ' onmouseout="setPointer(this, ' . $row_no . ', \'out\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\')"'; + } + if ($GLOBALS['cfg']['BrowseMarkerColor'] != '') { + $on_mouse .= ' onmousedown="setPointer(this, ' . $row_no . ', \'click\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\')"'; + } } ?> > @@ -1322,7 +1344,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ // 2. ----- Displays the top of the page ----- // 2.1 Displays a messages with position informations - if ($is_display['nav_bar'] == '1' && isset($pos_next)) { + if ($is_display['nav_bar'] == '1' && isset($pos_next) && (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1')) { if (isset($unlim_num_rows) && $unlim_num_rows != $total) { $selectstring = ', ' . $unlim_num_rows . ' ' . $GLOBALS['strSelectNumRows']; } else { @@ -1332,7 +1354,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ ? $total - 1 : $pos_next - 1; PMA_showMessage($GLOBALS['strShowingRecords'] . " $pos - $last_shown_rec ($total " . $GLOBALS['strTotal'] . $selectstring . ')'); - } else { + } else if (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { PMA_showMessage($GLOBALS['strSQLQuery']); } @@ -1343,7 +1365,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ if ($is_display['nav_bar'] == '1') { PMA_displayTableNavigation($pos_next, $pos_prev, $encoded_sql_query); echo "\n"; - } else { + } else if (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { echo "\n" . '

' . "\n"; } @@ -1398,7 +1420,6 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){ unset($vertical_display); ?> -
' . "\n"; PMA_displayTableNavigation($pos_next, $pos_prev, $encoded_sql_query); - } else { - echo "\n" . '
' . "\n"; + } else if (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { + echo "\n" . '

' . "\n"; } } // end of the 'PMA_displayTable()' function diff --git a/sql.php3 b/sql.php3 index a2d963869..4ad673cb0 100755 --- a/sql.php3 +++ b/sql.php3 @@ -388,9 +388,13 @@ else { if (isset($show_query)) { unset($show_query); } - $js_to_run = 'functions.js'; - include('./header.inc.php3'); - include('./libraries/bookmark.lib.php3'); + if (isset($printview) && $printview == '1') { + include('./header_printview.inc.php3'); + } else { + $js_to_run = 'functions.js'; + include('./header.inc.php3'); + include('./libraries/bookmark.lib.php3'); + } // Gets the list of fields properties while ($field = mysql_fetch_field($result)) { @@ -403,40 +407,64 @@ else { if (empty($disp_mode)) { // see the "PMA_setDisplayMode()" function in // libraries/display_tbl.lib.php3 - $disp_mode = 'urdr11110'; + $disp_mode = 'urdr111101'; } PMA_displayTable($result, $disp_mode); mysql_free_result($result); - // Displays "Insert a new row" link if required - if ($disp_mode[6] == '1') { - $lnk_goto = 'sql.php3' - . '?lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db) - . '&table=' . urlencode($table) - . '&pos=' . $pos - . '&session_max_rows=' . $session_max_rows - . '&disp_direction=' . $disp_direction - . '&repeat_cells=' . $repeat_cells - . '&sql_query=' . urlencode($sql_query); - $url_query = 'lang=' . $lang - . '&server=' . $server - . '&db=' . urlencode($db) - . '&table=' . urlencode($table) - . '&pos=' . $pos - . '&session_max_rows=' . $session_max_rows - . '&disp_direction=' . $disp_direction - . '&repeat_cells=' . $repeat_cells - . '&sql_query=' . urlencode($sql_query) - . '&goto=' . urlencode($lnk_goto); - - echo "\n\n"; - echo '' . "\n"; + if ($disp_mode[6] == '1' || $disp_mode[9] =='1') { echo '

' . "\n"; - echo ' ' . $strInsertNewRow . '' . "\n"; + + // Displays "Insert a new row" link if required + if ($disp_mode[6] == '1') { + $lnk_goto = 'sql.php3' + . '?lang=' . $lang + . '&server=' . $server + . '&db=' . urlencode($db) + . '&table=' . urlencode($table) + . '&pos=' . $pos + . '&session_max_rows=' . $session_max_rows + . '&disp_direction=' . $disp_direction + . '&repeat_cells=' . $repeat_cells + . '&sql_query=' . urlencode($sql_query); + $url_query = '?lang=' . $lang + . '&server=' . $server + . '&db=' . urlencode($db) + . '&table=' . urlencode($table) + . '&pos=' . $pos + . '&session_max_rows=' . $session_max_rows + . '&disp_direction=' . $disp_direction + . '&repeat_cells=' . $repeat_cells + . '&sql_query=' . urlencode($sql_query) + . '&goto=' . urlencode($lnk_goto); + + echo ' ' . "\n" + . ' ' . $strInsertNewRow . ''; + if ($disp_mode[9] == '1') { + echo '
'; + } + echo "\n"; + } // end insert new row + + // Displays "print view" link if required + if ($disp_mode[9] == '1') { + $url_query = '?lang=' . $lang + . '&server=' . $server + . '&db=' . urlencode($db) + . '&table=' . urlencode($table) + . '&pos=' . $pos + . '&session_max_rows=' . $session_max_rows + . '&disp_direction=' . $disp_direction + . '&repeat_cells=' . $repeat_cells + . '&printview=1' + . (($dontlimitchars == '1') ? '&dontlimitchars=1' : '') + . '&sql_query=' . urlencode($sql_query); + echo ' ' . "\n" + . ' ' . $strPrintView . '' . "\n"; + } + echo '

' . "\n"; - } // end insert new row + } // Bookmark Support if required if ($disp_mode[7] == '1'