Sigh... I guess global search and replace in emacs doesn't work QUITE as

[squirrelmail.git] / functions / imap_general.php
diff --git a/functions/imap_general.php b/functions/imap_general.php

index 28fe6cffe8a536209d5cba0030660c8b67be193e..7e482e2846e2d0222e13c7a05f78d40e1de2930c 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -12,7 +12,6 @@
   */
  
  require_once('../functions/page_header.php');
-require_once('../functions/display_messages.php');
  
  global $sqimap_session_id;
  $sqimap_session_id = 1;
@@ -247,12 +246,10 @@ function sqimap_login ($username, $password, $imap_server_address, $imap_port, $
                   * $squirrelmail_language is set by a cookie when
                   * the user selects language and logs out
                   */
-
+                
                  set_up_language($squirrelmail_language, true);
-
-                displayHtmlHeader( _("Unknown user or password incorrect.") );
-                echo "<body bgcolor=\"#ffffff\">\n";
-                error_username_password_incorrect();
+                include_once( '../functions/display_messages.php' );
+                logout_error( _("Unknown user or password incorrect.") );                
                  session_destroy();
                  exit;
              }