January 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1523-g82d6f8b
by Marc Delisle 31 Jan '11

31 Jan '11

The branch, master has been updated via 82d6f8bfd827d58b043a3b7da85b1f82b544d91a (commit) from 326f7e13a982d164c89c0655402843f1fe88e651 (commit) - Log ----------------------------------------------------------------- commit 82d6f8bfd827d58b043a3b7da85b1f82b544d91a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 31 06:41:44 2011 -0500 Clarify which MariaDB versions were tested ----------------------------------------------------------------------- Summary of changes: Documentation.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation.html b/Documentation.html index 9630c69..1ba09a1 100644 --- a/Documentation.html +++ b/Documentation.html @@ -2750,7 +2750,7 @@ setfacl -d -m "g:www-data:rwx" tmp minor version since the one that is bundled with some PHP distributions is rather old and might cause problems <a href="#faq1_17a"> (see <abbr title="Frequently Asked Questions">FAQ</abbr> 1.17a)</a>.<br /><br /> - MariaDB is also supported (version 5.2 was tested). + MariaDB is also supported (versions 5.1 and 5.2 were tested). </p> <h5 id="faq1_17a"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1522-g326f7e1
by Michal Čihař 31 Jan '11

31 Jan '11

The branch, master has been updated via 326f7e13a982d164c89c0655402843f1fe88e651 (commit) via afad83c975fe52c39db09e93bc9fb6b9c45b0f0f (commit) via d352f02eae8fad47fb3a54ba69f257e127d33463 (commit) via 75d758745dfc8fdfb877aa6623283807357a3bc2 (commit) via a9bfd7b820858134ce8538f292dfc1673d486f2c (commit) via eeb2da33ea9e2252565e90b33d05008a85d1107c (commit) via efdc3b5407550d2db51bea485ee1c44a1fcba8ba (commit) via 5dc499abc68a03700a2ca591feb872086ad6bfe7 (commit) via cd2d9ac7b2271fc592505d877d5a1ce3032ab9e6 (commit) via e3986d4b415e50a7c86ffab6b2bf954c6dfc0644 (commit) via 9cab3874ffa2d3ae5e01c4252b73329c6b986e81 (commit) via 81170b1c51091c07300fa9eba54eb15d937af953 (commit) via 5d0a9f602a4801dbc9e03f9cab1ce1d5b588399c (commit) via f9d4d6431a0cddb4698c25ad1cb435125b549884 (commit) via e79e7e8f025ae8e187c553fb6ed232dffee5abc1 (commit) via 5dc07efdb125b73fffa6c8cde3e22db732302d74 (commit) via bd7c4df4d06922353afdd01f79b3938f88cf7713 (commit) via 3d73dad2669c3b23745f40a479c3eb29520abab2 (commit) via 427f2e483862c3c0c3aaf6f124446ad41b3b14a9 (commit) via a8dce8c8315c17d13e8dfc6a008191e3b930ad83 (commit) via 973ec50b6ea3b4e99799d36cd095c9f40354c98b (commit) via 7fce20564965d0c106c2e8c0a164cbc68eeab1f1 (commit) via ea02f19789ef498273b4c50e9c261eea79e768f5 (commit) via 61fed3317788d3aab059b24eb4d16084a5938a96 (commit) from 534d93fa4600c4edab647a0cbb2b260bef2d3994 (commit) - Log ----------------------------------------------------------------- commit 326f7e13a982d164c89c0655402843f1fe88e651 Merge: 534d93fa4600c4edab647a0cbb2b260bef2d3994 afad83c975fe52c39db09e93bc9fb6b9c45b0f0f Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jan 31 10:01:31 2011 +0100 Merge remote branch 'pootle/master' Conflicts: po/ru.po commit afad83c975fe52c39db09e93bc9fb6b9c45b0f0f Merge: d352f02eae8fad47fb3a54ba69f257e127d33463 dea96e2e5ad21df2dd1c456457d451e137747e27 Author: Pootle server <pootle(a)cihar.com> Date: Sat Jan 29 18:40:07 2011 +0100 Merge remote branch 'origin/master' commit d352f02eae8fad47fb3a54ba69f257e127d33463 Merge: 75d758745dfc8fdfb877aa6623283807357a3bc2 3c573fc82e35834646ed861bbc53f55d30db1b4e Author: Pootle server <pootle(a)cihar.com> Date: Sat Jan 29 16:40:05 2011 +0100 Merge remote branch 'origin/master' commit 75d758745dfc8fdfb877aa6623283807357a3bc2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Jan 29 16:02:30 2011 +0200 Translation update done using Pootle. commit a9bfd7b820858134ce8538f292dfc1673d486f2c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Jan 29 16:00:35 2011 +0200 Translation update done using Pootle. commit eeb2da33ea9e2252565e90b33d05008a85d1107c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Jan 29 15:57:59 2011 +0200 Translation update done using Pootle. commit efdc3b5407550d2db51bea485ee1c44a1fcba8ba Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Jan 29 15:57:00 2011 +0200 Translation update done using Pootle. commit 5dc499abc68a03700a2ca591feb872086ad6bfe7 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Jan 29 15:51:09 2011 +0200 Translation update done using Pootle. commit cd2d9ac7b2271fc592505d877d5a1ce3032ab9e6 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Jan 29 15:47:39 2011 +0200 Translation update done using Pootle. commit e3986d4b415e50a7c86ffab6b2bf954c6dfc0644 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Jan 29 15:46:24 2011 +0200 Translation update done using Pootle. commit 9cab3874ffa2d3ae5e01c4252b73329c6b986e81 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Jan 29 15:44:23 2011 +0200 Translation update done using Pootle. commit 81170b1c51091c07300fa9eba54eb15d937af953 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Jan 29 15:41:12 2011 +0200 Translation update done using Pootle. commit 5d0a9f602a4801dbc9e03f9cab1ce1d5b588399c Merge: f9d4d6431a0cddb4698c25ad1cb435125b549884 21fd381c84482d2792902034f3292d274e11383c Author: Pootle server <pootle(a)cihar.com> Date: Sat Jan 29 14:40:27 2011 +0100 Merge remote branch 'origin/master' commit f9d4d6431a0cddb4698c25ad1cb435125b549884 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Jan 29 15:39:12 2011 +0200 Translation update done using Pootle. commit e79e7e8f025ae8e187c553fb6ed232dffee5abc1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Jan 29 15:37:52 2011 +0200 Translation update done using Pootle. commit 5dc07efdb125b73fffa6c8cde3e22db732302d74 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Jan 29 15:36:21 2011 +0200 Translation update done using Pootle. commit bd7c4df4d06922353afdd01f79b3938f88cf7713 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Jan 29 15:36:07 2011 +0200 Translation update done using Pootle. commit 3d73dad2669c3b23745f40a479c3eb29520abab2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Jan 29 15:32:34 2011 +0200 Translation update done using Pootle. commit 427f2e483862c3c0c3aaf6f124446ad41b3b14a9 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Jan 29 15:28:45 2011 +0200 Translation update done using Pootle. commit a8dce8c8315c17d13e8dfc6a008191e3b930ad83 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Jan 29 15:27:22 2011 +0200 Translation update done using Pootle. commit 973ec50b6ea3b4e99799d36cd095c9f40354c98b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Jan 29 15:22:07 2011 +0200 Translation update done using Pootle. commit 7fce20564965d0c106c2e8c0a164cbc68eeab1f1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Jan 29 15:21:45 2011 +0200 Translation update done using Pootle. commit ea02f19789ef498273b4c50e9c261eea79e768f5 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Jan 29 14:21:36 2011 +0200 Translation update done using Pootle. commit 61fed3317788d3aab059b24eb4d16084a5938a96 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Jan 29 14:09:54 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ru.po | 49 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 36 insertions(+), 13 deletions(-) diff --git a/po/ru.po b/po/ru.po index 6478fb4..e926f72 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-29 15:09-0500\n" -"PO-Revision-Date: 2011-01-25 17:26+0200\n" +"PO-Revision-Date: 2011-01-29 16:02+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" "MIME-Version: 1.0\n" @@ -5502,26 +5502,28 @@ msgid "" "Enclose table and field names with backquotes <i>(Protects field and table " "names formed with special characters or keywords)</i>" msgstr "" +"Заключить имена таблиц и полей в обратные кавычки <i>(защищает имена таблиц " +"и полей содержащих специальные символы или зарезервированные слова)</i>" #: libraries/export/sql.php:136 msgid "Instead of <code>INSERT</code> statements, use:" -msgstr "" +msgstr "Использовать вместо <code>INSERT</code> выражения:" #: libraries/export/sql.php:138 msgid "<code>INSERT DELAYED</code> statements" -msgstr "" +msgstr "<code>INSERT DELAYED</code>" #: libraries/export/sql.php:140 msgid "<code>INSERT IGNORE</code> statements" -msgstr "" +msgstr "<code>INSERT IGNORE</code>" #: libraries/export/sql.php:147 msgid "Function to use when dumping data:" -msgstr "" +msgstr "Использовать оператор при сохранении данных:" #: libraries/export/sql.php:151 msgid "Syntax to use when inserting data:" -msgstr "" +msgstr "Использовать синтаксис при вставке данных:" #: libraries/export/sql.php:154 msgid "" @@ -5529,6 +5531,9 @@ msgid "" "    Example: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES " "(1,2,3)</code>" msgstr "" +"включение имен полей в каждом выражении <code>INSERT</code> <br />   " +"    Пример: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES " +"(1,2,3)</code>" #: libraries/export/sql.php:155 msgid "" @@ -5536,30 +5541,43 @@ msgid "" "    Example: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), " "(7,8,9)</code>" msgstr "" +"включение нескольких строк в каждом выражении <code>INSERT</code><br /> " +"      Пример: <code>INSERT INTO tbl_name VALUES (1,2,3), " +"(4,5,6), (7,8,9)</code>" #: libraries/export/sql.php:156 msgid "" "both of the above<br />       Example: <code>INSERT INTO " "tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>" msgstr "" +"комбинация обоих верхних вариантов<br />       Пример: " +"<code>INSERT INTO tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), " +"(7,8,9)</code>" #: libraries/export/sql.php:157 msgid "" "neither of the above<br />       Example: <code>INSERT INTO " "tbl_name VALUES (1,2,3)</code>" msgstr "" +"ни один из выше перечисленных<br />       Пример: " +"<code>INSERT INTO tbl_name VALUES (1,2,3)</code>" #: libraries/export/sql.php:167 msgid "" "Dump binary columns in hexadecimal notation <i>(for example, \"abc\" becomes " "0x616263)</i>" msgstr "" +"Сохранение бинарных полей в шестнадцатеричном виде <i>(к примеру, \"abc\" " +"станет 0x616263)</i>" #: libraries/export/sql.php:171 msgid "" "Dump TIMESTAMP columns in UTC <i>(enables TIMESTAMP columns to be dumped and " "reloaded between servers in different time zones)</i>" msgstr "" +"Сохранять поля с типом TIMESTAMP в UTC <i>(позволяет сохранить и перенести " +"поля с типом TIMESTAMP между серверами находящимися в различных временных " +"зонах)</i>" #: libraries/export/sql.php:393 libraries/export/xml.php:34 msgid "Procedures" @@ -5604,13 +5622,12 @@ msgstr "XML" #: libraries/export/xml.php:30 msgid "Object creation options (all are recommended)" -msgstr "" +msgstr "Параметры создания объекта (рекомендуется выбрать все)" #: libraries/export/xml.php:40 -#, fuzzy #| msgid "View" msgid "Views" -msgstr "Представление" +msgstr "Представления" #: libraries/export/xml.php:47 msgid "Export contents" @@ -5674,6 +5691,8 @@ msgid "" "The first line of the file contains the table column names <i>(if this is " "unchecked, the first line will become part of the data)</i>" msgstr "" +"Первая строка файла содержит имена полей таблицы <i>(если данный параметр не " +"выбран, то первая строка будет частью данных)</i>" #: libraries/import/csv.php:39 msgid "" @@ -5681,12 +5700,14 @@ msgid "" "database, list the corresponding column names here. Column names must be " "separated by commas and not enclosed in quotations." msgstr "" +"Если данные в строках файла расположены не в том же порядке, как в базе " +"данных, введите здесь имена полей в соответствующей последовательности. " +"Имена полей разделяются запятыми и не должны быть заключены в кавычки." #: libraries/import/csv.php:41 -#, fuzzy #| msgid "Column names" msgid "Column names: " -msgstr "Названия столбцов" +msgstr "Названия столбцов:" #: libraries/import/csv.php:60 libraries/import/csv.php:72 #: libraries/import/csv.php:76 libraries/import/csv.php:80 @@ -5700,6 +5721,8 @@ msgid "" "Invalid column (%s) specified! Ensure that columns names are spelled " "correctly, separated by commas, and not enclosed in quotes." msgstr "" +"Указано ошибочное имя столбца (%s)! Убедитесь, что названия столбцов указаны " +"верно, разделены запятыми, и не заключены в кавычки." #: libraries/import/csv.php:179 libraries/import/csv.php:426 #, php-format @@ -5707,10 +5730,10 @@ msgid "Invalid format of CSV input on line %d." msgstr "Неправильный формат входных CSV-данных в строке %d." #: libraries/import/csv.php:314 -#, fuzzy, php-format +#, php-format #| msgid "Invalid field count in CSV input on line %d." msgid "Invalid column count in CSV input on line %d." -msgstr "Неправильное количество полей во входных CSV-данных в строке %d." +msgstr "Несоответствие количества столбцов в CSV данных на строке %d." #: libraries/import/docsql.php:27 msgid "DocSQL" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1498-g534d93f
by Marc Delisle 30 Jan '11

30 Jan '11

The branch, master has been updated via 534d93fa4600c4edab647a0cbb2b260bef2d3994 (commit) from a7ec18fde9b382a1e3b82e2f0df98db701a95bc4 (commit) - Log ----------------------------------------------------------------- commit 534d93fa4600c4edab647a0cbb2b260bef2d3994 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jan 30 08:45:50 2011 -0500 MariaDB support explicitely stated Fixed minor typos ----------------------------------------------------------------------- Summary of changes: Documentation.html | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Documentation.html b/Documentation.html index 5ace8bc..9630c69 100644 --- a/Documentation.html +++ b/Documentation.html @@ -2743,13 +2743,15 @@ setfacl -d -m "g:www-data:rwx" tmp connect to your MySQL server using PHP's classic <a href="http://php.net/mysql">MySQL extension</a> as well as the <a href="http://php.net/mysqli">improved MySQL extension (MySQLi)</a> that - is available in php 5.0. The latter one should be used unless you have + is available in php 5.0. The latter one should be used unless you have a good reason not to do so.<br /> - When compiling php, we strongly recommend that you manually link the MySQL + When compiling PHP, we strongly recommend that you manually link the MySQL extension of your choice to a MySQL client library of at least the same minor version since the one that is bundled with some PHP distributions is rather old and might cause problems <a href="#faq1_17a"> - (see <abbr title="Frequently Asked Questions">FAQ</abbr> 1.17a)</a>.</p> + (see <abbr title="Frequently Asked Questions">FAQ</abbr> 1.17a)</a>.<br /><br /> + MariaDB is also supported (version 5.2 was tested). + </p> <h5 id="faq1_17a"> <a href="#faq1_17a">1.17a I cannot connect to the MySQL server. It always returns the error hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1497-ga7ec18f
by Marc Delisle 30 Jan '11

30 Jan '11

The branch, master has been updated via a7ec18fde9b382a1e3b82e2f0df98db701a95bc4 (commit) from c432089db8041ae0b2f2f725076ba1a169a416db (commit) - Log ----------------------------------------------------------------- commit a7ec18fde9b382a1e3b82e2f0df98db701a95bc4 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jan 30 08:32:13 2011 -0500 Bug #3167048 Error when viewing table content/structure (Also this bug caused the chosen table not to be marked in navi panel) ----------------------------------------------------------------------- Summary of changes: js/common.js | 32 ++++---------------------------- 1 files changed, 4 insertions(+), 28 deletions(-) diff --git a/js/common.js b/js/common.js index 0ab1e88..b3e996c 100644 --- a/js/common.js +++ b/js/common.js @@ -206,40 +206,16 @@ function refreshNavigation(force) { } } -/** - * adds class to element - */ -function addClass(element, classname) -{ - if (element != null) { - $("#"+element).addClass(classname); - //alert('set class: ' + classname + ', now: ' + element.className); - } -} - -/** - * removes class from element - */ -function removeClass(element, classname) -{ - if (element != null) { - $("#"+element).removeClass(classname); - //alert('removed class: ' + classname + ', now: ' + element.className); - } -} - function unmarkDbTable(db, table) { var element_reference = window.frame_navigation.document.getElementById(db); if (element_reference != null) { - //alert('remove from: ' + db); - removeClass(element_reference.parentNode, 'marked'); + $(element_reference).parent().removeClass('marked'); } element_reference = window.frame_navigation.document.getElementById(db + '.' + table); if (element_reference != null) { - //alert('remove from: ' + db + '.' + table); - removeClass(element_reference.parentNode, 'marked'); + $(element_reference).parent().removeClass('marked'); } } @@ -247,7 +223,7 @@ function markDbTable(db, table) { var element_reference = window.frame_navigation.document.getElementById(db); if (element_reference != null) { - addClass(element_reference.parentNode, 'marked'); + $(element_reference).parent().addClass('marked'); // scrolldown element_reference.focus(); // opera marks the text, we dont want this ... @@ -256,7 +232,7 @@ function markDbTable(db, table) element_reference = window.frame_navigation.document.getElementById(db + '.' + table); if (element_reference != null) { - addClass(element_reference.parentNode, 'marked'); + $(element_reference).parent().addClass('marked'); // scrolldown element_reference.focus(); // opera marks the text, we dont want this ... hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1496-gc432089
by Marc Delisle 30 Jan '11

30 Jan '11

The branch, master has been updated via c432089db8041ae0b2f2f725076ba1a169a416db (commit) from 783ad8c8685fcd6a97586a6802071e0ce0f93613 (commit) - Log ----------------------------------------------------------------- commit c432089db8041ae0b2f2f725076ba1a169a416db Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jan 30 06:46:15 2011 -0500 Remove author names per our policy ----------------------------------------------------------------------- Summary of changes: setup/lib/ConfigGenerator.class.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/lib/ConfigGenerator.class.php b/setup/lib/ConfigGenerator.class.php index ddad7f1..95c3325 100644 --- a/setup/lib/ConfigGenerator.class.php +++ b/setup/lib/ConfigGenerator.class.php @@ -31,7 +31,7 @@ class ConfigGenerator . ' * Generated configuration file' . $crlf . ' * Generated by: phpMyAdmin ' . $GLOBALS['PMA_Config']->get('PMA_VERSION') - . ' setup script by Piotr Przybylski <piotrprz(a)gmail.com>' . $crlf + . ' setup script' . $crlf . ' * Date: ' . date(DATE_RFC1123) . $crlf . ' */' . $crlf . $crlf; @@ -148,4 +148,4 @@ class ConfigGenerator return $ret; } } -?> \ No newline at end of file +?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1495-g783ad8c
by Madhura Jayaratne 30 Jan '11

