New upstream release 4.6.1.0

Author: nuxwin

ChangeLog

@@ -1,6 +1,32 @@
 phpMyAdmin - ChangeLog
 ======================
 
+4.6.1 (2016-05-02)
+- issue #12120 PMA_Util not found in insert_edit.lib.php
+- issue #12118 Fixed activation of some languages
+- issue #12121 Fixed error in 3NF step of normalization
+- issue #12135 Fix offering JSON datatype in incompatible MySQL versions
+- issue #12132 Can not open table with JSON field
+- issue #12125 Cannot highlight a column if I scroll down from the top of the table
+- issue #12154 Fixed possible PHP error in SQL parser
+- issue #12029 Fixed SQL quoting in SQL export
+- issue #12129 Improve performance of database structure page
+- issue #12159 Fix PHP error if user did unpack new version over old one
+- issue #12165 Fix parsing of expression 0
+- issue #12146 Document setup with Google Cloud SQL
+- issue #12197 Fix parsing of queries with double \
+- issue #12202 Fixed setting of language from user configuration
+- issue #12200 Fixed check for ndb version
+- issue #12206 Fixed loading of configuration file
+- issue #12204 Check if sessions are working and report failures
+- issue #12211 non-clickable initial letter for users / and can't modify users with MySQL 5.7.12
+- issue #12215 Fixed config tab persistence errors
+- issue #12217 Fixed javascript erros on user creation
+- issue #12144 Fixed parsing of some AS clauses
+- issue #12205 Fixed parsing of FULL OUTER JOIN queries
+- issue #12171 Fixed editing of VIEW structure
+- issue #12208 Avoid printing executed queries on import
+
 4.6.0.0 (2016-03-22)
 + issue #11456 Disabled storage engines
 + issue #11479 Allow setting routine wise privileges

README

@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.6.0
+Version 4.6.1
 
 A web interface for MySQL and MariaDB.
 

RELEASE-DATE-4.6.0

@@ -0,0 +1 @@
+Mon May  2 21:23:35 UTC 2016

RELEASE-DATE-4.6.1

@@ -55,7 +55,7 @@
    <arg line="${source_comma_sep}
               xml
               codesize,design,naming,unusedcode
-              --exclude test,build,tcpdf,php-gettext,bfShapeFiles,PMAStandard,phpseclib,recaptchalib.php,swekey.php,vendor,sql-parser
+              --exclude test,build,tcpdf,php-gettext,bfShapeFiles,phpseclib,recaptchalib.php,swekey.php,vendor,sql-parser
               --reportfile '${basedir}/build/logs/pmd.xml'" />
   </exec>
  </target>
@@ -64,7 +64,6 @@
   <exec executable="phpcpd">
    <arg line="--log-pmd '${basedir}/build/logs/pmd-cpd.xml'
               --exclude test
-              --exclude PMAStandard
               --exclude build
               --exclude vendor
               --exclude libraries/tcpdf
@@ -82,7 +81,6 @@
   <exec executable="phploc">
    <arg line="--log-csv '${basedir}/build/logs/phploc.csv'
               --exclude test
-              --exclude PMAStandard
               --exclude build
               --exclude vendor
               --exclude libraries/tcpdf
@@ -96,10 +94,16 @@
   </exec>
  </target>
 
- <target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer excluding third party libraries">
+ <target name="phpcs-config" description="PHPCS configuration tweaking">
+  <exec executable="phpcs">
+   <arg line="--config-set installed_paths ${basedir}/vendor/phpmyadmin/coding-standard" />
+  </exec>
+ </target>
+
+ <target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer excluding third party libraries" depends="phpcs-config">
   <exec executable="phpcs">
    <arg line="
