--- loncom/auth/lonauth.pm 2006/04/05 22:39:55 1.74 +++ loncom/auth/lonauth.pm 2006/05/31 15:33:39 1.77 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.74 2006/04/05 22:39:55 albertel Exp $ +# $Id: lonauth.pm,v 1.77 2006/05/31 15:33:39 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,7 +40,6 @@ use Apache::lonnet; use Apache::lonmenu(); use Fcntl qw(:flock); use Apache::lonlocal; -use POSIX qw(strftime); my %FORM; @@ -156,8 +155,6 @@ sub success { print $idf "browser.localres=$FORM{'localres'}\n"; } print $idf "server.domain=".$r->dir_config('lonDefDomain')."\n"; - my $timezone=POSIX::strftime("%Z",localtime(time)); - print $idf "server.timezone=$timezone\n"; print $idf "request.course.fn=\n"; print $idf "request.course.uri=\n"; print $idf "request.course.sec=\n"; @@ -211,7 +208,8 @@ sub success { my $setflags=&Apache::lonmenu::setflags(); my $maincall=&Apache::lonmenu::maincall(); my $start_page=&Apache::loncommon::start_page('Successful Login', - $startupremote); + $startupremote, + {'no_inline_link' => 1,}); my $end_page =&Apache::loncommon::end_page(); my $continuelink; @@ -249,7 +247,8 @@ ENDSUCCESS sub failed { my ($r,$message) = @_; - my $start_page = &Apache::loncommon::start_page('Unsuccessful Login'); + my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef, + {'no_inline_link' => 1,}); my $end_page = &Apache::loncommon::end_page(); my %lt=('sorry' => &mt('Sorry ...'), @@ -368,9 +367,12 @@ ENDFAILED failed($r,'Information needed to verify your login information is missing, inaccessible or expired.'); return OK; } else { - unless (&Apache::lonnet::reply('tmpdel:'.$FORM{'logtoken'}, - $FORM{'serverid'}) eq 'ok') { + my $reply = &Apache::lonnet::reply('tmpdel:'.$FORM{'logtoken'}, + $FORM{'serverid'}); + if ( $reply ne 'ok' ) { &failed($r,'Session could not be opened.'); + &Apache::lonnet::logthis("ERROR got a reply of $reply when trying to contact ". $FORM{'serverid'}." to get login token"); + return OK; } } my ($key,$firsturl)=split(/&/,$tmpinfo);