X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Flogin.php;h=90f16c3f9f86ce16977599606102db5a4acbf2ab;hb=ae4d36f76ba12b1a47fa8053e29b91c91d6296e7;hp=f124cceffd643560d7527d6b57527291683c1745;hpb=ae958cd393ee39fb805a2cc6937b9dff5af29867;p=squirrelmail.git
diff --git a/src/login.php b/src/login.php
index f124ccef..90f16c3f 100644
--- a/src/login.php
+++ b/src/login.php
@@ -3,17 +3,20 @@
/**
* 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
* 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. */
@@ -26,6 +29,7 @@ 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
@@ -47,11 +51,11 @@ $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.
*/
@@ -60,11 +64,12 @@ if($imap_auth_mech == 'login') {
$logindisabled = sqimap_capability($imap,'LOGINDISABLED');
sqimap_logout($imap);
if ($logindisabled) {
- $string = "The IMAP server is reporting that logins are disabled.
";
+ $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 .= "The use of TLS may allow SquirrelMail to login.
";
+ $string .= _("Also, the use of TLS may allow SquirrelMail to login.").'
';
}
- $string .= "Please contact your system administrator.";
+ $string .= _("Please contact your system administrator and report this error.");
error_box($string,$color);
exit;
}
@@ -120,7 +125,7 @@ if (isset($org_logo) && $org_logo) {
}
if(sqgetGlobalVar('mailto', $mailto)) {
- $rcptaddress = '' . "\n";
+ $rcptaddress = addHidden('mailto', $mailto);
} else {
$rcptaddress = '';
}
@@ -134,8 +139,8 @@ echo html_tag( 'table',
' />
' . "\n"
: '' ).
( (isset($hide_sm_attributions) && $hide_sm_attributions) ? '' :
- '' . sprintf (_("SquirrelMail version %s"), $version) . '
' ."\n".
- ' ' . _("By the SquirrelMail Development Team") . '
' . "\n" ) .
+ '' . _("SquirrelMail Webmail Application") . '
' ."\n".
+ ' ' . _("By the SquirrelMail Project Team") . '
' . "\n" ) .
html_tag( 'table',
html_tag( 'tr',
html_tag( 'td',
@@ -150,7 +155,7 @@ echo html_tag( 'table',
_("Name:") ,
'right', '', 'width="30%"' ) .
html_tag( 'td',
- '' ,
+ addInput($username_form_name, $loginname_value),
'left', '', 'width="*"' )
) . "\n" .
html_tag( 'tr',
@@ -158,18 +163,18 @@ echo html_tag( 'table',
_("Password:") ,
'right', '', 'width="30%"' ) .
html_tag( 'td',
- '' . "\n" .
- '' . "\n" .
+ addPwField($password_form_name).
+ addHidden('js_autodetect_results', SMPREF_JS_OFF).
$rcptaddress .
- '' . "\n",
+ addHidden('just_logged_in', '1'),
'left', '', 'width="*"' )
) ,
'center', $color[4], 'border="0" width="100%"' ) ,
'left', $color[4] )
- ) .
+ ) .
html_tag( 'tr',
html_tag( 'td',
- '