--- loncom/auth/lonlogin.pm 2008/01/24 15:06:21 1.100 +++ loncom/auth/lonlogin.pm 2009/04/28 21:54:51 1.119 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.100 2008/01/24 15:06:21 bisitz Exp $ +# $Id: lonlogin.pm,v 1.119 2009/04/28 21:54:51 tempelho 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,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 @@ -99,16 +102,7 @@ sub handler { # ----------------------------------------------------------- Process Interface $env{'form.interface'}=~s/\W//g; - my $textbrowsers=$r->dir_config('lonTextBrowsers'); my $httpbrowser=$ENV{"HTTP_USER_AGENT"}; - - foreach (split(/\:/,$textbrowsers)) { - if ($httpbrowser=~/$_/i) { - $env{'form.interface'}='textual'; - } - } - - my $fullgraph=($env{'form.interface'} ne 'textual'); my $iconpath= &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); @@ -198,422 +192,284 @@ sub handler { $hostname. '/adm/login?domain='.$authdomain.'">'. $hostname.''. - ' (preferred)'.$/; - $last=$hostname; - } - $spares.= 'Please attempt to login to one of the following servers:
$spares - -