New upstream version 4.7.9

Author: nijel

CONTRIBUTING.md

@@ -20,9 +20,10 @@ Please report [bugs on GitHub][1].
 ## Patches submission
 
 Patches are welcome as [pull requests on GitHub][2].  Please include a
-Signed-off-by tag.  Note that by submitting patches with the Signed-off-by
-tag, you are giving permission to license the patch as GPLv2-or-later.  See
-[the DCO file][3] for details.
+Signed-off-by tag in the commit message (you can do this by passing `--signoff`
+parameter to Git).  Note that by submitting patches with the Signed-off-by tag,
+you are giving permission to license the patch as GPLv2-or-later.  See [the DCO
+file][3] for details.
 
 [2]: https://github.com/phpmyadmin/phpmyadmin/pulls
 [3]: https://github.com/phpmyadmin/phpmyadmin/blob/master/DCO

ChangeLog

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

README

@@ -0,0 +1 @@
+Mon Mar  5 15:36:00 UTC 2018

RELEASE-DATE-4.6.6

@@ -0,0 +1,34 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Generic AJAX endpoint for getting information about database
+ *
+ * @package PhpMyAdmin
+ */
+
+use PMA\libraries\Response;
+use PMA\libraries\Util;
+require_once 'libraries/common.inc.php';
+
+$response = Response::getInstance();
+
+if (empty($_POST['type'])) {
+    PMA_fatalError(__('Bad type!'));
+}
+
+switch ($_POST['type']) {
+    case 'list-databases':
+        $response->addJSON('databases', $GLOBALS['dblist']->databases);
+        break;
+    case 'list-tables':
+        Util::checkParameters(array('db'));
+        $response->addJSON('tables', $GLOBALS['dbi']->getTables($_REQUEST['db']));
+        break;
+    case 'list-columns':
+        Util::checkParameters(array('db', 'table'));
+        $response->addJSON('columns', $GLOBALS['dbi']->getColumnNames($_REQUEST['db'], $_REQUEST['table']));
+        break;
+
+    default:
+        PMA_fatalError(__('Bad type!'));
+}

RELEASE-DATE-4.7.9

@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 
 require_once 'libraries/common.inc.php';
 require_once 'libraries/transformations.lib.php';
@@ -26,7 +27,7 @@
 
 PMA\libraries\Util::checkParameters(array('db', 'table', 'field'));
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $response->getFooter()->setMinimal();
 $header = $response->getHeader();
 $header->disableMenuAndConsole();
@@ -36,8 +37,7 @@
  * Displays the frame
  */
 
-$cfgRelation = PMA_getRelationsParam();
-$foreigners  = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : false);
+$foreigners  = PMA_getForeigners($db, $table);
 $foreign_limit = PMA_getForeignLimit(
     isset($_REQUEST['foreign_showAll']) ? $_REQUEST['foreign_showAll'] : null
 );

ajax.php

@@ -55,7 +55,7 @@
    <arg line="${source_comma_sep}
               xml
               codesize,design,naming,unusedcode
-              --exclude test,build,tcpdf,php-gettext,bfShapeFiles,phpseclib,recaptchalib.php,vendor,sql-parser
+              --exclude test,build,vendor
               --reportfile '${basedir}/build/logs/pmd.xml'" />
   </exec>
  </target>
@@ -66,12 +66,6 @@
               --exclude test
               --exclude build
               --exclude vendor
-              --exclude libraries/tcpdf
-              --exclude libraries/php-gettext
-              --exclude libraries/bfShapeFiles
-              --exclude libraries/phpseclib
-              --exclude libraries/plugins/auth/recaptcha/recaptchalib.php
-              --exclude libraries/sql-parser
               ${source}" />
   </exec>
  </target>
@@ -82,12 +76,6 @@
               --exclude test
               --exclude build
               --exclude vendor
-              --exclude libraries/tcpdf
-              --exclude libraries/php-gettext
-              --exclude libraries/bfShapeFiles
-              --exclude libraries/phpseclib
-              --exclude libraries/plugins/auth/recaptcha/recaptchalib.php
-              --exclude libraries/sql-parser
               ${source}" />
   </exec>
  </target>
@@ -101,7 +89,7 @@
  <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/*,*/phpseclib/*,*/recaptcha/*,*/sql-parser/*
+              --ignore=*/vendor/*,*/canvg/*,*/codemirror/*,*/openlayers/*,*/jquery/*,*/jqplot/*,*/build/*
               --report=checkstyle
               --extensions=php
               --report-file='${basedir}/build/logs/checkstyle.xml'

browse_foreigners.php

@@ -5,13 +5,14 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 
 /**
  * Gets core libraries and defines some variables
  */
 require 'libraries/common.inc.php';
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $response->disable();
 $response->getHeader()->sendHttpHeaders();
 
