From 2bf398a3a8d0627b88398384af246367cc1e00ba Mon Sep 17 00:00:00 2001
From: Deven Bansod <devenbansod.bits@gmail.com>
Date: Wed, 5 Oct 2016 11:10:11 +0530
Subject: [PATCH 01/20] Use sprintf instead of directly concatenating the
 variable

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
---
 templates/navigation/logo.phtml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/templates/navigation/logo.phtml b/templates/navigation/logo.phtml
index c7e15614cb..5beda2be3e 100644
--- a/templates/navigation/logo.phtml
+++ b/templates/navigation/logo.phtml
@@ -17,12 +17,11 @@ $linkAttribs = isset($linkAttribs) ? $linkAttribs : null;
 if (!isset($logo)) {
     $logo = null;
     if (isset($GLOBALS['pmaThemeImage'])) {
-        $imgTag = '<img src="' . $GLOBALS['pmaThemeImage'] . '%s" '
-            . 'alt="phpMyAdmin" id="imgpmalogo" />';
+        $imgTag = '<img src="%s%s" ' . 'alt="phpMyAdmin" id="imgpmalogo" />';
         if (@file_exists($GLOBALS['pmaThemeImage'] . 'logo_left.png')) {
-            $logo = sprintf($imgTag, 'logo_left.png');
+            $logo = sprintf($imgTag, $GLOBALS['pmaThemeImage'], 'logo_left.png');
         } elseif (@file_exists($GLOBALS['pmaThemeImage'] . 'pma_logo2.png')) {
-            $logo = sprintf($imgTag, 'pma_logo2.png');
+            $logo = sprintf($imgTag, $GLOBALS['pmaThemeImage'], 'pma_logo2.png');
         }
     }
 }

From 7bf85fe817114460de0ad51cf436d1921aef2924 Mon Sep 17 00:00:00 2001
From: Deven Bansod <devenbansod.bits@gmail.com>
Date: Thu, 6 Oct 2016 10:27:23 +0530
Subject: [PATCH 02/20] Use sprintf instead of directly concatenating the
 variable

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
---
 libraries/navigation/NavigationTree.php |  6 +++++-
 libraries/navigation/nodes/Node.php     | 20 +++++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/libraries/navigation/NavigationTree.php b/libraries/navigation/NavigationTree.php
index 5bc830a34b..0e9b2986c0 100644
--- a/libraries/navigation/NavigationTree.php
+++ b/libraries/navigation/NavigationTree.php
@@ -171,10 +171,13 @@ class NavigationTree
          * @todo describe a scenario where this code is executed
          */
         if (!$GLOBALS['cfg']['Server']['DisableIS']) {
+            $dbSeparator = Util::sqlAddSlashes(
+                $GLOBALS['cfg']['NavigationTreeDbSeparator']
+            );
             $query = "SELECT (COUNT(DB_first_level) DIV %d) * %d ";
             $query .= "from ( ";
             $query .= " SELECT distinct SUBSTRING_INDEX(SCHEMA_NAME, ";
-            $query .= " '" . Util::sqlAddSlashes($GLOBALS['cfg']['NavigationTreeDbSeparator']) . "', 1) ";
+            $query .= " '%s', 1) ";
             $query .= " DB_first_level ";
             $query .= " FROM INFORMATION_SCHEMA.SCHEMATA ";
             $query .= " WHERE `SCHEMA_NAME` < '%s' ";
@@ -185,6 +188,7 @@ class NavigationTree
                     $query,
                     (int)$GLOBALS['cfg']['FirstLevelNavigationItems'],
                     (int)$GLOBALS['cfg']['FirstLevelNavigationItems'],
+                    $dbSeparator,
                     Util::sqlAddSlashes($GLOBALS['db'])
                 )
             );
diff --git a/libraries/navigation/nodes/Node.php b/libraries/navigation/nodes/Node.php
index de6b1d2d62..e78cf4debf 100644
--- a/libraries/navigation/nodes/Node.php
+++ b/libraries/navigation/nodes/Node.php
@@ -424,7 +424,9 @@ class Node
             return $retval;
         }
 
-        $dbSeparator = $GLOBALS['cfg']['NavigationTreeDbSeparator'];
+        $dbSeparator = Util::sqlAddSlashes(
+            $GLOBALS['cfg']['NavigationTreeDbSeparator']
+        );
         if (isset($GLOBALS['cfg']['Server']['DisableIS'])
             && !$GLOBALS['cfg']['Server']['DisableIS']
         ) {
@@ -434,7 +436,7 @@ class Node
             $query .= "SELECT DB_first_level ";
             $query .= "FROM ( ";
             $query .= "SELECT DISTINCT SUBSTRING_INDEX(SCHEMA_NAME, ";
-            $query .= "'" . Util::sqlAddSlashes($dbSeparator) . "', 1) ";
+            $query .= "'%s', 1) ";
             $query .= "DB_first_level ";
             $query .= "FROM INFORMATION_SCHEMA.SCHEMATA ";
             $query .= $this->_getWhereClause('SCHEMA_NAME', $searchClause);
@@ -444,11 +446,19 @@ class Node
             $query .= ") t2 ";
             $query .= $this->_getWhereClause('SCHEMA_NAME', $searchClause);
             $query .= "AND 1 = LOCATE(CONCAT(DB_first_level, ";
-            $query .= "'" . Util::sqlAddSlashes($dbSeparator) . "'), ";
+            $query .= "'%s'), ";
             $query .= "CONCAT(SCHEMA_NAME, ";
-            $query .= "'" . Util::sqlAddSlashes($dbSeparator) . "')) ";
+            $query .= "'%s')) ";
             $query .= "ORDER BY SCHEMA_NAME ASC";
-            $retval = $GLOBALS['dbi']->fetchResult($query);
+
+            $retval = $GLOBALS['dbi']->fetchResult(
+                sprintf(
+                    $query,
+                    $dbSeparator,
+                    $dbSeparator,
+                    $dbSeparator
+                )
+            );
 
             return $retval;
         }

