From 2189c875356fc1af21c6da32235bf24f60f53b96 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 24 May 2013 12:40:01 -0400 Subject: [PATCH 1/7] 4.0.2 release --- ChangeLog | 2 +- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a0d9a7aec..7f8171a27d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -4.0.2.0 (not yet released) +4.0.2.0 (2013-05-24) - bug #3902 Cannot browse when table name contains keyword "call" + center loading indicator for navigation refresh, related to bug #3920 - bug #3925 Table sorting in navigation panel is case-sensitive diff --git a/README b/README index 88d2d4647d..2db85164a2 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.0.2-rc1 +Version 4.0.2 A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index a76fac0906..0dab0c4511 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -49,7 +49,7 @@ copyright = u'2012 - 2013, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.0.2-rc1' +version = '4.0.2' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index ae3034df2f..0fa39e0958 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -101,7 +101,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.0.2-rc1'); + $this->set('PMA_VERSION', '4.0.2'); /** * @deprecated */ From 9b3551601ce714adb5e3f428476052f0ec6093bf Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Wed, 29 May 2013 21:13:32 +0200 Subject: [PATCH 2/7] escape query in error message --- view_create.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/view_create.php b/view_create.php index d8781295d8..cd2ec3b616 100644 --- a/view_create.php +++ b/view_create.php @@ -114,7 +114,8 @@ if (isset($_REQUEST['createview'])) { $response->addJSON( 'message', PMA_Message::error( - "$sql_query

" . PMA_DBI_getError() + "" . htmlspecialchars($sql_query) . "