@@ -35,10 +36,11 @@
 } else {
     printf(
         __(
-            'The %s file is not available on this system, please visit '
-            . 'www.phpmyadmin.net for more information.'
+            'The %s file is not available on this system, please visit ' .
+            '%s for more information.'
         ),
-        $filename
+        $filename,
+        '<a href="https://www.phpmyadmin.net/">phpmyadmin.net</a>'
     );
     exit;
 }
@@ -79,10 +81,6 @@
     '/(?:rfe|feature)\s*#?([0-9]{6,})/i'
     => '<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="url.php?url=' . $github_url . 'commits/HEAD/\\2">\\2</a>',
-
     // FAQ entries
     '/FAQ ([0-9]+)\.([0-9a-z]+)/i'
     => '<a href="url.php?url=' . $faq_url . '#faq\\1-\\2">FAQ \\1.\\2</a>',
@@ -132,6 +130,9 @@
     '/(    ### )(.*)/'
     => '\\1<b>\\2</b>',
 
+    // Links target and rel
+    '/a href="/' => 'a target="_blank" rel="noopener noreferrer" href="'
+
 );
 
 header('Content-type: text/html; charset=utf-8');
@@ -151,12 +152,5 @@
 echo preg_replace(array_keys($replaces), $replaces, $changelog);
 echo '</pre>';
 ?>
-<script type="text/javascript">
-var links = document.getElementsByTagName("a");
-for(var i = 0; i < links.length; i++) {
-    links[i].target = "_blank";
-    links[i].rel = "noopener noreferrer";
-}
-</script>
 </body>
 </html>

build.xml

@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Response;
 
 require_once 'libraries/common.inc.php';
 
@@ -26,7 +27,7 @@
     PMA_fixPMATables($cfgRelation['db']);
 }
 
-$response = PMA\libraries\Response::getInstance();
+$response = Response::getInstance();
 $response->addHTML(
     PMA_getRelationsParamDiagnostic($cfgRelation)
 );

changelog.php

@@ -1,32 +1,52 @@
 {
     "name": "phpmyadmin/phpmyadmin",
-    "type": "application",
+    "type": "project",
     "description": "MySQL web administration tool",
     "keywords": ["phpmyadmin","mysql","web"],
     "homepage": "https://www.phpmyadmin.net/",
-    "license": "GPL-2.0+",
-    "authors": [
-        {
-            "name": "The phpMyAdmin Team",
-            "email": "[email protected]",
-            "homepage": "https://www.phpmyadmin.net/team/"
-        }
-    ],
     "support": {
         "forum": "https://www.phpmyadmin.net/support/",
         "issues": "https://github.com/phpmyadmin/phpmyadmin/issues",
         "wiki": "https://wiki.phpmyadmin.net/",
         "docs": "https://docs.phpmyadmin.net/",
         "source": "https://github.com/phpmyadmin/phpmyadmin"
     },
+    "license": "GPL-2.0-only",
+    "authors": [
+        {
+            "name": "The phpMyAdmin Team",
+            "email": "[email protected]",
+            "homepage": "https://www.phpmyadmin.net/team/"
+        }
+    ],
     "non-feature-branches": ["RELEASE_.*"],
+    "autoload": {
+        "psr-4": {
+            "PMA\\": "./"
+        }
+    },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://www.phpmyadmin.net"
+        }
+    ],
     "require": {
         "php": ">=5.5.0",
         "ext-mbstring": "*",
         "ext-mysqli": "*",
         "ext-xml": "*",
         "ext-pcre": "*",
-        "ext-json": "*"
+        "ext-json": "*",
+        "phpmyadmin/sql-parser": "^4.2.3",
+        "phpmyadmin/motranslator": "^4.0",
+        "phpmyadmin/shapefile": "^2.0",
+        "tecnickcom/tcpdf": "^6.2",
+        "phpseclib/phpseclib": "^2.0",
+        "google/recaptcha": "^1.1"
+    },
+    "conflict": {
+        "phpseclib/phpseclib": "2.0.8"
     },
     "suggest": {
         "ext-openssl": "Cookie encryption",
@@ -35,20 +55,14 @@
         "ext-zlib": "For gz import and export",
         "ext-bz2": "For bzip2 import and export",
         "ext-zip": "For zip import and export",
-        "ext-gd2": "For image transformations"
+        "ext-gd2": "For image transformations",
+        "tecnickcom/tcpdf": "For PDF support"
     },
     "require-dev": {
-        "satooshi/php-coveralls": "~0.6",
         "phpunit/phpunit": "~4.1",
-        "codacy/coverage": "dev-master",
+        "codacy/coverage": "^1.3.0",
         "phpunit/phpunit-selenium": "~1.2",
         "squizlabs/php_codesniffer": "2.*",
         "phpmyadmin/coding-standard": ">=0.1.0"
-    },
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "https://www.phpmyadmin.net"
-        }
-    ]
+    }
 }