--- modules/gci/lonlogin.pm 2009/09/17 01:55:01 1.1 +++ modules/gci/lonlogin.pm 2009/09/23 13:14:19 1.2 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.1 2009/09/17 01:55:01 gci Exp $ +# $Id: lonlogin.pm,v 1.2 2009/09/23 13:14:19 gci 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']); } @@ -84,7 +84,7 @@ sub handler { $r->print( $start_page .'

'.&mt('You are already logged in!').'

' - .'

'.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_4].', + .'

'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].', '','','','').'

' .'

'.&mt('Login problems?').'

' .$end_page @@ -179,6 +179,16 @@ 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, $lonhost); @@ -281,7 +291,8 @@ sub handler { my $now=time; my $js = (< + - +// ]]> ENDSCRIPT # --------------------------------------------------- Print login screen header @@ -464,7 +475,7 @@ my %lt=&Apache::lonlocal::texthash(   -
+ @@ -569,7 +580,7 @@ END_OF_BLOCK2

The LearningOnline Network with CAPA

$lt{'tbli'}

$announcements

$lt{'options_headline'}

- +


@@ -580,8 +591,8 @@ END_OF_BLOCK2 ENDACCESSOPTIONS } $r->print(' - - + + '); unless ($fullgraph) { my $logintitle; @@ -597,7 +608,7 @@ ENDACCESSOPTIONS .''; $r->print(< -
 
+
$logintitle$noscript_warning @@ -676,6 +687,7 @@ sub contactdisplay { my $thisurl = &escape('/adm/login'); $$helpdeskscript = <<"ENDSCRIPT"; ENDSCRIPT }