" + . PMA_DBI_getError() ) ); $response->isSuccess(false); From 3311c6f1615922a1c0666d40ef9fe55c9db2fa71 Mon Sep 17 00:00:00 2001 From: "J.M" Date: Fri, 31 May 2013 15:34:02 +0200 Subject: [PATCH 3/7] Changelog entry for Javascript execution vulnerability PMASA-2013-6 --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index dd68d236da..f59e546950 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ phpMyAdmin - ChangeLog - bug #3957 Cookies must be enabled past this point - bug #3956 "Browse foreign values" search filter / page selector not working - bug #3579 NOW() function incorrectly selected (partial regression) +- [security] Javascript execution vulnerability in Create view, + reported by Maxim Rupp (see PMASA-2013-6) 4.0.2.0 (2013-05-24) - bug #3902 Cannot browse when table name contains keyword "call" From c2d9a2f0c4179cec69c55ca53699678d66c2314e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 30 May 2013 12:59:30 +0200 Subject: [PATCH 4/7] Translated using Weblate (Bengali) Currently translated at 20.3% (529 of 2602) --- po/bn.po | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/po/bn.po b/po/bn.po index 788c646861..b951cd27ef 100644 --- a/po/bn.po +++ b/po/bn.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-05-28 12:35-0400\n" -"PO-Revision-Date: 2013-04-25 16:02+0200\n" +"PO-Revision-Date: 2013-05-30 12:59+0200\n" "Last-Translator: Michal Čihař \n" "Language-Team: Bengali \n" +"Language: bn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bn\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 1.6-dev\n" @@ -652,9 +652,6 @@ msgid "" "file size exceeded the maximum size permitted by your PHP configuration. See " "[doc@faq1-16]FAQ 1.16[/doc]." msgstr "" -"No data was received to import. Either no file name was submitted, or the " -"file size exceeded the maximum size permitted by your PHP configuration. See " -"[doc@faq1-16]FAQ 1.16[/doc]." #: import.php:447 msgid "" From bd088b1f13e9cfdef2f71c39d4a088ae55b6f88f Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Fri, 31 May 2013 14:23:12 +0200 Subject: [PATCH 5/7] Translated using Weblate (English (United Kingdom)) Currently translated at 100.0% (2602 of 2602) --- po/en_GB.po | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index ff0b137b4c..d1504f7277 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,16 +6,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-05-28 12:35-0400\n" -"PO-Revision-Date: 2013-03-28 12:20+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: English (United Kingdom) \n" +"PO-Revision-Date: 2013-05-31 14:23+0200\n" +"Last-Translator: Robert Readman \n" +"Language-Team: English (United Kingdom) " +"\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 1.5-dev\n" +"X-Generator: Weblate 1.6-dev\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:344 #: libraries/DisplayResults.class.php:809 @@ -6165,10 +6165,9 @@ msgstr "CSV using LOAD DATA" #: libraries/config/setup.forms.php:255 libraries/config/setup.forms.php:348 #: libraries/config/user_preferences.forms.php:160 #: libraries/config/user_preferences.forms.php:252 -#, fuzzy #| msgid "Open Document Spreadsheet" msgid "OpenDocument Spreadsheet" -msgstr "Open Document Spreadsheet" +msgstr "Open-Document Spreadsheet" #: libraries/config/setup.forms.php:262 #: libraries/config/user_preferences.forms.php:167 @@ -6197,10 +6196,9 @@ msgstr "Microsoft Word 2000" #: libraries/config/setup.forms.php:352 #: libraries/config/user_preferences.forms.php:256 -#, fuzzy #| msgid "Open Document Text" msgid "OpenDocument Text" -msgstr "Open Document Text" +msgstr "Open-Document Text" #: libraries/config/validate.lib.php:214 msgid "Could not initialize Drizzle connection library" @@ -7649,7 +7647,7 @@ msgstr "" #: libraries/plugins/auth/AuthenticationConfig.class.php:142 msgid "Retry to connect" -msgstr "" +msgstr "Retry to connect" #: libraries/plugins/auth/AuthenticationCookie.class.php:44 msgid "Failed to use Blowfish from mcrypt!" @@ -10649,20 +10647,18 @@ msgid "Instructions/Setup" msgstr "Instructions/Setup" #: server_status_monitor.php:483 -#, fuzzy #| msgid "Done rearranging/editing charts" msgid "Done dragging (rearranging) charts" -msgstr "Done rearranging/editing charts" +msgstr "Done dragging (rearranging) charts" #: server_status_monitor.php:489 server_status_monitor.php:606 msgid "Add chart" msgstr "Add chart" #: server_status_monitor.php:492 -#, fuzzy #| msgid "Enable highlighting" msgid "Enable charts dragging" -msgstr "Enable highlighting" +msgstr "Enable charts dragging" #: server_status_monitor.php:496 msgid "Refresh rate" @@ -12161,10 +12157,9 @@ msgid "No index defined! Create one below" msgstr "No index defined! Create one below" #: tbl_structure.php:125 -#, fuzzy #| msgid "No rows selected" msgid "No column selected." -msgstr "No rows selected" +msgstr "No column selected." #: tbl_structure.php:149 #, php-format From fe1fe990ac2b7a8c766711f2cc6b9933e81154d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 30 May 2013 13:31:11 +0200 Subject: [PATCH 6/7] Translated using Weblate (German) Currently translated at 99.8% (2597 of 2602) --- po/de.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index a01c8a1353..8b9b50f436 100644 --- a/po/de.po +++ b/po/de.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-05-28 12:35-0400\n" -"PO-Revision-Date: 2013-05-24 21:18+0200\n" -"Last-Translator: Jan Erik Zassenhaus \n" +"PO-Revision-Date: 2013-05-30 13:31+0200\n" +"Last-Translator: Michal Čihař \n" "Language-Team: German \n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 1.6-dev\n" From db0201b679189fd8b5ae02673fb2cd63d5da4a55 Mon Sep 17 00:00:00 2001 From: Yungu Kim Date: Thu, 30 May 2013 15:36:18 +0200 Subject: [PATCH 7/7] Translated using Weblate (Korean) Currently translated at 65.9% (1716 of 2602) --- po/ko.po | 52 +++++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/po/ko.po b/po/ko.po index a4805c560d..aad1fce733 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-05-28 12:35-0400\n" -"PO-Revision-Date: 2013-05-23 17:03+0200\n" +"PO-Revision-Date: 2013-05-30 15:36+0200\n" "Last-Translator: Yungu Kim \n" "Language-Team: Korean \n" +"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Weblate 1.6-dev\n" @@ -6420,10 +6420,9 @@ msgid "File uploads are not allowed on this server." msgstr "이 서버에서는 파일 업로드가 허용되지 않습니다." #: libraries/display_import.lib.php:276 -#, fuzzy #| msgid "Partial Texts" msgid "Partial Import:" -msgstr "Partial Texts" +msgstr "일부분만 가져오기:" #: libraries/display_import.lib.php:282 #, php-format @@ -6437,14 +6436,16 @@ msgid "" "to the PHP timeout limit. (This might be a good way to import large " "files, however it can break transactions.)" msgstr "" +"PHP 실행 시간 제한이 근접하였을 때 가져오기를 일시 중지하기. (대용량의 파일들을 가져올 때 유용합니다. 하지만 트랜잭션이 " +"유지되지 않을 수 있습니다.)" #: libraries/display_import.lib.php:296 msgid "Number of rows to skip, starting from the first row:" -msgstr "" +msgstr "스킵할 열의 수(첫 번째 열부터가 기준):" #: libraries/display_import.lib.php:318 msgid "Format-Specific Options:" -msgstr "" +msgstr "상세 포멧 옵션:" #: libraries/display_select_lang.lib.php:56 #: libraries/display_select_lang.lib.php:57 setup/frames/index.inc.php:75 @@ -6453,11 +6454,11 @@ msgstr "언어" #: libraries/engines/innodb.lib.php:28 msgid "Data home directory" -msgstr "" +msgstr "데이터 홈 디렉토리" #: libraries/engines/innodb.lib.php:29 msgid "The common part of the directory path for all InnoDB data files." -msgstr "" +msgstr "모든 InnoDB 데이터 파일에 대한, 파일 경로의 공통 부분." #: libraries/engines/innodb.lib.php:32 msgid "Data files" @@ -7060,7 +7061,7 @@ msgstr "스웨덴어" #: libraries/mysql_charsets.lib.php:336 libraries/mysql_charsets.lib.php:433 msgid "Thai" -msgstr "" +msgstr "타이어" #: libraries/mysql_charsets.lib.php:339 libraries/mysql_charsets.lib.php:427 msgid "Turkish" @@ -7078,11 +7079,11 @@ msgstr "유니코드" #: libraries/mysql_charsets.lib.php:363 libraries/mysql_charsets.lib.php:370 #: libraries/mysql_charsets.lib.php:392 libraries/mysql_charsets.lib.php:403 msgid "multilingual" -msgstr "" +msgstr "다국어" #: libraries/mysql_charsets.lib.php:370 msgid "Central European" -msgstr "" +msgstr "중부유럽어" #: libraries/mysql_charsets.lib.php:375 msgid "Russian" @@ -7090,15 +7091,15 @@ msgstr "러시아어" #: libraries/mysql_charsets.lib.php:392 msgid "Baltic" -msgstr "" +msgstr "발트어" #: libraries/mysql_charsets.lib.php:397 msgid "Armenian" -msgstr "" +msgstr "아르메니아어" #: libraries/mysql_charsets.lib.php:403 msgid "Cyrillic" -msgstr "" +msgstr "키릴어" #: libraries/mysql_charsets.lib.php:406 msgid "Arabic" @@ -7110,7 +7111,7 @@ msgstr "히브리어" #: libraries/mysql_charsets.lib.php:415 msgid "Georgian" -msgstr "" +msgstr "조지아어" #: libraries/mysql_charsets.lib.php:418 msgid "Greek" @@ -7118,7 +7119,7 @@ msgstr "그리스어" #: libraries/mysql_charsets.lib.php:421 msgid "Czech-Slovak" -msgstr "" +msgstr "체코슬로바키아어" #: libraries/mysql_charsets.lib.php:436 libraries/mysql_charsets.lib.php:443 #: libraries/structure.lib.php:1068 @@ -7127,7 +7128,7 @@ msgstr "알수없음" #: libraries/navigation/Navigation.class.php:61 msgid "An error has occured while loading the navigation tree" -msgstr "" +msgstr "네비게이션 트리를 불러오는 도중 에러가 발생함" #: libraries/navigation/NavigationHeader.class.php:178 msgid "Home" @@ -7143,7 +7144,7 @@ msgstr "phpMyAdmin 설명서" #: libraries/navigation/NavigationHeader.class.php:238 msgid "Reload navigation frame" -msgstr "" +msgstr "네비게이션 프레임 새로고침" #: libraries/navigation/NavigationTree.class.php:708 #, php-format @@ -9089,9 +9090,9 @@ msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" #: libraries/server_privileges.lib.php:1460 -#, fuzzy, php-format +#, php-format msgid "Grant all privileges on database "%s"" -msgstr "데이터베이스 "%s" 에 대한 사용권한 검사." +msgstr "데이터베이스 "%s"에 대한 모든 권한을 부여" #: libraries/server_privileges.lib.php:1555 #, php-format @@ -10886,7 +10887,7 @@ msgstr "" #: server_status_variables.php:565 msgid "The maximum time to acquire a row lock, in milliseconds." -msgstr "" +msgstr "행에 대한 락을 획득하기 위해 기다릴 최대 시간 (밀리초)." #: server_status_variables.php:568 msgid "The number of times a row lock had to be waited for." @@ -11892,9 +11893,8 @@ msgid "VIEW name" msgstr "뷰 이름" #: view_operations.php:90 -#, fuzzy msgid "Rename view to" -msgstr "테이블 이름 바꾸기" +msgstr "뷰 이름 변경" #: libraries/advisory_rules.txt:49 msgid "Uptime below one day" @@ -12063,7 +12063,7 @@ msgstr "" msgid "" "You should upgrade, as recent versions of MySQL 5.1 have improved " "performance and MySQL 5.5 even more so." -msgstr "" +msgstr "최신 버전의 MySQL(5.1 또는 5.5)로 업그레이드하여 성능을 향상하길 권장합니다." #: libraries/advisory_rules.txt:117 msgid "Version less than 5.5.8 (the first GA release of 5.5)." @@ -12088,6 +12088,8 @@ msgid "" "distribution. The MySQL manual only is accurate for official MySQL binaries, " "not any package distributions (such as RedHat, Debian/Ubuntu etc)." msgstr "" +"만약 소스파일을 컴파일하지 않았다면, 레드햇이나 데비안, 우분투 등에서 수정된 패키지를 설치한 것일 수 있습니다. MySQL 메뉴얼은 " +"MySQL 공식 바이너리에 대해서만 정확성을 보장합니다." #: libraries/advisory_rules.txt:126 msgid "'source' found in version_comment" @@ -12095,7 +12097,7 @@ msgstr "버전 코멘트에 'source'라는 문자가 있음" #: libraries/advisory_rules.txt:131 libraries/advisory_rules.txt:138 msgid "The MySQL manual only is accurate for official MySQL binaries." -msgstr "" +msgstr "MySQL 메뉴얼은 MySQL 공식 바이너리에 대해서만 정확성을 보장합니다." #: libraries/advisory_rules.txt:132 msgid "Percona documentation is at http://www.percona.com/docs/wiki/"