diff --git a/ChangeLog b/ChangeLog index f53825efe..e8d05194b 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,15 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-10-20 Michal Cihar + * libraries/export/sql.php3: Fix undefined variable for MySQL < 3.23.20 + (bug #828370). + * libraries/export/sql.php3. libraries/export/latex.php3, + libraries/display_export.lib.php3, export.php3, lang/*, + libraries/common.lib.php3, libraries/config_import.lib.php3: Allow to + supress dates in SQL dump separately. + * lang/add_message.sh: Fail if no message specified. + 2003-10-21 Marc Delisle * pdf_pages.php3: Patch 825672: show fields in Edit PDF scratchboard, thanks to Chris Walsh (chriswalshaz) diff --git a/config.inc.php3 b/config.inc.php3 index 17f4bcca9..202e50b1b 100755 --- a/config.inc.php3 +++ b/config.inc.php3 @@ -329,6 +329,7 @@ $cfg['Export']['sql_drop_database'] = FALSE; $cfg['Export']['sql_drop_table'] = FALSE; $cfg['Export']['sql_auto_increment'] = TRUE; $cfg['Export']['sql_backquotes'] = TRUE; +$cfg['Export']['sql_dates'] = FALSE; $cfg['Export']['sql_relation'] = FALSE; $cfg['Export']['sql_columns'] = FALSE; $cfg['Export']['sql_extended'] = FALSE; diff --git a/export.php3 b/export.php3 index 5924aa5d3..8fb436a63 100755 --- a/export.php3 +++ b/export.php3 @@ -344,6 +344,9 @@ if ($do_mime) { require('./libraries/transformations.lib.php3'); } +// Include dates in export? +$do_dates = isset($GLOBALS[$what . '_dates']); + /** * Builds the dump */ @@ -373,7 +376,7 @@ if ($export_type == 'server') { while ($i < $num_tables) { $table = PMA_mysql_tablename($tables, $i); $local_query = 'SELECT * FROM ' . PMA_backquote($current_db) . '.' . PMA_backquote($table); - if (isset($GLOBALS[$what . '_structure'])) PMA_exportStructure($current_db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime); + if (isset($GLOBALS[$what . '_structure'])) PMA_exportStructure($current_db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates); if (isset($GLOBALS[$what . '_data'])) PMA_exportData($current_db, $table, $crlf, $err_url, $local_query); $i++; } @@ -393,7 +396,7 @@ if ($export_type == 'server') { if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $table . '|')) || !isset($tmp_select)) { - if (isset($GLOBALS[$what . '_structure'])) PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime); + if (isset($GLOBALS[$what . '_structure'])) PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates); if (isset($GLOBALS[$what . '_data'])) PMA_exportData($db, $table, $crlf, $err_url, $local_query); } $i++; @@ -418,7 +421,7 @@ if ($export_type == 'server') { $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $add_query; } - if (isset($GLOBALS[$what . '_structure'])) PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime); + if (isset($GLOBALS[$what . '_structure'])) PMA_exportStructure($db, $table, $crlf, $err_url, $do_relation, $do_comments, $do_mime, $do_dates); if (isset($GLOBALS[$what . '_data'])) PMA_exportData($db, $table, $crlf, $err_url, $local_query); PMA_exportDBFooter($db); } diff --git a/lang/afrikaans-iso-8859-1.inc.php3 b/lang/afrikaans-iso-8859-1.inc.php3 index 7547e76e8..7d73060f3 100644 --- a/lang/afrikaans-iso-8859-1.inc.php3 +++ b/lang/afrikaans-iso-8859-1.inc.php3 @@ -725,4 +725,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/afrikaans-utf-8.inc.php3 b/lang/afrikaans-utf-8.inc.php3 index 2e9fb2f06..7d5793f9e 100644 --- a/lang/afrikaans-utf-8.inc.php3 +++ b/lang/afrikaans-utf-8.inc.php3 @@ -726,4 +726,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/albanian-iso-8859-1.inc.php3 b/lang/albanian-iso-8859-1.inc.php3 index 97c0ece84..515d6a6f7 100644 --- a/lang/albanian-iso-8859-1.inc.php3 +++ b/lang/albanian-iso-8859-1.inc.php3 @@ -717,4 +717,5 @@ $strZip = '"kompresuar me zip"'; $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php3 b/lang/albanian-utf-8.inc.php3 index d080054b8..53eb34c9b 100644 --- a/lang/albanian-utf-8.inc.php3 +++ b/lang/albanian-utf-8.inc.php3 @@ -717,4 +717,5 @@ $strZip = '"kompresuar me zip"'; $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php3 b/lang/arabic-utf-8.inc.php3 index bb091c376..64804d81f 100644 --- a/lang/arabic-utf-8.inc.php3 +++ b/lang/arabic-utf-8.inc.php3 @@ -741,4 +741,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/arabic-windows-1256.inc.php3 b/lang/arabic-windows-1256.inc.php3 index f0d5ae0c9..e42b2cf96 100644 --- a/lang/arabic-windows-1256.inc.php3 +++ b/lang/arabic-windows-1256.inc.php3 @@ -740,4 +740,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/azerbaijani-iso-8859-9.inc.php3 b/lang/azerbaijani-iso-8859-9.inc.php3 index 8fb889571..a3482d878 100644 --- a/lang/azerbaijani-iso-8859-9.inc.php3 +++ b/lang/azerbaijani-iso-8859-9.inc.php3 @@ -714,4 +714,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php3 b/lang/azerbaijani-utf-8.inc.php3 index 36682b8dd..0670b4848 100644 --- a/lang/azerbaijani-utf-8.inc.php3 +++ b/lang/azerbaijani-utf-8.inc.php3 @@ -715,4 +715,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php3 b/lang/bosnian-utf-8.inc.php3 index 7cedf6ac5..bfb5d6836 100644 --- a/lang/bosnian-utf-8.inc.php3 +++ b/lang/bosnian-utf-8.inc.php3 @@ -700,4 +700,5 @@ $strYes = 'Da'; $strZeroRemovesTheLimit = 'Napomena: Postavljanje ovih opcija na 0 (nulu) uklanja limite.'; $strZip = '"zipovano"'; +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/bosnian-windows-1250.inc.php3 b/lang/bosnian-windows-1250.inc.php3 index 8abdb7696..97df7254c 100644 --- a/lang/bosnian-windows-1250.inc.php3 +++ b/lang/bosnian-windows-1250.inc.php3 @@ -699,4 +699,5 @@ $strYes = 'Da'; $strZeroRemovesTheLimit = 'Napomena: Postavljanje ovih opcija na 0 (nulu) uklanja limite.'; $strZip = '"zipovano"'; +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/brazilian_portuguese-iso-8859-1.inc.php3 b/lang/brazilian_portuguese-iso-8859-1.inc.php3 index b28ce2d5a..ad2df5154 100644 --- a/lang/brazilian_portuguese-iso-8859-1.inc.php3 +++ b/lang/brazilian_portuguese-iso-8859-1.inc.php3 @@ -739,4 +739,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php3 b/lang/brazilian_portuguese-utf-8.inc.php3 index e1df88f39..a00005752 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php3 +++ b/lang/brazilian_portuguese-utf-8.inc.php3 @@ -740,4 +740,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/bulgarian-koi8-r.inc.php3 b/lang/bulgarian-koi8-r.inc.php3 index 2304d17bc..4d608b788 100644 --- a/lang/bulgarian-koi8-r.inc.php3 +++ b/lang/bulgarian-koi8-r.inc.php3 @@ -720,4 +720,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php3 b/lang/bulgarian-utf-8.inc.php3 index 6201ba03f..c72fa48f6 100644 --- a/lang/bulgarian-utf-8.inc.php3 +++ b/lang/bulgarian-utf-8.inc.php3 @@ -721,4 +721,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/bulgarian-windows-1251.inc.php3 b/lang/bulgarian-windows-1251.inc.php3 index 1422cc141..d466d389d 100644 --- a/lang/bulgarian-windows-1251.inc.php3 +++ b/lang/bulgarian-windows-1251.inc.php3 @@ -720,4 +720,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/catalan-iso-8859-1.inc.php3 b/lang/catalan-iso-8859-1.inc.php3 index bc2ec210d..ed6a86c89 100644 --- a/lang/catalan-iso-8859-1.inc.php3 +++ b/lang/catalan-iso-8859-1.inc.php3 @@ -712,4 +712,5 @@ $strZeroRemovesTheLimit = 'Nota: Establint aquestes opcions a 0 (zero) treu el l $strZip = '"comprimit amb zip"'; // To translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php3 b/lang/catalan-utf-8.inc.php3 index a42599044..7eb6e59a5 100644 --- a/lang/catalan-utf-8.inc.php3 +++ b/lang/catalan-utf-8.inc.php3 @@ -713,4 +713,5 @@ $strZeroRemovesTheLimit = 'Nota: Establint aquestes opcions a 0 (zero) treu el l $strZip = '"comprimit amb zip"'; // To translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/chinese_big5-utf-8.inc.php3 b/lang/chinese_big5-utf-8.inc.php3 index 7571d2f77..2255b6229 100644 --- a/lang/chinese_big5-utf-8.inc.php3 +++ b/lang/chinese_big5-utf-8.inc.php3 @@ -723,4 +723,5 @@ $strBookmarkAllUsers = '所有用者可讀取此書籤'; $strConstraintsForDumped = '備份資料表限制'; $strConstraintsForTable = '資料表限制'; $strBookmarkOptions = '書籤選項'; +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3 index c0657457e..91945d688 100644 --- a/lang/chinese_big5.inc.php3 +++ b/lang/chinese_big5.inc.php3 @@ -722,4 +722,5 @@ $strBookmarkAllUsers = ' $strConstraintsForDumped = 'ƥƪ'; $strConstraintsForTable = 'ƪ'; $strBookmarkOptions = 'ҿﶵ'; +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/chinese_gb-utf-8.inc.php3 b/lang/chinese_gb-utf-8.inc.php3 index f9ee32097..5cc17ea69 100644 --- a/lang/chinese_gb-utf-8.inc.php3 +++ b/lang/chinese_gb-utf-8.inc.php3 @@ -717,4 +717,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3 index bd620e053..9a44f62ec 100644 --- a/lang/chinese_gb.inc.php3 +++ b/lang/chinese_gb.inc.php3 @@ -716,4 +716,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/croatian-iso-8859-2.inc.php3 b/lang/croatian-iso-8859-2.inc.php3 index 5836887c8..df1b829ab 100644 --- a/lang/croatian-iso-8859-2.inc.php3 +++ b/lang/croatian-iso-8859-2.inc.php3 @@ -738,4 +738,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php3 b/lang/croatian-utf-8.inc.php3 index b4c6bc1e8..422124f2b 100644 --- a/lang/croatian-utf-8.inc.php3 +++ b/lang/croatian-utf-8.inc.php3 @@ -739,4 +739,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/croatian-windows-1250.inc.php3 b/lang/croatian-windows-1250.inc.php3 index f8461a668..53029f1fe 100644 --- a/lang/croatian-windows-1250.inc.php3 +++ b/lang/croatian-windows-1250.inc.php3 @@ -738,4 +738,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/czech-iso-8859-2.inc.php3 b/lang/czech-iso-8859-2.inc.php3 index 624ceab8d..89839fc07 100644 --- a/lang/czech-iso-8859-2.inc.php3 +++ b/lang/czech-iso-8859-2.inc.php3 @@ -148,6 +148,7 @@ $strCreateNewDatabase = 'Vytvo $strCreateNewTable = 'Vytvoit novou tabulku v databzi %s'; $strCreatePage = 'Vytvoit novou strnku'; $strCreatePdfFeat = 'Vytven PDF'; +$strCreationDates = 'Datum vytvoen, posledn zmny a kontroly'; $strCriteria = 'Podmnka'; $strCroatian = 'Chorvatsky'; $strCyrillic = 'Cyrilika'; diff --git a/lang/czech-utf-8.inc.php3 b/lang/czech-utf-8.inc.php3 index 363f160f2..f7ff36750 100644 --- a/lang/czech-utf-8.inc.php3 +++ b/lang/czech-utf-8.inc.php3 @@ -149,6 +149,7 @@ $strCreateNewDatabase = 'Vytvořit novou databázi'; $strCreateNewTable = 'Vytvořit novou tabulku v databázi %s'; $strCreatePage = 'Vytvořit novou stránku'; $strCreatePdfFeat = 'Vytváření PDF'; +$strCreationDates = 'Datum vytvoření, poslední změny a kontroly'; $strCriteria = 'Podmínka'; $strCroatian = 'Chorvatsky'; $strCyrillic = 'Cyrilika'; diff --git a/lang/czech-windows-1250.inc.php3 b/lang/czech-windows-1250.inc.php3 index 68ea81e04..e362dab88 100644 --- a/lang/czech-windows-1250.inc.php3 +++ b/lang/czech-windows-1250.inc.php3 @@ -148,6 +148,7 @@ $strCreateNewDatabase = 'Vytvo $strCreateNewTable = 'Vytvoit novou tabulku v databzi %s'; $strCreatePage = 'Vytvoit novou strnku'; $strCreatePdfFeat = 'Vytven PDF'; +$strCreationDates = 'Datum vytvoen, posledn zmny a kontroly'; $strCriteria = 'Podmnka'; $strCroatian = 'Chorvatsky'; $strCyrillic = 'Cyrilika'; diff --git a/lang/danish-iso-8859-1.inc.php3 b/lang/danish-iso-8859-1.inc.php3 index 431155bfb..dc3869df4 100644 --- a/lang/danish-iso-8859-1.inc.php3 +++ b/lang/danish-iso-8859-1.inc.php3 @@ -733,4 +733,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php3 b/lang/danish-utf-8.inc.php3 index 4497ca974..b3f5cad7d 100644 --- a/lang/danish-utf-8.inc.php3 +++ b/lang/danish-utf-8.inc.php3 @@ -734,4 +734,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/dutch-iso-8859-1.inc.php3 b/lang/dutch-iso-8859-1.inc.php3 index 0ac22cf2b..00547d7e8 100644 --- a/lang/dutch-iso-8859-1.inc.php3 +++ b/lang/dutch-iso-8859-1.inc.php3 @@ -718,4 +718,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php3 b/lang/dutch-utf-8.inc.php3 index f116b4068..a9efe85a7 100644 --- a/lang/dutch-utf-8.inc.php3 +++ b/lang/dutch-utf-8.inc.php3 @@ -719,4 +719,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/english-iso-8859-1.inc.php3 b/lang/english-iso-8859-1.inc.php3 index a2fdb8a77..83b9cf15f 100644 --- a/lang/english-iso-8859-1.inc.php3 +++ b/lang/english-iso-8859-1.inc.php3 @@ -142,6 +142,7 @@ $strCreateNewDatabase = 'Create new database'; $strCreateNewTable = 'Create new table on database %s'; $strCreatePage = 'Create a new Page'; $strCreatePdfFeat = 'Creation of PDFs'; +$strCreationDates = 'Creation/Update/Check dates'; $strCriteria = 'Criteria'; $strCroatian = 'Croatian'; $strCyrillic = 'Cyrillic'; @@ -709,4 +710,5 @@ $strYes = 'Yes'; $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; $strZip = '"zipped"'; + ?> diff --git a/lang/english-utf-8.inc.php3 b/lang/english-utf-8.inc.php3 index 68c732095..2ef5959f7 100644 --- a/lang/english-utf-8.inc.php3 +++ b/lang/english-utf-8.inc.php3 @@ -143,6 +143,7 @@ $strCreateNewDatabase = 'Create new database'; $strCreateNewTable = 'Create new table on database %s'; $strCreatePage = 'Create a new Page'; $strCreatePdfFeat = 'Creation of PDFs'; +$strCreationDates = 'Creation/Update/Check dates'; $strCriteria = 'Criteria'; $strCroatian = 'Croatian'; $strCyrillic = 'Cyrillic'; @@ -710,4 +711,5 @@ $strYes = 'Yes'; $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; $strZip = '"zipped"'; + ?> diff --git a/lang/estonian-iso-8859-1.inc.php3 b/lang/estonian-iso-8859-1.inc.php3 index 84cd2ac17..1a624945d 100644 --- a/lang/estonian-iso-8859-1.inc.php3 +++ b/lang/estonian-iso-8859-1.inc.php3 @@ -711,4 +711,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/estonian-utf-8.inc.php3 b/lang/estonian-utf-8.inc.php3 index c054fff7c..fddee3255 100644 --- a/lang/estonian-utf-8.inc.php3 +++ b/lang/estonian-utf-8.inc.php3 @@ -712,4 +712,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/finnish-iso-8859-1.inc.php3 b/lang/finnish-iso-8859-1.inc.php3 index 8ec13407f..b4b058d29 100644 --- a/lang/finnish-iso-8859-1.inc.php3 +++ b/lang/finnish-iso-8859-1.inc.php3 @@ -735,4 +735,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php3 b/lang/finnish-utf-8.inc.php3 index e4fbd2700..d7b794eba 100644 --- a/lang/finnish-utf-8.inc.php3 +++ b/lang/finnish-utf-8.inc.php3 @@ -736,4 +736,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/french-iso-8859-1.inc.php3 b/lang/french-iso-8859-1.inc.php3 index 7ee11500c..627a4ea5f 100644 --- a/lang/french-iso-8859-1.inc.php3 +++ b/lang/french-iso-8859-1.inc.php3 @@ -712,4 +712,5 @@ $strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enl $strZip = '"zipp"'; // To translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/french-utf-8.inc.php3 b/lang/french-utf-8.inc.php3 index 6688eac67..cc363fc20 100644 --- a/lang/french-utf-8.inc.php3 +++ b/lang/french-utf-8.inc.php3 @@ -713,4 +713,5 @@ $strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlève la limite.'; $strZip = '"zippé"'; // To translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/galician-iso-8859-1.inc.php3 b/lang/galician-iso-8859-1.inc.php3 index 70574cca6..657f3c4fb 100644 --- a/lang/galician-iso-8859-1.inc.php3 +++ b/lang/galician-iso-8859-1.inc.php3 @@ -717,4 +717,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php3 b/lang/galician-utf-8.inc.php3 index 877b968aa..4ee535812 100644 --- a/lang/galician-utf-8.inc.php3 +++ b/lang/galician-utf-8.inc.php3 @@ -718,4 +718,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php3 b/lang/georgian-utf-8.inc.php3 index 99f162e09..092b25610 100644 --- a/lang/georgian-utf-8.inc.php3 +++ b/lang/georgian-utf-8.inc.php3 @@ -739,4 +739,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/german-iso-8859-1.inc.php3 b/lang/german-iso-8859-1.inc.php3 index dc3020b07..f8249f707 100644 --- a/lang/german-iso-8859-1.inc.php3 +++ b/lang/german-iso-8859-1.inc.php3 @@ -719,4 +719,5 @@ $strBookmarkAllUsers = 'Diese gespeicherte SQL-Abfrage f $strConstraintsForDumped = 'Constraints der exportierten Tabellen'; $strConstraintsForTable = 'Constraints der Tabelle'; $strBookmarkOptions = 'Optionen zur Speicherung der SQL-Abfrage'; +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/german-utf-8.inc.php3 b/lang/german-utf-8.inc.php3 index 3648b1242..9b44d7f4a 100644 --- a/lang/german-utf-8.inc.php3 +++ b/lang/german-utf-8.inc.php3 @@ -720,4 +720,5 @@ $strBookmarkAllUsers = 'Diese gespeicherte SQL-Abfrage für jeden Benutzer verf $strConstraintsForDumped = 'Constraints der exportierten Tabellen'; $strConstraintsForTable = 'Constraints der Tabelle'; $strBookmarkOptions = 'Optionen zur Speicherung der SQL-Abfrage'; +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/greek-iso-8859-7.inc.php3 b/lang/greek-iso-8859-7.inc.php3 index e0afa2946..0eddfc13b 100644 --- a/lang/greek-iso-8859-7.inc.php3 +++ b/lang/greek-iso-8859-7.inc.php3 @@ -719,4 +719,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php3 b/lang/greek-utf-8.inc.php3 index 8669a7db0..e343de379 100644 --- a/lang/greek-utf-8.inc.php3 +++ b/lang/greek-utf-8.inc.php3 @@ -720,4 +720,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/hebrew-iso-8859-8-i.inc.php3 b/lang/hebrew-iso-8859-8-i.inc.php3 index 4ada5284f..20ee29bfd 100644 --- a/lang/hebrew-iso-8859-8-i.inc.php3 +++ b/lang/hebrew-iso-8859-8-i.inc.php3 @@ -735,4 +735,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php3 b/lang/hindi-utf-8.inc.php3 index 7ee34d44e..5347763ce 100644 --- a/lang/hindi-utf-8.inc.php3 +++ b/lang/hindi-utf-8.inc.php3 @@ -749,4 +749,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/hungarian-iso-8859-2.inc.php3 b/lang/hungarian-iso-8859-2.inc.php3 index 6250852ca..284b52553 100644 --- a/lang/hungarian-iso-8859-2.inc.php3 +++ b/lang/hungarian-iso-8859-2.inc.php3 @@ -723,4 +723,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php3 b/lang/hungarian-utf-8.inc.php3 index a17554b39..9e1084221 100644 --- a/lang/hungarian-utf-8.inc.php3 +++ b/lang/hungarian-utf-8.inc.php3 @@ -724,4 +724,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/indonesian-iso-8859-1.inc.php3 b/lang/indonesian-iso-8859-1.inc.php3 index 3dca832e8..55852bbe5 100644 --- a/lang/indonesian-iso-8859-1.inc.php3 +++ b/lang/indonesian-iso-8859-1.inc.php3 @@ -711,4 +711,5 @@ $strZeroRemovesTheLimit = 'Perhatian: Merubah pilihan ini ke posisi 0 (zero) aka $strZip = '"Dikompress dengan Zip"'; // To translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php3 b/lang/indonesian-utf-8.inc.php3 index 70991ed1f..fdf845e74 100644 --- a/lang/indonesian-utf-8.inc.php3 +++ b/lang/indonesian-utf-8.inc.php3 @@ -712,4 +712,5 @@ $strZeroRemovesTheLimit = 'Perhatian: Merubah pilihan ini ke posisi 0 (zero) aka $strZip = '"Dikompress dengan Zip"'; // To translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/italian-iso-8859-1.inc.php3 b/lang/italian-iso-8859-1.inc.php3 index 2ede76fee..34792b35f 100644 --- a/lang/italian-iso-8859-1.inc.php3 +++ b/lang/italian-iso-8859-1.inc.php3 @@ -716,4 +716,5 @@ $strZeroRemovesTheLimit = 'N.B.: 0 (zero) significa nessun limite.'; $strZip = '"compresso con zip"'; // To translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php3 b/lang/italian-utf-8.inc.php3 index f5c4afe20..21af8cac7 100644 --- a/lang/italian-utf-8.inc.php3 +++ b/lang/italian-utf-8.inc.php3 @@ -717,4 +717,5 @@ $strZeroRemovesTheLimit = 'N.B.: 0 (zero) significa nessun limite.'; $strZip = '"compresso con zip"'; // To translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/japanese-euc.inc.php3 b/lang/japanese-euc.inc.php3 index a5eab15e8..f67f9da45 100644 --- a/lang/japanese-euc.inc.php3 +++ b/lang/japanese-euc.inc.php3 @@ -723,4 +723,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/japanese-sjis.inc.php3 b/lang/japanese-sjis.inc.php3 index 0eb2e421e..d3982d976 100644 --- a/lang/japanese-sjis.inc.php3 +++ b/lang/japanese-sjis.inc.php3 @@ -723,4 +723,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php3 b/lang/japanese-utf-8.inc.php3 index 8b127df08..5ff647ef2 100644 --- a/lang/japanese-utf-8.inc.php3 +++ b/lang/japanese-utf-8.inc.php3 @@ -724,4 +724,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/korean-ks_c_5601-1987.inc.php3 b/lang/korean-ks_c_5601-1987.inc.php3 index ce12ae929..2ce9903dd 100644 --- a/lang/korean-ks_c_5601-1987.inc.php3 +++ b/lang/korean-ks_c_5601-1987.inc.php3 @@ -733,4 +733,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php3 b/lang/latvian-utf-8.inc.php3 index f86ec7b63..c631c09fc 100644 --- a/lang/latvian-utf-8.inc.php3 +++ b/lang/latvian-utf-8.inc.php3 @@ -717,4 +717,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/latvian-windows-1257.inc.php3 b/lang/latvian-windows-1257.inc.php3 index ef5a9b1c4..b9d758a9c 100644 --- a/lang/latvian-windows-1257.inc.php3 +++ b/lang/latvian-windows-1257.inc.php3 @@ -716,4 +716,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php3 b/lang/lithuanian-utf-8.inc.php3 index e50cc41d2..ab3cc7b0c 100644 --- a/lang/lithuanian-utf-8.inc.php3 +++ b/lang/lithuanian-utf-8.inc.php3 @@ -713,4 +713,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/lithuanian-windows-1257.inc.php3 b/lang/lithuanian-windows-1257.inc.php3 index 9e02f6544..18be7219a 100644 --- a/lang/lithuanian-windows-1257.inc.php3 +++ b/lang/lithuanian-windows-1257.inc.php3 @@ -712,4 +712,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/malay-iso-8859-1.inc.php3 b/lang/malay-iso-8859-1.inc.php3 index decee4002..01a212d01 100644 --- a/lang/malay-iso-8859-1.inc.php3 +++ b/lang/malay-iso-8859-1.inc.php3 @@ -736,4 +736,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php3 b/lang/malay-utf-8.inc.php3 index d345968d5..80cf8e1d0 100644 --- a/lang/malay-utf-8.inc.php3 +++ b/lang/malay-utf-8.inc.php3 @@ -737,4 +737,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/norwegian-iso-8859-1.inc.php3 b/lang/norwegian-iso-8859-1.inc.php3 index 056eb37c5..a283269f3 100644 --- a/lang/norwegian-iso-8859-1.inc.php3 +++ b/lang/norwegian-iso-8859-1.inc.php3 @@ -718,4 +718,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php3 b/lang/norwegian-utf-8.inc.php3 index 5e1707df9..e14e0995a 100644 --- a/lang/norwegian-utf-8.inc.php3 +++ b/lang/norwegian-utf-8.inc.php3 @@ -717,4 +717,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php3 b/lang/persian-utf-8.inc.php3 index 45ce9d8cb..bbebed8b1 100644 --- a/lang/persian-utf-8.inc.php3 +++ b/lang/persian-utf-8.inc.php3 @@ -741,4 +741,5 @@ $strWritingRelationNotPossible = 'Writing of relation not possible'; //to transl $strXML = 'XML'; //to translate $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/persian-windows-1256.inc.php3 b/lang/persian-windows-1256.inc.php3 index cb7315952..5294ac029 100644 --- a/lang/persian-windows-1256.inc.php3 +++ b/lang/persian-windows-1256.inc.php3 @@ -740,4 +740,5 @@ $strWritingRelationNotPossible = 'Writing of relation not possible'; //to transl $strXML = 'XML'; //to translate $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/polish-iso-8859-2.inc.php3 b/lang/polish-iso-8859-2.inc.php3 index da04df25c..5264c087b 100644 --- a/lang/polish-iso-8859-2.inc.php3 +++ b/lang/polish-iso-8859-2.inc.php3 @@ -711,4 +711,5 @@ $strZeroRemovesTheLimit = 'Uwaga: Ustawienie tych opcji na 0 (zero) usuwa ograni $strZip = '".zip"'; // To translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php3 b/lang/polish-utf-8.inc.php3 index e0db99cfe..17e376a3d 100644 --- a/lang/polish-utf-8.inc.php3 +++ b/lang/polish-utf-8.inc.php3 @@ -712,4 +712,5 @@ $strZeroRemovesTheLimit = 'Uwaga: Ustawienie tych opcji na 0 (zero) usuwa ograni $strZip = '".zip"'; // To translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/portuguese-iso-8859-1.inc.php3 b/lang/portuguese-iso-8859-1.inc.php3 index 3847be638..3f1beb80e 100644 --- a/lang/portuguese-iso-8859-1.inc.php3 +++ b/lang/portuguese-iso-8859-1.inc.php3 @@ -734,4 +734,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php3 b/lang/portuguese-utf-8.inc.php3 index dbccc4a3d..f9ecdaa84 100644 --- a/lang/portuguese-utf-8.inc.php3 +++ b/lang/portuguese-utf-8.inc.php3 @@ -735,4 +735,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/romanian-iso-8859-1.inc.php3 b/lang/romanian-iso-8859-1.inc.php3 index d8a7a7b43..5ca7ac8d4 100644 --- a/lang/romanian-iso-8859-1.inc.php3 +++ b/lang/romanian-iso-8859-1.inc.php3 @@ -713,4 +713,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php3 b/lang/romanian-utf-8.inc.php3 index d4d07fa78..b18392de5 100644 --- a/lang/romanian-utf-8.inc.php3 +++ b/lang/romanian-utf-8.inc.php3 @@ -714,4 +714,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/russian-dos-866.inc.php3 b/lang/russian-dos-866.inc.php3 index ceeb6e009..e7e38c1da 100644 --- a/lang/russian-dos-866.inc.php3 +++ b/lang/russian-dos-866.inc.php3 @@ -718,4 +718,5 @@ $strZeroRemovesTheLimit = ' $strZip = '娢஢ zip'; // To translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/russian-koi8-r.inc.php3 b/lang/russian-koi8-r.inc.php3 index f980c69ad..b2d67f36f 100644 --- a/lang/russian-koi8-r.inc.php3 +++ b/lang/russian-koi8-r.inc.php3 @@ -718,4 +718,5 @@ $strZeroRemovesTheLimit = ' $strZip = ' zip'; // To translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php3 b/lang/russian-utf-8.inc.php3 index 06a312459..c1142cedd 100644 --- a/lang/russian-utf-8.inc.php3 +++ b/lang/russian-utf-8.inc.php3 @@ -719,4 +719,5 @@ $strZeroRemovesTheLimit = 'Замечание: Установка этих оп $strZip = 'архивировать в zip'; // To translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/russian-windows-1251.inc.php3 b/lang/russian-windows-1251.inc.php3 index aba1e2a4c..ef8abebce 100644 --- a/lang/russian-windows-1251.inc.php3 +++ b/lang/russian-windows-1251.inc.php3 @@ -718,4 +718,5 @@ $strZeroRemovesTheLimit = ' $strZip = ' zip'; // To translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php3 b/lang/serbian_cyrillic-utf-8.inc.php3 index 383c6cfe1..54cb6ba8a 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php3 +++ b/lang/serbian_cyrillic-utf-8.inc.php3 @@ -16,4 +16,6 @@ $right_font_family = 'arial, helvetica, geneva, sans-serif'; $number_thousands_separator = ','; $number_decimal_separator = '.'; // shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa -$byteUnits = array(' \ No newline at end of file +$byteUnits = array(' +$strCreationDates = 'Creation/Update/Check dates'; //to translate +?> diff --git a/lang/serbian_cyrillic-windows-1251.inc.php3 b/lang/serbian_cyrillic-windows-1251.inc.php3 index 8c23651a8..b1c1d3f08 100644 --- a/lang/serbian_cyrillic-windows-1251.inc.php3 +++ b/lang/serbian_cyrillic-windows-1251.inc.php3 @@ -717,4 +717,5 @@ $strYes = ' $strZeroRemovesTheLimit = ': 0 () .'; $strZip = '""'; +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php3 b/lang/serbian_latin-utf-8.inc.php3 index 9036532de..9b611def3 100644 --- a/lang/serbian_latin-utf-8.inc.php3 +++ b/lang/serbian_latin-utf-8.inc.php3 @@ -18,4 +18,6 @@ $number_decimal_separator = '.'; // shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa $byteUnits = array('bajtova', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB'); -$day_of_week = array('Ned', 'Pon', 'Uto', 'Sre', ' \ No newline at end of file +$day_of_week = array('Ned', 'Pon', 'Uto', 'Sre', ' +$strCreationDates = 'Creation/Update/Check dates'; //to translate +?> diff --git a/lang/serbian_latin-windows-1250.inc.php3 b/lang/serbian_latin-windows-1250.inc.php3 index 56e61d0c9..6597ea405 100644 --- a/lang/serbian_latin-windows-1250.inc.php3 +++ b/lang/serbian_latin-windows-1250.inc.php3 @@ -717,4 +717,5 @@ $strYes = 'Da'; $strZeroRemovesTheLimit = 'Napomena: Postavljanje ovih opcija na 0 (nulu) uklanja limite.'; $strZip = '"zipovano"'; +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/slovak-iso-8859-2.inc.php3 b/lang/slovak-iso-8859-2.inc.php3 index 6d65b71e0..fa8e25258 100644 --- a/lang/slovak-iso-8859-2.inc.php3 +++ b/lang/slovak-iso-8859-2.inc.php3 @@ -712,4 +712,5 @@ $strYes = ' $strZeroRemovesTheLimit = 'Poznmka: Nastavenie tchto parametrov na 0 (nulu) odstrni obmedzenia.'; $strZip = '"zo zipovan"'; +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php3 b/lang/slovak-utf-8.inc.php3 index 5b6b3b951..87c4dc2e0 100644 --- a/lang/slovak-utf-8.inc.php3 +++ b/lang/slovak-utf-8.inc.php3 @@ -713,4 +713,5 @@ $strYes = 'Áno'; $strZeroRemovesTheLimit = 'Poznámka: Nastavenie týchto parametrov na 0 (nulu) odstráni obmedzenia.'; $strZip = '"zo zipované"'; +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/slovak-windows-1250.inc.php3 b/lang/slovak-windows-1250.inc.php3 index 6a789c29e..815c845fc 100644 --- a/lang/slovak-windows-1250.inc.php3 +++ b/lang/slovak-windows-1250.inc.php3 @@ -712,4 +712,5 @@ $strYes = ' $strZeroRemovesTheLimit = 'Poznmka: Nastavenie tchto parametrov na 0 (nulu) odstrni obmedzenia.'; $strZip = '"zo zipovan"'; +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/slovenian-iso-8859-2.inc.php3 b/lang/slovenian-iso-8859-2.inc.php3 index f7d80c73d..d4a0d66e0 100644 --- a/lang/slovenian-iso-8859-2.inc.php3 +++ b/lang/slovenian-iso-8859-2.inc.php3 @@ -713,4 +713,5 @@ $strZeroRemovesTheLimit = 'Obvestilo: $strZip = '"zipano"'; // To translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php3 b/lang/slovenian-utf-8.inc.php3 index 10608db0b..979c96626 100644 --- a/lang/slovenian-utf-8.inc.php3 +++ b/lang/slovenian-utf-8.inc.php3 @@ -714,4 +714,5 @@ $strZeroRemovesTheLimit = 'Obvestilo: Če postavite vrednost na 0 (nič), boste $strZip = '"zipano"'; // To translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/slovenian-windows-1250.inc.php3 b/lang/slovenian-windows-1250.inc.php3 index a031d3701..b902446dc 100644 --- a/lang/slovenian-windows-1250.inc.php3 +++ b/lang/slovenian-windows-1250.inc.php3 @@ -713,4 +713,5 @@ $strZeroRemovesTheLimit = 'Obvestilo: $strZip = '"zipano"'; // To translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/spanish-iso-8859-1.inc.php3 b/lang/spanish-iso-8859-1.inc.php3 index 209cf0654..6619ef236 100644 --- a/lang/spanish-iso-8859-1.inc.php3 +++ b/lang/spanish-iso-8859-1.inc.php3 @@ -711,4 +711,5 @@ $strYes = 'S $strZeroRemovesTheLimit = 'Nota: si cambia los parmetros de estas opciones a 0 (cero), remueve el lmite.'; $strZip = '"comprimido con zip"'; +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php3 b/lang/spanish-utf-8.inc.php3 index 07b859206..703eaa4ae 100644 --- a/lang/spanish-utf-8.inc.php3 +++ b/lang/spanish-utf-8.inc.php3 @@ -712,4 +712,5 @@ $strYes = 'Sí'; $strZeroRemovesTheLimit = 'Nota: si cambia los parámetros de estas opciones a 0 (cero), remueve el límite.'; $strZip = '"comprimido con zip"'; +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/swedish-iso-8859-1.inc.php3 b/lang/swedish-iso-8859-1.inc.php3 index 5fec13599..cc9f53458 100644 --- a/lang/swedish-iso-8859-1.inc.php3 +++ b/lang/swedish-iso-8859-1.inc.php3 @@ -711,4 +711,5 @@ $strZeroRemovesTheLimit = 'Anm: Genom att s $strZip = '"zippad"'; // To translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php3 b/lang/swedish-utf-8.inc.php3 index 1036af868..03a69003a 100644 --- a/lang/swedish-utf-8.inc.php3 +++ b/lang/swedish-utf-8.inc.php3 @@ -712,4 +712,5 @@ $strZeroRemovesTheLimit = 'Anm: Genom att sätta dessa alternativ till 0 (noll) $strZip = '"zippad"'; // To translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/thai-tis-620.inc.php3 b/lang/thai-tis-620.inc.php3 index 209bec4fb..aed382516 100644 --- a/lang/thai-tis-620.inc.php3 +++ b/lang/thai-tis-620.inc.php3 @@ -723,4 +723,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php3 b/lang/thai-utf-8.inc.php3 index bf3dcac87..1b949fbe5 100644 --- a/lang/thai-utf-8.inc.php3 +++ b/lang/thai-utf-8.inc.php3 @@ -724,4 +724,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/turkish-iso-8859-9.inc.php3 b/lang/turkish-iso-8859-9.inc.php3 index b0e7c5d33..995bc342b 100644 --- a/lang/turkish-iso-8859-9.inc.php3 +++ b/lang/turkish-iso-8859-9.inc.php3 @@ -723,4 +723,5 @@ $strYes = 'Evet'; $strZeroRemovesTheLimit = 'Not: Bu seeneklerin 0\'a ayarlanmas snr kaldrr..'; $strZip = '"ziplenmi"'; +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php3 b/lang/turkish-utf-8.inc.php3 index c9b7da86f..1288df847 100644 --- a/lang/turkish-utf-8.inc.php3 +++ b/lang/turkish-utf-8.inc.php3 @@ -724,4 +724,5 @@ $strYes = 'Evet'; $strZeroRemovesTheLimit = 'Not: Bu seçeneklerin 0\'a ayarlanması sınırı kaldırır..'; $strZip = '"ziplenmiş"'; +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php3 b/lang/ukrainian-utf-8.inc.php3 index 166e3aa4a..97dfbafa0 100644 --- a/lang/ukrainian-utf-8.inc.php3 +++ b/lang/ukrainian-utf-8.inc.php3 @@ -716,4 +716,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/lang/ukrainian-windows-1251.inc.php3 b/lang/ukrainian-windows-1251.inc.php3 index f02119643..59a896ab4 100644 --- a/lang/ukrainian-windows-1251.inc.php3 +++ b/lang/ukrainian-windows-1251.inc.php3 @@ -715,4 +715,5 @@ $strBookmarkAllUsers = 'Let every user access this bookmark'; //to translate $strConstraintsForDumped = 'Constraints for dumped tables'; //to translate $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate +$strCreationDates = 'Creation/Update/Check dates'; //to translate ?> diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index 5cd75940d..664044dd2 100644 --- a/libraries/common.lib.php3 +++ b/libraries/common.lib.php3 @@ -135,7 +135,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold} * Includes compatibility code for older config.inc.php3 revisions * if necessary */ - if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 206) { + if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 207) { include('./libraries/config_import.lib.php3'); } diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3 index de0b65213..994f96ab4 100644 --- a/libraries/config_import.lib.php3 +++ b/libraries/config_import.lib.php3 @@ -1234,6 +1234,9 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) { if (!isset($cfg['Export']['sql_backquotes'])) { $cfg['Export']['sql_backquotes'] = TRUE; } + if (!isset($cfg['Export']['sql_dates'])) { + $cfg['Export']['sql_dates'] = FALSE; + } if (!isset($cfg['Export']['sql_relation'])) { $cfg['Export']['sql_relation'] = FALSE; } diff --git a/libraries/display_export.lib.php3 b/libraries/display_export.lib.php3 index 0bf893fac..d74c7c923 100644 --- a/libraries/display_export.lib.php3 +++ b/libraries/display_export.lib.php3 @@ -144,7 +144,14 @@ if (PMA_MYSQL_INT_VERSION >= 32306) { ?>
+= 32321) { +?> + /> +
= 3.23.21 + if (!empty($cfgRelation['relation'])) { ?> /> @@ -152,10 +159,12 @@ if (!empty($cfgRelation['relation'])) { />
diff --git a/libraries/export/latex.php3 b/libraries/export/latex.php3 index 3dabc60a1..4fb4c9cb6 100644 --- a/libraries/export/latex.php3 +++ b/libraries/export/latex.php3 @@ -204,7 +204,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { * @access public */ // @@@ $strTableStructure -function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false) +function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false) { global $cfgRelation; diff --git a/libraries/export/sql.php3 b/libraries/export/sql.php3 index 45d8688c4..14f6ffd9d 100644 --- a/libraries/export/sql.php3 +++ b/libraries/export/sql.php3 @@ -122,9 +122,7 @@ function PMA_exportDBFooter($db) { * @param string the table name * @param string the end of line sequence * @param string the url to go back in case of error - * @param boolean whether to include relation comments - * @param boolean whether to include column comments - * @param boolean whether to include mime comments + * @param boolean whether to include creation/update/check dates * * @return string resulting schema * @@ -134,7 +132,7 @@ function PMA_exportDBFooter($db) { * * @access public */ -function PMA_getTableDef($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false) +function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false) { global $drop; global $use_backquotes; @@ -145,6 +143,7 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $do_relation = false, $ $auto_increment = ''; $new_crlf = $crlf; + if (PMA_MYSQL_INT_VERSION >= 32321) { $result = PMA_mysql_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddslashes($table) . '\''); if ($result != FALSE) { @@ -154,17 +153,17 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $do_relation = false, $ $auto_increment .= ' AUTO_INCREMENT=' . $tmpres['Auto_increment'] . ' '; } - if ($do_comments && isset($tmpres['Create_time']) && !empty($tmpres['Create_time'])) { + if ($show_dates && isset($tmpres['Create_time']) && !empty($tmpres['Create_time'])) { $schema_create .= '# ' . $GLOBALS['strStatCreateTime'] . ': ' . PMA_localisedDate(strtotime($tmpres['Create_time'])) . $crlf; $new_crlf = '#' . $crlf . $crlf; } - if ($do_comments && isset($tmpres['Update_time']) && !empty($tmpres['Update_time'])) { + if ($show_dates && isset($tmpres['Update_time']) && !empty($tmpres['Update_time'])) { $schema_create .= '# ' . $GLOBALS['strStatUpdateTime'] . ': ' . PMA_localisedDate(strtotime($tmpres['Update_time'])) . $crlf; $new_crlf = '#' . $crlf . $crlf; } - if ($do_comments && isset($tmpres['Check_time']) && !empty($tmpres['Check_time'])) { + if ($show_dates && isset($tmpres['Check_time']) && !empty($tmpres['Check_time'])) { $schema_create .= '# ' . $GLOBALS['strStatCheckTime'] . ': ' . PMA_localisedDate(strtotime($tmpres['Check_time'])) . $crlf; $new_crlf = '#' . $crlf . $crlf; } @@ -179,30 +178,6 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $do_relation = false, $ $schema_create .= 'DROP TABLE IF EXISTS ' . PMA_backquote($table, $use_backquotes) . ';' . $crlf; } - if ($do_comments && $cfgRelation['commwork']) { - if (!($comments_map = PMA_getComments($db, $table))) unset($comments_map); - } - - // Check if we can use Relations (Mike Beck) - if ($do_relation && !empty($cfgRelation['relation'])) { - // Find which tables are related with the current one and write it in - // an array - $res_rel = PMA_getForeigners($db, $table); - - if ($res_rel && count($res_rel) > 0) { - $have_rel = TRUE; - } else { - $have_rel = FALSE; - } - } - else { - $have_rel = FALSE; - } // end if - - if ($do_mime && $cfgRelation['mimework']) { - if (!($mime_map = PMA_getMIME($db, $table, true))) unset($mime_map); - } - // Steve Alberty's patch for complete table dump, // modified by Lem9 to allow older MySQL versions to continue to work if (PMA_MYSQL_INT_VERSION >= 32321) { @@ -256,37 +231,6 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $do_relation = false, $ $schema_create .= $auto_increment; - // garvin: Because replacing within a direct mysql result is a bit dangerous, just insert comments after that. - if (isset($comments_map) && count($comments_map) > 0) { - $schema_create .= $crlf . $crlf . '/* COMMENTS FOR TABLE ' . PMA_backquote($table, $use_backquotes) . ':' . $crlf; - @reset($comments_map); - while(list($comment_field, $comment) = each($comments_map)) { - $schema_create .= ' ' . PMA_backquote($comment_field, $use_backquotes) . $crlf . ' ' . PMA_backquote($comment, $use_backquotes) . $crlf; - // omitting html_format is intentional. No use for htmlchars in the dump. - } - $schema_create .= '*/'; - } - - if (isset($mime_map) && count($mime_map) > 0) { - $schema_create .= $crlf . $crlf . '/* MIME TYPES FOR TABLE ' . PMA_backquote($table, $use_backquotes) . ':' . $crlf; - @reset($mime_map); - while(list($mime_field, $mime) = each($mime_map)) { - $schema_create .= ' ' . PMA_backquote($mime_field, $use_backquotes) . $crlf . ' ' . PMA_backquote($mime['mimetype'], $use_backquotes) . $crlf; - // omitting html_format is intentional. No use for htmlchars in the dump. - } - $schema_create .= '*/'; - } - - if ($have_rel) { - $schema_create .= $crlf . $crlf . '/* RELATIONS FOR TABLE ' . PMA_backquote($table, $use_backquotes) . ':' . $crlf; - @reset($res_rel); - while(list($rel_field, $rel) = each($res_rel)) { - $schema_create .= ' ' . PMA_backquote($rel_field, $use_backquotes) . $crlf . ' ' . PMA_backquote($rel['foreign_table'], $use_backquotes) . ' -> ' . PMA_backquote($rel['foreign_field'], $use_backquotes) . $crlf; - // omitting html_format is intentional. No use for htmlchars in the dump. - } - $schema_create .= '*/'; - } - mysql_free_result($result); return $schema_create; } // end if MySQL >= 3.23.21 @@ -308,11 +252,6 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $do_relation = false, $ $schema_create .= ' ' . $row['Extra']; } - if ($comments && is_array($comments_map) && isset($comments_map[$row['Field']])) { - $schema_create .= $crlf . ' /* ' . PMA_backquote($comments_map[$row['Field']], $use_backquotes) . ' */'; - // omitting html_format is intentional. No use for htmlchars in the dump. - } - $schema_create .= ',' . $crlf; } // end while mysql_free_result($result); @@ -360,6 +299,85 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $do_relation = false, $ $schema_create .= $crlf . ')'; return $schema_create; + +} // end of the 'PMA_getTableDef()' function + + +/** + * Returns $table's comments, relations etc. + * + * @param string the database name + * @param string the table name + * @param string the end of line sequence + * @param boolean whether to include relation comments + * @param boolean whether to include column comments + * @param boolean whether to include mime comments + * + * @return string resulting comments + * + * @access public + */ +function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_comments = false, $do_mime = false) +{ + global $cfgRelation; + global $use_backquotes; + global $sql_constraints; + + $schema_create = ''; + + if ($do_comments && $cfgRelation['commwork']) { + if (!($comments_map = PMA_getComments($db, $table))) unset($comments_map); + } + + // Check if we can use Relations (Mike Beck) + if ($do_relation && !empty($cfgRelation['relation'])) { + // Find which tables are related with the current one and write it in + // an array + $res_rel = PMA_getForeigners($db, $table); + + if ($res_rel && count($res_rel) > 0) { + $have_rel = TRUE; + } else { + $have_rel = FALSE; + } + } + else { + $have_rel = FALSE; + } // end if + + if ($do_mime && $cfgRelation['mimework']) { + if (!($mime_map = PMA_getMIME($db, $table, true))) unset($mime_map); + } + + if (isset($comments_map) && count($comments_map) > 0) { + $schema_create .= $crlf . '#' . $crlf . '# COMMENTS FOR TABLE ' . PMA_backquote($table, $use_backquotes) . ':' . $crlf; + @reset($comments_map); + while(list($comment_field, $comment) = each($comments_map)) { + $schema_create .= '# ' . PMA_backquote($comment_field, $use_backquotes) . $crlf . '# ' . PMA_backquote($comment, $use_backquotes) . $crlf; + } + $schema_create .= '#' . $crlf; + } + + if (isset($mime_map) && count($mime_map) > 0) { + $schema_create .= $crlf . '#' . $crlf . '# MIME TYPES FOR TABLE ' . PMA_backquote($table, $use_backquotes) . ':' . $crlf; + @reset($mime_map); + while(list($mime_field, $mime) = each($mime_map)) { + $schema_create .= '# ' . PMA_backquote($mime_field, $use_backquotes) . $crlf . '# ' . PMA_backquote($mime['mimetype'], $use_backquotes) . $crlf; + } + $schema_create .= '#' . $crlf; + } + + if ($have_rel) { + $schema_create .= $crlf . '#' . $crlf . '# RELATIONS FOR TABLE ' . PMA_backquote($table, $use_backquotes) . ':' . $crlf; + @reset($res_rel); + while(list($rel_field, $rel) = each($res_rel)) { + $schema_create .= '# ' . PMA_backquote($rel_field, $use_backquotes) . $crlf . '# ' . PMA_backquote($rel['foreign_table'], $use_backquotes) . ' -> ' . PMA_backquote($rel['foreign_field'], $use_backquotes) . $crlf; + } + $schema_create .= '#' . $crlf; + } + + return $schema_create; + } // end of the 'PMA_getTableDef()' function /** @@ -377,7 +395,7 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $do_relation = false, $ * * @access public */ -function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = FALSE, $comments = FALSE, $mime = FALSE) { +function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = FALSE, $comments = FALSE, $mime = FALSE, $dates = FALSE) { $formatted_table_name = (isset($GLOBALS['use_backquotes'])) ? PMA_backquote($table) : '\'' . $table . '\''; @@ -386,7 +404,9 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = FALSE, . $crlf . '#' . $crlf . '# ' . $GLOBALS['strTableStructure'] . ' ' . $formatted_table_name . $crlf . '#' . $crlf - . PMA_getTableDef($db, $table, $crlf, $error_url, $relation, $comments, $mime) . ';' . $crlf; + . PMA_getTableDef($db, $table, $crlf, $error_url, $dates) . ';' . $crlf + . PMA_getTableComments($db, $table, $crlf, $relation, $comments, $mime); + return PMA_exportOutputHandler($dump); }