From 645cf9f978a20c70fa07f599cee4385bdbbec051 Mon Sep 17 00:00:00 2001
From: Alexei Yuzhakov <sibprogrammer@gmail.com>
Date: Sun, 14 Jun 2015 20:46:11 +0600
Subject: [PATCH 1/7] Prohibit the ability to check version if it was disabled.

Signed-off-by: Alexei Yuzhakov <sibprogrammer@gmail.com>
---
 libraries/Util.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index 7a4ef957bd..dd6cad089f 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -4491,6 +4491,10 @@ class PMA_Util
      */
     public static function getLatestVersion()
     {
+        if (!$GLOBALS['cfg']['VersionCheck']) {
+            return array();
+        }
+
         // wait 3s at most for server response, it's enough to get information
         // from a working server
         $connection_timeout = 3;

From 1a0005418bf6f07ff0ac29d9e96702d2fba0e759 Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Mon, 15 Jun 2015 00:41:27 +0200
Subject: [PATCH 2/7] Manage logo display in navigation panel, with a template.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 .../navigation/NavigationHeader.class.php     | 95 +++++++++++--------
 templates/logo.phtml                          | 15 +++
 2 files changed, 70 insertions(+), 40 deletions(-)
 create mode 100644 templates/logo.phtml

diff --git a/libraries/navigation/NavigationHeader.class.php b/libraries/navigation/NavigationHeader.class.php
index 9d9ec76ab3..a5023e4a27 100644
--- a/libraries/navigation/NavigationHeader.class.php
+++ b/libraries/navigation/NavigationHeader.class.php
@@ -9,6 +9,9 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+require_once 'libraries/Template.class.php';
+use PMA\Template;
+
 /**
  * This class renders the logo, links, server selection,
  * which are then displayed at the top of the navigation panel
@@ -73,11 +76,10 @@ class PMA_NavigationHeader
      */
     private function _logo()
     {
-        $retval = '<!-- LOGO START -->';
         // display Logo, depending on $GLOBALS['cfg']['NavigationDisplayLogo']
         if (!$GLOBALS['cfg']['NavigationDisplayLogo']) {
-            $retval .= '<!-- LOGO END -->';
-            return $retval;
+            return Template::get('logo')
+                ->render(array('displayLogo' => false));
         }
 
         $logo = 'phpMyAdmin';
@@ -88,44 +90,57 @@ class PMA_NavigationHeader
             $logo = '<img src="' . $GLOBALS['pmaThemeImage'] . 'pma_logo2.png" '
                 . 'alt="' . $logo . '" id="imgpmalogo" />';
         }
-        $retval .= '<div id="pmalogo">';
-        if ($GLOBALS['cfg']['NavigationLogoLink']) {
-            $logo_link = trim(
-                htmlspecialchars($GLOBALS['cfg']['NavigationLogoLink'])
-            );
-            // prevent XSS, see PMASA-2013-9
-            // if link has protocol, allow only http and https
-            if (preg_match('/^[a-z]+:/i', $logo_link)
-                && ! preg_match('/^https?:/i', $logo_link)
-            ) {
-                $logo_link = 'index.php';
-            }
-            $retval .= '    <a href="' . $logo_link;
-            switch ($GLOBALS['cfg']['NavigationLogoLinkWindow']) {
-            case 'new':
-                $retval .= '" target="_blank"';
-                break;
-            case 'main':
-                // do not add our parameters for an external link
-                $navLogoLinkLower = /*overload*/mb_strtolower(
-                    $GLOBALS['cfg']['NavigationLogoLink']
-                );
-                if (/*overload*/mb_substr($navLogoLinkLower, 0, 4) !== '://') {
-                    $retval .= $GLOBALS['url_query'] . '"';
-                } else {
-                    $retval .= '" target="_blank"';
-                }
-            }
-            $retval .= '>';
-            $retval .= $logo;
-            $retval .= '</a>';
-        } else {
-            $retval .= $logo;
-        }
-        $retval .= '</div>';
 
-        $retval .= '<!-- LOGO END -->';
-        return $retval;
+        if (!$GLOBALS['cfg']['NavigationLogoLink']) {
+            return Template::get('logo')
+                ->render(
+                    array(
+                        'displayLogo' => true,
+                        'useLogoLink' => false,
+                        'logo' => $logo,
+                    )
+                );
+        }
+
+        $useLogoLink = true;
+        $logoLink = null;
+        $linkAttriks = null;
+        $logoLink = trim(
+            htmlspecialchars($GLOBALS['cfg']['NavigationLogoLink'])
+        );
+        // prevent XSS, see PMASA-2013-9
+        // if link has protocol, allow only http and https
+        if (preg_match('/^[a-z]+:/i', $logoLink)
+            && ! preg_match('/^https?:/i', $logoLink)
+        ) {
+            $logoLink = 'index.php';
+        }
+        switch ($GLOBALS['cfg']['NavigationLogoLinkWindow']) {
+        case 'new':
+            $linkAttriks = 'target="_blank"';
+            break;
+        case 'main':
+            // do not add our parameters for an external link
+            $navLogoLinkLower = /*overload*/mb_strtolower(
+                $GLOBALS['cfg']['NavigationLogoLink']
+            );
+            if (/*overload*/mb_substr($navLogoLinkLower, 0, 4) !== '://') {
+                $logoLink .= $GLOBALS['url_query'];
+            } else {
+                $linkAttriks = 'target="_blank"';
+            }
+        }
+
+        return Template::get('logo')
+            ->render(
+                array(
+                    'displayLogo' => true,
+                    'useLogoLink' => $useLogoLink,
+                    'logoLink' => $logoLink,
+                    'linkAttribs' => $linkAttriks,
+                    'logo' => $logo,
+                )
+            );
     }
 
     /**
diff --git a/templates/logo.phtml b/templates/logo.phtml
new file mode 100644
index 0000000000..60b60e88d7
--- /dev/null
+++ b/templates/logo.phtml
@@ -0,0 +1,15 @@
+<!-- LOGO START -->
+<?php if (false === $displayLogo) : ?>
+    <!-- LOGO END -->
+    <?php return; ?>
+<?php endif; ?>
+<div id="pmalogo">
+    <?php if (true === $useLogoLink) : ?>
+        <a href="<?php echo $logoLink; ?>" <?php echo $linkAttribs; ?>>
+    <?php endif; ?>
+    <?php echo $logo; ?>
+    <?php if (true === $useLogoLink) : ?>
+        </a>
+    <?php endif; ?>
+</div>
+<!-- LOGO END -->
\ No newline at end of file

From d384a6b4327e6ea6f057720f3d4edba12761319d Mon Sep 17 00:00:00 2001
From: Alexei Yuzhakov <sibprogrammer@gmail.com>
Date: Mon, 15 Jun 2015 08:05:17 +0600
Subject: [PATCH 3/7] Ability to contol the minimal MySQL version via config.

Signed-off-by: Alexei Yuzhakov <sibprogrammer@gmail.com>
---
 libraries/common.inc.php     |  4 ++--
 libraries/config.default.php | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index a8412dd446..7d795a480a 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -1027,10 +1027,10 @@ if (! defined('PMA_MINIMUM_COMMON')) {
         /* Log success */
         PMA_logUser($cfg['Server']['user']);
 
