Bug #9293: Fix some imp redirection issues when viewing page from wrong view type

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 47c6f1d..d6a926c 100644 (file)
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -205,6 +205,7 @@ class Horde_Registry
 
         $classname = __CLASS__;
         $registry = $GLOBALS['registry'] = new $classname($s_ctrl);
+        $registry->initialApp = $app;
 
         $appob = $registry->getApiInstance($app, 'application');
         $appob->initParams = $args;
@@ -225,8 +226,6 @@ class Horde_Registry
             $registry->authenticateFailure($app, $e);
         }
 
-        $registry->initialApp = $app;
-
         if ($args['timezone']) {
             $registry->setTimeZone();
         }

diff --git a/imp/compose.php b/imp/compose.php
index 5cefdfb..7acd2a3 100644 (file)
--- a/imp/compose.php
+++ b/imp/compose.php
@@ -15,7 +15,10 @@
  */
 
 require_once dirname(__FILE__) . '/lib/Application.php';
-Horde_Registry::appInit('imp', array('session_control' => 'netscape'));
+Horde_Registry::appInit('imp', array(
+    'impmode' => 'imp',
+    'session_control' => 'netscape'
+));
 
 $registry->setTimeZone();
 

diff --git a/imp/folders.php b/imp/folders.php
index b71398a..e4f7ffd 100644 (file)
--- a/imp/folders.php
+++ b/imp/folders.php
@@ -16,7 +16,9 @@
  */
 
 require_once dirname(__FILE__) . '/lib/Application.php';
-Horde_Registry::appInit('imp');
+Horde_Registry::appInit('imp', array(
+    'impmode' => 'imp'
+));
 
 Horde::addScriptFile('folders.js', 'imp');
 

diff --git a/imp/lib/Application.php b/imp/lib/Application.php
index cc1b843..c1ce8f4 100644 (file)
--- a/imp/lib/Application.php
+++ b/imp/lib/Application.php
@@ -120,6 +120,8 @@ class IMP_Application extends Horde_Registry_Application
 
         switch (IMP::getViewMode()) {
         case 'dimp':
+            $redirect = (!empty($this->initParams['impmode']) &&
+                         ($this->initParams['impmode'] != 'dimp'));
             $GLOBALS['notification']->addType('status', 'dimp.*', 'IMP_Notification_Event_Status');
             break;
 
@@ -130,7 +132,7 @@ class IMP_Application extends Horde_Registry_Application
 
         case 'imp':
             $redirect = (!empty($this->initParams['impmode']) &&
-                         ($this->initParams['impmode'] == 'dimp'));
+                         ($this->initParams['impmode'] != 'imp'));
             $GLOBALS['notification']->attach('audio');
             break;
         }

diff --git a/imp/mailbox.php b/imp/mailbox.php
index 4f2d9ee..aaf27d6 100644 (file)
--- a/imp/mailbox.php
+++ b/imp/mailbox.php
@@ -34,7 +34,9 @@ function _outputSummaries($msgs)
 
 
 require_once dirname(__FILE__) . '/lib/Application.php';
-Horde_Registry::appInit('imp');
+Horde_Registry::appInit('imp', array(
+    'impmode' => 'imp'
+));
 
 $registry->setTimeZone();
 

diff --git a/imp/message.php b/imp/message.php
index 4e9488a..e2fa863 100644 (file)
--- a/imp/message.php
+++ b/imp/message.php
@@ -22,7 +22,9 @@ function _returnToMailbox($startIndex = null, $actID = null)
 }
 
 require_once dirname(__FILE__) . '/lib/Application.php';
-Horde_Registry::appInit('imp');
+Horde_Registry::appInit('imp', array(
+    'impmode' => 'imp'
+));
 
 $registry->setTimeZone();
 

diff --git a/imp/search-basic.php b/imp/search-basic.php
index 00f4629..0e1cede 100644 (file)
--- a/imp/search-basic.php
+++ b/imp/search-basic.php
@@ -14,7 +14,9 @@
  */
 
 require_once dirname(__FILE__) . '/lib/Application.php';
-Horde_Registry::appInit('imp');
+Horde_Registry::appInit('imp', array(
+    'impmode' => 'imp'
+));
 
 /* This is an IMP-only script. */
 if ($_SESSION['imp']['view'] != 'imp') {

diff --git a/imp/thread.php b/imp/thread.php
index ca52946..5df7898 100644 (file)
--- a/imp/thread.php
+++ b/imp/thread.php
@@ -15,6 +15,7 @@
 
 require_once dirname(__FILE__) . '/lib/Application.php';
 Horde_Registry::appInit('imp', array(
+    'impmode' => 'imp',
     'timezone' => true
 ));