--- loncom/auth/lonlogin.pm	2009/05/14 10:21:10	1.120
+++ loncom/auth/lonlogin.pm	2009/05/22 17:01:28	1.122
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.120 2009/05/14 10:21:10 foxr Exp $
+# $Id: lonlogin.pm,v 1.122 2009/05/22 17:01:28 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -264,6 +264,7 @@ my $now=time;
 my $js = (<<ENDSCRIPT);
 
 <script type="text/javascript" language="JavaScript">
+// <![CDATA[
 function send()
 {
 this.document.server.elements.uname.value
@@ -289,6 +290,7 @@ this.document.client.elements.upass$now.
 this.document.server.submit();
 return false;
 }
+// ]]>
 </script>
 
 ENDSCRIPT
@@ -344,10 +346,6 @@ $r->print(
 #  then just us a relative link to authenticate:
 #
 
-if ($otherserver eq "http://") {
-    $otherserver="";
-}
-
 $r->print(<<ENDSERVERFORM);
 <form name="server" action="$otherserver/adm/authenticate" method="post" target="_top">
    <input type="hidden" name="logtoken" value="$logtoken" />
@@ -385,7 +383,7 @@ my $contactblock = &contactdisplay(\%lt,
                             $version,$authdomain,\$helpdeskscript);
 
 my $loginform=(<<LFORM);
-<form name="client" onsubmit="return(send())">
+<form name="client" action="" onsubmit="return(send())">
   <input type="hidden" name="lextkey" value="$lextkey" />
   <input type="hidden" name="uextkey" value="$uextkey" />
   <b><label for="uname">$lt{'un'}</label>:</b><br />
@@ -481,8 +479,10 @@ $r->print(<<ENDDOCUMENT);
  </div>
 
 <script type="text/javascript">
+// <![CDATA[
 // the if prevents the script error if the browser can not handle this
 if ( document.client.uname ) { document.client.uname.focus(); }
+// ]]>
 </script>
 $helpdeskscript
 
@@ -509,6 +509,7 @@ sub contactdisplay {
         my $thisurl = &escape('/adm/login');
         $$helpdeskscript = <<"ENDSCRIPT";
 <script type="text/javascript">
+// <![CDATA[
 function helpdesk() {
     var codedom = document.client.udom.value;
     if (codedom == '') {
@@ -518,6 +519,7 @@ function helpdesk() {
     document.location.href = "/adm/helpdesk?"+querystr;
     return;
 }
+// ]]>
 </script>
 ENDSCRIPT
     }