Folder list not skipping INBOX for Courier; case seems to matter

[squirrelmail.git] / src / login.php

diff --git a/src/login.php b/src/login.php
index f124cceffd643560d7527d6b57527291683c1745..28c0f24158ff854bf6d53f62530bffe13b916cd2 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -9,11 +9,14 @@
  * 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
@@ -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.<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.";
+        $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 = '<input type="hidden" name="mailto" value="' . urlencode($mailto) . '" />' . "\n";
+    $rcptaddress = addHidden('mailto', $mailto);
 } else {
     $rcptaddress = '';
 }
@@ -150,7 +155,7 @@ echo html_tag( 'table',
                                     _("Name:") ,
                                 'right', '', 'width="30%"' ) .
                                 html_tag( 'td',
-                                    '<input type="text" name="' . $username_form_name .'" value="' . $loginname_value .'" />' ,
+                                    addInput($username_form_name, $loginname_value),
                                 'left', '', 'width="*"' )
                                 ) . "\n" .
                             html_tag( 'tr',
@@ -158,10 +163,10 @@ echo html_tag( 'table',
                                     _("Password:") ,
                                 'right', '', 'width="30%"' ) .
                                 html_tag( 'td',
-                                    '<input type="password" name="' . $password_form_name . '" />' . "\n" .
-                                    '<input type="hidden" name="js_autodetect_results" value="'.SMPREF_JS_OFF.'" />' . "\n" .
+                                    addPwField($password_form_name).
+                                    addHidden('js_autodetect_results', SMPREF_JS_OFF).
                                     $rcptaddress .
-                                    '<input type="hidden" name="just_logged_in" value="1" />' . "\n",
+                                    addHidden('just_logged_in', '1'),
                                 'left', '', 'width="*"' )
                             ) ,
                         'center', $color[4], 'border="0" width="100%"' ) ,
@@ -169,7 +174,7 @@ echo html_tag( 'table',
                 ) . 
                 html_tag( 'tr',
                     html_tag( 'td',
-                        '<center><input type="submit" value="' . _("Login") . '" /></center>',
+                        '<center>'. addSubmit(_("Login")) .'</center>',
                     'left' )
                 ),
             '', $color[4], 'border="0" width="350"' ) . '</center>',
@@ -180,6 +185,5 @@ do_hook('login_form');
 echo '</form>' . "\n";
 
 do_hook('login_bottom');
-echo "</body>\n".
-     "</html>\n";
 ?>
+</body></html>