Fix #1222617. Javascript creation relied on rg=1 for forcing focus to

password field if username was supplied by url arg.

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

diff --git a/ChangeLog b/ChangeLog
index 84c110b1a4cbcfe68260c0923105a9c68d3dfb57..d095c98ee958dee08c25d5b5ef76baf606d62fb0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -376,6 +376,8 @@ Version 1.5.1 -- CVS
   - Some LDAP address book backend configuration options (listing
     controls, filtering, scope limit) are moved to 'advanced
     configuration' subsection.
+  - Javascript relied on rg=1 in the login page to force focus to
+    password box if username was supplied as a url arg (#1222617).
 
 Version 1.5.0 - 2 February 2004
 -------------------------------

diff --git a/src/login.php b/src/login.php
index 203938867811f0ec5edd3d41fadae0b385a1a859..a7c22d1f3b53c2679edbbc1aab1ea283d2452f25 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -83,6 +83,8 @@ if($imap_auth_mech == 'login') {
 
 do_hook('login_cookie');
 
+$loginname_value = (sqGetGlobalVar('loginname', $loginname) ? htmlspecialchars($loginname) : '');
+
 /* Output the javascript onload function. */
 
 $header = "<script language=\"JavaScript\" type=\"text/javascript\">\n" .
@@ -114,8 +116,6 @@ $username_form_name = 'login_username';
 $password_form_name = 'secretkey';
 do_hook('login_top');
 
-$loginname_value = (sqGetGlobalVar('loginname', $loginname) ? htmlspecialchars($loginname) : '');
-
 /* If they don't have a logo, don't bother.. */
 if (isset($org_logo) && $org_logo) {
     /* Display width and height like good little people */
@@ -193,4 +193,4 @@ echo '</form>' . "\n";
 do_hook('login_bottom');
 
 ?>
-</body></html>
\ No newline at end of file
+</body></html>