--- loncom/auth/lonauth.pm 2011/10/10 21:02:55 1.101.8.9 +++ loncom/auth/lonauth.pm 2012/02/09 22:01:34 1.101.8.9.2.2 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.101.8.9 2011/10/10 21:02:55 raeburn Exp $ +# $Id: lonauth.pm,v 1.101.8.9.2.2 2012/02/09 22:01:34 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -82,9 +82,13 @@ sub success { my $now=time; my $then=$env{'user.login.time'}; my $refresh=$env{'user.refresh.time'}; + my $update=$env{'user.update.time'}; + if (!$update) { + $update = $then; + } if (exists($env{$envkey})) { my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus); - &Apache::lonnet::role_status($envkey,$then,$refresh,$now,\$role,\$where, + &Apache::lonnet::role_status($envkey,$update,$refresh,$now,\$role,\$where, \$trolecode,\$tstatus,\$tstart,\$tend); if ($tstatus eq 'is') { $destination .= ($destination =~ /\?/) ? '&' : '?'; @@ -111,6 +115,10 @@ sub success { $destination .= '&destinationurl='.$destsymb; } } + if ($destination =~ m{^/adm/roles}) { + $destination .= ($destination =~ /\?/) ? '&' : '?'; + $destination .= 'source=login'; + } my $windowinfo=&Apache::lonmenu::open($env{'browser.os'}); my $startupremote=&Apache::lonmenu::startupremote($destination); @@ -334,6 +342,7 @@ sub handler { # ---------------------------------------------------------------- Authenticate my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$form{'udom'}); + my $domdesc = &Apache::lonnet::domain($form{'udom'},'description'); my ($cancreate,$statustocreate) = &Apache::createaccount::get_creation_controls($form{'udom'},$domconfig{'usercreation'}); my $defaultauth; @@ -343,47 +352,36 @@ sub handler { } } my $clientcancheckhost = 1; - my $authhost=Apache::lonnet::authenticate($form{'uname'},$upass, + my $uname = $form{'uname'}; + my $authhost=Apache::lonnet::authenticate($uname,$upass, $form{'udom'},$defaultauth, $clientcancheckhost); # --------------------------------------------------------------------- Failed? if ($authhost eq 'no_host') { - &failed($r,'Username and/or password could not be authenticated.', - \%form); - return OK; - } elsif ($authhost eq 'no_account_on_host') { - if ($defaultauth) { - my $domdesc = &Apache::lonnet::domain($form{'udom'},'description'); - unless (&check_can_host($r,\%form,'no_account_on_host',$domdesc)) { - return OK; - } - my $start_page = - &Apache::loncommon::start_page('Create a user account in LON-CAPA', - '',{'no_inline_link' => 1,}); - my $lonhost = $r->dir_config('lonHostID'); - my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; - my $contacts = - &Apache::loncommon::build_recipient_list(undef,'helpdeskmail', - $form{'udom'},$origmail); - my ($contact_email) = split(',',$contacts); - my $output = - &Apache::createaccount::username_check($form{'uname'},$form{'udom'}, - $domdesc,'',$lonhost, - $contact_email,$contact_name, - undef,$statustocreate); - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - &Apache::createaccount::print_header($r,$start_page); - $r->print('