X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Flogin.php;h=88b43680bd0a04fe907185a92495ff2fccc650c7;hb=87745b9cf4c1ea33c3788ab0c3a554e9574ec5d7;hp=1421ba43337e4844f4883c3003e165f748907d4d;hpb=30967a1e09679c395b31929cbdb1a0e88b13f01e;p=squirrelmail.git
diff --git a/src/login.php b/src/login.php
index 1421ba43..88b43680 100644
--- a/src/login.php
+++ b/src/login.php
@@ -3,7 +3,7 @@
/**
* login.php -- simple login screen
*
- * Copyright (c) 1999-2004 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
@@ -51,31 +51,40 @@ $base_uri = sqm_baseuri();
*/
sqsession_destroy();
-
+
header('Pragma: no-cache');
/**
- * This detects if the IMAP server has logins disabled, and if so,
+ * 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 logins are disabled.
";
- if (!$use_imap_tls) {
- $string .= "The use of TLS may allow SquirrelMail to login.
";
+ /**
+ * detect disabled login, only when imapServerAddress contains
+ * server address and not mapping. See sqimap_get_user_server()
+ */
+ if (substr($imapServerAddress, 0, 4) != "map:") {
+ $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');
+$loginname_value = (sqGetGlobalVar('loginname', $loginname) ? htmlspecialchars($loginname) : '');
+
/* Output the javascript onload function. */
$header = "