Improve session_timeout handling

diff --git a/imp/ajax.php b/imp/ajax.php
index 82a0160..c6038f2 100644 (file)
--- a/imp/ajax.php
+++ b/imp/ajax.php
@@ -165,7 +165,7 @@ if (in_array($action, array('chunkContent', 'Html2Text', 'Text2Html', 'GetReplyD
 }
 
 $imp_dimp_logout = ($action == 'LogOut');
-$session_timeout = 'json';
+$imp_session_timeout = 'json';
 require_once IMP_BASE . '/lib/base.php';
 
 // Process common request variables.

diff --git a/imp/lib/base.php b/imp/lib/base.php
index cc963e5..6b59855 100644 (file)
--- a/imp/lib/base.php
+++ b/imp/lib/base.php
@@ -20,6 +20,8 @@
  *   'none' - Do not start a session
  *   'readonly' - Start session readonly
  *   [DEFAULT] - Start read/write session
+ * $imp_session_timeout - Sets special handling for session timeouts:
+ *   'json' - Send session logout request to browser.
  * </pre>
  *
  * Global variables defined:
@@ -88,21 +90,13 @@ try {
             throw $e;
         }
 
-        if ($viewmode == 'dimp') {
-            // Handle session timeouts
-            switch (Horde_Util::nonInputVar('session_timeout')) {
-            case 'json':
-                $GLOBALS['notification']->push(null, 'dimp.timeout');
-                Horde::sendHTTPResponse(Horde::prepareResponse(), 'json');
-                exit;
-
-            case 'none':
-                exit;
-
-            default:
-                // TODO: Redirect to login screen
-                exit;
-            }
+        // Handle session timeouts when they come from an AJAX request.
+        if (($viewmode == 'dimp') &&
+            (Horde_Util::nonInputVar('imp_session_timeout') == 'json')) {
+            $notification = Horde_Notification::singleton();
+            $notification->push(null, 'dimp.timeout');
+            Horde::sendHTTPResponse(Horde::prepareResponse(), 'json');
+            exit;
         }
 
         if (Horde_Util::nonInputVar('imp_compose_page')) {