From 96b4f13e54c9ebbebfd19d0690bfa0812b6818c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 8 Dec 2016 10:23:57 +0100
Subject: [PATCH 03/20] Quote table name for use in regexp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/controllers/database/DatabaseStructureController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/controllers/database/DatabaseStructureController.php b/libraries/controllers/database/DatabaseStructureController.php
index cd22393f35..925ccd1244 100644
--- a/libraries/controllers/database/DatabaseStructureController.php
+++ b/libraries/controllers/database/DatabaseStructureController.php
@@ -887,7 +887,7 @@ class DatabaseStructureController extends DatabaseController
             if ($this->db == PMA_extractDbOrTable($db_table)
                 && preg_match(
                     "@^" .
-                    mb_substr(PMA_extractDbOrTable($db_table, 'table'), 0, -1) . "@",
+                    preg_quote(mb_substr(PMA_extractDbOrTable($db_table, 'table'), 0, -1)) . "@",
                     $truename
                 )
             ) {

From 4c84070ad6136c3158caa93286754ebbfbce61ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 8 Dec 2016 10:49:06 +0100
Subject: [PATCH 04/20] Avoid using REQUEST_URI in form action
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's really not necessary here and might cause redirection issues.

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 setup/frames/index.inc.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 370bf748a7..4d279d891c 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -91,8 +91,7 @@ if (!$is_https) {
     PMA_messagesSet('notice', 'no_https', __('Insecure connection'), $text);
 }
 
-echo '<form id="select_lang" method="post" action="'
-    , htmlspecialchars($_SERVER['REQUEST_URI']) , '">';
+echo '<form id="select_lang" method="post">';
 echo PMA_URL_getHiddenInputs();
 echo '<bdo lang="en" dir="ltr"><label for="lang">';
 echo __('Language') , (__('Language') != 'Language' ? ' - Language' : '');

From 9d712359d00afa828d5dd70325b213071d411f83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 8 Dec 2016 10:56:42 +0100
Subject: [PATCH 05/20] Fix typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/navigation/NavigationTree.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/navigation/NavigationTree.php b/libraries/navigation/NavigationTree.php
index 8fb468803c..a978a4118d 100644
--- a/libraries/navigation/NavigationTree.php
+++ b/libraries/navigation/NavigationTree.php
@@ -171,7 +171,7 @@ class NavigationTree
          * @todo describe a scenario where this code is executed
          */
         if (!$GLOBALS['cfg']['Server']['DisableIS']) {
-            $dbSeparator = $GLOBALS['dbi']->escapeString((
+            $dbSeparator = $GLOBALS['dbi']->escapeString(
                 $GLOBALS['cfg']['NavigationTreeDbSeparator']
             );
             $query = "SELECT (COUNT(DB_first_level) DIV %d) * %d ";

From e37bf40f44a3272a6709eb5b38feccac41658e3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 8 Dec 2016 10:59:53 +0100
Subject: [PATCH 06/20] Avoid using REQUEST_URI for redirection
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Stick with PMA_sendHeaderLocation to handle server weirdness
* Use already calculated URL

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/config/PageSettings.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libraries/config/PageSettings.php b/libraries/config/PageSettings.php
index 5aeddab481..cb319a1622 100644
--- a/libraries/config/PageSettings.php
+++ b/libraries/config/PageSettings.php
@@ -112,7 +112,10 @@ class PageSettings
             $result = PMA_saveUserprefs($cf->getConfigArray());
             if ($result === true) {
                 // reload page
-                header('Location: ' . $_SERVER['REQUEST_URI']);
+                $response = Response::getInstance();
+                PMA_sendHeaderLocation(
+                    $response->getFooter()->getSelfUrl('unencoded')
+                )
                 exit();
             } else {
                 $error = $result;

From ec6c55c1df67b6a6e809087b095f36cfcf703d9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 8 Dec 2016 11:06:10 +0100
Subject: [PATCH 07/20] Add missing ;
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/config/PageSettings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/config/PageSettings.php b/libraries/config/PageSettings.php
index cb319a1622..ef43390b28 100644
--- a/libraries/config/PageSettings.php
+++ b/libraries/config/PageSettings.php
@@ -115,7 +115,7 @@ class PageSettings
                 $response = Response::getInstance();
                 PMA_sendHeaderLocation(
                     $response->getFooter()->getSelfUrl('unencoded')
-                )
+                );
                 exit();
             } else {
                 $error = $result;

From a134a0117765644cd6d9311b5e3d963a20e6ed15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 8 Dec 2016 11:18:51 +0100
Subject: [PATCH 08/20] Avoid infinite recursion on goto
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 tbl_replace.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tbl_replace.php b/tbl_replace.php
index 668d2c3b22..36fc4f098e 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -310,6 +310,10 @@ if ($is_insert && count($value_sets) > 0) {
     //
     // Note: logic passes here for inline edit
     $message = PMA\libraries\Message::success(__('No change'));
+    // Avoid infinite recursion
+    if ($goto_include == 'tbl_replace.php') {
+        $goto_include = 'tbl_change.php';
+    }
     $active_page = $goto_include;
     include '' . PMA_securePath($goto_include);
     exit;

From 3a6247674e653507294f23480b4c0e1c532badbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 8 Dec 2016 11:26:51 +0100
Subject: [PATCH 09/20] Do not provide fallback to cookie for font size
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* This should be already handled by Config class
* Injecting cookie value to CSS could be security risk

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/Theme.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libraries/Theme.php b/libraries/Theme.php
index 0762cce155..18685c010a 100644
--- a/libraries/Theme.php
+++ b/libraries/Theme.php
@@ -431,9 +431,6 @@ class Theme
         if (!is_null($fs)) {
             return $fs;
         }
-        if (isset($_COOKIE['pma_fontsize'])) {
-            return htmlspecialchars($_COOKIE['pma_fontsize']);
-        }
         return '82%';
     }
 

From 3b6ed1f9ecaab86c488d106b1588d7683a6d53ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 8 Dec 2016 11:56:46 +0100
Subject: [PATCH 10/20] Improve PHP path cleanup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- properly handle situation when query string contains PATH_INFO
- cleanup path from any relative parts

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/core.lib.php                        | 23 +++++++++++++++++-
 .../core/PMA_cleanupPathInfo_test.php         | 24 +++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index 9f5040477b..6236c9f21c 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -946,6 +946,10 @@ function PMA_cleanupPathInfo()
     }
     $_PATH_INFO = PMA_getenv('PATH_INFO');
     if (! empty($_PATH_INFO) && ! empty($PMA_PHP_SELF)) {
+        $question_pos = mb_strpos($PMA_PHP_SELF, '?');
+        if ($question_pos != false) {
+            $PMA_PHP_SELF = mb_substr($PMA_PHP_SELF, 0, $question_pos);
+        }
         $path_info_pos = mb_strrpos($PMA_PHP_SELF, $_PATH_INFO);
         if ($path_info_pos !== false) {
             $path_info_part = mb_substr($PMA_PHP_SELF, $path_info_pos, mb_strlen($_PATH_INFO));
@@ -954,7 +958,24 @@ function PMA_cleanupPathInfo()
             }
         }
     }
-    $PMA_PHP_SELF = htmlspecialchars($PMA_PHP_SELF);
+
+    $path = [];
+    foreach(explode('/', $PMA_PHP_SELF) as $part) {
+        // ignore parts that have no value
+        if (empty($part) || $part === '.') continue;
+
+        if ($part !== '..') {
+            // cool, we found a new part
+            array_push($path, $part);
+        } else if (count($path) > 0) {
+            // going back up? sure
+            array_pop($path);
+        }
+        // Here we intentionall ignore case where we go too up
+        // as there is nothing sane to do
+    }
+
+    $PMA_PHP_SELF = htmlspecialchars('/' . join('/', $path));
 }
 
 /**
diff --git a/test/libraries/core/PMA_cleanupPathInfo_test.php b/test/libraries/core/PMA_cleanupPathInfo_test.php
index 7ca9f3f971..3d40a91fb4 100644
--- a/test/libraries/core/PMA_cleanupPathInfo_test.php
+++ b/test/libraries/core/PMA_cleanupPathInfo_test.php
@@ -66,6 +66,30 @@ class PMA_CleanupPathInfo_Test extends PHPUnit_Framework_TestCase
                 '/; cookieinj=value/',
                 '/phpmyadmin/index.php'
             ),
+            array(
+                '',
+                '//example.com/../phpmyadmin/index.php',
+                '',
+                '/phpmyadmin/index.php'
+            ),
+            array(
+                '',
+                '//example.com/../../.././phpmyadmin/index.php',
+                '',
+                '/phpmyadmin/index.php'
+            ),
+            array(
+                '',
+                '/page.php/malicouspathinfo?malicouspathinfo',
+                'malicouspathinfo',
+                '/page.php'
+            ),
+            array(
+                '/phpmyadmin/./index.php',
+                '/phpmyadmin/./index.php',
+                '',
+                '/phpmyadmin/index.php'
+            ),
             array(
                 '/phpmyadmin/index.php',
                 '/phpmyadmin/index.php',

From 695a488c4294ebdb972607d8296746310ddb5b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 21 Dec 2016 11:07:00 +0100
Subject: [PATCH 11/20] Do not allow arbitrary connection in replication setup
 without AllowArbitraryServer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/replication_gui.lib.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index 82620916b3..321a4daaf9 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -906,7 +906,10 @@ function PMA_handleControlRequest()
         $messageSuccess = null;
         $messageError = null;
 
-        if (isset($_REQUEST['slave_changemaster'])) {
+        if (isset($_REQUEST['slave_changemaster']) && ! $GLOBALS['cfg']['AllowArbitraryServer']) {
+            $_SESSION['replication']['sr_action_status'] = 'error';
+            $_SESSION['replication']['sr_action_info'] = __('Connection to server is disabled, please enable $cfg[\'AllowArbitraryServer\'] in phpMyAdmin configuration.');
+        } elseif (isset($_REQUEST['slave_changemaster'])) {
             $result = PMA_handleRequestForSlaveChangeMaster();
         } elseif (isset($_REQUEST['sr_slave_server_control'])) {
             $result = PMA_handleRequestForSlaveServerControl();

From c962ee4287b50af754b8fe72c0c4ef6cebf3c489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 21 Dec 2016 11:26:52 +0100
Subject: [PATCH 12/20] Remove setup download/load/delete features
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This removes risk of third party manipulating with the configuration as
there was race condition between editing and using the file.

Downloading the file should not be big hassle and this really makes the
whole setup a bit simpler.

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 doc/setup.rst                          | 59 +++--------------------
 libraries/config/ConfigFile.php        | 10 ----
 libraries/vendor_config.php            | 11 -----
 setup/config.php                       | 53 --------------------
 setup/frames/config.inc.php            |  9 ----
 setup/frames/index.inc.php             | 40 ---------------
 setup/lib/index.lib.php                | 25 ----------
 test/classes/config/ConfigFileTest.php | 11 -----
 test/libraries/PMA_SetupIndex_test.php | 67 --------------------------
 9 files changed, 6 insertions(+), 279 deletions(-)

diff --git a/doc/setup.rst b/doc/setup.rst
index 5f8e146a71..b6be504c51 100644
--- a/doc/setup.rst
+++ b/doc/setup.rst
@@ -305,60 +305,13 @@ Using Setup script
 ------------------
 
 Instead of manually editing :file:`config.inc.php`, you can use phpMyAdmin's 
-setup feature. First you must manually create a folder ``config``
-in the phpMyAdmin directory. This is a security measure. On a
-Linux/Unix system you can use the following commands:
+setup feature. The file can be generated using the setup and you can download it 
+for upload to the server.
 
-.. code-block:: sh
-
-
-    cd phpMyAdmin
-    mkdir config                        # create directory for saving
-    chmod o+rw config                   # give it world writable permissions
-
-And to edit an existing configuration, copy it over first:
-
-.. code-block:: sh
-
-
-    cp config.inc.php config/           # copy current configuration for editing
-    chmod o+w config/config.inc.php     # give it world writable permissions
-
-.. note::
-
-    Debian and Ubuntu have simplified this setup and all you need to do is to
-    execute :program:`/usr/sbin/pma-configure`.
-
-On other platforms, simply create the folder and ensure that your web
-server has read and write access to it. :ref:`faq1_26` can help with
-this.
-
-Next, open your browser and visit the location where you installed phpMyAdmin, with the ``/setup`` suffix. If you have an existing configuration,
-use the ``Load`` button to bring its content inside the setup panel.
-Note that **changes are not saved to disk until you explicitly choose ``Save``**
-from the *Configuration* area of the screen. Normally the script saves the new
-:file:`config.inc.php` to the ``config/`` directory, but if the webserver does
-not have the proper permissions you may see the error "Cannot load or
-save configuration." Ensure that the ``config/`` directory exists and
-has the proper permissions - or use the ``Download`` link to save the
-config file locally and upload it (via FTP or some similar means) to the
-proper location.
-
-Once the file has been saved, it must be moved out of the ``config/``
-directory and the permissions must be reset, again as a security
-measure:
-
-.. code-block:: sh
-
-
-    mv config/config.inc.php .         # move file to current directory
-    chmod o-rw config.inc.php          # remove world read and write permissions
-    rm -rf config                      # remove not needed directory
-
-.. note::
-
-    Debian and Ubuntu have simplified this setup and all you need to do is to
-    execute :program:`/usr/sbin/pma-secure`.
+Next, open your browser and visit the location where you installed phpMyAdmin,
+with the ``/setup`` suffix. The changes are not saved to the server, you need to 
+use the :guilabel:`Download` button to save them to your computer and then upload 
+to the server.
 
 Now the file is ready to be used. You can choose to review or edit the
 file with your favorite editor, if you prefer to set some advanced
diff --git a/libraries/config/ConfigFile.php b/libraries/config/ConfigFile.php
index b74c1cc838..a28888ea38 100644
--- a/libraries/config/ConfigFile.php
+++ b/libraries/config/ConfigFile.php
@@ -482,16 +482,6 @@ class ConfigFile
         }
     }
 
-    /**
-     * Returns config file path, relative to phpMyAdmin's root path
-     *
-     * @return string
-     */
-    public function getFilePath()
-    {
-        return SETUP_CONFIG_FILE;
-    }
-
     /**
      * Returns configuration array (full, multidimensional format)
      *
diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php
index 025eba39cb..56e71ab0c9 100644
--- a/libraries/vendor_config.php
+++ b/libraries/vendor_config.php
@@ -25,17 +25,6 @@ define('CHANGELOG_FILE', './ChangeLog');
  */
 define('LICENSE_FILE', './LICENSE');
 
-/**
- * Path to config file generated using setup script.
- */
-define('SETUP_CONFIG_FILE', './config/config.inc.php');
-
-/**
- * Whether setup requires writable directory where config
- * file will be generated.
- */
-define('SETUP_DIR_WRITABLE', true);
-
 /**
  * Directory where SQL scripts to create/upgrade configuration storage reside.
  */
diff --git a/setup/config.php b/setup/config.php
index db9e7c905e..372cd9f916 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -15,28 +15,9 @@ require './lib/common.inc.php';
 
 require './libraries/config/setup.forms.php';
 
-/**
- * Loads configuration file path
- *
- * Do this in a function to avoid messing up with global $cfg
- *
- * @param string $config_file_path
- *
- * @return array
- */
-function loadConfig($config_file_path)
-{
-    $cfg = array();
-    if (file_exists($config_file_path)) {
-        include $config_file_path;
-    }
-    return $cfg;
-}
-
 $form_display = new FormDisplay($GLOBALS['ConfigFile']);
 $form_display->registerForm('_config.php', $forms['_config.php']);
 $form_display->save('_config.php');
-$config_file_path = $GLOBALS['ConfigFile']->getFilePath();
 
 if (isset($_POST['eol'])) {
     $_SESSION['eol'] = ($_POST['eol'] == 'unix') ? 'unix' : 'win';
@@ -58,40 +39,6 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
     PMA_downloadHeader('config.inc.php', 'text/plain');
     echo ConfigGenerator::getConfigFile($GLOBALS['ConfigFile']);
     exit;
-} elseif (PMA_ifSetOr($_POST['submit_save'], '')) {
-    //
-    // Save generated config file on the server
-    //
-    $result = @file_put_contents(
-        $config_file_path,
-        ConfigGenerator::getConfigFile($GLOBALS['ConfigFile'])
-    );
-    if ($result === false) {
-        $state = 'config_not_saved';
-    } else {
-        $state = 'config_saved';
-    }
-    header('HTTP/1.1 303 See Other');
-    header('Location: index.php' . PMA_URL_getCommon() . '&action_done=' . $state);
-    exit;
-} elseif (PMA_ifSetOr($_POST['submit_load'], '')) {
-    //
-    // Load config file from the server
-    //
-    $GLOBALS['ConfigFile']->setConfigData(
-        loadConfig($config_file_path)
-    );
-    header('HTTP/1.1 303 See Other');
-    header('Location: index.php' . PMA_URL_getCommon());
-    exit;
-} elseif (PMA_ifSetOr($_POST['submit_delete'], '')) {
-    //
-    // Delete config file on the server
-    //
-    @unlink($config_file_path);
-    header('HTTP/1.1 303 See Other');
-    header('Location: index.php' . PMA_URL_getCommon());
-    exit;
 } else {
     //
     // Show generated config file in a <textarea>
diff --git a/setup/frames/config.inc.php b/setup/frames/config.inc.php
index c04359a90b..783961f5b7 100644
--- a/setup/frames/config.inc.php
+++ b/setup/frames/config.inc.php
@@ -18,10 +18,6 @@ if (!defined('PHPMYADMIN')) {
 require_once './libraries/config/FormDisplay.tpl.php';
 require_once './setup/lib/index.lib.php';
 
-$config_readable = false;
-$config_writable = false;
-$config_exists = false;
-PMA_checkConfigRw($config_readable, $config_writable, $config_exists);
 echo '<h2>' , __('Configuration file') , '</h2>';
 
 echo PMA_displayFormTop('config.php');
@@ -40,11 +36,6 @@ echo '<tr>';
 echo '<td class="lastrow" style="text-align: left">';
 echo '<input type="submit" name="submit_download" value="'
     , __('Download') , '" class="green" />';
-echo '<input type="submit" name="submit_save" value="' , __('Save') , '"';
-if (!$config_writable) {
-    echo ' disabled="disabled"';
-}
-echo '/>';
 echo '</td>';
 echo '</tr>';
 
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index eee9a42eed..3b3f3dda7b 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -45,26 +45,6 @@ if (isset($_GET['version_check'])) {
 $configChecker = new ServerConfigChecks($GLOBALS['ConfigFile']);
 $configChecker->performConfigChecks();
 
-//
-// Check whether we can read/write configuration
-//
-$config_readable = false;
-$config_writable = false;
-$config_exists = false;
-PMA_checkConfigRw($config_readable, $config_writable, $config_exists);
-if (!$config_writable || !$config_readable) {
-    PMA_messagesSet(
-        'error', 'config_rw', __('Cannot load or save configuration'),
-        PMA_sanitize(
-            __(
-                'Please create web server writable folder [em]config[/em] in '
-                . 'phpMyAdmin top level directory as described in '
-                . '[doc@setup_script]documentation[/doc]. Otherwise you will be '
-                . 'only able to download or display it.'
-            )
-        )
-    );
-}
 //
 // Https connection warning (check done on the client side)
 //
@@ -275,26 +255,6 @@ echo '<tr>';
 echo '<td colspan="2" class="lastrow" style="text-align: left">';
 echo '<input type="submit" name="submit_display" value="' , __('Display') , '" />';
 echo '<input type="submit" name="submit_download" value="' , __('Download') , '" />';
-echo '&nbsp; &nbsp;';
-
-echo '<input type="submit" name="submit_save" value="' , __('Save') , '"';
-if (!$config_writable) {
-    echo ' disabled="disabled"';
-}
-echo '/>';
-
-echo '<input type="submit" name="submit_load" value="' , __('Load') , '"';
-if (!$config_exists) {
-    echo ' disabled="disabled"';
-}
-echo '/>';
-
-echo '<input type="submit" name="submit_delete" value="' , __('Delete') , '"';
-if (!$config_exists || !$config_writable) {
-    echo ' disabled="disabled"';
-}
-echo '/>';
-
 echo '&nbsp; &nbsp;';
 echo '<input type="submit" name="submit_clear" value="' , __('Clear')
     , '" class="red" />';
diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php
index 17451b597e..2b873fe643 100644
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -181,28 +181,3 @@ function PMA_versionCheck()
         }
     }
 }
-
-/**
- * Checks whether config file is readable/writable
- *
- * @param bool &$is_readable whether the file is readable
- * @param bool &$is_writable whether the file is writable
- * @param bool &$file_exists whether the file exists
- *
- * @return void
- */
-function PMA_checkConfigRw(&$is_readable, &$is_writable, &$file_exists)
-{
-    $file_path = $GLOBALS['ConfigFile']->getFilePath();
-    $file_dir = dirname($file_path);
-    $is_readable = true;
-    $is_writable = @is_dir($file_dir);
-    if (SETUP_DIR_WRITABLE) {
-        $is_writable = $is_writable && @is_writable($file_dir);
-    }
-    $file_exists = file_exists($file_path);
-    if ($file_exists) {
-        $is_readable = is_readable($file_path);
-        $is_writable = $is_writable && @is_writable($file_path);
-    }
-}
diff --git a/test/classes/config/ConfigFileTest.php b/test/classes/config/ConfigFileTest.php
index df77943322..de8c5b217e 100644
--- a/test/classes/config/ConfigFileTest.php
+++ b/test/classes/config/ConfigFileTest.php
@@ -577,17 +577,6 @@ class ConfigFileTest extends PMATestCase
         );
     }
 
