gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_6' into QA_4_6-security

Browse Source
This commit is contained in:
Michal Čihař 2016-08-02 08:33:39 +02:00
commit ef9bd20e7a
6 changed files with 46 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog
- issue #12303 Avoid typecasting to float when not needed
- issue #12425 Duplicate message variable names in messages.inc.php
- issue #12399 Adding index to table shows wrong top navigation
- issue #12424 Fixed password change on MariaDB without auth plugin
4.6.3 (2016-06-23)
- issue #12249 Fixed cookie path on Windows

10
doc/config.rst
View File

@ -1418,7 +1418,7 @@ Generic settings
This is not a security measure as there will be always ways to
circumvent this. If you want to prohibit users from dropping databases,
revoke them corresponding DROP privilege.
revoke their corresponding DROP privilege.
Defines whether normal users (non-administrator) are allowed to delete
their own database or not. If set as false, the link :guilabel:`Drop
@ -2594,7 +2594,7 @@ webserver. If you cannot avoid having this directory published by webserver,
limit access to it either by web server configuration (for example using
.htaccess or web.config files) or place at least an empty :file:`index.html`
file there, so that directory listing is not possible. However as long as the
directory is accessible by web server, attacker can guess filenames to download
directory is accessible by web server, an attacker can guess filenames to download
the files.
.. config:option:: $cfg['UploadDir']
@ -2622,7 +2622,7 @@ the files.
.. warning::
Please see top of this chapter (:ref:`web-dirs`) for instructions how
to setup this directory and how to make it's usage secure.
to setup this directory and how to make its usage secure.
.. seealso::
@ -2644,7 +2644,7 @@ the files.
.. warning::
Please see top of this chapter (:ref:`web-dirs`) for instructions how
to setup this directory and how to make it's usage secure.
to setup this directory and how to make its usage secure.
.. config:option:: $cfg['TempDir']
@ -2683,7 +2683,7 @@ the files.
.. warning::
Please see top of this chapter (:ref:`web-dirs`) for instructions how
to setup this directory and how to make it's usage secure.
to setup this directory and how to make its usage secure.
Various display setting
-----------------------

8
doc/privileges.rst
View File

@ -60,15 +60,15 @@ will see in the phpMyAdmin navigation.
.. warning::
This feature only limits what user sees, he is still able to use all the
This feature only limits what a user sees, he is still able to use all the
functions. So this can not be considered as a security limitation. Should
you want to limit what users can do, use MySQL privileges to achieve that.
With this feature enabled, the :guilabel:`User accounts` management interface gains
second tab for managing :guilabel:`User groups`, where you can define what each
a second tab for managing :guilabel:`User groups`, where you can define what each
group will view (see image below) and you can then assign each user to one of
groups. Users will be presented by simplified user interface, what might be
useful for inexperienced users who could be overwhelmed by all features
these groups. Users will be presented with a simplified user interface, which might be
useful for inexperienced users who could be overwhelmed by all the features
phpMyAdmin provides.
.. image:: images/usergroups.png

65
po/ia.po
View File

@ -8,16 +8,16 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.6.4-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2016-08-01 11:04+0200\n"
"PO-Revision-Date: 2016-05-23 13:15+0000\n"
"PO-Revision-Date: 2016-08-01 13:13+0000\n"
"Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
"Language-Team: Interlingua <https://hosted.weblate.org/projects/"
"phpmyadmin/4-6/ia/>\n"
"Language-Team: Interlingua "
"<https://hosted.weblate.org/projects/phpmyadmin/4-6/ia/>\n"
"Language: ia\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 2.7-dev\n"
"X-Generator: Weblate 2.8-dev\n"
#: changelog.php:37 license.php:33
#, php-format
@ -5367,10 +5367,9 @@ msgid "Could not connect to the database server!"
msgstr "Il non pote connecter a servitor de base de datos!"
#: libraries/config/Validator.php:286
#, fuzzy
#| msgid "Authentication type"
msgid "Invalid authentication type!"
msgstr "Typo de authentication"
msgstr "Typo de authentication invalide!"
#: libraries/config/Validator.php:293
msgid "Empty username while using [kbd]config[/kbd] authentication method!"
@ -6277,8 +6276,7 @@ msgstr "Dishabilita alcun avisos monstrate per phpMyAdmin."
#: libraries/config/messages.inc.php:353
msgid "Enable gzip compression for import and export operations."
msgstr ""
"Il habilita le compression gzip2 per operationes de importation e "
"exportation."
"Il habilita le compression gzip per operationes de importation e exportation."
#: libraries/config/messages.inc.php:356
msgid "GZip"
@ -6975,7 +6973,6 @@ msgid "HTTP Realm"
msgstr "Sphera HTTP"
#: libraries/config/messages.inc.php:636
#, fuzzy
#| msgid ""
#| "The path for the config file for [a@https://swekey.com]SweKey hardware "
#| "authentication[/a] (not located in your document root; suggested: /etc/"
@ -6984,9 +6981,8 @@ msgid ""
"The path for the config file for SweKey hardware authentication (not located "
"in your document root; suggested: /etc/swekey.conf)."
msgstr ""
"le percurso pro le file de configuration pro [a@https://swekey.com]SweKey "
"hardware authentication[/a] (non locate in tu radice de documento; "
"suggerite: /etc/swekey.conf)."
"Le percurso pro le file de configuration pro authentication hardware de "
"SweKey (non locate in tu radice de documento; suggerite: /etc/swekey.conf)."
#: libraries/config/messages.inc.php:640
msgid "SweKey config file"
@ -7001,7 +6997,6 @@ msgid "Authentication type"
msgstr "Typo de authentication"
#: libraries/config/messages.inc.php:644
#, fuzzy
#| msgid ""
#| "Leave blank for no [a@https://wiki.phpmyadmin.net/pma/bookmark]bookmark[/"
#| "a] support, suggested: [kbd]pma__bookmark[/kbd]"
@ -7009,8 +7004,8 @@ msgid ""
"Leave blank for no [doc@bookmarks@]bookmark[/doc] support, suggested: "
"[kbd]pma__bookmark[/kbd]"
msgstr ""
"Lassa vacue pro nulle [a@https://wiki.phpmyadmin.net/pma/bookmark]bookmark[/"
"a] supporto, suggerite: [kbd]pma__bookmark[/kbd]"
"Lassa vacue pro nulle [doc@bookmarks@]bookmark[/doc] supporto, suggerite: "
"[kbd]pma__bookmark[/kbd]"
#: libraries/config/messages.inc.php:647
msgid "Bookmark table"
@ -7049,7 +7044,6 @@ msgid "Control user password"
msgstr "Contrasigno de usator de controlo"
#: libraries/config/messages.inc.php:660
#, fuzzy
#| msgid ""
#| "A special MySQL user configured with limited permissions, more "
#| "information available on [a@https://wiki.phpmyadmin.net/pma/"
@ -7059,8 +7053,7 @@ msgid ""
"available on [doc@linked-tables]documentation[/doc]."
msgstr ""
"Un usator special de MySQL configurate con permissiones limitate, ulterior "
"information disponibile sur [a@https://wiki.phpmyadmin.net/pma/"
"controluser]wiki[/a]."
"information disponibile sur [doc@linked-tables] 1documentation[/doc] 2."
#: libraries/config/messages.inc.php:663
msgid "Control user"
@ -7226,7 +7219,6 @@ msgid "PDF schema: pages table"
msgstr "Schema PDF: tabella de paginas"
#: libraries/config/messages.inc.php:727
#, fuzzy
#| msgid ""
#| "Database used for relations, bookmarks, and PDF features. See [a@https://"
#| "wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave "
@ -7237,9 +7229,8 @@ msgid ""
"Suggested: [kbd]phpmyadmin[/kbd]."
msgstr ""
"Base de datos usate pro relationes, marcatores de libro, e characteristicas "
"de PDF. Vide [a@https://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] pro le "
"information complete. Lassa vacue pro nulle supporto. Suggerite: "
"[kbd]phpmyadmin[/kbd]."
"de PDF. Vide [doc@linked-tables] 1pmadb[/doc] 2 pro le information complete. "
"Lassa vacue pro nulle supporto. Suggerite: [kbd] 3phpmyadmin[/kbd] 4."
#: libraries/config/messages.inc.php:731
#: templates/server/databases/create.phtml:20
@ -7281,7 +7272,6 @@ msgid "Favorites table"
msgstr "Tabellas favorite"
#: libraries/config/messages.inc.php:746
#, fuzzy
#| msgid ""
#| "Leave blank for no [a@https://wiki.phpmyadmin.net/pma/relation]relation-"
#| "links[/a] support, suggested: [kbd]pma__relation[/kbd]."
@ -7289,23 +7279,22 @@ msgid ""
"Leave blank for no [doc@relations@]relation-links[/doc] support, suggested: "
"[kbd]pma__relation[/kbd]."
msgstr ""
"Lassa vacue pro nulle [a@https://wiki.phpmyadmin.net/pma/relation]relation-"
"links[/a] supporto, suggerite: [kbd]pma__relation[/kbd]."
"Lassa vacue pro nulle supporto [doc@relations@] 1relation-links[/doc] 2 , "
"suggerite: [kbd] 3pma__relation[/kbd] 4."
#: libraries/config/messages.inc.php:750
msgid "Relation table"
msgstr "Tabella de relation"
#: libraries/config/messages.inc.php:752
#, fuzzy
#| msgid ""
#| "See [a@https://wiki.phpmyadmin.net/pma/auth_types#signon]authentication "
#| "types[/a] for an example."
msgid ""
"See [doc@authentication-modes]authentication types[/doc] for an example."
msgstr ""
"Vide [a@https://wiki.phpmyadmin.net/pma/auth_types#signon]typos de "
"authentication[/a] pro un exemplo."
"Vide [doc@authentication-modes] typos de authentication [/doc] pro un "
"exemplo."
#: libraries/config/messages.inc.php:755
msgid "Signon session name"
@ -7835,14 +7824,12 @@ msgid "Proxy password"
msgstr "Contrasigno de proxy"
#: libraries/config/messages.inc.php:978
#, fuzzy
#| msgid ""
#| "Enable [a@https://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for "
#| "import and export operations."
msgid "Enable ZIP compression for import and export operations."
msgstr ""
"Il habilita le compression [a@https://en.wikipedia.org/wiki/Bzip2]bzip2[/a] "
"per operationes de importation e exportation."
"Il habilita le compression ZIP per operationes de importation e exportation."
#: libraries/config/messages.inc.php:981
msgid "ZIP"
@ -9444,10 +9431,9 @@ msgid "Log out"
msgstr "Claude session"
#: libraries/navigation/NavigationHeader.php:172
#, fuzzy
#| msgid "Dumping data"
msgid "Empty session data"
msgstr "Dump (discargamento) de datos"
msgstr "Datos de session vacue"
#: libraries/navigation/NavigationHeader.php:188
msgid "phpMyAdmin documentation"
@ -13560,10 +13546,9 @@ msgid "An opening bracket was expected."
msgstr ""
#: libraries/sql-parser/src/Components/CreateDefinition.php:225
#, fuzzy
#| msgid "Variable name was expected."
msgid "A symbol name was expected!"
msgstr "On expectava un nomine de variabile."
msgstr "On expectava un nomine de symbolo!"
#: libraries/sql-parser/src/Components/CreateDefinition.php:257
msgid "A comma or a closing bracket was expected."
@ -14215,10 +14200,9 @@ msgid ""
msgstr ""
#: setup/frames/index.inc.php:132
#, fuzzy
#| msgid "Configuration saved."
msgid "Configuration not saved!"
msgstr "Configuration salveguardate."
msgstr "Configuration non salveguardate!"
#: setup/frames/index.inc.php:147 setup/frames/menu.inc.php:19
msgid "Overview"
@ -14855,7 +14839,6 @@ msgid "Tracking is not active."
msgstr ""
#: templates/error/report_form.phtml:7
#, fuzzy
#| msgid ""
#| "phpMyAdmin has encountered an error. We have collected data about this "
#| "error as well as information about relevant configuration settings to "
@ -14865,9 +14848,9 @@ msgid ""
"about relevant configuration settings. It will be sent to the phpMyAdmin "
"team for debugging the error."
msgstr ""
"phpMyAdmin ha incontrate un error. Nos ha colligite datos re iste error assi "
"como informationes re preferentias de configuration relevante pro inviar al "
"equipa de phpMyAdmin pro adjutar nos a analysar le problema."
"Iste reporto includeva automaticamente datos re le error e re le information "
"super fixationes de configuration relevante. Illo essera inviata al equipa "
"de phpMtAdmin pro analysar le error."
#: templates/error/report_form.phtml:14
msgid ""

22
po/sl.po
View File

@ -4,17 +4,17 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.6.4-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2016-08-01 11:04+0200\n"
"PO-Revision-Date: 2016-05-23 17:45+0000\n"
"PO-Revision-Date: 2016-08-01 12:56+0000\n"
"Last-Translator: Domen <mitenem@outlook.com>\n"
"Language-Team: Slovenian <https://hosted.weblate.org/projects/phpmyadmin/4-6/"
"sl/>\n"
"Language-Team: Slovenian "
"<https://hosted.weblate.org/projects/phpmyadmin/4-6/sl/>\n"
"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
"%100==4 ? 2 : 3;\n"
"X-Generator: Weblate 2.7-dev\n"
"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
"n%100==4 ? 2 : 3;\n"
"X-Generator: Weblate 2.8-dev\n"
#: changelog.php:37 license.php:33
#, php-format
@ -7010,9 +7010,9 @@ msgid ""
"More information on [a@https://sourceforge.net/p/phpmyadmin/bugs/2606/]PMA "
"bug tracker[/a] and [a@https://bugs.mysql.com/19588]MySQL Bugs[/a]"
msgstr ""
"Več informacij na [a@https://sourceforge.net/p/phpmyadmin/"
"bugs/2606/]sledilniku hroščev PMA[/a] in[a@https://bugs.mysql."
"com/19588]hroščih MySQL[/a]"
"Več informacij na [a@https://sourceforge.net/p/phpmyadmin/bugs/2606/]"
"sledilniku hroščev PMA[/a] in [a@https://bugs.mysql.com/19588]hroščih "
"MySQL[/a]"
#: libraries/config/messages.inc.php:681
msgid "Disable use of INFORMATION_SCHEMA"
@ -14371,14 +14371,14 @@ msgstr "Nezavarovana povezava"
#: setup/frames/index.inc.php:119
msgid "Configuration saved."
msgstr "Konfiguracija je shranjena."
msgstr "Konfiguracijo smo shranili."
#: setup/frames/index.inc.php:122
msgid ""
"Configuration saved to file config/config.inc.php in phpMyAdmin top level "
"directory, copy it to top level one and delete directory config to use it."
msgstr ""
"Konfiguracija je shranjena v datoteko config/config.inc.php v vrhnji mapi "
"Konfiguracijo smo shranili v datoteko config/config.inc.php v vrhnji mapi "
"phpMyAdmin; skopirajte jo v vrhnjo mapo in izbrišite mapo config, če jo "
"želite uporabiti."

1
user_password.php
View File

@ -240,6 +240,7 @@ function PMA_changePassUrlParamsAndSubmitQuery(
} else if ($serverType == 'MariaDB'
&& PMA_MYSQL_INT_VERSION >= 50200
&& PMA_MYSQL_INT_VERSION < 100100
&& $orig_auth_plugin !== ''
) {
if ($orig_auth_plugin == 'mysql_native_password') {
// Set the hashing method used by PASSWORD()