From fbf2e028f55a59b307022b0c79cf1b6f4df65cf5 Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Sun, 14 Sep 2014 20:44:25 +0200 Subject: [PATCH 1/4] Fix #4523 insert as new row submit type on multiple selected records does not set all AUTO_INCREMENTs to 0 value Signed-off-by: Hugues Peccatte --- ChangeLog | 1 + js/tbl_change.js | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index baba21244e..08bc77c36f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ phpMyAdmin - ChangeLog 4.2.8.1 (not yet released) - bug #4530 [security] DOM based XSS that results to a CSRF that creates a ROOT account in certain conditions +- bug #4523 tbl_change.js: insert as new row submit type on multiple selected records does not set all AUTO_INCREMENTs to 0 value 4.2.8.0 (2014-08-31) - bug #4516 Odd export behavior diff --git a/js/tbl_change.js b/js/tbl_change.js index b95efc48ef..bab668dbad 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -311,20 +311,28 @@ AJAX.registerOnload('tbl_change.js', function () { * available). */ $('select[name="submit_type"]').bind('change', function (e) { + var $thisElemSubmitTypeField = $(this); var $table = $('table.insertRowTable'); - var auto_increment_column = $table.find('input[name^="auto_increment"]').attr('name'); - if (auto_increment_column) { - var prev_value_field = $table.find('input[name="' + auto_increment_column.replace('auto_increment', 'fields_prev') + '"]'); - var value_field = $table.find('input[name="' + auto_increment_column.replace('auto_increment', 'fields') + '"]'); + var auto_increment_column = $table.find('input[name^="auto_increment"]'); + auto_increment_column.each(function () { + var $thisElemAIField = $(this); + var thisElemName = $thisElemAIField.attr('name'); + + var prev_value_field = $table.find('input[name="' + thisElemName.replace('auto_increment', 'fields_prev') + '"]'); + var value_field = $table.find('input[name="' + thisElemName.replace('auto_increment', 'fields') + '"]'); var previous_value = $(prev_value_field).val(); if (previous_value !== undefined) { - if ($(this).val() == 'insert' || $(this).val() == 'insertignore' || $(this).val() == 'showinsert') { + if ($thisElemSubmitTypeField.val() == 'insert' + || $thisElemSubmitTypeField.val() == 'insertignore' + || $thisElemSubmitTypeField.val() == 'showinsert' + ) { $(value_field).val(0); } else { $(value_field).val(previous_value); } } - } + }); + }); /** From 41c02512c7af351231f4ec280e146eef597be2db Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Sun, 14 Sep 2014 20:47:24 +0200 Subject: [PATCH 2/4] Code style improvements. Signed-off-by: Hugues Peccatte --- js/tbl_change.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index bab668dbad..d73e4edc50 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -311,7 +311,7 @@ AJAX.registerOnload('tbl_change.js', function () { * available). */ $('select[name="submit_type"]').bind('change', function (e) { - var $thisElemSubmitTypeField = $(this); + var thisElemSubmitTypeVal = $(this).val(); var $table = $('table.insertRowTable'); var auto_increment_column = $table.find('input[name^="auto_increment"]'); auto_increment_column.each(function () { @@ -322,9 +322,9 @@ AJAX.registerOnload('tbl_change.js', function () { var value_field = $table.find('input[name="' + thisElemName.replace('auto_increment', 'fields') + '"]'); var previous_value = $(prev_value_field).val(); if (previous_value !== undefined) { - if ($thisElemSubmitTypeField.val() == 'insert' - || $thisElemSubmitTypeField.val() == 'insertignore' - || $thisElemSubmitTypeField.val() == 'showinsert' + if (thisElemSubmitTypeVal == 'insert' + || thisElemSubmitTypeVal == 'insertignore' + || thisElemSubmitTypeVal == 'showinsert' ) { $(value_field).val(0); } else { From 0df1d4b837ef8e55f6250d9a98270a677a327518 Mon Sep 17 00:00:00 2001 From: Kyeong Su Shin Date: Sun, 14 Sep 2014 21:06:58 +0200 Subject: [PATCH 3/4] Translated using Weblate (Korean) Currently translated at 84.6% (2342 of 2768) [ci skip] --- po/ko.po | 106 ++++++++++++++++++++----------------------------------- 1 file changed, 39 insertions(+), 67 deletions(-) diff --git a/po/ko.po b/po/ko.po index bc27f0459d..1db989e907 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-08-20 02:09+0200\n" -"Last-Translator: s.c. yoo \n" +"PO-Revision-Date: 2014-09-14 21:06+0200\n" +"Last-Translator: Kyeong Su Shin \n" "Language-Team: Korean \n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -6188,15 +6188,13 @@ msgid "Use SSL" msgstr "SSL 사용" #: libraries/config/messages.inc.php:665 -#, fuzzy #| msgid "" #| "Leave blank for no PDF schema support, suggested: [kbd]pma__pdf_pages[/" #| "kbd]" msgid "" "Leave blank for no PDF schema support, suggested: [kbd]pma__table_coords[/" "kbd]." -msgstr "" -"PDF 스키마를 제공하지 않을 경우 비워두세요. 제안값: [kbd]pma__pdf_pages[/kbd]" +msgstr "PDF 스키마를 제공하지 않을 경우 비워두세요. 제안값: [kbd]pma__table_coords[/kbd]." #: libraries/config/messages.inc.php:667 msgid "PDF schema: table coordinates" @@ -6589,16 +6587,13 @@ msgid "Use database search" msgstr "데이터베이스 검색 사용" #: libraries/config/messages.inc.php:773 -#, fuzzy #| msgid "" #| "When disabled, users cannot set any of the options below, regardless of " #| "the checkbox on the right" msgid "" "When disabled, users cannot set any of the options below, regardless of the " "checkbox on the right." -msgstr "" -"꺼져있을 경우, 사용자들은 오른쪽 체크박스에 관계없이 아래의 옵션 중 어느것도 " -"설정할 수 없습니다." +msgstr "꺼져있을 경우, 사용자들은 오른쪽 체크박스에 관계없이 아래의 옵션 중 어느것도 설정할 수 없습니다." #: libraries/config/messages.inc.php:774 msgid "Enable the Developer tab in settings" @@ -6628,10 +6623,12 @@ msgid "" "if the server where phpMyAdmin is installed does not have direct access to " "the internet. The format is: \"hostname:portnumber\"." msgstr "" +"phpMyAdmin의 최신 버전에 관한 정보를 받아오거나 오류 리포트를 전송할 시 거칠 프록시 서버의 주소. phpMyAdmin이 설치된 " +"서버가 인터넷에 직접 연결되어있지 않고 프록시를 거쳐야 하는 경우 필요합니다. 양식은 \"hostname:포트 번호\" 입니다." #: libraries/config/messages.inc.php:779 msgid "Proxy url" -msgstr "" +msgstr "프록시 주소" #: libraries/config/messages.inc.php:780 msgid "" @@ -6641,23 +6638,20 @@ msgid "" msgstr "" #: libraries/config/messages.inc.php:781 -#, fuzzy #| msgid "Username" msgid "Proxy username" -msgstr "사용자명" +msgstr "프록시 사용자명" #: libraries/config/messages.inc.php:782 msgid "The password for authenticating with the proxy." msgstr "" #: libraries/config/messages.inc.php:783 -#, fuzzy #| msgid "Password" msgid "Proxy password" -msgstr "암호" +msgstr "프록시 암호" #: libraries/config/messages.inc.php:785 -#, fuzzy #| msgid "" #| "Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] " #| "compression for import and export operations" @@ -6665,8 +6659,8 @@ msgid "" "Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression " "for import and export operations." msgstr "" -"가져오기와 내보내기 작업들에 대해 [a@http://en.wikipedia.org/wiki/ZIP_" -"(file_format)]ZIP[/a] compression 가능하게 함" +"가져오기와 내보내기 작업들에 대해 [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] " +"압축이 가능하게 함." #: libraries/config/messages.inc.php:786 msgid "ZIP" @@ -6678,7 +6672,7 @@ msgstr "" #: libraries/config/messages.inc.php:788 msgid "Public key for reCaptcha" -msgstr "" +msgstr "reCaptcha용 공개 키(Public key)" #: libraries/config/messages.inc.php:789 msgid "Enter your private key for your domain reCaptcha service." @@ -6686,7 +6680,7 @@ msgstr "" #: libraries/config/messages.inc.php:790 msgid "Private key for reCaptcha" -msgstr "" +msgstr "reCaptcha용 개인 키(Private key)" #: libraries/config/messages.inc.php:792 #, fuzzy @@ -6695,10 +6689,9 @@ msgid "Choose the default action when sending error reports." msgstr "오류보고서 전송전 물어보기" #: libraries/config/messages.inc.php:793 -#, fuzzy #| msgid "Server port" msgid "Send error reports" -msgstr "서버 포트" +msgstr "오류보고서 전송" #: libraries/config/setup.forms.php:40 msgid "Config authentication" @@ -6806,10 +6799,9 @@ msgstr "암호:" #: libraries/display_change_password.lib.php:73 #: libraries/replication_gui.lib.php:857 #: libraries/server_privileges.lib.php:1493 -#, fuzzy #| msgid "Server type:" msgid "Re-type:" -msgstr "서버 타입:" +msgstr "재입력:" #: libraries/display_change_password.lib.php:80 msgid "Password Hashing:" @@ -7121,11 +7113,11 @@ msgstr "" #: libraries/display_import.lib.php:455 msgid "About %MIN min. %SEC sec. remaining." -msgstr "" +msgstr "약 %MIN 분 %SEC 초 남음." #: libraries/display_import.lib.php:456 msgid "About %SEC sec. remaining." -msgstr "" +msgstr "약 %SEC 초 남음." #: libraries/display_import.lib.php:458 msgid "The file is being processed, please be patient." @@ -7575,10 +7567,9 @@ msgid "Binary" msgstr "바이너리" #: libraries/insert_edit.lib.php:658 -#, fuzzy #| msgid "Because of its length,
this column might not be editable" msgid "Because of its length,
this column might not be editable." -msgstr "컬럼의 길이 때문에,
이 컬럼을 편집할 수 없을 수도 있습니다" +msgstr "컬럼의 길이 때문에,
이 컬럼을 편집할 수 없을 수도 있습니다." #: libraries/insert_edit.lib.php:1106 msgid "Binary - do not edit" @@ -8016,7 +8007,6 @@ msgid "New" msgstr "" #: libraries/navigation/Nodes/Node_Procedure.class.php:34 -#, fuzzy #| msgid "Procedures" msgid "Procedure" msgstr "프로시저" @@ -8521,20 +8511,18 @@ msgstr "생성" #: libraries/plugins/export/ExportLatex.class.php:226 #: libraries/plugins/export/ExportSql.class.php:659 #: libraries/plugins/export/ExportXml.class.php:199 -#, fuzzy #| msgid "PHP extension:" msgid "PHP Version:" -msgstr "PHP 확장:" +msgstr "PHP 버전:" #: libraries/plugins/export/ExportLatex.class.php:251 #: libraries/plugins/export/ExportSql.class.php:809 #: libraries/plugins/export/ExportXml.class.php:398 #: libraries/plugins/export/PMA_ExportPdf.class.php:116 #: libraries/sql.lib.php:446 -#, fuzzy #| msgid "Database" msgid "Database:" -msgstr "데이터베이스" +msgstr "데이터베이스:" #: libraries/plugins/export/ExportLatex.class.php:304 #: libraries/plugins/export/ExportSql.class.php:1761 @@ -8544,10 +8532,9 @@ msgid "Data:" msgstr "데이터베이스" #: libraries/plugins/export/ExportLatex.class.php:488 -#, fuzzy #| msgid "Structure" msgid "Structure:" -msgstr "구조" +msgstr "구조:" #: libraries/plugins/export/ExportMediawiki.class.php:84 msgid "Export table names" @@ -8740,10 +8727,9 @@ msgid "Export contents" msgstr "데이터 포인트 내용" #: libraries/plugins/export/PMA_ExportPdf.class.php:117 -#, fuzzy #| msgid "Table" msgid "Table:" -msgstr "테이블" +msgstr "테이블:" #: libraries/plugins/import/ImportCsv.class.php:63 #: libraries/plugins/import/ImportOds.class.php:75 @@ -8839,15 +8825,13 @@ msgid "There was an error importing the ESRI shape file: \"%s\"." msgstr "ESRI 형태의 파일을 가져오는 도중 에러가 발생했습니다: \"%s\"." #: libraries/plugins/import/ImportShp.class.php:204 -#, fuzzy #| msgid "" #| "You tried to import an invalid file or the imported file contains invalid " #| "data" msgid "" "You tried to import an invalid file or the imported file contains invalid " "data!" -msgstr "" -"가져오기한 파일이 잘못된 파일이거나 파일이 잘못된 값을 포함하고 있습니다" +msgstr "가져오기한 파일이 잘못된 파일이거나 파일이 잘못된 값을 포함하고 있습니다!" #: libraries/plugins/import/ImportShp.class.php:210 #, php-format @@ -8855,10 +8839,9 @@ msgid "MySQL Spatial Extension does not support ESRI type \"%s\"." msgstr "" #: libraries/plugins/import/ImportShp.class.php:258 -#, fuzzy #| msgid "The imported file does not contain any data" msgid "The imported file does not contain any data!" -msgstr "입력한 파일에 아무 데이터도 없음" +msgstr "가져온 파일에 아무런 데이터도 없습니다!" #: libraries/plugins/import/ImportSql.class.php:71 msgid "SQL compatibility mode:" @@ -9256,10 +9239,9 @@ msgstr "" #: libraries/replication_gui.lib.php:383 libraries/replication_gui.lib.php:767 #: libraries/server_privileges.lib.php:1263 -#, fuzzy #| msgid "User:" msgid "User name:" -msgstr "사용자:" +msgstr "사용자명:" #: libraries/replication_gui.lib.php:389 libraries/replication_gui.lib.php:771 #: libraries/replication_gui.lib.php:787 @@ -9277,20 +9259,18 @@ msgid "Password" msgstr "암호" #: libraries/replication_gui.lib.php:418 -#, fuzzy #| msgid "Sort:" msgid "Port:" -msgstr "정렬:" +msgstr "포트:" #: libraries/replication_gui.lib.php:502 -#, fuzzy #| msgid "Show master status" msgid "Master status" -msgstr "마스터 상태 보기" +msgstr "마스터 상태" #: libraries/replication_gui.lib.php:505 msgid "Slave status" -msgstr "슬레이브 스테이터스" +msgstr "슬레이브 상태" #: libraries/replication_gui.lib.php:514 #: libraries/server_status_variables.lib.php:219 @@ -9366,10 +9346,9 @@ msgid "Re-type" msgstr "재입력" #: libraries/replication_gui.lib.php:865 -#, fuzzy #| msgid "Generate password" msgid "Generate Password:" -msgstr "암호 생성" +msgstr "암호 생성:" #: libraries/replication_gui.lib.php:903 #, fuzzy @@ -9439,10 +9418,10 @@ msgid "Unable to change master!" msgstr "마스터를 변경할 수 없음" #: libraries/replication_gui.lib.php:1002 -#, fuzzy, php-format +#, php-format #| msgid "Master server changed successfully to %s" msgid "Master server changed successfully to %s." -msgstr "마스터 서버가 성공적으로 %s로 변경되었습니다" +msgstr "마스터 서버가 성공적으로 %s로 변경되었습니다." #: libraries/rte/rte_events.lib.php:110 libraries/rte/rte_events.lib.php:119 #: libraries/rte/rte_events.lib.php:157 libraries/rte/rte_routines.lib.php:307 @@ -9476,11 +9455,10 @@ msgstr "이벤트 %1$s 를 생성했습니다." #: libraries/rte/rte_events.lib.php:178 libraries/rte/rte_routines.lib.php:378 #: libraries/rte/rte_triggers.lib.php:150 -#, fuzzy #| msgid "" #| "One or more errors have occured while processing your request:" msgid "One or more errors have occurred while processing your request:" -msgstr "요청을 처리하는 중에 하나 혹은 그 이상의 오류가 발생했습니다:" +msgstr "요청을 처리하는 중에 하나 혹은 그 이상의 오류가 발생했습니다:" #: libraries/rte/rte_events.lib.php:234 msgid "Edit event" @@ -10008,10 +9986,9 @@ msgid "Unknown language: %1$s." msgstr "" #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:46 -#, fuzzy #| msgid "Server:" msgid "Current Server:" -msgstr "서버:" +msgstr "현재 서버:" #: libraries/server_bin_log.lib.php:30 msgid "Select binary log to view" @@ -10030,10 +10007,9 @@ msgid "Original position" msgstr "원본 위치" #: libraries/server_bin_log.lib.php:133 libraries/structure.lib.php:2186 -#, fuzzy #| msgid "Show PHP information" msgid "Information" -msgstr "PHP 정보 보기" +msgstr "정보" #: libraries/server_bin_log.lib.php:183 libraries/server_status.lib.php:461 msgid "Truncate Shown Queries" @@ -10329,10 +10305,9 @@ msgstr "테이블에 관한 권한" #: libraries/server_privileges.lib.php:828 #: libraries/server_privileges.lib.php:1013 #: libraries/server_privileges.lib.php:2960 -#, fuzzy #| msgid "Note: MySQL privilege names are expressed in English" msgid "Note: MySQL privilege names are expressed in English." -msgstr "주의: MySQL 권한 이름은 영어로 표시됩니다" +msgstr "주의: MySQL 권한 이름은 영어로 표시됩니다." #: libraries/server_privileges.lib.php:976 msgid "Administration" @@ -10440,9 +10415,8 @@ msgstr "사용자" #: libraries/server_privileges.lib.php:1951 #: libraries/server_privileges.lib.php:2782 #: libraries/server_privileges.lib.php:2966 -#, fuzzy msgid "Grant" -msgstr "인쇄" +msgstr "허용" #: libraries/server_privileges.lib.php:1888 msgid "User has been added." @@ -11678,16 +11652,14 @@ msgid "Summary by state" msgstr "" #: libraries/sql.lib.php:510 -#, fuzzy #| msgid "Total time:" msgid "Total Time" -msgstr "전체 시간:" +msgstr "전체 시간" #: libraries/sql.lib.php:512 -#, fuzzy #| msgid "Time" msgid "% Time" -msgstr "시간" +msgstr "% 시간" #: libraries/sql.lib.php:514 #, fuzzy @@ -12563,7 +12535,7 @@ msgstr "새로고침" #: pmd_general.php:111 msgid "Help" -msgstr "" +msgstr "도움말" #: pmd_general.php:119 msgid "Angular links" From 6af812ee44a0f7684d6218a0b1b2e8d97c653ec8 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 15 Sep 2014 08:01:57 -0400 Subject: [PATCH 4/4] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 08bc77c36f..c2fdfe26cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,11 +6,11 @@ phpMyAdmin - ChangeLog - bug sql.js: str is undefined - bug #4524 Allow for direct selection of "0" on the "user overview" page - bug #4529 Undefined index: pos +- bug #4523 tbl_change.js: insert as new row submit type on multiple selected records does not set all AUTO_INCREMENTs to 0 value 4.2.8.1 (not yet released) - bug #4530 [security] DOM based XSS that results to a CSRF that creates a ROOT account in certain conditions -- bug #4523 tbl_change.js: insert as new row submit type on multiple selected records does not set all AUTO_INCREMENTs to 0 value 4.2.8.0 (2014-08-31) - bug #4516 Odd export behavior