From 23b6499dc8a65ab3d3995d796f0383b492c652f3 Mon Sep 17 00:00:00 2001 From: jorge jansen abreu Date: Wed, 27 Jul 2016 00:30:26 +0000 Subject: [PATCH 1/2] Translated using Weblate (Spanish) Currently translated at 99.7% (3202 of 3209 strings) [CI skip] --- po/es.po | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/po/es.po b/po/es.po index d177cc656d..e06355e303 100644 --- a/po/es.po +++ b/po/es.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-05-23 14:29+0200\n" -"PO-Revision-Date: 2016-07-03 16:17+0000\n" -"Last-Translator: Franco \n" +"PO-Revision-Date: 2016-07-27 00:30+0000\n" +"Last-Translator: jorge jansen abreu \n" "Language-Team: Spanish " "\n" "Language: es\n" @@ -13,7 +13,7 @@ msgstr "" "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 @@ -3232,10 +3232,9 @@ msgid "Switch to dark theme" msgstr "Cambiar al tema oscuro" #: libraries/DatabaseInterface.php:1548 -#, fuzzy #| msgid "Failed to read configuration file!" msgid "Failed to set configured collation connection!" -msgstr "¡Fallo al definir el archivo de configuración de cotejamiento!" +msgstr "¡Fallo al definir la conexión de colacion configurada!" #: libraries/DatabaseInterface.php:2159 msgid "" @@ -15278,7 +15277,6 @@ msgid "Tracking is not active." msgstr "El seguimiento no está activo." #: 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 " @@ -15288,9 +15286,9 @@ msgid "" "about relevant configuration settings. It will be sent to the phpMyAdmin " "team for debugging the error." msgstr "" -"phpMyAdmin encontró un error. Hemos recolectado datos sobre este error así " -"como información relevante de configuración para enviar al equipo de " -"phpMyAdmin y ayudarnos a investigar el problema." +"Este reporte automaticamente incluye datos acerca del error e información " +"acerca de ajustes de configuración relevantes. Será enviado al equipo " +"phpMyAdmin para depurar el error." #: templates/error/report_form.phtml:14 msgid "" @@ -16049,10 +16047,9 @@ msgstr "" "Versión menor a 5.5.8 (la primer versión de 5.5 disponible públicamente)." #: libraries/advisory_rules.txt:118 -#, fuzzy #| msgid "You should upgrade, to a stable version of MySQL 5.5" msgid "You should upgrade, to a stable version of MySQL 5.5." -msgstr "Debería actualizar a una versión estable de MySQL 5.5" +msgstr "Usted debería actualizar a una versión estable de MySQL 5.5." #: libraries/advisory_rules.txt:121 libraries/advisory_rules.txt:128 msgid "Distribution" @@ -16364,7 +16361,6 @@ msgid "Too many sorts are causing temporary tables." msgstr "Demasiadas ordenaciones causan tablas temporales." #: libraries/advisory_rules.txt:208 libraries/advisory_rules.txt:215 -#, fuzzy #| msgid "" #| "Consider increasing {sort_buffer_size} and/or {read_rnd_buffer_size}, " #| "depending on your system memory limits" @@ -16373,7 +16369,7 @@ msgid "" "depending on your system memory limits." msgstr "" "Considere aumentar {sort_buffer_size} y/o {read_rnd_buffer_size} dependiendo " -"de los límites de memoria del sistema" +"de los límites de memoria de su sistema." #: libraries/advisory_rules.txt:209 #, php-format From 2f4fec52d62acca374d846acd8bbc6bd33bde7c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 27 Jul 2016 17:01:02 +0200 Subject: [PATCH 2/2] Document setup of *Dirs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- doc/config.rst | 48 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/doc/config.rst b/doc/config.rst index 22205fa13c..88bae2f431 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -2591,9 +2591,26 @@ SQL query box settings Whether to display a link to refresh a query in any SQL Query box. +.. _web-dirs: + Web server upload/save/import directories ----------------------------------------- +If PHP is running in safe mode, all directories must be owned by the same user +as the owner of the phpMyAdmin scripts. + +If the directory where phpMyAdmin is installed is subject to an +``open_basedir`` restriction, you need to create a temporary directory in some +directory accessible by the PHP interpreter. + +For security reasons, all directories should be outside the tree published by +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 +the files. + .. config:option:: $cfg['UploadDir'] :type: string @@ -2616,11 +2633,14 @@ Web server upload/save/import directories uploaded via :term:`HTTP`, or when file uploads are disabled in PHP. - .. note:: + .. warning:: - If PHP is running in safe mode, this directory must be owned by the same - user as the owner of the phpMyAdmin scripts. See also :ref:`faq1_16` for - alternatives. + Please see top of this chapter (:ref:`web-dirs`) for instructions how + to setup this directory and how to make it's usage secure. + + .. seealso:: + + See :ref:`faq1_16` for alternatives. .. config:option:: $cfg['SaveDir'] @@ -2635,10 +2655,10 @@ Web server upload/save/import directories Please note that the directory must exist and has to be writable for the user running webserver. - .. note:: + .. warning:: - If PHP is running in safe mode, this directory must be owned by the same - user as the owner of the phpMyAdmin scripts. + Please see top of this chapter (:ref:`web-dirs`) for instructions how + to setup this directory and how to make it's usage secure. .. config:option:: $cfg['TempDir'] @@ -2651,14 +2671,6 @@ Web server upload/save/import directories work around limitations of ``open_basedir`` for uploaded files, see :ref:`faq1_11`. - If the directory where phpMyAdmin is installed is - subject to an ``open_basedir`` restriction, you need to create a - temporary directory in some directory accessible by the web server. - However for security reasons, this directory should be outside the - tree published by webserver. If you cannot avoid having this directory - published by webserver, place at least an empty :file:`index.html` file - there, so that directory listing is not possible. - This directory should have as strict permissions as possible as the only user required to access this directory is the one who runs the webserver. If you have root privileges, simply make this user owner of this directory @@ -2666,7 +2678,6 @@ Web server upload/save/import directories .. code-block:: sh - chown www-data:www-data tmp chmod 700 tmp @@ -2683,6 +2694,11 @@ Web server upload/save/import directories :command:`chmod 777`, but it might impose risk of other users on system reading and writing data in this directory. + .. 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. + Various display setting -----------------------