From b190b5ba2efda9afa906cc64949f8090eec5f4f8 Mon Sep 17 00:00:00 2001
From: Garvin Hicking <me@supergarv.de>
Date: Mon, 7 Jul 2003 12:13:01 +0000
Subject: [PATCH] Safari detection

---
 ChangeLog                  | 2 ++
 libraries/common.lib.php3  | 2 +-
 libraries/defines.lib.php3 | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 6603e8537..1f9cd7931 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ $Source$
     * libraries/transformations/image_jpeg__inline.inc.php3,
       libraries/transformations/image_png__inline.inc.php3: Proper escaping
       of &amp;
+    * libraries/common.lib.php3, libraries/defines.lib.php3: Safari detection,
+      smaller default font size (like OPERA). Bug #752646.
     
 2003-07-07 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/auth/cookie.auth.lib.php3, config.inc.php3, user_password.php3,
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index c5f387bff..aa42f9f36 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -532,7 +532,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
         // Some mac browsers need also smaller default fonts size (OmniWeb &
         // Opera)...
         else if (PMA_USR_OS == 'Mac'
-                    && (PMA_USR_BROWSER_AGENT == 'OMNIWEB' || PMA_USR_BROWSER_AGENT == 'OPERA')) {
+                    && (PMA_USR_BROWSER_AGENT == 'OMNIWEB' || PMA_USR_BROWSER_AGENT == 'OPERA' || PMA_USR_BROWSER_AGENT == 'SAFARI')) {
             $font_size     = 'x-small';
             $font_biggest  = 'large';
             $font_bigger   = 'medium';
diff --git a/libraries/defines.lib.php3 b/libraries/defines.lib.php3
index 120ddb59a..33f93e10d 100644
--- a/libraries/defines.lib.php3
+++ b/libraries/defines.lib.php3
@@ -94,6 +94,10 @@ if (!defined('PMA_USR_OS')) {
     } else if (ereg('(Konqueror/)(.*)(;)', $HTTP_USER_AGENT, $log_version)) {
         define('PMA_USR_BROWSER_VER', $log_version[2]);
         define('PMA_USR_BROWSER_AGENT', 'KONQUEROR');
+    } else if (ereg('Mozilla/([0-9].[0-9]{1,2})', $HTTP_USER_AGENT, $log_version)
+               && ereg('Safari/([0-9]*)', $HTTP_USER_AGENT, $log_version2)) {
+        define('PMA_USR_BROWSER_VER', $log_version[1] . '.' . $log_version2[1]);
+        define('PMA_USR_BROWSER_AGENT', 'SAFARI');
     } else if (ereg('Mozilla/([0-9].[0-9]{1,2})', $HTTP_USER_AGENT, $log_version)) {
         define('PMA_USR_BROWSER_VER', $log_version[1]);
         define('PMA_USR_BROWSER_AGENT', 'MOZILLA');