--- loncom/auth/lonlogin.pm 2008/02/24 23:18:37 1.101 +++ loncom/auth/lonlogin.pm 2008/05/30 19:31:20 1.103 @@ -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.103 2008/05/30 19:31:20 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -47,6 +47,9 @@ sub handler { $ENV{'REDIRECT_QUERY_STRING'}), ['interface','username','domain','firsturl','localpath','localres', 'token']); + 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,7 +83,7 @@ sub handler { &Apache::loncommon::end_page(); $r->print( $start_page - .'

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

' + .'

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

' .'

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

' .'

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

' @@ -218,16 +221,20 @@ sub handler { $hostname.''; $last=$hostname; } - $r->print(< -The LearningOnline Network with CAPA - - -

This LON-CAPA server is temporarily not available for login

-

Please attempt to login to one of the following servers:

$spares - - -ENDTROUBLE + $r->print( + '' + .'' + .&mt('The LearningOnline Network with CAPA') + .'' + .'' + .'

'.&mt('The LearningOnline Network with CAPA').'

' + .'' + .'

'.&mt('This LON-CAPA server is temporarily not available for login.').'

' + .'

'.&mt('Please attempt to login to one of the following servers:').'

' + .$spares + .'' + .'' + ); return OK; }