-    /**
-     * Test for ConfigFile::getFilePath
-     *
-     * @return void
-     * @test
-     */
-    public function testGetFilePath()
-    {
-        $this->assertNotEmpty($this->object->getFilePath());
-    }
-
     /**
      * Test for ConfigFile::getConfigArray
      *
diff --git a/test/libraries/PMA_SetupIndex_test.php b/test/libraries/PMA_SetupIndex_test.php
index 0acaa7f640..451c9414d5 100644
--- a/test/libraries/PMA_SetupIndex_test.php
+++ b/test/libraries/PMA_SetupIndex_test.php
@@ -160,73 +160,6 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA_checkConfigRw
-     *
-     * @return void
-     */
-    public function testPMACheckConfigRw()
-    {
-        if (! PMA_HAS_RUNKIT) {
-            $this->markTestSkipped('Cannot redefine constant');
-        }
-
-        $redefine = null;
-        $GLOBALS['cfg']['AvailableCharsets'] = array();
-        $GLOBALS['server'] = 0;
-        $GLOBALS['ConfigFile'] = new ConfigFile();
-        if (!defined('SETUP_CONFIG_FILE')) {
-            define('SETUP_CONFIG_FILE', 'test/test_data/configfile');
-        } else {
-            $redefine = 'SETUP_CONFIG_FILE';
-            runkit_constant_redefine(
-                'SETUP_CONFIG_FILE',
-                'test/test_data/configfile'
-            );
-        }
-        $is_readable = false;
-        $is_writable = false;
-        $file_exists = false;
-
-        PMA_checkConfigRw($is_readable, $is_writable, $file_exists);
-
-        $this->assertTrue(
-            $is_readable
-        );
-
-        $this->assertTrue(
-            $is_writable
-        );
-
-        $this->assertFalse(
-            $file_exists
-        );
-
-        runkit_constant_redefine(
-            'SETUP_CONFIG_FILE',
-            'test/test_data/test.file'
-        );
-
-        PMA_checkConfigRw($is_readable, $is_writable, $file_exists);
-
-        $this->assertTrue(
-            $is_readable
-        );
-
-        $this->assertTrue(
-            $is_writable
-        );
-
-        $this->assertTrue(
-            $file_exists
-        );
-
-        if ($redefine !== null) {
-            runkit_constant_redefine('SETUP_CONFIG_FILE', $redefine);
-        } else {
-            runkit_constant_remove('SETUP_CONFIG_FILE');
-        }
-    }
-
     /**
      * Test for ServerConfigChecks::performConfigChecks
      *

From f792f294f219290f3a9360788940d0e491f5d009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 21 Dec 2016 11:36:32 +0100
Subject: [PATCH 13/20] Disable setup if configuration already exists
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The setup allows to figure out quite a lot about system and network, so
it's safer to block access to it once phpMyAdmin has been configured.

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 setup/index.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setup/index.php b/setup/index.php
index 9720a2f2df..7009c5aacc 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -12,6 +12,10 @@
  */
 require './lib/common.inc.php';
 
