From 1de35ef88bf805d7c1dfae1a2c2dcac250170cd2 Mon Sep 17 00:00:00 2001 From: "J.M" Date: Mon, 8 Apr 2013 13:08:58 +0200 Subject: [PATCH 1/2] Detect Firefox browser --- libraries/Config.class.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 91338f1a69..9b59a02d41 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -242,6 +242,14 @@ class PMA_Config 'PMA_USR_BROWSER_VER', $log_version[1] . '.' . $log_version2[1] ); $this->set('PMA_USR_BROWSER_AGENT', 'SAFARI'); + // Firefox + } elseif (! strstr($HTTP_USER_AGENT, 'compatible') + && preg_match('@Firefox/([\w.]+)@', $HTTP_USER_AGENT, $log_version2) + ) { + $this->set( + 'PMA_USR_BROWSER_VER', $log_version2[1] + ); + $this->set('PMA_USR_BROWSER_AGENT', 'FIREFOX'); } elseif (preg_match('@rv:1.9(.*)Gecko@', $HTTP_USER_AGENT)) { $this->set('PMA_USR_BROWSER_VER', '1.9'); $this->set('PMA_USR_BROWSER_AGENT', 'GECKO'); From b49cc419401bb41f77c052e4d8d0f382c7b1ae3d Mon Sep 17 00:00:00 2001 From: "J.M" Date: Mon, 8 Apr 2013 13:19:01 +0200 Subject: [PATCH 2/2] Detect Internet Explorer 10 and 11 --- libraries/Config.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 9b59a02d41..8d0275ac06 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -189,11 +189,11 @@ class PMA_Config $this->set('PMA_USR_BROWSER_VER', $log_version[2]); $this->set('PMA_USR_BROWSER_AGENT', 'OPERA'); } elseif (preg_match( - '@MSIE ([0-9].[0-9]{1,2})@', + '@(MS)?IE ([0-9]{1,2}.[0-9]{1,2})@', $HTTP_USER_AGENT, $log_version )) { - $this->set('PMA_USR_BROWSER_VER', $log_version[1]); + $this->set('PMA_USR_BROWSER_VER', $log_version[2]); $this->set('PMA_USR_BROWSER_AGENT', 'IE'); } elseif (preg_match( '@OmniWeb/([0-9].[0-9]{1,2})@',