From 50af85cf34da89a76f649cc6fa7f7cbb2fb284b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 16 Feb 2016 10:19:33 +0100 Subject: [PATCH 1/5] Fix export of index comments in SQL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #11968 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/plugins/export/ExportSql.class.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 072143a2f6..1a2d3b7cde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ phpMyAdmin - ChangeLog - issue #11964 Undefined index: TABLE_COMMENT in database structure page - issue #11967 Fix PHP error on loading invalid XML or ODS file - issue #11969 Missing confirmation while dropping a view in view_operations.php +- issue #11968 Fix export of index comments in SQL 4.5.4.1 (2016-01-29) - issue #11892 Error with PMA 4.4.15.3 diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index 5b68c22667..715ad48f92 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -1627,7 +1627,9 @@ class ExportSql extends ExportPlugin $indexes_fulltext[] = $field->build($field); unset($statement->fields[$key]); } else if (empty($GLOBALS['sql_if_not_exists'])) { - $indexes[] = $field->build($field); + $indexes[] = str_replace( + 'COMMENT=\'', 'COMMENT \'', $field::build($field) + ); unset($statement->fields[$key]); } } From b3f9f6fabd5edcf90c84e1377bdffc4dab1f99b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 16 Feb 2016 10:08:50 +0100 Subject: [PATCH 2/5] Translated using Weblate (Czech) Currently translated at 94.4% (3036 of 3214 strings) [CI skip] --- po/cs.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/cs.po b/po/cs.po index 998458750a..493906306d 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,10 +6,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-02-08 09:42+0100\n" -"PO-Revision-Date: 2016-01-31 11:31+0000\n" +"PO-Revision-Date: 2016-02-16 10:08+0000\n" "Last-Translator: Michal Čihař \n" -"Language-Team: Czech \n" +"Language-Team: Czech " +"\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -10404,8 +10404,8 @@ msgid "" "Dump binary columns in hexadecimal notation (for example, \"abc\" becomes " "0x616263)" msgstr "" -"Vypisovat binární pole šestnáctkově (například, „abc“ becomes 0x616263)" +"Vypisovat binární pole šestnáctkově (například vypíše 0x616263 místo " +"„abc“)" #: libraries/plugins/export/ExportSql.php:447 msgid "" From f6572e0fa5b30d4eb033bba380def8e2ee17f4df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 16 Feb 2016 10:08:53 +0100 Subject: [PATCH 3/5] Translated using Weblate (Czech) Currently translated at 94.4% (3036 of 3214 strings) [CI skip] --- po/cs.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/cs.po b/po/cs.po index 154ca5db48..348c2ee938 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,10 +6,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-02-08 09:38+0100\n" -"PO-Revision-Date: 2016-01-31 11:31+0000\n" +"PO-Revision-Date: 2016-02-16 10:08+0000\n" "Last-Translator: Michal Čihař \n" -"Language-Team: Czech \n" +"Language-Team: Czech " +"\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -10404,8 +10404,8 @@ msgid "" "Dump binary columns in hexadecimal notation (for example, \"abc\" becomes " "0x616263)" msgstr "" -"Vypisovat binární pole šestnáctkově (například, „abc“ becomes 0x616263)" +"Vypisovat binární pole šestnáctkově (například vypíše 0x616263 místo " +"„abc“)" #: libraries/plugins/export/ExportSql.php:447 msgid "" From 3e74102b129284ce535147d6deb513ef73383cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 16 Feb 2016 12:30:18 +0100 Subject: [PATCH 4/5] Log authentication attempts to syslog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #6146 Signed-off-by: Michal Čihař --- ChangeLog | 2 +- libraries/logging.lib.php | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cdb229bc8b..80c2ed94ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.7.0.0 (not yet released) - issue #11924 Remove caching of server information +- issue #6146 Log authentication attempts to syslog 4.6.0.0 (not yet released) + issue #11456 Disabled storage engines @@ -127,7 +128,6 @@ phpMyAdmin - ChangeLog 4.3.14.0 (not yet released) - --- Older ChangeLogs can be found on our project website --- http://www.phpmyadmin.net/old-stuff/ChangeLogs/ diff --git a/libraries/logging.lib.php b/libraries/logging.lib.php index 540ff5a4a5..105a9ead7d 100644 --- a/libraries/logging.lib.php +++ b/libraries/logging.lib.php @@ -22,5 +22,11 @@ function PMA_logUser($user, $status = 'ok') apache_note('userID', $user); apache_note('userStatus', $status); } + if (function_exists('syslog')) { + @syslog( + LOG_AUTHPRIV, + 'phpMyAdmin: ' . $user . ' (' . $status . ') from ' . $_SERVER['REMOTE_ADDR'] + ); + } } From 2fdd232873daf36e3141bbedcf5f214cf0065187 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Tue, 16 Feb 2016 23:58:21 +0530 Subject: [PATCH 5/5] navigation.js registeronload getting fired on all node clicks, causing reload on all clicks Signed-off-by: Atul Pratap Singh --- js/navigation.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/js/navigation.js b/js/navigation.js index a4fd2724b7..222acd1635 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -515,9 +515,6 @@ $(function () { } }); }); -}); - -AJAX.registerOnload('navigation.js', function () { // Check if session storage is supported if (isStorageSupported('sessionStorage')) { var storage = window.sessionStorage; @@ -538,11 +535,6 @@ AJAX.registerOnload('navigation.js', function () { } } }); -AJAX.registerTeardown('navigation.js', function () { - if (isStorageSupported('sessionStorage')) { - $(document).off('submit', 'form.config-form'); - } -}); /** * updates the tree state in sessionStorage