30 Jan '11

The branch, master has been updated via 783ad8c8685fcd6a97586a6802071e0ce0f93613 (commit) from 41e0d5cc53d255cc87dc696d492e743ced3097b7 (commit) - Log ----------------------------------------------------------------- commit 783ad8c8685fcd6a97586a6802071e0ce0f93613 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Jan 30 07:56:54 2011 +0530 Fix typo. ----------------------------------------------------------------------- Summary of changes: js/functions.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/functions.js b/js/functions.js index 2c8d2a1..42325ca 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1699,7 +1699,7 @@ $(document).ready(function() { open: PMA_verifyTypeOfAllColumns, buttons : button_options_error })// end dialog options - //remove the redundant [Back] link in the error message// + //remove the redundant [Back] link in the error message. .find('fieldset').remove(); } else { $('<div id="create_table_dialog"></div>') hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1494-g41e0d5c
by Madhura Jayaratne 29 Jan '11

29 Jan '11

The branch, master has been updated via 41e0d5cc53d255cc87dc696d492e743ced3097b7 (commit) via 88bde613d2ac44b062c377db08caa342049c4d08 (commit) via 1c50e94ddd7565981cefdeb9b5c109ab473252dc (commit) from b6e62ff786339518f5289307eb2d4d8eb3f12684 (commit) - Log ----------------------------------------------------------------- commit 41e0d5cc53d255cc87dc696d492e743ced3097b7 Merge: 88bde613d2ac44b062c377db08caa342049c4d08 b6e62ff786339518f5289307eb2d4d8eb3f12684 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Jan 30 01:44:03 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 88bde613d2ac44b062c377db08caa342049c4d08 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Jan 30 01:41:26 2011 +0530 Button caption changed to 'OK' in the case of an error. Redundant 'Back' link removed from the error message. commit 1c50e94ddd7565981cefdeb9b5c109ab473252dc Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Jan 30 01:32:05 2011 +0530 Bug #3166950 [AJAX] Empty dialog after attempt to create already existing table ----------------------------------------------------------------------- Summary of changes: js/functions.js | 36 +++++++++++++++++++++++++++--------- 1 files changed, 27 insertions(+), 9 deletions(-) diff --git a/js/functions.js b/js/functions.js index a13758e..2c8d2a1 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1679,21 +1679,39 @@ $(document).ready(function() { // in the following function we need to use $(this) button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();} + var button_options_error = {}; + button_options_error[PMA_messages['strOK']] = function() {$(this).dialog('close').remove();} + PMA_ajaxShowMessage(); if (! $form.find('input:hidden').is('#ajax_request_hidden')) { $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); } $.get($form.attr('action'), $form.serialize(), function(data) { - $('<div id="create_table_dialog"></div>') - .append(data) - .dialog({ - title: PMA_messages['strCreateTable'], - height: 600, - width: 900, - open: PMA_verifyTypeOfAllColumns, - buttons : button_options - }); // end dialog options + //in the case of an error, show the error message returned. + if (data.success != undefined && data.success == false) { + $('<div id="create_table_dialog"></div>') + .append(data.error) + .dialog({ + title: PMA_messages['strCreateTable'], + height: 230, + width: 900, + open: PMA_verifyTypeOfAllColumns, + buttons : button_options_error + })// end dialog options + //remove the redundant [Back] link in the error message// + .find('fieldset').remove(); + } else { + $('<div id="create_table_dialog"></div>') + .append(data) + .dialog({ + title: PMA_messages['strCreateTable'], + height: 600, + width: 900, + open: PMA_verifyTypeOfAllColumns, + buttons : button_options + }); // end dialog options + } }) // end $.get() // empty table name and number of columns from the minimal form hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1490-gb0fcd26
by Marc Delisle 29 Jan '11

