+$lt{'mes'}
-$remoteinfo -$maincall $continuelink $end_page ENDSUCCESS @@ -167,8 +148,7 @@ ENDSUCCESS sub failed { my ($r,$message,$form) = @_; - my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef, - {'no_inline_link' => 1,}); + my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef); my $retry = '/adm/login?username='.$form->{'uname'}. '&domain='.$form->{'udom'}; if (exists($form->{role})) { @@ -225,12 +205,12 @@ sub handler { } else { # Indeed, a valid token is found &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - my $start_page = - &Apache::loncommon::start_page('Already logged in'); - my $end_page = - &Apache::loncommon::end_page(); + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + my $start_page = + &Apache::loncommon::start_page('Already logged in'); + my $end_page = + &Apache::loncommon::end_page(); my $dest = '/adm/roles'; if ($env{'form.firsturl'} ne '') { $dest = $env{'form.firsturl'}; @@ -285,8 +265,7 @@ sub handler { my $tmpinfo=Apache::lonnet::reply('tmpget:'.$form{'logtoken'}, $form{'serverid'}); - if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost') || - ($tmpinfo eq 'no_such_host')) { + if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) { &failed($r,'Information needed to verify your login information is missing, inaccessible or expired.',\%form); return OK; } else { @@ -340,48 +319,61 @@ sub handler { } # ---------------------------------------------------------------- Authenticate - + my @cancreate; 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; - if (ref($cancreate) eq 'ARRAY') { - if (grep(/^login$/,@{$cancreate})) { - $defaultauth = 1; + if (ref($domconfig{'usercreation'}) eq 'HASH') { + if (ref($domconfig{'usercreation'}{'cancreate'}) eq 'HASH') { + if (ref($domconfig{'usercreation'}{'cancreate'}{'selfcreate'}) eq 'ARRAY') { + @cancreate = @{$domconfig{'usercreation'}{'cancreate'}{'selfcreate'}}; + } elsif (($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne 'none') && + ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne '')) { + @cancreate = ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'}); + } } } + my $defaultauth; + if (grep(/^login$/,@cancreate)) { + $defaultauth = 1; + } my $clientcancheckhost = 1; - my $uname = $form{'uname'}; - my $authhost=Apache::lonnet::authenticate($uname,$upass, + my $authhost=Apache::lonnet::authenticate($form{'uname'},$upass, $form{'udom'},$defaultauth, $clientcancheckhost); # --------------------------------------------------------------------- Failed? if ($authhost eq 'no_host') { - my $lc_uname = lc($uname); - if ($uname eq $lc_uname) { - &failed($r,'Username and/or password could not be authenticated.', - \%form); + &failed($r,'Username and/or password could not be authenticated.', + \%form); + return OK; + } elsif ($authhost eq 'no_account_on_host') { + my %domconfig = + &Apache::lonnet::get_dom('configuration',['usercreation'],$form{'udom'}); + if (grep(/^login$/,@cancreate)) { + my $domdesc = &Apache::lonnet::domain($form{'udom'},'description'); + &check_can_host($r,\%form,'no_account_on_host',$domdesc); + my $start_page = + &Apache::loncommon::start_page('Create a user account in LON-CAPA'); + 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); + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + &Apache::createaccount::print_header($r,$start_page); + $r->print(''.&mt('Currently a LON-CAPA server is not available within the [_1] domain for you to log-in to, to create an account.',$domdesc).'
'. &Apache::loncommon::end_page()); } + return OK; } else { &success($r,$form->{'uname'},$udom,$authhost,'noredirect',undef, $form); @@ -529,47 +473,6 @@ sub check_can_host { $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver); } } - return $canhost; -} - -sub noswitch { - my $result = &Apache::loncommon::start_page('Access to LON-CAPA unavailable'). - ''.&mt('Currently no other LON-CAPA server is available to host your session either.').'
'. - &Apache::loncommon::end_page(); - return $result; -} - -sub create_account { - my ($r,$form,$cancreate,$uname,$contact_name,$domdesc) = @_; - return unless((ref($form) eq 'HASH') && (ref($cancreate) eq 'ARRAY')); - my %domconfig = - &Apache::lonnet::get_dom('configuration',['usercreation'],$form->{'udom'}); - if (&check_can_host($r,$form,'no_account_on_host',$domdesc)) { - 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($uname,$form->{'udom'}, - $domdesc,'',$lonhost, - $contact_email,$contact_name); - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - &Apache::createaccount::print_header($r,$start_page); - $r->print('