-        if (PMA_MYSQL_INT_VERSION < 50500) {
+        if (PMA_MYSQL_INT_VERSION < $cfg['MysqlMinVersion']['internal']) {
             PMA_fatalError(
                 __('You should upgrade to %s %s or later.'),
-                array('MySQL', '5.5.0')
+                array('MySQL', $cfg['MysqlMinVersion']['human'])
             );
         }
 
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 06cb63ebad..79cb5390b9 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -3065,4 +3065,15 @@ $cfg['maxRowPlotLimit'] = 500;
  */
 $cfg['ShowGitRevision'] = true;
 
+/**
+ * MySQL minimal version required
+ *
+ * @global array $cfg['MysqlMinVersion']
+ */
+$cfg['MysqlMinVersion'] = array(
+    'internal' => 50500,
+    'human' => '5.5.0'
+);
+
+
 ?>

From 9bb7e9fea1a99340d08ad70f0687878fe211d59c Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 15 Jun 2015 06:23:57 -0400
Subject: [PATCH 4/7] Clarify doc due to new verification introduced

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 doc/config.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/config.rst b/doc/config.rst
index b65799bb01..be47defb82 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -1111,8 +1111,8 @@ Generic settings
     :type: boolean
     :default: true
 
-    Enables check for latest versions using javascript on main phpMyAdmin
-    page.
+    Enables check for latest versions using JavaScript on the main phpMyAdmin
+    page or by directly accessing :file:`version_check.php`.
 
     .. note::
 

From 175fb2f4b7393b191501c101d791a6102b7ecf8b Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 15 Jun 2015 06:49:01 -0400
Subject: [PATCH 5/7] Match returned value with documented type

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 libraries/Util.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index dd6cad089f..51f3f3f5dd 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -4492,7 +4492,7 @@ class PMA_Util
     public static function getLatestVersion()
     {
         if (!$GLOBALS['cfg']['VersionCheck']) {
-            return array();
+            return new stdClass();
         }
 
         // wait 3s at most for server response, it's enough to get information

From 9acf48878da6288427ab50d76b2568dc44d5ac44 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 15 Jun 2015 11:11:03 -0400
Subject: [PATCH 6/7] The "GENERAL" word was a keyword only between MySQL 5.5.3
 and 5.5.8

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 libraries/sqlparser.data.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index c1379864d6..ec9451ccb1 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -473,7 +473,6 @@ $PMA_SQPdata_reserved_word = array (
     'FUNCTION',
     'GEMINI',
     'GEMINI_SPIN_RETRIES',
-    'GENERAL',
     'GLOBAL',
     'GRANT',
     'GRANTS',
@@ -766,7 +765,6 @@ $PMA_SQPdata_forbidden_word = array (
     'FOREIGN',
     'FROM',
     'FULLTEXT',
-    'GENERAL',
     'GET',
     'GRANT',
     'GROUP',

From 2e55cf1139caf9f247a54aa6df6b5bb7bceba706 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 15 Jun 2015 15:31:15 -0400
Subject: [PATCH 7/7] Doc for the MysqlMinVersion directive

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 doc/config.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/config.rst b/doc/config.rst
index be47defb82..7d484284fd 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -1693,6 +1693,15 @@ Main panel
     Defines whether to display informations about the current Git revision (if
     applicable) on the main panel.
 
+.. config:option:: $cfg['MysqlMinVersion']
+
+    :type: array
+
+    Defines the minimum supported MySQL version. The default is chosen
+    by the phpMyAdmin team; however this directive was asked by a developer
+    of the Plesk control panel to ease integration with older MySQL servers
+    (where most of the phpMyAdmin features work).
+
 Database structure
 ------------------