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

diff --git a/src/redirect.php b/src/redirect.php
index c570974339cc64f775ab5273f7ff92268fbf3da3..bcc939e256a8bc5b37648b4e6112973abcc992db 100644 (file)
--- 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 . "<br>\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');