-              --ignore=*/php-gettext/*,*/vendor/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/openlayers/*,*/jquery/*,*/jqplot/*,*/build/*,*/bfShapeFiles/*,*/PMAStandard/*,*/phpseclib/*,*/recaptcha/*,*/swekey/*,*/sql-parser/*
+              --ignore=*/php-gettext/*,*/vendor/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/openlayers/*,*/jquery/*,*/jqplot/*,*/build/*,*/bfShapeFiles/*,*/phpseclib/*,*/recaptcha/*,*/swekey/*,*/sql-parser/*
               --report=checkstyle
               --extensions=php
               --report-file='${basedir}/build/logs/checkstyle.xml'

build.xml

@@ -55,76 +55,76 @@
 $faq_url = 'http://docs.phpmyadmin.net/en/latest/faq.html';
 
 $replaces = array(
-    '@(http://[./a-zA-Z0-9.-_-]*[/a-zA-Z0-9_])@'
-    => '<a href="\\1">\\1</a>',
+    '@(https?://[./a-zA-Z0-9.-_-]*[/a-zA-Z0-9_])@'
+    => '<a href="url.php?url=\\1">\\1</a>',
 
     // sourceforge users
     '/([0-9]{4}-[0-9]{2}-[0-9]{2}) (.+[^ ]) +&lt;(.*)@users.sourceforge.net&gt;/i'
-    => '\\1 <a href="https://sourceforge.net/users/\\3/">\\2</a>',
+    => '\\1 <a href="url.php?url=https://sourceforge.net/users/\\3/">\\2</a>',
     '/thanks to ([^\(\r\n]+) \(([-\w]+)\)/i'
-    => 'thanks to <a href="https://sourceforge.net/users/\\2/">\\1</a>',
+    => 'thanks to <a href="url.php?url=https://sourceforge.net/users/\\2/">\\1</a>',
     '/thanks to ([^\(\r\n]+) -\s+([-\w]+)/i'
-    => 'thanks to <a href="https://sourceforge.net/users/\\2/">\\1</a>',
+    => 'thanks to <a href="url.php?url=https://sourceforge.net/users/\\2/">\\1</a>',
 
     // mail address
     '/([0-9]{4}-[0-9]{2}-[0-9]{2}) (.+[^ ]) +&lt;(.*@.*)&gt;/i'
     => '\\1 <a href="mailto:\\3">\\2</a>',
 
     // linking patches
     '/patch\s*#?([0-9]{6,})/i'
-    => '<a href="' . $tracker_url . '">patch #\\1</a>',
+    => '<a href="url.php?url=' . $tracker_url . '">patch #\\1</a>',
 
     // linking RFE
     '/(?:rfe|feature)\s*#?([0-9]{6,})/i'
-    => '<a href="https://sourceforge.net/support/tracker.php?aid=\\1">RFE #\\1</a>',
+    => '<a href="url.php?url=https://sourceforge.net/support/tracker.php?aid=\\1">RFE #\\1</a>',
 
     // linking files
     '/(\s+)([\\/a-z_0-9\.]+\.(?:php3?|html|pl|js|sh))/i'
-    => '\\1<a href="' . $github_url . 'commits/HEAD/\\2">\\2</a>',
+    => '\\1<a href="url.php?url=' . $github_url . 'commits/HEAD/\\2">\\2</a>',
 
     // FAQ entries
     '/FAQ ([0-9]+)\.([0-9a-z]+)/i'
-    => '<a href="' . $faq_url . '#faq\\1-\\2">FAQ \\1.\\2</a>',
+    => '<a href="url.php?url=' . $faq_url . '#faq\\1-\\2">FAQ \\1.\\2</a>',
 
     // linking bugs
     '/bug\s*#?([0-9]{6,})/i'
-    => '<a href="https://sourceforge.net/support/tracker.php?aid=\\1">bug #\\1</a>',
+    => '<a href="url.php?url=https://sourceforge.net/support/tracker.php?aid=\\1">bug #\\1</a>',
 
     // all other 6+ digit numbers are treated as bugs
     '/(?<!bug|RFE|patch) #?([0-9]{6,})/i'
-    => '<a href="' . $tracker_url . '">bug #\\1</a>',
+    => '<a href="url.php?url=' . $tracker_url . '">bug #\\1</a>',
 
     // GitHub issues
     '/issue\s*#?([0-9]{4,5}) /i'
-    => '<a href="' . $github_url . 'issues/\\1">issue #\\1</a> ',
+    => '<a href="url.php?url=' . $github_url . 'issues/\\1">issue #\\1</a> ',
 
     // transitioned SF.net project bug/rfe/patch links
     // by the time we reach 6-digit numbers, we can probably retire the above links
     '/patch\s*#?([0-9]{4,5}) /i'
-    => '<a href="' . $tracker_url_patch . '">patch #\\1</a> ',
+    => '<a href="url.php?url=' . $tracker_url_patch . '">patch #\\1</a> ',
     '/(?:rfe|feature)\s*#?([0-9]{4,5}) /i'
-    => '<a href="' . $tracker_url_rfe . '">RFE #\\1</a> ',
+    => '<a href="url.php?url=' . $tracker_url_rfe . '">RFE #\\1</a> ',
     '/bug\s*#?([0-9]{4,5}) /i'
-    => '<a href="' . $tracker_url_bug . '">bug #\\1</a> ',
+    => '<a href="url.php?url=' . $tracker_url_bug . '">bug #\\1</a> ',
     '/(?<!bug|RFE|patch) #?([0-9]{4,5}) /i'
-    => '<a href="' . $tracker_url_bug . '">bug #\\1</a> ',
+    => '<a href="url.php?url=' . $tracker_url_bug . '">bug #\\1</a> ',
 
     // CVE/CAN entries
     '/((CAN|CVE)-[0-9]+-[0-9]+)/'
-    => '<a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=\\1">\\1</a>',
+    => '<a href="url.php?url=https://cve.mitre.org/cgi-bin/cvename.cgi?name=\\1">\\1</a>',
 
     // PMASAentries
     '/(PMASA-[0-9]+-[0-9]+)/'
-    => '<a href="https://www.phpmyadmin.net/security/\\1/">\\1</a>',
+    => '<a href="url.php?url=https://www.phpmyadmin.net/security/\\1/">\\1</a>',
 
     // Highlight releases (with links)
     '/([0-9]+)\.([0-9]+)\.([0-9]+)\.0 (\([0-9-]+\))/'
     => '<a name="\\1_\\2_\\3"></a>'
-        . '<a href="' . $github_url . 'commits/RELEASE_\\1_\\2_\\3">'
+        . '<a href="url.php?url=' . $github_url . 'commits/RELEASE_\\1_\\2_\\3">'
         . '\\1.\\2.\\3.0 \\4</a>',
     '/([0-9]+)\.([0-9]+)\.([0-9]+)\.([1-9][0-9]*) (\([0-9-]+\))/'
     => '<a name="\\1_\\2_\\3_\\4"></a>'
-        . '<a href="' . $github_url . 'commits/RELEASE_\\1_\\2_\\3_\\4">'
+        . '<a href="url.php?url=' . $github_url . 'commits/RELEASE_\\1_\\2_\\3_\\4">'
         . '\\1.\\2.\\3.\\4 \\5</a>',
 
     // Highlight releases (not linkable)

changelog.php

@@ -1,7 +1,7 @@
 {
     "name": "imscp/phpmyadmin",
     "description": "iMSCP tools - PhpMyadmin - MySQL administration tool",
-    "version": "4.6.0.0",
+    "version": "4.6.1.0",
     "authors": [
         {
             "name": "The phpMyAdmin Team",

composer.json

@@ -15,18 +15,6 @@
 require_once 'libraries/common.inc.php';
 require_once 'libraries/db_common.inc.php';
 
-list(
-    $tables,
-    $num_tables,
-    $total_num_tables,
-    $sub_part,
-    $is_show_stats,
-    $db_is_system_schema,
-    $tooltip_truename,
-    $tooltip_aliasname,
-    $pos
-) = Util::getDbInfo($GLOBALS['db'], isset($sub_part) ? $sub_part : '');
-
 $container = libraries\di\Container::getDefaultContainer();
 $container->factory('PMA\libraries\controllers\database\DatabaseStructureController');
 $container->alias(
@@ -36,16 +24,10 @@
 $container->set('PMA\libraries\Response', Response::getInstance());
 $container->alias('response', 'PMA\libraries\Response');
 
-global $db, $pos, $db_is_system_schema, $total_num_tables, $tables, $num_tables;
 /* Define dependencies for the concerned controller */
 $dependency_definitions = array(
     'db' => $db,
     'url_query' => &$GLOBALS['url_query'],
-    'pos' => $pos,
-    'db_is_system_schema' => $db_is_system_schema,
-    'num_tables' => $num_tables,
-    'total_num_tables' => $total_num_tables,
-    'tables' => $tables,
 );
 
 /** @var DatabaseStructureController $controller */

