From 469080dad517a21f4f677067602f017c0a1cb5e7 Mon Sep 17 00:00:00 2001 From: "ian%hixie.ch" Date: Sun, 21 Apr 2002 14:05:15 +0000 Subject: [PATCH] If a user bookmarks or reloads the logout page, we don't want to show an error. --- webtools/PLIF/PLIF/Service/Components/Login.pm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/webtools/PLIF/PLIF/Service/Components/Login.pm b/webtools/PLIF/PLIF/Service/Components/Login.pm index 9bbad4651f83..b95477a76977 100644 --- a/webtools/PLIF/PLIF/Service/Components/Login.pm +++ b/webtools/PLIF/PLIF/Service/Components/Login.pm @@ -121,11 +121,14 @@ sub cmdLoginLogout { my $self = shift; my($app) = @_; my $user = $app->getObject('user'); - $self->assert(defined($user), 0, 'Not logged in, cannot log out'); - $self->assert($app->getSelectingServiceList('user.logout.'.$app->input->defaultOutputProtocol)->logoutUser($app, $user) or - $app->getSelectingServiceList('user.logout.generic')->logoutUser($app, $user), - 0, 'Logging out when using the '.($app->input->defaultOutputProtocol).' protocol is not supported'); - $app->removeObject($user); + if (defined($user)) { + $self->assert($app->getSelectingServiceList('user.logout.'.$app->input->defaultOutputProtocol)->logoutUser($app, $user) or + $app->getSelectingServiceList('user.logout.generic')->logoutUser($app, $user), + 0, 'Logging out when using the '.($app->input->defaultOutputProtocol).' protocol is not supported'); + $app->removeObject($user); + } else { + $self->warn(4, 'tried to log out but was not logged in'); + } $app->noCommand(); }