Provide basic checking to prevent switching between mimp/imp/dimp during session

diff --git a/imp/compose-dimp.php b/imp/compose-dimp.php
index ae8a325..4a13615 100644 (file)
--- a/imp/compose-dimp.php
+++ b/imp/compose-dimp.php
@@ -28,7 +28,7 @@
  */
 
 require_once dirname(__FILE__) . '/lib/Application.php';
-Horde_Registry::appInit('imp');
+Horde_Registry::appInit('imp', array('impmode' => 'dimp'));
 
 Horde_Nls::setTimeZone();
 $vars = Horde_Variables::getDefaultVariables();

diff --git a/imp/compose-mimp.php b/imp/compose-mimp.php
index 5d50b44..de46685 100644 (file)
--- a/imp/compose-mimp.php
+++ b/imp/compose-mimp.php
@@ -13,7 +13,7 @@
  */
 
 require_once dirname(__FILE__) . '/lib/Application.php';
-Horde_Registry::appInit('imp');
+Horde_Registry::appInit('imp', array('impmode' => 'mimp'));
 
 Horde_Nls::setTimeZone();
 

diff --git a/imp/folders-mimp.php b/imp/folders-mimp.php
index af5c3c4..262c4e6 100644 (file)
--- a/imp/folders-mimp.php
+++ b/imp/folders-mimp.php
@@ -17,7 +17,7 @@
  */
 
 require_once dirname(__FILE__) . '/lib/Application.php';
-Horde_Registry::appInit('imp');
+Horde_Registry::appInit('imp', array('impmode' => 'mimp'));
 
 /* Redirect back to the mailbox if folder use is not allowed. */
 if (empty($conf['user']['allow_folders'])) {

diff --git a/imp/index-dimp.php b/imp/index-dimp.php
index 5a5ff27..3fe7364 100644 (file)
--- a/imp/index-dimp.php
+++ b/imp/index-dimp.php
@@ -13,7 +13,7 @@
  */
 
 require_once dirname(__FILE__) . '/lib/Application.php';
-Horde_Registry::appInit('imp');
+Horde_Registry::appInit('imp', array('impmode' => 'dimp'));
 
 $scripts = array(
     array('DimpBase.js', 'imp'),

diff --git a/imp/lib/Application.php b/imp/lib/Application.php
index 11b6cce..b982952 100644 (file)
--- a/imp/lib/Application.php
+++ b/imp/lib/Application.php
@@ -107,14 +107,26 @@ class IMP_Application extends Horde_Registry_Application
         // IMP_Search object.
         IMP::setCurrentMailboxInfo();
 
+        $impmode = empty($this->initParams['impmode'])
+            ? 'imp'
+            : $this->initParams['impmode'];
         $viewmode = IMP::getViewMode();
+
         if ($viewmode == 'mimp') {
+            if ($impmode != 'mimp') {
+                header('Location: ' . IMP_Auth::getInitialPage(true)->setRaw(true));
+                exit;
+            }
             $GLOBALS['imp_notify'] = $GLOBALS['notification']->replace('status', array(), 'IMP_Notification_Listener_StatusMobile');
         } else {
-            $GLOBALS['imp_notify'] = $GLOBALS['notification']->replace('status', array('viewmode' => $viewmode), 'IMP_Notification_Listener_Status');
             if ($viewmode == 'imp') {
                 $GLOBALS['notification']->attach('audio');
+                if ($impmode == 'dimp') {
+                    header('Location: ' . IMP_Auth::getInitialPage(true)->setRaw(true));
+                    exit;
+                }
             }
+            $GLOBALS['imp_notify'] = $GLOBALS['notification']->replace('status', array('viewmode' => $viewmode), 'IMP_Notification_Listener_Status');
         }
     }
 

diff --git a/imp/mailbox-mimp.php b/imp/mailbox-mimp.php
index 0fc6553..9de9bcd 100644 (file)
--- a/imp/mailbox-mimp.php
+++ b/imp/mailbox-mimp.php
@@ -21,7 +21,7 @@
  */
 
 require_once dirname(__FILE__) . '/lib/Application.php';
-Horde_Registry::appInit('imp');
+Horde_Registry::appInit('imp', array('impmode' => 'mimp'));
 
 Horde_Nls::setTimeZone();
 

diff --git a/imp/message-dimp.php b/imp/message-dimp.php
index d398499..b585054 100644 (file)
--- a/imp/message-dimp.php
+++ b/imp/message-dimp.php
@@ -11,7 +11,7 @@
  */
 
 require_once dirname(__FILE__) . '/lib/Application.php';
-Horde_Registry::appInit('imp');
+Horde_Registry::appInit('imp', array('impmode' => 'dimp'));
 
 $folder = Horde_Util::getFormData('folder');
 $uid = Horde_Util::getFormData('uid');

diff --git a/imp/message-mimp.php b/imp/message-mimp.php
index ba88dd7..a243971 100644 (file)
--- a/imp/message-mimp.php
+++ b/imp/message-mimp.php
@@ -19,7 +19,7 @@
  */
 
 require_once dirname(__FILE__) . '/lib/Application.php';
-Horde_Registry::appInit('imp');
+Horde_Registry::appInit('imp', array('impmode' => 'mimp'));
 
 Horde_Nls::setTimeZone();