+if (file_exists(CONFIG_FILE)) {
+    PMA_fatalError(__('Configuration already exists, setup is disabled!'));
+}
+
 $page = PMA_isValid($_GET['page'], 'scalar') ? $_GET['page'] : null;
 $page = preg_replace('/[^a-z]/', '', $page);
 if ($page === '') {

From 4ab34edba6a14dfdad988310a88e1b3770c6ab64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 17 Jan 2017 13:32:35 +0100
Subject: [PATCH 14/20] Merge changes from php-gettext 1.0.12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This ensures that parameter to select_string is numeric, avoiding code
injection through it.

Our code is not vulnerable as we do not pass user supplied values to
this function, this fix is included only to be closer to upstream.

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/php-gettext/gettext.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libraries/php-gettext/gettext.php b/libraries/php-gettext/gettext.php
index d712deac1c..9f1c16a214 100644
--- a/libraries/php-gettext/gettext.php
+++ b/libraries/php-gettext/gettext.php
@@ -350,6 +350,10 @@ class gettext_reader {
    * @return int array index of the right plural form
    */
   function select_string($n) {
+    if (!is_int($n)) {
+      throw new InvalidArgumentException(
+        "Select_string only accepts integers: " . $n);
+    }
     $string = $this->get_plural_forms();
     $string = str_replace('nplurals',"\$total",$string);
     $string = str_replace("n",$n,$string);

From 3adb0eb8889ca8d88c72e74b3a20f67db45d749f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Sat, 21 Jan 2017 16:45:59 +0100
Subject: [PATCH 15/20] Add changelog entries for security fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index cf3ab5a81b..e17a2e4b87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,14 @@ phpMyAdmin - ChangeLog
 - issue #12881 Fix database search with newer php-gettext
 - issue #12894 Fix linter error on unterminated variable name
 - issue #12732 Fixed filtering for active processes
+- issue        [security] Multiple vulnerabilities in setup script, see PMASA-2016-44.
+- issue        [security] Open redirect, see PMASA-2017-1.
+- issue        [security] php-gettext code execution, see PMASA-2017-2.
+- issue        [security] DOS vulnerabiltiy in table editing, see PMASA-2017-3.
+- issue        [security] CSS injection in themes, see PMASA-2017-4.
+- issue        [security] Cookie attribute injection attack, see PMASA-2017-5.
+- issue        [security] SSRF in replication, see PMASA-2017-6.
+- issue        [security] DOS in replication status, see PMASA-2017-7.
 
 4.6.5.2 (2016-12-05)
 - issue #12765 Fixed SQL export with newlines

From d121c692265078fb75b19e9b1f6eb49aae54c9ab Mon Sep 17 00:00:00 2001
From: Burak Yavuz <hitowerdigit@hotmail.com>
Date: Mon, 23 Jan 2017 17:33:25 +0000
Subject: [PATCH 16/20] Translated using Weblate (Turkish)

Currently translated at 100.0% (3226 of 3226 strings)

[CI skip]
---
 po/tr.po | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/po/tr.po b/po/tr.po
index d75b3c31ff..e576cffd87 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,16 +4,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.6.6-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2017-01-23 14:25+0100\n"
-"PO-Revision-Date: 2016-12-13 10:04+0000\n"
+"PO-Revision-Date: 2017-01-23 17:33+0000\n"
 "Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
-"Language-Team: Turkish <https://hosted.weblate.org/projects/phpmyadmin/4-6/"
-"tr/>\n"
+"Language-Team: Turkish "
+"<https://hosted.weblate.org/projects/phpmyadmin/4-6/tr/>\n"
 "Language: tr\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.10-dev\n"
+"X-Generator: Weblate 2.11-dev\n"
 
 #: changelog.php:38 license.php:33
 #, php-format
@@ -13834,10 +13834,9 @@ msgid "This option conflicts with \"%1$s\"."
 msgstr "Bu seçenek \"%1$s\" ile çakışıyor."
 
 #: libraries/sql-parser/src/Components/OptionsArray.php:256
-#, fuzzy, php-format
-#| msgid "Value/Expression for the option %1$s was expected"
+#, php-format
 msgid "Value/Expression for the option %1$s was expected."
-msgstr "%1$s seçeneği için değer/ifade beklenmekte"
+msgstr "%1$s seçeneği için değer/ifade beklenmekte."
 
 #: libraries/sql-parser/src/Components/RenameOperation.php:97
 msgid "The old name of the table was expected."
@@ -13856,10 +13855,8 @@ msgid "A rename operation was expected."
 msgstr "Yeniden adlandırma işlemi beklenmekte."
 
 #: libraries/sql-parser/src/Components/SetOperation.php:105
-#, fuzzy
-#| msgid "as regular expression"
 msgid "Missing expression."
-msgstr "düzenli ifade olarak"
+msgstr "Eksik ifade."
 
 #: libraries/sql-parser/src/Lexer.php:261
 msgid "Unexpected character."

From 18f18af84822f22d04d7f1c52395bd1e26643b46 Mon Sep 17 00:00:00 2001
From: Domen <mitenem@outlook.com>
Date: Mon, 23 Jan 2017 18:41:06 +0000
Subject: [PATCH 17/20] Translated using Weblate (Slovenian)

Currently translated at 100.0% (3226 of 3226 strings)

[CI skip]
---
 po/sl.po | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/po/sl.po b/po/sl.po
index ebb50bbdf9..b3f36881b6 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,17 +4,17 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.6.6-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2017-01-23 14:25+0100\n"
-"PO-Revision-Date: 2016-12-14 09:30+0000\n"
+"PO-Revision-Date: 2017-01-23 18:41+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.10-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.11-dev\n"
 
 #: changelog.php:38 license.php:33
 #, php-format
@@ -13818,10 +13818,9 @@ msgid "This option conflicts with \"%1$s\"."
 msgstr "Izbira je v sporu z \"%1$s\"."
 
 #: libraries/sql-parser/src/Components/OptionsArray.php:256
-#, fuzzy, php-format
-#| msgid "Value/Expression for the option %1$s was expected"
+#, php-format
 msgid "Value/Expression for the option %1$s was expected."
-msgstr "Pričakovali smo vrednost/izraz za možnost %1$s"
+msgstr "Pričakovali smo vrednost/izraz za možnost %1$s."
 
 #: libraries/sql-parser/src/Components/RenameOperation.php:97
 msgid "The old name of the table was expected."
@@ -13840,10 +13839,8 @@ msgid "A rename operation was expected."
 msgstr "Pričakovali smo poseg preimenovanja."
 
 #: libraries/sql-parser/src/Components/SetOperation.php:105
-#, fuzzy
-#| msgid "as regular expression"
 msgid "Missing expression."
-msgstr "kot običajni izraz (regular expression)"
+msgstr "Manjkajoč izraz."
 
 #: libraries/sql-parser/src/Lexer.php:261
 msgid "Unexpected character."

From c812bcd4112c3d44e6e6bc72e710b9935c6aa9d3 Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Mon, 23 Jan 2017 14:19:14 -0500
Subject: [PATCH 18/20] Prepare for 4.6.6 release

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 ChangeLog            | 2 +-
 README               | 2 +-
 doc/conf.py          | 2 +-
 libraries/Config.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e17a2e4b87..644ed47e40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 phpMyAdmin - ChangeLog
 ======================
 
-4.6.6 (not yet released)
+4.6.6 (2017-01-23)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'
 - issue #12760 Fix Notice regarding 'Undefined index: users'
 - issue #12762 Fixed parsing of SQL with BINARY function
diff --git a/README b/README
index 0f8671254a..d547484ee6 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.6.6-dev
+Version 4.6.6
 
 A web interface for MySQL and MariaDB.
 
diff --git a/doc/conf.py b/doc/conf.py
index 1b34b9babc..daa0c446e2 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -51,7 +51,7 @@ copyright = u'2012 - 2016, The phpMyAdmin devel team'
 # built documents.
 #
 # The short X.Y version.
-version = '4.6.6-dev'
+version = '4.6.6'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/libraries/Config.php b/libraries/Config.php
index f1191ce01c..254d9533d4 100644
--- a/libraries/Config.php
+++ b/libraries/Config.php
@@ -101,7 +101,7 @@ class Config
      */
     public function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.6.6-dev');
+        $this->set('PMA_VERSION', '4.6.6');
         /**
          * @deprecated
          */

From 8d952350fa4d061b3a37795d98405c22388a1607 Mon Sep 17 00:00:00 2001
From: Giovanni Sora <g.sora@tiscali.it>
Date: Mon, 23 Jan 2017 21:22:11 +0000
Subject: [PATCH 19/20] Translated using Weblate (Interlingua)

Currently translated at 76.0% (2454 of 3226 strings)

[CI skip]
---
 po/ia.po | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/po/ia.po b/po/ia.po
index 11a2c35943..e090537778 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -8,10 +8,10 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.6.6-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2017-01-23 14:25+0100\n"
-"PO-Revision-Date: 2017-01-17 21:58+0000\n"
+"PO-Revision-Date: 2017-01-23 21:22+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"
@@ -7605,8 +7605,8 @@ msgid ""
 "Shows link to [a@https://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
 "output."
 msgstr ""
-"Monstra ligamine a exito [a@https://php.net/manual/function.phpinfo."
-"php]phpinfo()[/a] ."
+"Monstra ligamine a "
+"exito[a@https://php.net/manual/function.phpinfo.php]phpinfo()[/a]."
 
 #: libraries/config/messages.inc.php:872
 msgid "Show phpinfo() link"
@@ -10803,6 +10803,8 @@ msgid ""
 "You tried to import an invalid file or the imported file contains invalid "
 "data!"
 msgstr ""
+"Tu tentava importar un file invalide ole file importate contine datos "
+"invalide!"
 
 #: libraries/plugins/import/ImportShp.php:204
 #, php-format
@@ -10830,7 +10832,7 @@ msgstr "XML"
 #: libraries/plugins/import/ShapeRecord.php:57
 #, php-format
 msgid "Geometry type '%s' is not supported by MySQL."
-msgstr ""
+msgstr "Le typo de geometria '%s' non es supportate per MySQL."
 
 #: libraries/plugins/schema/ExportRelationSchema.php:288
 msgid "SCHEMA ERROR: "
@@ -10925,6 +10927,8 @@ msgid ""
 "Converts Boolean values to text (default 'T' and 'F'). First option is for "
 "TRUE, second for FALSE. Nonzero=true."
 msgstr ""
+"Il converte valores de Boolean a texto (predefinite 'T' e 'F'). Le prime "
+"option es per TRUE, le secunde per FALSE. Nonzero=true."
 
 #: libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php:31
 msgid ""
@@ -13648,10 +13652,9 @@ msgid "This option conflicts with \"%1$s\"."
 msgstr "Iste option conflige con \"%1$s\"."
 
 #: libraries/sql-parser/src/Components/OptionsArray.php:256
-#, fuzzy, php-format
-#| msgid "Value/Expression for the option %1$s was expected"
+#, php-format
 msgid "Value/Expression for the option %1$s was expected."
-msgstr "On expectava un valor/expression pro le option %1$s"
+msgstr "On expectava un valor/expression pro le option %1$s."
 
 #: libraries/sql-parser/src/Components/RenameOperation.php:97
 msgid "The old name of the table was expected."
@@ -13670,10 +13673,8 @@ msgid "A rename operation was expected."
 msgstr "On expectava un operation de renominar.."
 
 #: libraries/sql-parser/src/Components/SetOperation.php:105
-#, fuzzy
-#| msgid "as regular expression"
 msgid "Missing expression."
-msgstr "como expression regular"
+msgstr "Expression mancante."
 
 #: libraries/sql-parser/src/Lexer.php:261
 msgid "Unexpected character."

From da40b6a7573873bcb2f350decf1f85ae3d0cc3d7 Mon Sep 17 00:00:00 2001
From: Stefano Martinelli <stefano.ste.martinelli@gmail.com>
Date: Mon, 23 Jan 2017 23:50:48 +0000
Subject: [PATCH 20/20] Translated using Weblate (Italian)

Currently translated at 100.0% (3226 of 3226 strings)

[CI skip]
---
 po/it.po | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/po/it.po b/po/it.po
index d3f11e2773..9e7f47afa0 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,16 +4,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.6.6-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2017-01-23 14:25+0100\n"
-"PO-Revision-Date: 2016-12-13 14:09+0000\n"
+"PO-Revision-Date: 2017-01-23 23:51+0000\n"
 "Last-Translator: Stefano Martinelli <stefano.ste.martinelli@gmail.com>\n"
-"Language-Team: Italian <https://hosted.weblate.org/projects/phpmyadmin/4-6/"
-"it/>\n"
+"Language-Team: Italian "
+"<https://hosted.weblate.org/projects/phpmyadmin/4-6/it/>\n"
 "Language: it\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.10-dev\n"
+"X-Generator: Weblate 2.11-dev\n"
 
 #: changelog.php:38 license.php:33
 #, php-format
@@ -14010,10 +14010,9 @@ msgid "This option conflicts with \"%1$s\"."
 msgstr "Questa opzione è in conflitto con \"%1$s\"."
 
 #: libraries/sql-parser/src/Components/OptionsArray.php:256
-#, fuzzy, php-format
-#| msgid "Value/Expression for the option %1$s was expected"
+#, php-format
 msgid "Value/Expression for the option %1$s was expected."
-msgstr "Era atteso un valore/espressione per l'opzione %1$s"
+msgstr "Era atteso un valore/espressione per l'opzione %1$s."
 
 #: libraries/sql-parser/src/Components/RenameOperation.php:97
 msgid "The old name of the table was expected."
@@ -14032,10 +14031,8 @@ msgid "A rename operation was expected."
 msgstr "Era attesa una operazione di rinomina."
 
 #: libraries/sql-parser/src/Components/SetOperation.php:105
-#, fuzzy
-#| msgid "as regular expression"
 msgid "Missing expression."
-msgstr "come espressione regolare"
+msgstr "Espressione mancante."
 
 #: libraries/sql-parser/src/Lexer.php:261
 msgid "Unexpected character."