Also remove Safari 2 support for DIMP

diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
index ab49f80..a5b7c05 100644 (file)
--- a/imp/docs/CHANGES
+++ b/imp/docs/CHANGES
@@ -2,7 +2,7 @@
 v5.0-git
 --------
 
-[mms] Remove IE 6 support for DIMP.
+[mms] Remove IE 6 (and below) and Safari 2 (and below) support for DIMP.
 [mms] Add chance to switch between forward options on compose page when using
       auto-forward (DIMP).
 [mms] Add chance to switch reply type to single recipient on compose page when

diff --git a/imp/lib/Auth.php b/imp/lib/Auth.php
index b6f4fe9..ac40ecd 100644 (file)
--- a/imp/lib/Auth.php
+++ b/imp/lib/Auth.php
@@ -459,12 +459,15 @@ class IMP_Auth
             ? (empty($conf['user']['force_view']) ? 'imp' : $conf['user']['force_view'])
             : (empty($sess['cache']['select_view']) ? 'imp' : $sess['cache']['select_view']);
 
-        /* Enforce minimum browser standards for DIMP. */
+        /* Enforce minimum browser standards for DIMP.
+         * No IE < 7; Safari < 3 */
         if (($sess['view'] == 'dimp') &&
-            $GLOBALS['browser']->isBrowser('msie') &&
-            ($GLOBALS['browser']->getMajor() < 7)) {
+            (($GLOBALS['browser']->isBrowser('msie') &&
+              ($GLOBALS['browser']->getMajor() < 7)) ||
+             ($GLOBALS['browser']->hasFeature('issafari') &&
+              ($GLOBALS['browser']->getMajor() < 2)))) {
             $sess['view'] = 'imp';
-            $GLOBALS['notification']->push(_("Dynamic mode requires Internet Explorer 7+. Using traditional mode instead."), 'horde.error');
+            $GLOBALS['notification']->push(_("Your browser is too old to display the dynamic mode. Using traditional mode instead."), 'horde.error');
         }
 
         setcookie('default_imp_view', $sess['view'], time() + 30 * 86400,