From 44925ab0dda165dd60b99aa629b402c1c5571bf4 Mon Sep 17 00:00:00 2001 From: kink Date: Sat, 26 Oct 2002 14:18:01 +0000 Subject: [PATCH] This check now already happens in sqimap_login, no need to do it twice git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4029 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/redirect.php | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/redirect.php b/src/redirect.php index c5709743..bcc939e2 100644 --- a/src/redirect.php +++ b/src/redirect.php @@ -98,18 +98,11 @@ if (!sqsession_is_registered('user_is_logged_in')) { } $imapConnection = sqimap_login($login_username, $key, $imapServerAddress, $imapPort, 0); - if (!$imapConnection) { - $errTitle = _("There was an error contacting the mail server."); - $errString = $errTitle . "
\n". - _("Contact your administrator for help."); - include_once( '../functions/display_messages.php' ); - logout_error( $errString, $errTitle ); - exit; - } else { - $sqimap_capabilities = sqimap_capability($imapConnection); - sqsession_register($sqimap_capabilities, 'sqimap_capabilities'); - $delimiter = sqimap_get_delimiter ($imapConnection); - } + + $sqimap_capabilities = sqimap_capability($imapConnection); + sqsession_register($sqimap_capabilities, 'sqimap_capabilities'); + $delimiter = sqimap_get_delimiter ($imapConnection); + sqimap_logout($imapConnection); sqsession_register($delimiter, 'delimiter'); -- 2.25.1