adding limit_scope and filter support. Should close #1035454 and #539534

[squirrelmail.git] / src / login.php

diff --git a/src/login.php b/src/login.php
index e459c0aac24a59eb57fc4188212485b8f5325a7e..90f16c3f9f86ce16977599606102db5a4acbf2ab 100644 (file)
--- 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,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.
  */
@@ -64,9 +64,10 @@ 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.").'<br />';
+        $string = _("The IMAP server is reporting that plain text logins are disabled.").'<br />'.
+            _("Using CRAM-MD5 or DIGEST-MD5 authentication instead may work.").'<br />';
         if (!$use_imap_tls) {
-            $string .= _("The use of TLS may allow SquirrelMail to login.").'<br />';
+            $string .= _("Also, the use of TLS may allow SquirrelMail to login.").'<br />';
         }
         $string .= _("Please contact your system administrator and report this error.");
         error_box($string,$color);
@@ -138,8 +139,8 @@ echo html_tag( 'table',
                 ' /><br />' . "\n"
               : '' ).
             ( (isset($hide_sm_attributions) && $hide_sm_attributions) ? '' :
-            '<small>' . sprintf (_("SquirrelMail version %s"), $version) . '<br />' ."\n".
-            '  ' . _("By the SquirrelMail Development Team") . '<br /></small>' . "\n" ) .
+            '<small>' . _("SquirrelMail Webmail Application") . '<br />' ."\n".
+            '  ' . _("By the SquirrelMail Project Team") . '<br /></small>' . "\n" ) .
             html_tag( 'table',
                 html_tag( 'tr',
                     html_tag( 'td',
@@ -154,7 +155,7 @@ echo html_tag( 'table',
                                     _("Name:") ,
                                 'right', '', 'width="30%"' ) .
                                 html_tag( 'td',
-                                   addInput($username_form_name, $loginname_value),
+                                    addInput($username_form_name, $loginname_value),
                                 'left', '', 'width="*"' )
                                 ) . "\n" .
                             html_tag( 'tr',
@@ -162,15 +163,15 @@ echo html_tag( 'table',
                                     _("Password:") ,
                                 'right', '', 'width="30%"' ) .
                                 html_tag( 'td',
-                                   addPwField($password_form_name).
-                                   addHidden('js_autodetect_results', SMPREF_JS_OFF).
+                                    addPwField($password_form_name).
+                                    addHidden('js_autodetect_results', SMPREF_JS_OFF).
                                     $rcptaddress .
-                                   addHidden('just_logged_in', '1'),
+                                    addHidden('just_logged_in', '1'),
                                 'left', '', 'width="*"' )
                             ) ,
                         'center', $color[4], 'border="0" width="100%"' ) ,
                     'left', $color[4] )
-                ) . 
+                ) .
                 html_tag( 'tr',
                     html_tag( 'td',
                         '<center>'. addSubmit(_("Login")) .'</center>',
@@ -184,6 +185,5 @@ do_hook('login_form');
 echo '</form>' . "\n";
 
 do_hook('login_bottom');
-echo "</body>\n".
-     "</html>\n";
-?>
\ No newline at end of file
+?>
+</body></html>