--- loncom/auth/lonlogin.pm	2009/05/18 12:59:47	1.106.4.1
+++ loncom/auth/lonlogin.pm	2010/02/09 17:49:15	1.106.4.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.106.4.1 2009/05/18 12:59:47 raeburn Exp $
+# $Id: lonlogin.pm,v 1.106.4.5 2010/02/09 17:49:15 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]log out[_4].',
-                  '<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>').'</p>'
+                  '<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>').'</p>'
                  .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
                  .$end_page
                  );
@@ -179,8 +183,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
@@ -284,6 +298,7 @@ sub handler {
     my $js = (<<ENDSCRIPT);
 
  <script type="text/javascript">
+ // <![CDATA[
     function send()
     {
         this.document.server.elements.uname.value
@@ -327,6 +342,7 @@ sub handler {
         this.document.server.submit();
         return false;
     }
+ // ]]>
  </script>
 
 ENDSCRIPT
@@ -358,7 +374,7 @@ my %lt=&Apache::lonlocal::texthash(
                   'userload' => 'User Load',
                   'about'  => 'About LON-CAPA',
                   'access' => 'Accessibility Options',
-                  'catalog' => 'Course Catalog',
+                  'catalog' => 'Course/Community Catalog',
 		  'log' => 'Log in',
 		  'help' => 'Log-in Help',
 		  'serv' => 'Server',
@@ -500,7 +516,7 @@ ENDTOP
                  .'<h2>'.&mt('Text-based Interface Login').'</h2>'
                  .$announcements);
     }
-    $r->print('<form name="client" onsubmit="return(send())">');
+    $r->print('<form name="client" action="" onsubmit="return(send())">');
     unless ($fullgraph) {
         $r->print(<<ENDACCESSOPTIONS);
 <h3>$lt{'options_headline'}</h3>
@@ -659,8 +675,10 @@ $domainlogo
  </table>
 
 <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
 
@@ -688,6 +706,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 == '') {
@@ -697,6 +716,7 @@ function helpdesk() {
     document.location.href = "/adm/helpdesk?"+querystr;
     return;
 }
+// ]]>
 </script>
 ENDSCRIPT
     }