--- loncom/auth/lonlogin.pm 2008/02/24 23:18:37 1.101 +++ loncom/auth/lonlogin.pm 2009/08/12 19:52:15 1.106.4.3 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.101 2008/02/24 23:18:37 raeburn Exp $ +# $Id: lonlogin.pm,v 1.106.4.3 2009/08/12 19:52:15 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -46,7 +46,10 @@ 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']); + } # -- check if they are a migrating user if (defined($env{'form.token'})) { @@ -80,8 +83,8 @@ sub handler { &Apache::loncommon::end_page(); $r->print( $start_page - .'
'.&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].', '','','','').'
' .'' .$end_page @@ -176,8 +179,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 @@ -198,7 +211,7 @@ sub handler { $hostname. '/adm/login?domain='.$authdomain.'">'. $hostname.''. - ' (preferred)'.$/; + ' '.&mt('(preferred)').''.$/; $last=$hostname; } $spares.= 'Please attempt to login to one of the following servers:
$spares - -