Move error checking up

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4030 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 737390d6e44528b33f9a017e6e567a209c74f07f..8575e7eb032b8be65c87ae277caf46b6b319e2cf 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -210,13 +210,6 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $
     $imap_server_address = sqimap_get_user_server($imap_server_address, $username);
 
     $imap_stream = fsockopen ( $imap_server_address, $imap_port, $error_number, $error_string, 15);
-    if ( !$imap_stream ) {
-        return false;
-    }
-    $server_info = fgets ($imap_stream, 1024);
-
-    /* Decrypt the password */
-    $password = OneTimePadDecrypt($password, $onetimepad);
 
     /* Do some error correction */
     if (!$imap_stream) {
@@ -226,11 +219,16 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $
            $string = sprintf (_("Error connecting to IMAP server: %s.") .
                              "<br>\r\n", $imap_server_address) .
                       "$error_number : $error_string<br>\r\n";
-           error_box($string,$color);
+           logout_error($string,$color);
         }
         exit;
     }
 
+    $server_info = fgets ($imap_stream, 1024);
+
+    /* Decrypt the password */
+    $password = OneTimePadDecrypt($password, $onetimepad);
+
     $query = 'LOGIN "' . quoteIMAP($username) .  '" "' . quoteIMAP($password) . '"';
     $read = sqimap_run_command ($imap_stream, $query, false, $response, $message);