From 18bccea2915d770a67812e0be9e5fded9166b159 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Mon, 16 Mar 2015 04:31:21 +0530 Subject: [PATCH 1/5] Fixes bug #4803 Signed-off-by: Deven Bansod --- libraries/navigation/NavigationTree.class.php | 7 +++++++ libraries/navigation/Nodes/Node_Database.class.php | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php index fc6acd0e07..d6f47f68ab 100644 --- a/libraries/navigation/NavigationTree.class.php +++ b/libraries/navigation/NavigationTree.class.php @@ -733,6 +733,13 @@ class PMA_NavigationTree $keySeparatorLength ) ); + + if ($new_child instanceof Node_Database + && $child->getHiddenCount() > 0 + ) { + $new_child->setHiddenCount($child->getHiddenCount()); + } + $new_child->real_name = $child->real_name; $new_child->icon = $child->icon; $new_child->links = $child->links; diff --git a/libraries/navigation/Nodes/Node_Database.class.php b/libraries/navigation/Nodes/Node_Database.class.php index 7fca56c110..e8151d93da 100644 --- a/libraries/navigation/Nodes/Node_Database.class.php +++ b/libraries/navigation/Nodes/Node_Database.class.php @@ -652,6 +652,16 @@ class Node_Database extends Node { $this->_hiddenCount = $count; } + + /** + * Returns the number of hidden items in this database + * + * @return int hidden item count + */ + public function getHiddenCount() + { + return $this->_hiddenCount; + } } ?> From 0b8e328f9d446a8ebf67ef6972b46b9240ff9a82 Mon Sep 17 00:00:00 2001 From: Hauke Henningsen Date: Mon, 16 Mar 2015 02:11:42 +0100 Subject: [PATCH 2/5] Translated using Weblate (German) Currently translated at 100.0% (3032 of 3032 strings) [CI skip] --- po/de.po | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/po/de.po b/po/de.po index 71f388a3fe..c55ceb70cd 100644 --- a/po/de.po +++ b/po/de.po @@ -4,14 +4,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-03-06 08:15-0500\n" -"PO-Revision-Date: 2015-03-06 10:13+0200\n" -"Last-Translator: Matthias Bluthardt \n" -"Language-Team: German \n" +"PO-Revision-Date: 2015-03-16 02:11+0200\n" +"Last-Translator: Hauke Henningsen \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 2.3-dev\n" @@ -829,7 +829,6 @@ msgid "List of changes" msgstr "Liste der Änderungen" #: index.php:447 -#, fuzzy #| msgid "" #| "Your configuration file contains settings (root with no password) that " #| "correspond to the default MySQL privileged account. Your MySQL server is " @@ -841,11 +840,11 @@ msgid "" "default, is open to intrusion, and you really should fix this security hole " "by setting a password for user 'root'." msgstr "" -"Ihre Konfigurationsdatei enthält Einstellungen (Benutzer root ohne " -"Passwort), welche denen des MySQL-Standardbenutzers entsprechen. Wird Ihr " -"MySQL-Server mit diesen Einstellungen betrieben, so können Unbefugte leicht " -"von außen auf ihn zugreifen. Sie sollten diese Sicherheitslücke unbedingt " -"durch das Setze eines Passworts für den Benutzer 'root' schließen." +"Sie sind als „root“ ohne Passwort verbunden, was dem MySQL-Standardbenutzer " +"entspricht. Wird Ihr MySQL-Server mit diesen Einstellungen betrieben, so " +"können Unbefugte leicht von außen auf ihn zugreifen. Sie sollten diese " +"Sicherheitslücke unbedingt durch das Setze eines Passworts für den Benutzer " +"'root' schließen." #: index.php:464 msgid "" @@ -11947,11 +11946,10 @@ msgstr "Verlange SSL" #: libraries/server_privileges.lib.php:759 #: libraries/server_privileges.lib.php:768 -#, fuzzy #| msgid "Requires that a specific cipher method be used for a connection." msgid "Requires that a specific cipher method be used for a connection." msgstr "" -"Erfordert, dass ein bestimmtes Verschlüsselungsverfahren für eine Verbindung " +"Erfordert, dass eine bestimmte Verschlüsselungsmethode für zum Verbinden " "verwendet wird." #: libraries/server_privileges.lib.php:778 From 9f1f0e6bc1e4161e048628a3b177d97faac0254d Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 11 Mar 2015 14:12:26 +0530 Subject: [PATCH 3/5] Per server iv Signed-off-by: Madhura Jayaratne --- libraries/plugins/auth/AuthenticationCookie.class.php | 6 +++--- .../plugin/auth/PMA_AuthenticationCookie_test.php | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php index 6a013cacbc..7db3eb2071 100644 --- a/libraries/plugins/auth/AuthenticationCookie.class.php +++ b/libraries/plugins/auth/AuthenticationCookie.class.php @@ -442,7 +442,7 @@ class AuthenticationCookie extends AuthenticationPlugin // check cookies if (empty($_COOKIE['pmaUser-' . $GLOBALS['server']]) - || empty($_COOKIE['pma_iv']) + || empty($_COOKIE['pma_iv-' . $GLOBALS['server']]) ) { return false; } @@ -784,7 +784,7 @@ class AuthenticationCookie extends AuthenticationPlugin public function cookieDecrypt($encdata, $secret) { if (is_null($this->_cookie_iv)) { - $this->_cookie_iv = base64_decode($_COOKIE['pma_iv'], true); + $this->_cookie_iv = base64_decode($_COOKIE['pma_iv-' . $GLOBALS['server']], true); } if (strlen($this->_cookie_iv) < $this->getIVSize()) { $this->createIV(); @@ -840,7 +840,7 @@ class AuthenticationCookie extends AuthenticationPlugin ); } $GLOBALS['PMA_Config']->setCookie( - 'pma_iv', + 'pma_iv-' . $GLOBALS['server'], base64_encode($this->_cookie_iv) ); } diff --git a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php index 3941b9299a..83e10a9637 100644 --- a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php +++ b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php @@ -544,7 +544,7 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase $GLOBALS['server'] = 1; $_COOKIE['pmaServer-1'] = 'pmaServ1'; $_COOKIE['pmaUser-1'] = ''; - $_COOKIE['pma_iv'] = base64_encode('testiv09testiv09'); + $_COOKIE['pma_iv-1'] = base64_encode('testiv09testiv09'); $this->assertFalse( $this->object->authCheck() @@ -560,7 +560,7 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase $GLOBALS['server'] = 1; $_COOKIE['pmaServer-1'] = 'pmaServ1'; $_COOKIE['pmaUser-1'] = 'pmaUser1'; - $_COOKIE['pma_iv'] = base64_encode('testiv09testiv09'); + $_COOKIE['pma_iv-1'] = base64_encode('testiv09testiv09'); $_COOKIE['pmaPass-1'] = ''; $GLOBALS['cfg']['blowfish_secret'] = 'secret'; $_SESSION['last_access_time'] = time() - 1000; @@ -635,7 +635,7 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase $_REQUEST['pma_username'] = ''; $_COOKIE['pmaServer-1'] = 'pmaServ1'; $_COOKIE['pmaUser-1'] = 'pmaUser1'; - $_COOKIE['pma_iv'] = base64_encode('testiv09testiv09'); + $_COOKIE['pma_iv-1'] = base64_encode('testiv09testiv09'); $GLOBALS['cfg']['blowfish_secret'] = 'secret'; $_SESSION['last_access_time'] = ''; $_SESSION['last_valid_captcha'] = true; @@ -674,7 +674,7 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase $_COOKIE['pmaServer-1'] = 'pmaServ1'; $_COOKIE['pmaUser-1'] = 'pmaUser1'; $_COOKIE['pmaPass-1'] = 'pmaPass1'; - $_COOKIE['pma_iv'] = base64_encode('testiv09testiv09'); + $_COOKIE['pma_iv-1'] = base64_encode('testiv09testiv09'); $GLOBALS['cfg']['blowfish_secret'] = 'secret'; $_SESSION['last_valid_captcha'] = true; $_SESSION['last_access_time'] = time() - 1000; @@ -718,7 +718,7 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase $_REQUEST['pma_username'] = ''; $_COOKIE['pmaServer-1'] = 'pmaServ1'; $_COOKIE['pmaUser-1'] = 'pmaUser1'; - $_COOKIE['pma_iv'] = base64_encode('testiv09testiv09'); + $_COOKIE['pma_iv-1'] = base64_encode('testiv09testiv09'); $GLOBALS['cfg']['blowfish_secret'] = 'secret'; $_SESSION['last_access_time'] = 1; $_SESSION['last_valid_captcha'] = true; From 31cbe20756077c74455ca42aa98fd64773dddf5b Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Sun, 15 Mar 2015 22:07:56 +0100 Subject: [PATCH 4/5] Translated using Weblate (Interlingua) Currently translated at 68.8% (2087 of 3032 strings) [CI skip] --- po/ia.po | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/po/ia.po b/po/ia.po index d4d3849b4f..71b33df353 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.0-alpha1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-03-06 08:15-0500\n" -"PO-Revision-Date: 2015-03-09 15:46+0200\n" +"PO-Revision-Date: 2015-03-15 22:07+0200\n" "Last-Translator: Giovanni Sora \n" "Language-Team: Interlingua " "\n" @@ -4914,6 +4914,10 @@ msgid "" "setting for [em]$cfg['Servers'][%3$d]['SessionTimeZone'][/em]. phpMyAdmin is " "currently using the default time zone of the database server." msgstr "" +"Incapace a usar fuso horari %1$s pro servitor %2$d. Pro verifica tu " +"preferentias de configuration per " +"[em]$cfg['Servers'][%3$d]['SessionTimeZone'][/em]. phpMyAdmin es " +"currentemente usante le fuso horari predefinite de servitor de base de datos." #: libraries/common.inc.php:1020 #, php-format @@ -5378,6 +5382,9 @@ msgid "" "MySQL server is enabled by matching the IP or hostname of the MySQL server " "to the given regular expression." msgstr "" +"Il restringe le servitores de MySQL que le usator pote insertar quando un " +"accesso a un servitor MySQL arbitrari es habilitate per equalar le IP o le " +"nomine de hospite del servitor MySQL a le date expression regular." #: libraries/config/messages.inc.php:25 msgid "Restrict login to MySQL server" From 12e8654df065a7d395f5c159c27485320fe9004e Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 16 Mar 2015 07:59:26 -0400 Subject: [PATCH 5/5] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index c0e198e255..98d2072d80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.3.13.0 (not yet released) +- bug #4803 "Show hidden items" is sometimes hidden 4.3.12.0 (2015-03-14) - bug #4746 Right-aligned columns have left-aligned header