db_structure.php

@@ -51,7 +51,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.6.0'
+version = '4.6.1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

doc/conf.py

@@ -254,6 +254,8 @@ Server connection settings
 
     We strongly recommend the ``'mysqli'`` extension when using this option.
 
+    .. seealso:: :ref:`example-google-ssl`
+
 .. config:option:: $cfg['Servers'][$i]['ssl_key']
 
     :type: string
@@ -267,20 +269,26 @@ Server connection settings
 
         $cfg['Servers'][$i]['ssl_key'] = '/etc/mysql/server-key.pem';
 
+    .. seealso:: :ref:`example-google-ssl`
+
 .. config:option:: $cfg['Servers'][$i]['ssl_cert']
 
     :type: string
     :default: NULL
 
     Path to the cert file when using SSL for connecting to the MySQL server.
 
+    .. seealso:: :ref:`example-google-ssl`
+
 .. config:option:: $cfg['Servers'][$i]['ssl_ca']
 
     :type: string
     :default: NULL
 
     Path to the CA file when using SSL for connecting to the MySQL server.
 
+    .. seealso:: :ref:`example-google-ssl`
+
 .. config:option:: $cfg['Servers'][$i]['ssl_ca_path']
 
     :type: string
@@ -300,14 +308,24 @@ Server connection settings
     :type: boolean
     :default: true
 