29 Jan '11

The branch, master has been updated via b0fcd264a9bfc23f53237404ba109787765ebb2a (commit) from 0b7d8e5bf44df5fa033399541f8982323ca99a7b (commit) - Log ----------------------------------------------------------------- commit b0fcd264a9bfc23f53237404ba109787765ebb2a Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 29 15:08:38 2011 -0500 Conditional Ajax parameter in user preferences ----------------------------------------------------------------------- Summary of changes: libraries/config/user_preferences.forms.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php index a027007..cfa78ae 100644 --- a/libraries/config/user_preferences.forms.php +++ b/libraries/config/user_preferences.forms.php @@ -22,6 +22,7 @@ $forms = array(); $forms['Features']['General'] = array( + 'AjaxEnable', 'NaturalOrder', 'InitialSlidersState', 'ErrorIconic', hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1489-g0b7d8e5
by Marc Delisle 29 Jan '11

29 Jan '11

The branch, master has been updated via 0b7d8e5bf44df5fa033399541f8982323ca99a7b (commit) from dea96e2e5ad21df2dd1c456457d451e137747e27 (commit) - Log ----------------------------------------------------------------- commit 0b7d8e5bf44df5fa033399541f8982323ca99a7b Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 29 15:04:08 2011 -0500 Conditional Ajax parameter in setup ----------------------------------------------------------------------- Summary of changes: libraries/config/messages.inc.php | 2 ++ libraries/config/setup.forms.php | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index 654974d..560b1e5 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -14,6 +14,8 @@ if (!function_exists('__')) { die('Bad invocation!'); } +$strConfigAjaxEnable_desc = __('Improves efficiency of screen refresh'); +$strConfigAjaxEnable_name = __('Enable Ajax'); $strConfigAllowArbitraryServer_desc = __('If enabled user can enter any MySQL server in login form for cookie auth'); $strConfigAllowArbitraryServer_name = __('Allow login to any MySQL server'); $strConfigAllowThirdPartyFraming_desc = __('Enabling this allows a page located on a different domain to call phpMyAdmin inside a frame, and is a potential [strong]security hole[/strong] allowing cross-frame scripting attacks'); diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php index 79c8bb7..7783065 100644 --- a/libraries/config/setup.forms.php +++ b/libraries/config/setup.forms.php @@ -120,6 +120,7 @@ $forms['Features']['Developer'] = array( 'Error_Handler/gather', 'DBG/sql'); $forms['Features']['Other_core_settings'] = array( + 'AjaxEnable', 'NaturalOrder', 'InitialSlidersState', 'ErrorIconic', hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1488-gdea96e2
by Marc Delisle 29 Jan '11

29 Jan '11

The branch, master has been updated via dea96e2e5ad21df2dd1c456457d451e137747e27 (commit) from 3c573fc82e35834646ed861bbc53f55d30db1b4e (commit) - Log ----------------------------------------------------------------- commit dea96e2e5ad21df2dd1c456457d451e137747e27 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 29 11:15:35 2011 -0500 Conditional Ajax for db Structure and Tracking ----------------------------------------------------------------------- Summary of changes: db_structure.php | 8 ++++++-- db_tracking.php | 3 ++- js/db_structure.js | 17 +++++++++++++++-- libraries/db_events.inc.php | 7 ++++++- libraries/db_routines.inc.php | 9 ++++++++- 5 files changed, 37 insertions(+), 7 deletions(-) diff --git a/db_structure.php b/db_structure.php index fb2ecc0..dcce45b 100644 --- a/db_structure.php +++ b/db_structure.php @@ -266,7 +266,11 @@ foreach ($tables as $keyname => $each_table) { if (! $db_is_information_schema) { if (! empty($each_table['TABLE_ROWS'])) { - $empty_table = '<a class="truncate_table_anchor" href="sql.php?' . $tbl_url_query + $empty_table = '<a '; + if ($GLOBALS['cfg']['AjaxEnable']) { + $empty_table .= 'class="truncate_table_anchor"'; + } + $empty_table .= ' href="sql.php?' . $tbl_url_query . '&sql_query='; $empty_table .= urlencode('TRUNCATE ' . PMA_backquote($each_table['TABLE_NAME'])) . '&message_to_show=' @@ -355,7 +359,7 @@ foreach ($tables as $keyname => $each_table) { <?php echo $titles['Insert']; ?></a></td> <td align="center"><?php echo $empty_table; ?></td> <td align="center"> - <a class="drop_table_anchor" href="sql.php?<?php echo $tbl_url_query; + <a <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'class="drop_table_anchor"' : ''); ?> href="sql.php?<?php echo $tbl_url_query; ?>&reload=1&purge=1&sql_query=<?php echo urlencode($drop_query); ?>&message_to_show=<?php echo urlencode($drop_message); ?>" > diff --git a/db_tracking.php b/db_tracking.php index 62f8554..d9a7da3 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -11,6 +11,7 @@ require_once './libraries/common.inc.php'; //Get some js files needed for Ajax requests $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; +$GLOBALS['js_include'][] = 'db_structure.js'; /** * If we are not in an Ajax request, then do the common work and show the links etc. @@ -129,7 +130,7 @@ if (PMA_DBI_num_rows($all_tables_result) > 0) { <td><?php echo $version_data['date_created'];?></td> <td><?php echo $version_data['date_updated'];?></td> <td><?php echo $version_status;?></td> - <td><a class="drop_tracking_anchor" href="<?php echo $delete_link;?>" ><?php echo $drop_image_or_text; ?></a></td> + <td><a <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'class="drop_tracking_anchor"' : ''); ?> href="<?php echo $delete_link;?>" ><?php echo $drop_image_or_text; ?></a></td> <td> <a href="<?php echo $tmp_link; ?>"><?php echo __('Versions');?></a> | <a href="<?php echo $tmp_link; ?>&report=true&version=<?php echo $version_data['version'];?>"><?php echo __('Tracking report');?></a> | <a href="<?php echo $tmp_link; ?>&snapshot=true&version=<?php echo $version_data['version'];?>"><?php echo __('Structure snapshot');?></a></td> diff --git a/js/db_structure.js b/js/db_structure.js index 8b529d7..4affd75 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -57,6 +57,7 @@ $(document).ready(function() { * * @uses $.PMA_confirm() * @uses PMA_ajaxShowMessage() + * @see $cfg['AjaxEnable'] */ $(".truncate_table_anchor").live('click', function(event) { event.preventDefault(); @@ -105,6 +106,7 @@ $(document).ready(function() { * * @uses $.PMA_confirm() * @uses PMA_ajaxShowMessage() + * @see $cfg['AjaxEnable'] */ $(".drop_table_anchor").live('click', function(event) { event.preventDefault(); @@ -150,6 +152,7 @@ $(document).ready(function() { * * @uses $.PMA_confirm() * @uses PMA_ajaxShowMessage() + * @see $cfg['AjaxEnable'] */ $('.drop_event_anchor').live('click', function(event) { event.preventDefault(); @@ -188,6 +191,7 @@ $(document).ready(function() { * * @uses $.PMA_confirm() * @uses PMA_ajaxShowMessage() + * @see $cfg['AjaxEnable'] */ $('.drop_procedure_anchor').live('click', function(event) { event.preventDefault(); @@ -217,19 +221,28 @@ $(document).ready(function() { }) // end $.PMA_confirm() }) //end Drop Procedure + /** + * Ajax Event handler for 'Drop tracking' + * + * @uses $.PMA_confirm() + * @uses PMA_ajaxShowMessage() + * @see $cfg['AjaxEnable'] + */ $('.drop_tracking_anchor').live('click', function(event) { event.preventDefault(); + var $anchor = $(this); + /** * @var curr_tracking_row Object containing reference to the current tracked table's row */ - var curr_tracking_row = $(this).parents('tr'); + var curr_tracking_row = $anchor.parents('tr'); /** * @var question String containing the question to be asked for confirmation */ var question = PMA_messages['strDeleteTrackingData']; - $(this).PMA_confirm(question, $(this).attr('href'), function(url) { + $anchor.PMA_confirm(question, $anchor.attr('href'), function(url) { PMA_ajaxShowMessage(PMA_messages['strDeletingTrackingData']); diff --git a/libraries/db_events.inc.php b/libraries/db_events.inc.php index 82ef51f..6e93299 100644 --- a/libraries/db_events.inc.php +++ b/libraries/db_events.inc.php @@ -25,6 +25,11 @@ if ($events) { __('Type')); $ct=0; $delimiter = '//'; + if ($GLOBALS['cfg']['AjaxEnable']) { + $conditional_class = 'class="drop_event_anchor"'; + } else { + $conditional_class = ''; + } foreach ($events as $event) { // information_schema (at least in MySQL 5.1.22) does not return @@ -45,7 +50,7 @@ if ($events) { ($ct%2 == 0) ? 'even' : 'odd', $event['EVENT_NAME'], ! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&sql_query=' . urlencode($definition) . '&show_query=1&db_query_force=1&delimiter=' . urlencode($delimiter), $titles['Structure']) : ' ', - '<a class="drop_event_anchor" href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDrop) . '" >' . $titles['Drop'] . '</a>', + '<a ' . $conditional_class . ' href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDrop) . '" >' . $titles['Drop'] . '</a>', $event['EVENT_TYPE']); $ct++; } diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php index d898d00..648d80c 100644 --- a/libraries/db_routines.inc.php +++ b/libraries/db_routines.inc.php @@ -37,6 +37,12 @@ if ($routines) { __('Return type')); $ct=0; $delimiter = '//'; + if ($GLOBALS['cfg']['AjaxEnable']) { + $conditional_class = 'class="drop_procedure_anchor"'; + } else { + $conditional_class = ''; + } + foreach ($routines as $routine) { // information_schema (at least in MySQL 5.0.45) @@ -64,6 +70,7 @@ if ($routines) { } else { $sqlDropProc = 'DROP FUNCTION ' . PMA_backquote($routine['SPECIFIC_NAME']); } + echo sprintf('<tr class="%s"> <td><input type="hidden" class="drop_procedure_sql" value="%s" /><strong>%s</strong></td> <td>%s</td> @@ -75,7 +82,7 @@ if ($routines) { $sqlDropProc, $routine['ROUTINE_NAME'], ! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&sql_query=' . urlencode($definition) . '&show_query=1&db_query_force=1&delimiter=' . urlencode($delimiter), $titles['Structure']) : ' ', - '<a class="drop_procedure_anchor" href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDropProc) . '" >' . $titles['Drop'] . '</a>', + '<a ' . $conditional_class . ' href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDropProc) . '" >' . $titles['Drop'] . '</a>', $routine['ROUTINE_TYPE'], $routine['DTD_IDENTIFIER']); $ct++; hooks/post-receive -- phpMyAdmin

1 0