--- loncom/auth/lonlogin.pm 2008/01/24 14:30:28 1.99 +++ 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.99 2008/01/24 14:30:28 bisitz 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'})) { @@ -78,15 +81,14 @@ sub handler { &Apache::loncommon::start_page('Already logged in'); my $end_page = &Apache::loncommon::end_page(); - $r->print(<You are already logged in -

Please either continue the current session or -logout.

-

-Problems?

-$end_page -ENDFAILED + $r->print( + $start_page + .'

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

' + .'

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

' + .'

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

' + .$end_page + ); return OK; } @@ -219,16 +221,20 @@ ENDFAILED $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; } @@ -264,6 +270,8 @@ ENDTROUBLE my $showcoursecat = &Apache::loncommon::designparm('login.coursecatalog',$domain); my $loginheader =&Apache::loncommon::designparm('login.loginheader',$domain); + my $shownewuserlink = + &Apache::loncommon::designparm('login.newuser',$domain); my $now=time; my $js = (< 'Server Administration', 'helpdesk' => 'Contact Helpdesk', 'forgotpw' => 'Forgot password?', + 'newuser' => 'New User?', 'options_headline' => 'Select Accessibility Options', 'sprs_img' => 'Suppress rendering of images', 'sprs_applet' => 'Suppress Java applets', @@ -397,6 +406,10 @@ ENDSERVERFORM if (($showcoursecat eq '') || ($showcoursecat)) { $coursecatalog = &coursecatalog_link($lt{'catalog'}); } + my $newuserlink; + if ($shownewuserlink) { + $newuserlink = &newuser_link($lt{'newuser'}); + } if ($fullgraph) { $r->print(< @@ -524,6 +537,8 @@ ENDNOOPT $loginhelp $forgotpw + $newuserlink +
@@ -668,7 +683,7 @@ sub forgotpwdisplay { my (%lt) = @_; my $prompt_for_resetpw = 1; if ($prompt_for_resetpw) { - return '
   '.$lt{'forgotpw'}.'

'; + return '
   '.$lt{'forgotpw'}.'
'; } return; } @@ -692,5 +707,10 @@ sub coursecatalog_link { END } +sub newuser_link { + my ($linkname) = @_; + return '   '.$linkname.'
'; +} + 1; __END__