From 48b97ecd064402134531af15124cb7d79c1f2e27 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 7 Oct 2014 08:03:39 +0530 Subject: [PATCH 1/5] bug #4252 Database-level permission bug for db names containing underscores Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/Util.class.php | 14 +------------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3a2a593c7..e501a8c39a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - bug #4543 Changing column name can break saved "order by" clause - bug #4545 trying to favorite table while browser localStorage is disabled throws JS error - bug #4259 reCaptcha sound session expired problem +- bug #4252 Database-level permission bug for db names containing underscores 4.2.9.0 (2014-09-20) - bug ajax.js responseHandler: cannot read property of null diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 047232a3b9..8f96cc19c4 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -3833,19 +3833,7 @@ class PMA_Util // If a database name was provided and user does not have the // required global privilege, try database-wise permissions. if ($db !== null) { - // need to escape wildcards in db and table names, see bug #3566 - // (wildcard characters appear as being quoted with a backslash - // when querying TABLE_SCHEMA.SCHEMA_PRIVILEGES) - $db = str_replace(array('%', '_'), array('\%', '\_'), $db); - /* - * This is to take into account a wildcard db privilege - * so we replace % by .* and _ by . to be able to compare - * with REGEXP. - * - * Also, we need to double the inner % to please sprintf(). - */ - $query .= " AND '%s' REGEXP" - . " REPLACE(REPLACE(TABLE_SCHEMA, '_', '.'), '%%', '.*')"; + $query .= " AND '%s' LIKE `TABLE_SCHEMA`"; $schema_privileges = $GLOBALS['dbi']->fetchValue( sprintf( $query, From b240909757a8bb35145ae774e2758e9897ee3e00 Mon Sep 17 00:00:00 2001 From: P Date: Mon, 6 Oct 2014 21:48:49 +0200 Subject: [PATCH 2/5] Translated using Weblate (Bulgarian) Currently translated at 64.8% (1796 of 2768 strings) [CI skip] --- po/bg.po | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/po/bg.po b/po/bg.po index 2e7b42378b..9e293bbeac 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,10 +4,10 @@ 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-17 21:05+0200\n" -"Last-Translator: Pl \n" -"Language-Team: Bulgarian " -"\n" +"PO-Revision-Date: 2014-10-06 21:48+0200\n" +"Last-Translator: P \n" +"Language-Team: Bulgarian " +"\n" "Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3953,10 +3953,9 @@ msgid "Max: %s%s" msgstr "Максимум: %s%s" #: libraries/Util.class.php:640 libraries/sql.lib.php:452 -#, fuzzy #| msgid "SQL query" msgid "SQL query:" -msgstr "SQL заявка" +msgstr "SQL заявка:" #: libraries/Util.class.php:684 libraries/rte/rte_events.lib.php:114 #: libraries/rte/rte_events.lib.php:123 libraries/rte/rte_events.lib.php:140 From 718d02272b02d2616547f510fc8fce14401a262a Mon Sep 17 00:00:00 2001 From: josep constanti Date: Sun, 5 Oct 2014 19:43:36 +0200 Subject: [PATCH 3/5] Translated using Weblate (Catalan) Currently translated at 86.0% (2381 of 2768 strings) [CI skip] --- po/ca.po | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/po/ca.po b/po/ca.po index 8d0d2fd4d6..1223398d9c 100644 --- a/po/ca.po +++ b/po/ca.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-10-03 17:08+0200\n" -"Last-Translator: Xavier Navarro \n" +"PO-Revision-Date: 2014-10-05 19:43+0200\n" +"Last-Translator: josep constanti \n" "Language-Team: Catalan " "\n" "Language: ca\n" @@ -4626,24 +4626,22 @@ msgstr "No s'ha pogut inicialitzar la biblioteca de connexió Drizzle!" #: libraries/config/Validator.class.php:262 #: libraries/config/Validator.class.php:273 #: libraries/config/Validator.class.php:280 -#, fuzzy #| msgid "Could not connect to the target" msgid "Could not connect to the database server!" -msgstr "No s'ha pogut connectar a la destinació" +msgstr "No s'ha pogut connectar amb el servidor de dades!" #: libraries/config/Validator.class.php:313 -#, fuzzy #| msgid "Empty username while using config authentication method" msgid "Empty username while using [kbd]config[/kbd] authentication method!" -msgstr "Nom d'usuari buit al usar el métode d'autenticació config" +msgstr "Nom d'usuari buit en usar el mètode d'autenticació [kbd]config[/kbd]!" #: libraries/config/Validator.class.php:320 -#, fuzzy #| msgid "Empty signon session name while using signon authentication method" msgid "" "Empty signon session name while using [kbd]signon[/kbd] authentication " "method!" -msgstr "Nom de sessió signon buit al usar el métode d'autenticació signon" +msgstr "" +"Nom de sessió signon buit en usar el mètode d'autenticació [kbd]signon[/kbd]!" #: libraries/config/Validator.class.php:329 #, fuzzy From 3ffcbcb52ba296c096697ac754727ae331a1e39a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xos=C3=A9=20Calvo?= Date: Mon, 6 Oct 2014 23:53:51 +0200 Subject: [PATCH 4/5] Translated using Weblate (Galician) Currently translated at 86.3% (2389 of 2768 strings) [CI skip] --- po/gl.po | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/po/gl.po b/po/gl.po index 2ceb644730..b59a65f304 100644 --- a/po/gl.po +++ b/po/gl.po @@ -4,16 +4,16 @@ 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-03-31 14:24+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Galician \n" +"PO-Revision-Date: 2014-10-06 23:53+0200\n" +"Last-Translator: Xosé Calvo \n" +"Language-Team: Galician " +"\n" "Language: gl\n" "MIME-Version: 1.0\n" "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.10-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -218,16 +218,16 @@ msgid "The database name is empty!" msgstr "O nome da base de datos está baleiro!" #: db_operations.php:130 -#, fuzzy, php-format +#, php-format #| msgid "Database %1$s has been renamed to %2$s." msgid "Database %1$s has been renamed to %2$s." -msgstr "A base de datos %1$s foi renomeada a %2$s" +msgstr "A base de datos %1$s foi renomeada como %2$s." #: db_operations.php:136 -#, fuzzy, php-format +#, php-format #| msgid "Database %1$s has been copied to %2$s." msgid "Database %1$s has been copied to %2$s." -msgstr "A base de datos %1$s foi copiada a %2$s" +msgstr "A base de datos %1$s foi copiada en %2$s." #: db_operations.php:260 #, php-format @@ -293,10 +293,9 @@ msgstr[0] "%s táboa" msgstr[1] "%s táboas" #: db_qbe.php:102 -#, fuzzy #| msgid "You have to choose at least one column to display" msgid "You have to choose at least one column to display!" -msgstr "Debe escoller cando menos unha columna para mostrar" +msgstr "Debe escoller cando menos unha columna para mostrar!" #: db_qbe.php:123 #, php-format @@ -583,7 +582,6 @@ msgid "Output" msgstr "Saída" #: gis_data_editor.php:410 -#, fuzzy #| msgid "" #| "Choose \"GeomFromText\" from the \"Function\" column and paste the string " #| "below into the \"Value\" field" @@ -592,7 +590,7 @@ msgid "" "below into the \"Value\" field." msgstr "" "Escolla «GeomFromText» na columna «Función» e apegue a cadea situada embaixo " -"no campo «Valor»" +"no campo «Valor»." #: import.php:116 #, php-format @@ -620,10 +618,9 @@ msgstr "" #: import.php:412 import.php:473 libraries/File.class.php:433 #: libraries/File.class.php:527 -#, fuzzy #| msgid "File could not be read" msgid "File could not be read!" -msgstr "Non foi posíbel ler o ficheiro" +msgstr "Non foi posíbel ler o ficheiro." #: import.php:421 import.php:432 import.php:453 import.php:464 #: libraries/File.class.php:593 @@ -646,25 +643,24 @@ msgstr "" "Consulte a [doc@faq1-16]Pregunta frecuente 1.16[/doc]." #: import.php:498 -#, fuzzy #| msgid "" #| "Cannot convert file's character set without character set conversion " #| "library" msgid "" "Cannot convert file's character set without character set conversion library!" msgstr "" -"Non se pode converter o xogo de caracteres do ficheiro sen a biblioteca " -"correspondente" +"Non é posíbel converter o xogo de caracteres do ficheiro sen a biblioteca " +"correspondente." #: import.php:536 libraries/display_import.inc.php:32 msgid "Could not load import plugins, please check your installation!" msgstr "Non foi posíbel importar os engadidos - Comprobe a instalación!" #: import.php:571 libraries/sql.lib.php:1048 libraries/sql.lib.php:1848 -#, fuzzy, php-format +#, php-format #| msgid "Bookmark %s created" msgid "Bookmark %s has been created." -msgstr "Creouse o marcador %s" +msgstr "Creouse o marcador %s." #: import.php:580 #, php-format @@ -695,10 +691,9 @@ msgid "Back" msgstr "Recuar" #: index.php:127 libraries/Footer.class.php:70 -#, fuzzy #| msgid "phpMyAdmin homepage" msgid "phpMyAdmin Demo Server" -msgstr "Páxina web do phpMyAdmin" +msgstr "Servidor de demostración do phpMyAdmin" #: index.php:131 #, php-format From 27ab463b9b0b655ba97db1cc0fab0e28335460b8 Mon Sep 17 00:00:00 2001 From: Alexey Rubinov Date: Tue, 7 Oct 2014 06:00:06 +0200 Subject: [PATCH 5/5] Translated using Weblate (Russian) Currently translated at 100.0% (2768 of 2768 strings) [CI skip] --- po/ru.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ru.po b/po/ru.po index 6ea5ae385b..7d35117901 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ 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-10-07 05:35+0200\n" +"PO-Revision-Date: 2014-10-07 06:00+0200\n" "Last-Translator: Alexey Rubinov \n" "Language-Team: Russian " "\n" @@ -2292,7 +2292,7 @@ msgstr "Нед." #. #: js/messages.php:555 msgid "calendar-month-year" -msgstr "число-месяц-год" +msgstr "календарь-месяц-год" #. l10n: Year suffix for calendar, "none" is empty. #: js/messages.php:558 @@ -6611,7 +6611,7 @@ msgstr "Имя сессии для Signon" #: libraries/config/messages.inc.php:658 msgid "Signon URL" -msgstr "Signon URL" +msgstr "URL для Signon" #: libraries/config/messages.inc.php:660 #| msgid "Socket on which MySQL server is listening, leave empty for default"