From 56e9cb638f6c217f816dc5facf1a26936f33f873 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 12 Feb 2003 18:32:31 +0000
Subject: [PATCH] Konqueror font size

---
 ChangeLog                  |  2 ++
 libraries/common.lib.php3  |  6 +++---
 libraries/defines.lib.php3 | 11 ++++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 97d50d83f..2b36537ae 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@ $Source$
     * lang/slovenian update, thanks to Kositer Uros
     * lang/swedish: update, thanks to Björn T. Hallberg
     * tbl_change.php3: upload field only to BLOBs
+    * libraries/defines.lib.php3, libraries/common.lib.php3: adjust Konqueror
+      font size
 
 2003-02-11 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_replace_fields.php3: sometimes we receive "none" as the file
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index 98a1338f5..557f42d1e 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -479,9 +479,10 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
             $font_smallest = '7pt';
         }
         // ... but most of them (except IE 5+ & NS 6+) need bigger fonts
-        else if (PMA_USR_OS == 'Mac'
+        else if ((PMA_USR_OS == 'Mac'
                  && ((PMA_USR_BROWSER_AGENT != 'IE' && PMA_USR_BROWSER_AGENT != 'MOZILLA')
-                     || PMA_USR_BROWSER_VER < 5)) {
+                     || PMA_USR_BROWSER_VER < 5))
+                || PMA_USR_BROWSER_AGENT == 'KONQUEROR') {
             $font_size     = 'medium';
             $font_biggest  = 'x-large';
             $font_bigger   = 'large';
@@ -930,7 +931,6 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
         } // end building available dbs from the "mysql" db
 
     } // end server connecting
-
     /**
      * Missing server hostname
      */
diff --git a/libraries/defines.lib.php3 b/libraries/defines.lib.php3
index 6b0fa2106..94d230fed 100644
--- a/libraries/defines.lib.php3
+++ b/libraries/defines.lib.php3
@@ -77,6 +77,8 @@ if (!defined('PMA_USR_OS')) {
     }
 
     // 2. browser and version
+    // (must check everything else before Mozilla)
+
     if (ereg('Opera(/| )([0-9].[0-9]{1,2})', $HTTP_USER_AGENT, $log_version)) {
         define('PMA_USR_BROWSER_VER', $log_version[2]);
         define('PMA_USR_BROWSER_AGENT', 'OPERA');
@@ -86,12 +88,15 @@ if (!defined('PMA_USR_OS')) {
     } else if (ereg('OmniWeb/([0-9].[0-9]{1,2})', $HTTP_USER_AGENT, $log_version)) {
         define('PMA_USR_BROWSER_VER', $log_version[1]);
         define('PMA_USR_BROWSER_AGENT', 'OMNIWEB');
+    //} else if (ereg('Konqueror/([0-9].[0-9]{1,2})', $HTTP_USER_AGENT, $log_version)) {
+    // Konqueror 2.2.2 says Konqueror/2.2.2
+    // Konqueror 3.0.3 says Konqueror/3
+    } 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)) {
         define('PMA_USR_BROWSER_VER', $log_version[1]);
         define('PMA_USR_BROWSER_AGENT', 'MOZILLA');
-    } else if (ereg('Konqueror/([0-9].[0-9]{1,2})', $HTTP_USER_AGENT, $log_version)) {
-        define('PMA_USR_BROWSER_VER', $log_version[1]);
-        define('PMA_USR_BROWSER_AGENT', 'KONQUEROR');
     } else {
         define('PMA_USR_BROWSER_VER', 0);
         define('PMA_USR_BROWSER_AGENT', 'OTHER');