Fixed javascript focus problem when first accessing login page. Also fixes errors...

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4534 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/login.php b/src/login.php
index 3bb63e920db6c8092f808d4167f400cd1ae7c1ae..f41bb1dac99b7c18214ec139505bbd2ab7bc1292 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -56,7 +56,16 @@ $header = "<script language=\"JavaScript\" type=\"text/javascript\">\n" .
           "<!--\n".
           "  function squirrelmail_loginpage_onload() {\n".
           "    document.forms[0].js_autodetect_results.value = '" . SMPREF_JS_ON . "';\n".
           "<!--\n".
           "  function squirrelmail_loginpage_onload() {\n".
           "    document.forms[0].js_autodetect_results.value = '" . SMPREF_JS_ON . "';\n".

-          '    document.forms[0].elements[' . (isset($loginname) ? 1 : 0) . "].focus();\n".
+          "    var textElements = 0;\n".
+          "    for (i = 0; i < document.forms[0].elements.length; i++) {\n".
+          "      if (document.forms[0].elements[i].type == \"text\" || document.forms[0].elements[i].type == \"password\") {\n".
+          "        textElements++;\n".
+          "        if (textElements == " . (isset($loginname) ? 2 : 1) . ") {\n".
+          "          document.forms[0].elements[i].focus();\n".
+          "          break;\n".
+          "        }\n".
+          "      }\n".
+          "    }\n".

           "  }\n".
           "// -->\n".
           "</script>\n";
           "  }\n".
           "// -->\n".
           "</script>\n";