From 0d4d696957c2eccc4c6a8b90655d56563ec55585 Mon Sep 17 00:00:00 2001 From: Chirayu Chiripal Date: Sat, 10 May 2014 12:28:47 +0530 Subject: [PATCH 01/14] Bug #4392: Cannot see databases in nav panel on databases grouping when disabled database expansion Signed-off-by: Chirayu Chiripal --- libraries/navigation/NavigationTree.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php index 865aa22110..4e00cd5319 100644 --- a/libraries/navigation/NavigationTree.class.php +++ b/libraries/navigation/NavigationTree.class.php @@ -544,7 +544,7 @@ class PMA_NavigationTree */ public function groupNode($node) { - if ($node->type != Node::CONTAINER) { + if ($node->type != Node::CONTAINER || $GLOBALS['cfg']['NavigationTreeDisableDatabaseExpansion']) { return; } From aa2c9cd5d60ae1b4e87036ec9579a7af3835bbbc Mon Sep 17 00:00:00 2001 From: Chirayu Chiripal Date: Thu, 15 May 2014 15:09:26 +0530 Subject: [PATCH 02/14] Bug fix #4414 table display of performance_schema DB structure Signed-off-by: Chirayu Chiripal --- libraries/structure.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index 146e9778bf..a24f23e669 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -181,7 +181,7 @@ function PMA_getHtmlBodyForTableSummary($num_tables, $server_slave_status, if ($server_slave_status) { $html_output .= '' . __('Replication') . '' . "\n"; } - $html_output .= '' + $html_output .= '' . __('Sum') . ''; $html_output .= '' @@ -750,7 +750,7 @@ function PMA_tableHeader($db_is_system_schema = false, $replication = false) $cnt = 0; // Let's count the columns... if ($db_is_system_schema) { - $action_colspan = 3; + $action_colspan = 4; } else { $action_colspan = 7; } From 7f445f99e362aa97f3ac7f8f0663418f6a2f339d Mon Sep 17 00:00:00 2001 From: Chirayu Chiripal Date: Thu, 15 May 2014 17:53:10 +0530 Subject: [PATCH 03/14] Bug fix #4411 Protect Binary when set to no in settings still does not allow insert binary data Signed-off-by: Chirayu Chiripal test case fix Signed-off-by: Chirayu Chiripal --- libraries/insert_edit.lib.php | 6 +++--- test/libraries/PMA_insert_edit_test.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 2672e97dc0..27ee6191ae 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -1099,9 +1099,9 @@ function PMA_getBinaryAndBlobColumn( $vkey, $is_upload ) { $html_output = ''; - if (($GLOBALS['cfg']['ProtectBinary'] && $column['is_blob']) - || ($GLOBALS['cfg']['ProtectBinary'] == 'all' && $column['is_binary']) - || ($GLOBALS['cfg']['ProtectBinary'] == 'noblob' && !$column['is_blob']) + if (($GLOBALS['cfg']['ProtectBinary'] === 'blob' && $column['is_blob']) + || ($GLOBALS['cfg']['ProtectBinary'] === 'all') + || ($GLOBALS['cfg']['ProtectBinary'] === 'noblob' && !$column['is_blob']) ) { $html_output .= __('Binary - do not edit'); if (isset($data)) { diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php index af57e4d8ab..817769a590 100644 --- a/test/libraries/PMA_insert_edit_test.php +++ b/test/libraries/PMA_insert_edit_test.php @@ -1127,7 +1127,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase */ public function testGetBinaryAndBlobColumn() { - $GLOBALS['cfg']['ProtectBinary'] = true; + $GLOBALS['cfg']['ProtectBinary'] = 'blob'; $column['is_blob'] = true; $column['Field_md5'] = '123'; $column['pma_type'] = 'blob'; From 95aab308e9d8770db36183ef3ca19692a77df4e4 Mon Sep 17 00:00:00 2001 From: Edie Johnny Date: Wed, 14 May 2014 20:18:29 +0200 Subject: [PATCH 04/14] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (2768 of 2768) --- po/pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index d4cd5ae96d..886cef4a93 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-04-24 14:50-0400\n" -"PO-Revision-Date: 2014-05-10 20:26+0200\n" +"PO-Revision-Date: 2014-05-14 20:18+0200\n" "Last-Translator: Edie Johnny \n" "Language-Team: Portuguese (Brazil) " "\n" @@ -2031,7 +2031,7 @@ msgid "" "Warning: a form on this page has more than %d fields. On submission, some of " "the fields might be ignored, due to PHP's max_input_vars configuration." msgstr "" -"Aviso: um formulário nesta páginas tem mais de %d campos. Ao enviar, alguns " +"Aviso: um formulário nesta página tem mais de %d campos. Ao enviar, alguns " "campos podem ser ignorados, por causa da configuração max_input_vars do PHP." #. l10n: Display text for calendar close link From fcd437cd21a66a6e0e48bbcd2f83733c014b9aee Mon Sep 17 00:00:00 2001 From: Anders Jonsson Date: Thu, 15 May 2014 01:04:51 +0200 Subject: [PATCH 05/14] Translated using Weblate (Swedish) Currently translated at 99.9% (2767 of 2768) --- po/sv.po | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/po/sv.po b/po/sv.po index ce55970527..01bd078ea0 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-04-24 13:06-0400\n" -"PO-Revision-Date: 2014-04-28 14:22+0200\n" +"PO-Revision-Date: 2014-05-15 01:04+0200\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -12,7 +12,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 1.9-dev\n" +"X-Generator: Weblate 1.9\n" #: changelog.php:36 license.php:28 #, php-format @@ -1591,11 +1591,11 @@ msgstr "Döp om databaser" #: js/messages.php:241 msgid "Copying Database" -msgstr "Kopiera databas" +msgstr "Kopierar databas" #: js/messages.php:242 msgid "Changing Charset" -msgstr "Ändra teckenuppsättning" +msgstr "Ändrar teckenuppsättning" #: js/messages.php:246 libraries/mult_submits.lib.php:432 msgid "Foreign key check:" @@ -9161,7 +9161,7 @@ msgstr "Visa/dölj navigationsobjekt" #: libraries/relation.lib.php:290 msgid "Saving Query-By-Example searches" -msgstr "" +msgstr "Sparar Query-By-Example-sökningar" #: libraries/relation.lib.php:296 msgid "Quick steps to setup advanced features:" @@ -12976,12 +12976,11 @@ msgstr "" "phpMyAdmin kunde inte döda tråd %s. Troligtvis har den redan avslutats." #: setup/frames/form.inc.php:25 -#, fuzzy #| msgid "" #| "Incorrect formset, check $formsets array in setup/frames/form.inc.php" msgid "Incorrect formset, check $formsets array in setup/frames/form.inc.php!" msgstr "" -"Felaktigt formset, kontrollera $formsets matris i setup/frames/form.inc.php" +"Felaktigt formset, kontrollera arrayen $formsets i setup/frames/form.inc.php!" #: setup/frames/index.inc.php:53 msgid "Cannot load or save configuration" From 1a3c958f394e1aa214321b3f4a87d52eee65d555 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Fri, 16 May 2014 02:25:03 +0530 Subject: [PATCH 06/14] Add datepicker to monmitor log analyzer Signed-off-by: Atul Pratap Singh --- js/server_status_monitor.js | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 6a22f0f63e..25b8375797 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1272,10 +1272,10 @@ AJAX.registerOnload('server_status_monitor.js', function () { } function PMA_getLogAnalyseDialog(min, max) { - $('#logAnalyseDialog input[name="dateStart"]') - .val(PMA_formatDateTime(min, true)); - $('#logAnalyseDialog input[name="dateEnd"]') - .val(PMA_formatDateTime(max, true)); + var $dateStart = $('#logAnalyseDialog input[name="dateStart"]'); + var $dateEnd = $('#logAnalyseDialog input[name="dateEnd"]'); + $dateStart.val(PMA_formatDateTime(min, true)); + $dateEnd.val(PMA_formatDateTime(max, true)); var dlgBtns = { }; @@ -1294,6 +1294,17 @@ AJAX.registerOnload('server_status_monitor.js', function () { height: 'auto', buttons: dlgBtns }); + + PMA_addDatepicker($dateStart, 'datetime', { + showMillisec: false, + showMicrosec: false, + timeFormat: 'HH:mm:ss' + }); + PMA_addDatepicker($dateEnd, 'datetime', { + showMillisec: false, + showMicrosec: false, + timeFormat: 'HH:mm:ss' + }); } function loadLog(type, min, max) { From 13654357ffed30087c5ed4e92a840a234fbb5faa Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 15 May 2014 12:47:06 -0400 Subject: [PATCH 07/14] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index e890832f17..4ca8502bc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.2.2.0 (not yet released) - bug #4388 Disable database expansion when enabled throws Error 500 when database name is clicked in navigation tree +- bug #4414 table display of performance_schema DB structure 4.2.1.0 (2014-05-13) - bug #4380 Cannot display table structure with enums containing special characters From 453178b9cda3d2a9fa5d9b5d7752df728004a485 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 16 May 2014 07:53:05 -0400 Subject: [PATCH 08/14] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 4ca8502bc0..13d16df33e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 4.2.2.0 (not yet released) - bug #4388 Disable database expansion when enabled throws Error 500 when database name is clicked in navigation tree - bug #4414 table display of performance_schema DB structure +- bug #4411 Protect Binary Columns: many problems 4.2.1.0 (2014-05-13) - bug #4380 Cannot display table structure with enums containing special characters From 0ee881da71a210fda2459417a85d605f4e73ae6b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 16 May 2014 09:56:47 -0400 Subject: [PATCH 09/14] bug #4395 BLOB link transformation is broken Signed-off-by: Marc Delisle --- ChangeLog | 1 + .../abstract/ImageLinkTransformationsPlugin.class.php | 5 ++++- test/classes/plugin/transformations/Image_Link_test.php | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 13d16df33e..2d5e7c794f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - bug #4388 Disable database expansion when enabled throws Error 500 when database name is clicked in navigation tree - bug #4414 table display of performance_schema DB structure - bug #4411 Protect Binary Columns: many problems +- bug #4395 BLOB link transformation is broken 4.2.1.0 (2014-05-13) - bug #4380 Cannot display table structure with enums containing special characters diff --git a/libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php b/libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php index d5059fdf48..b6e8759da3 100644 --- a/libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php +++ b/libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php @@ -45,8 +45,11 @@ abstract class ImageLinkTransformationsPlugin extends TransformationsPlugin */ public function applyTransformation($buffer, $options = array(), $meta = '') { + // must disable the page loader, see + // https://wiki.phpmyadmin.net/pma/Page_loader#Bypassing_the_page_loader $transform_options = array ( - 'string' => '[BLOB]' ); return PMA_Transformation_globalHtmlReplace( diff --git a/test/classes/plugin/transformations/Image_Link_test.php b/test/classes/plugin/transformations/Image_Link_test.php index 5e4ee755b2..29fb62af75 100644 --- a/test/classes/plugin/transformations/Image_Link_test.php +++ b/test/classes/plugin/transformations/Image_Link_test.php @@ -123,7 +123,8 @@ class Image_JPEG_Link_Test extends PHPUnit_Framework_TestCase { $buffer = "PMA_IMAGE_LINK"; $options = array("./image/", "200", "wrapper_link"=>"PMA_wrapper_link"); - $result = '[BLOB]'; $this->assertEquals( $result, From 99dca5d7a6e4e9a9037013ff7443a3e75e2fb02e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tom=C3=A1=C5=A1ek?= Date: Fri, 16 May 2014 12:35:28 -0400 Subject: [PATCH 10/14] Respect ['ShowCreateDb'] in the navi panel Signed-off-by: Marc Delisle --- libraries/navigation/Nodes/Node_Database_Container.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/navigation/Nodes/Node_Database_Container.class.php b/libraries/navigation/Nodes/Node_Database_Container.class.php index c76da069d1..d666fee482 100644 --- a/libraries/navigation/Nodes/Node_Database_Container.class.php +++ b/libraries/navigation/Nodes/Node_Database_Container.class.php @@ -29,7 +29,9 @@ class Node_Database_Container extends Node { parent::__construct($name, Node::CONTAINER); - if ($GLOBALS['is_create_db_priv']) { + if ($GLOBALS['is_create_db_priv'] + && $GLOBALS['cfg']['ShowCreateDb'] !== false + ) { $new = PMA_NodeFactory::getInstance( 'Node', _pgettext('Create new database', 'New') ); From 52cf4a6491d1376b7facfbc7ab6e7f8baf79510a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 16 May 2014 12:36:18 -0400 Subject: [PATCH 11/14] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 2d5e7c794f..beebfdd5ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - bug #4414 table display of performance_schema DB structure - bug #4411 Protect Binary Columns: many problems - bug #4395 BLOB link transformation is broken +- bug Respect ['ShowCreateDb'] in the navi panel 4.2.1.0 (2014-05-13) - bug #4380 Cannot display table structure with enums containing special characters From a0397557fc17777eb1126a7f20fc108365749f47 Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Sat, 17 May 2014 07:38:17 +0200 Subject: [PATCH 12/14] ChangeLog entry Signed-off-by: Hugues Peccatte --- ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index beebfdd5ee..b88b6650ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,9 +7,10 @@ phpMyAdmin - ChangeLog - bug #4411 Protect Binary Columns: many problems - bug #4395 BLOB link transformation is broken - bug Respect ['ShowCreateDb'] in the navi panel +- bug #4392 Cannot see databases in nav panel on databases grouping when disabled database expansion 4.2.1.0 (2014-05-13) -- bug #4380 Cannot display table structure with enums containing special characters +- bug #4380 Cannot display table structure with enums containing special characters - bug #4381 Cannot remove the last remembered sorted column - bug Correctly fetch length of user and host fields in MySQL tables - bug #4364 examples/signon.php does not support the SessionSavePath directive From a0140e7aae1f3c2ad409a4462f45df91f9f56de2 Mon Sep 17 00:00:00 2001 From: Sorawee Porncharoenwase Date: Sat, 17 May 2014 07:11:54 +0200 Subject: [PATCH 13/14] Translated using Weblate (Thai) Currently translated at 38.6% (1069 of 2768) --- po/th.po | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/po/th.po b/po/th.po index 5669107c0e..6749c2e1c2 100644 --- a/po/th.po +++ b/po/th.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-04-24 14:50-0400\n" -"PO-Revision-Date: 2014-03-27 15:15+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Thai \n" +"PO-Revision-Date: 2014-05-17 07:11+0200\n" +"Last-Translator: Sorawee Porncharoenwase \n" +"Language-Team: Thai \n" +"Language: th\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: th\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 1.9-dev\n" +"X-Generator: Weblate 1.9\n" #: changelog.php:36 license.php:28 #, php-format @@ -675,13 +675,15 @@ msgstr "ที่คั่นหน้า %s ได้ถูกสร้าง #: import.php:577 #, php-format msgid "Import has been successfully finished, %d queries executed." -msgstr "นำเข้าได้สำเร็จ %d ได้ถูกนำเดินการแล้ว" +msgstr "นำเข้าสำเร็จเรียบร้อย การสอบถาม %d รายการได้ถูกดำเนินการแล้ว" #: import.php:598 msgid "" "Script timeout passed, if you want to finish import, please resubmit same " "file and import will resume." -msgstr "หมดเวลาการนำเข้าสริปแล้ว กรุณานำเข้าไฟล์สริปใหม่" +msgstr "" +"หมดเวลาการนำเข้าแล้ว หากคุณต้องการดำเนินการต่อให้เรียบร้อย " +"กรุณานำเข้าไฟล์เดิมอีกรอบ" #: import.php:602 msgid "" From 2986cdcd8ad182b9072824b19998f507b4e871d7 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 17 May 2014 07:39:04 -0400 Subject: [PATCH 14/14] bug #4419 No more calendar into search tab Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/TableSearch.class.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b88b6650ef..9120706be0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - bug #4395 BLOB link transformation is broken - bug Respect ['ShowCreateDb'] in the navi panel - bug #4392 Cannot see databases in nav panel on databases grouping when disabled database expansion +- bug #4419 No more calendar into search tab 4.2.1.0 (2014-05-13) - bug #4380 Cannot display table structure with enums containing special characters diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php index bbc233c0a7..bc535a3643 100644 --- a/libraries/TableSearch.class.php +++ b/libraries/TableSearch.class.php @@ -986,7 +986,9 @@ EOT; $html_output .= '' . $properties['type'] . ''; $html_output .= '' . $properties['collation'] . ''; $html_output .= '' . $properties['func'] . ''; - $html_output .= '' . $properties['value'] . ''; + // here, the data-type attribute is needed for a date/time picker + $html_output .= '' . $properties['value'] . ''; $html_output .= ''; //Displays hidden fields $html_output .= '';