--- loncom/auth/lonlogin.pm	2009/03/10 18:18:31	1.114
+++ loncom/auth/lonlogin.pm	2009/09/11 23:04:45	1.125
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.114 2009/03/10 18:18:31 tempelho Exp $
+# $Id: lonlogin.pm,v 1.125 2009/09/11 23:04:45 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']);
     }
@@ -81,11 +81,15 @@ sub handler {
 	    &Apache::loncommon::start_page('Already logged in');
 	my $end_page = 
 	    &Apache::loncommon::end_page();
+        my $dest = '/adm/roles';
+        if ($env{'form.firsturl'} ne '') {
+            $dest = $env{'form.firsturl'}; 
+        }
 	$r->print(
                   $start_page
                  .'<h1>'.&mt('You are already logged in!').'</h1>'
-                 .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_4].',
-                  '<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>').'</p>'
+                 .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].',
+                  '<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>').'</p>'
                  .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
                  .$end_page
                  );
@@ -103,8 +107,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 +174,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 +247,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);
@@ -270,7 +277,8 @@ my $shownewuserlink =
 my $now=time;
 my $js = (<<ENDSCRIPT);
 
-<script language="JavaScript">
+<script type="text/javascript" language="JavaScript">
+// <![CDATA[
 function send()
 {
 this.document.server.elements.uname.value
@@ -296,16 +304,14 @@ this.document.client.elements.upass$now.
 this.document.server.submit();
 return false;
 }
+// ]]>
 </script>
 
 ENDSCRIPT
 
 # --------------------------------------------------- Print login screen header
 
-my %add_entries = (topmargin    => "0",
-	       leftmargin   => "0",
-	       marginheight => "0",
-	       marginwidth  => "0",
+my %add_entries = (
 	       bgcolor      => "$mainbg",
 	       text         => "$font",
 	       link         => "$link",
@@ -326,7 +332,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',
@@ -347,10 +352,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">
@@ -389,9 +397,9 @@ my $contactblock = &contactdisplay(\%lt,
                             $version,$authdomain,\$helpdeskscript);
 
 my $loginform=(<<LFORM);
-<form name="client" onsubmit="return(send())">
-  <input type="hidden" name="lextkey" value="$lextkey">
-  <input type="hidden" name="uextkey" value="$uextkey">
+<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 />
   <input type="text" name="uname" size="15" value="$authusername" /><br />
   <b><label for="upass$now">$lt{'pw'}</label>:</b><br />
@@ -402,25 +410,21 @@ my $loginform=(<<LFORM);
 </form>
 LFORM
 
-if ($fullgraph) {
     if ($showbanner) {
         $r->print(<<HEADER);
 <!-- The LON-CAPA Header -->
 <table border="0" align="left" width="100%" cellspacing="0" cellpadding="1">
  <tr>
   <td align="left" valign="top" bgcolor="$pgbg">
-      <img src="$img" border=0 alt="The Learning Online Network with CAPA" />
+      <img src="$img" border="0" alt="The Learning Online Network with CAPA" />
   </td>
  </tr>
 </table>
 HEADER
     }
-    if ($showmainlogo) {
-        $r->print('<div class="LC_loginpage_space">&nbsp;</div>'."\n".
-                  '    <img src="'.$logo.'" alt="" />'."\n");
-    }
     $r->print(<<ENDTOP);
-<div class="LC_loginpage_loginDomain">$domainlogo</div>
+<div class="LC_loginpage_space">&nbsp;</div>
+<div class="LC_loginpage_floatLeft">
 <div class="LC_loginpage_loginContainer">
   $logintitle
    <table border="0" align="left" cellspacing="1" cellpadding="2" width="100%">
@@ -438,20 +442,21 @@ HEADER
         $forgotpw<br />
 	$contactblock<br />
         $newuserlink
-        $coursecatalog<br /><br />
-        <a href="/adm/about.html"><b>$lt{'about'}</b></a>
+        $coursecatalog
 </div>
-
-<div class="LC_loginpage_space">&nbsp;</div>
+</div>
+ENDTOP
+    if ($showmainlogo) {
+        $r->print(' <img src="'.$logo.'" alt="" />'."\n");
+    }
+$r->print(<<ENDTOP);
 $announcements
+$domainlogo
+<div class="LC_loginpage_space">&nbsp;</div>
 ENDTOP
-}
 
-if($announcements){$r->print('<div class="LC_loginpage_space">&nbsp;</div>');}
-
-if ($fullgraph) {
 $r->print(<<ENDDOCUMENT);
-     <table border=0 cellspacing=0 cellpadding=0>
+     <table border="0" cellspacing="0" cellpadding="0">
       <tr>
        <td  align="left" valign="top">
         <small><b>&nbsp;&nbsp;&nbsp;$lt{'dom'}:&nbsp;</b></small>
@@ -488,13 +493,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;
@@ -517,6 +523,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 == '') {
@@ -526,6 +533,7 @@ function helpdesk() {
     document.location.href = "/adm/helpdesk?"+querystr;
     return;
 }
+// ]]>
 </script>
 ENDSCRIPT
     }