+    .. versionadded:: 4.6.0
+
+        This is supported since phpMyAdmin 4.6.0.
+
     If your PHP install uses the MySQL Native Driver (mysqlnd), your
     MySQL server is 5.6 or later, and your SSL certificate is self-signed,
     there is a chance your SSL connection will fail due to validation.
     Setting this to ``false`` will disable the validation check.
 
+    Since PHP 5.6.0 it also verifies whether server name matches CN of it's
+    certificate. There is currently no way to disable just this check without
+    disabling complete SSL verification.
+
     .. note::
 
-        This flag only works with PHP 5.6.16 or later
+        This flag only works with PHP 5.6.16 or later.
+
+    .. seealso:: :ref:`example-google-ssl`
 
 .. config:option:: $cfg['Servers'][$i]['connect_type']
 
@@ -2885,3 +2903,52 @@ Developer
 
     Enable to let server present itself as demo server.
     This is used for <http://demo.phpmyadmin.net/>.
+
+
+Examples
+--------
+
+See following configuration snippets for usual setups of phpMyAdmin.
+
+.. _example-google-ssl:
+
+Google Cloud SQL with SSL
++++++++++++++++++++++++++
+
+To connect to Google Could SQL, you currently need to disable certificate
+verification. This is caused by the certficate being issued for CN matching
+your instance name, but you connect to an IP address and PHP tries to match
+these two. With verfication you end up with error message like::
+
+    Peer certificate CN=`api-project-851612429544:pmatest' did not match expected CN=`8.8.8.8'
+
+.. warning::
+
+    With disabled verification your traffic is encrypted, but you're open to
+    man in the middle attacks.
+
+To connect phpMyAdmin to Google Cloud SQL using SSL download the client and
+server certificates and tell phpMyAdmin to use them:
+
+.. code-block:: php
+
+    // IP address of your instance
+    $cfg['Servers'][2]['host'] = '8.8.8.8';
+    // Use SSL for connection
+    $cfg['Servers'][$i]['ssl'] = true;
+    // Client secret key
+    $cfg['Servers'][$i]['ssl_key'] = '../client-key.pem';
+    // Client certificate
+    $cfg['Servers'][$i]['ssl_cert'] = '../client-cert.pem';
+    // Server certification authority
+    $cfg['Servers'][$i]['ssl_ca'] = '../server-ca.pem';
+    // Disable SSL verification (see above note)
+    $cfg['Servers'][$i]['ssl_verify'] = false;
+
+.. seealso::
+
+    :config:option:`$cfg['Servers'][$i]['ssl']`,
+    :config:option:`$cfg['Servers'][$i]['ssl_key']`,
+    :config:option:`$cfg['Servers'][$i]['ssl_cert']`,
+    :config:option:`$cfg['Servers'][$i]['ssl_ca']`,
+    :config:option:`$cfg['Servers'][$i]['ssl_verify']`