[imp] Logout behavior

[David Shafer]

We had been running IMP 3.1, and I upgraded to RELENG_3 a few days ago.
Before the upgrade, we'd been using "/horde/imp/" as the URL path to
access IMP directly, which worked fine-- when you logged out, you were
taken back to "/horde/imp/login.php" as expected.

After the upgrade, we found that clicking the logout button in IMP now
takes you to "/horde/login.php". Horde is configured properly to use IMP
for authentication, so that much works, but after login, you're taken to
the Horde summary screen, not IMP. Our preferred behavior would be for
the IMP logout button to take you back to the same login screen you
started your session from.

I did a before and after comparison of
/horde/imp/templates/menu/menu.inc, and here's a snippet I found that
changed:

3.1
---
/* Logout */
if ($registry->getMethod('auth/logout') == 'imp') {
    Menu::printItem(Horde::applicationUrl('login.php?reason=logout'),
_("Logout"), 'logout.gif', $registry->getParam('graphics', 'horde'));
} else {
    Menu::printItem(Horde::url($registry->getParam('webroot', 'horde') .
'/login.php?reason=logout'), _("Logout"), 'logout.gif',
$registry->getParam('graphics', 'horde'));
}

RELENG_3
--------
/* Logout */
if ($registry->getMethod('auth/logout') == 'imp') {
    Menu::printItem(Horde::url($registry->getParam('webroot', 'horde') .
'/login.php?reason=logout'), _("Logout"), 'logout.gif',
$registry->getParam('graphics', 'horde'));
} else {
    Menu::printItem(Horde::applicationUrl('login.php?reason=logout'),
_("Logout"), 'logout.gif', $registry->getParam('graphics', 'horde'));
}

It seems the printItem() calls were switched, relative to the if logic,
and I'm thinking it should've been left as it was in 3.1. When I change
it back, it works as expected. Should this be changed in CVS?

	 - Dave

David Shafer
University of Iowa
ITS - SPA Unix Systems
Iowa City, IA