X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Flogin.php;h=90f16c3f9f86ce16977599606102db5a4acbf2ab;hb=ae4d36f76ba12b1a47fa8053e29b91c91d6296e7;hp=ac9b981590a03105eb5c9d36473fcf5caa144e53;hpb=ea348fd37a5f4faae0586ffce5de22e1312ecf8f;p=squirrelmail.git
diff --git a/src/login.php b/src/login.php
index ac9b9815..90f16c3f 100644
--- a/src/login.php
+++ b/src/login.php
@@ -3,16 +3,20 @@
/**
* login.php -- simple login screen
*
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This a simple login screen. Some housekeeping is done to clean
* cookies and find language.
*
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
define('SM_PATH','../');
/* SquirrelMail required files. */
@@ -25,8 +29,9 @@ require_once(SM_PATH . 'functions/page_header.php');
require_once(SM_PATH . 'functions/html.php');
require_once(SM_PATH . 'functions/global.php');
require_once(SM_PATH . 'functions/imap_general.php');
+require_once(SM_PATH . 'functions/forms.php');
-/*
+/**
* $squirrelmail_language is set by a cookie when the user selects
* language and logs out
*/
@@ -46,20 +51,28 @@ $base_uri = sqm_baseuri();
*/
sqsession_destroy();
-
+
header('Pragma: no-cache');
-$imap = sqimap_create_stream($imapServerAddress, $imapPort, $use_imap_tls);
-$logindisabled = sqimap_capability($imap,'LOGINDISABLED');
-sqimap_logout($imap);
-if ($logindisabled) {
- $string = "The IMAP server is reporting that logins are disabled.
";
- if (!$use_imap_tls) {
- $string .= "The use of TLS may allow SquirrelMail to login.
";
+/**
+ * This detects if the IMAP server has logins disabled, and if so,
+ * squelches the display of the login form and puts up a message
+ * explaining the situation.
+ */
+if($imap_auth_mech == 'login') {
+ $imap = sqimap_create_stream($imapServerAddress, $imapPort, $use_imap_tls);
+ $logindisabled = sqimap_capability($imap,'LOGINDISABLED');
+ sqimap_logout($imap);
+ if ($logindisabled) {
+ $string = _("The IMAP server is reporting that plain text logins are disabled.").'
'.
+ _("Using CRAM-MD5 or DIGEST-MD5 authentication instead may work.").'
';
+ if (!$use_imap_tls) {
+ $string .= _("Also, the use of TLS may allow SquirrelMail to login.").'
';
+ }
+ $string .= _("Please contact your system administrator and report this error.");
+ error_box($string,$color);
+ exit;
}
- $string .= "Please contact your system administrator.";
- error_box($string,$color);
- exit;
}
do_hook('login_cookie');
@@ -69,7 +82,6 @@ do_hook('login_cookie');
$header = "