From 88b2247faec341feba8ddf3be8f0ce6512ae0208 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Mon, 15 Nov 2010 23:48:24 +0100
Subject: [PATCH] Add new mobile view to login screen.

---
 imp/js/login.js         |  5 +++--
 imp/lib/Application.php | 13 ++++++++++---
 imp/lib/Auth.php        | 11 ++++++++---
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/imp/js/login.js b/imp/js/login.js
index 41325d521..6c5a45960 100644
--- a/imp/js/login.js
+++ b/imp/js/login.js
@@ -26,8 +26,9 @@ var ImpLogin = {
         var s = $('imp_select_view');
         if (s) {
             s.down('option[value=dimp]').show();
-            if (this.dimp_sel) {
-                s.selectedIndex = s.down('option[value=dimp]').index;
+            s.down('option[value=mobile]').show();
+            if (this.pre_sel) {
+                s.selectedIndex = s.down('option[value=' + this.pre_sel + ']').index;
             }
         }
     }
diff --git a/imp/lib/Application.php b/imp/lib/Application.php
index a142a60b5..5919819aa 100644
--- a/imp/lib/Application.php
+++ b/imp/lib/Application.php
@@ -345,10 +345,14 @@ class IMP_Application extends Horde_Registry_Application
             if (!($view_cookie = Horde_Util::getFormData('imp_select_view'))) {
                 $view_cookie = isset($_COOKIE['default_imp_view'])
                     ? $_COOKIE['default_imp_view']
-                    : ($GLOBALS['browser']->isMobile() ? 'mimp' : 'imp');
+                    : ($GLOBALS['browser']->isMobile()
+                       ? ($GLOBALS['browser']->getBrowser() == 'webkit'
+                          ? 'mimp'
+                          : 'mobile')
+                       : 'imp');
             }
 
-            $js_code['-ImpLogin.dimp_sel'] = intval($view_cookie == 'dimp');
+            $js_code['ImpLogin.pre_sel'] = $view_cookie;
 
             $params['imp_select_view'] = array(
                 'label' => _("Mode"),
@@ -361,7 +365,10 @@ class IMP_Application extends Horde_Registry_Application
                     'dimp' => array(
                         'hidden' => true,
                         'name' => _("Dynamic")
-                        // Dimp selected is handled by javascript (dimp_sel)
+                    ),
+                    'mobile' => array(
+                        'hidden' => true,
+                        'name' => _("Mobile (Smartphone)")
                     ),
                     'mimp' => array(
                         'name' => _("Mobile"),
diff --git a/imp/lib/Auth.php b/imp/lib/Auth.php
index eb837308c..fd5edb384 100644
--- a/imp/lib/Auth.php
+++ b/imp/lib/Auth.php
@@ -532,9 +532,14 @@ class IMP_Auth
     static public function setViewMode($view)
     {
         /* Enforce minimum browser standards for DIMP. */
-        if (($view == 'dimp') && !Horde::ajaxAvailable()) {
-            $view = 'imp';
-            $GLOBALS['notification']->push(_("Your browser is too old to display the dynamic mode. Using traditional mode instead."), 'horde.warning');
+        if (($view == 'dimp' || $view == 'mobile') && !Horde::ajaxAvailable()) {
+            if ($view == 'dimp') {
+                $view = 'imp';
+                $GLOBALS['notification']->push(_("Your browser is too old to display the dynamic mode. Using traditional mode instead."), 'horde.warning');
+            } else {
+                $view = 'mimp';
+                $GLOBALS['notification']->push(_("Your browser is too old to display the smartphone mode. Using mobile mode instead."), 'horde.warning');
+            }
         }
 
         $GLOBALS['session']->set('imp', 'view', $view);
-- 
2.11.0