--- loncom/auth/lonlogin.pm	2009/04/08 10:13:13	1.118
+++ loncom/auth/lonlogin.pm	2009/07/22 21:51:03	1.124
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.118 2009/04/08 10:13:13 tempelho Exp $
+# $Id: lonlogin.pm,v 1.124 2009/07/22 21:51:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,7 +46,7 @@ sub handler {
 	(join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'},
 	      $ENV{'REDIRECT_QUERY_STRING'}),
 	 ['interface','username','domain','firsturl','localpath','localres',
-	  'token']);
+	  'token','role','symb']);
     if (!defined($env{'form.firsturl'})) {
         &Apache::lonacc::get_posted_cgi($r,['firsturl']);
     }
@@ -103,8 +103,6 @@ sub handler {
     $env{'form.interface'}=~s/\W//g;
 
     my $httpbrowser=$ENV{"HTTP_USER_AGENT"};
-    
-    my $fullgraph=($env{'form.interface'} ne 'textual');
 
     my $iconpath= 
 	&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
@@ -172,8 +170,18 @@ sub handler {
     if ($uextkey>2147483647) { $uextkey-=4294967296; }
 
 # -------------------------------------------------------- Store away log token
+    my $tokenextras;
+    if ($env{'form.role'}) {
+        $tokenextras = '&role='.&escape($env{'form.role'});
+    }
+    if ($env{'form.symb'}) {
+        if (!$tokenextras) {
+            $tokenextras = '&';
+        }
+        $tokenextras .= '&symb='.&escape($env{'form.symb'});
+    }
     my $logtoken=Apache::lonnet::reply(
-       'tmpput:'.$ukey.$lkey.'&'.$firsturl,
+       'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras,
        $lonhost);
 
 # ------------------- If we cannot talk to ourselves, we are in serious trouble
@@ -235,17 +243,12 @@ return OK;
 $servadm=~s/\,/\<br \/\>/g;
 
 # ----------------------------------------------------------- Front page design
-my $pgbg=
-($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF');
-my $font=
-($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000');
-my $link=
-($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF');
-my $vlink=
-($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF');
+my $pgbg=&Apache::loncommon::designparm('login.pgbg',$domain);
+my $font=&Apache::loncommon::designparm('login.font',$domain);
+my $link=&Apache::loncommon::designparm('login.link',$domain);
+my $vlink=&Apache::loncommon::designparm('login.vlink',$domain);
 my $alink=&Apache::loncommon::designparm('login.alink',$domain);
-my $mainbg=
-($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF');
+my $mainbg=&Apache::loncommon::designparm('login.mainbg',$domain);
 my $logo=&Apache::loncommon::designparm('login.logo',$domain);
 my $img=&Apache::loncommon::designparm('login.img',$domain);
 my $domainlogo=&Apache::loncommon::domainlogo($domain);
@@ -271,6 +274,7 @@ my $now=time;
 my $js = (<<ENDSCRIPT);
 
 <script type="text/javascript" language="JavaScript">
+// <![CDATA[
 function send()
 {
 this.document.server.elements.uname.value
@@ -296,6 +300,7 @@ this.document.client.elements.upass$now.
 this.document.server.submit();
 return false;
 }
+// ]]>
 </script>
 
 ENDSCRIPT
@@ -323,7 +328,6 @@ my %lt=&Apache::lonlocal::texthash(
 	  'perc' => 'percent',
 	  'load' => 'Server Load',
 	  'userload' => 'User Load',
-	  'about'  => 'About LON-CAPA',
 	  'catalog' => 'Course Catalog',
 	  'log' => 'Log in',
 	  'help' => 'Log-in Help',
@@ -344,10 +348,13 @@ $r->print(<$jsh>);
 }
 # ---------------------------------------------------------- Serve rest of page
 
-if ($fullgraph) {
 $r->print(
 	  '<div class="LC_loginpage_container">');
-}
+
+#
+#  If the loadbalancing yielded just http:// because perhaps there's no loadbalancing?
+#  then just us a relative link to authenticate:
+#
 
 $r->print(<<ENDSERVERFORM);
 <form name="server" action="$otherserver/adm/authenticate" method="post" target="_top">
@@ -386,7 +393,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 />
@@ -399,7 +406,6 @@ my $loginform=(<<LFORM);
 </form>
 LFORM
 
-if ($fullgraph) {
     if ($showbanner) {
         $r->print(<<HEADER);
 <!-- The LON-CAPA Header -->
@@ -432,8 +438,7 @@ HEADER
         $forgotpw<br />
 	$contactblock<br />
         $newuserlink
-        $coursecatalog<br /><br />
-        <a href="/adm/about.html"><b>$lt{'about'}</b></a>
+        $coursecatalog
 </div>
 </div>
 ENDTOP
@@ -445,9 +450,7 @@ $announcements
 $domainlogo
 <div class="LC_loginpage_space">&nbsp;</div>
 ENDTOP
-}
 
-if ($fullgraph) {
 $r->print(<<ENDDOCUMENT);
      <table border="0" cellspacing="0" cellpadding="0">
       <tr>
@@ -486,13 +489,14 @@ $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
 
 ENDDOCUMENT
-}
     my %endargs = ( 'noredirectlink' => 1, );
     $r->print(&Apache::loncommon::end_page(\%endargs));
     return OK;
@@ -515,6 +519,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 == '') {
@@ -524,6 +529,7 @@ function helpdesk() {
     document.location.href = "/adm/helpdesk?"+querystr;
     return;
 }
+// ]]>
 </script>
 ENDSCRIPT
     }