'.&mt($message).'
' - .''.&mt('Please [_1]log in again[_2].' - ,"{'uname'}&domain=$form->{'udom'}\">",'') + .'
'.&mt('Please [_1]log in again[_2].','','') .'
' .'' .$end_page @@ -164,23 +209,33 @@ sub handler { # -------------------------------- Prevent users from attempting to login twice my $handle = &Apache::lonnet::check_for_valid_session($r); if ($handle ne '') { + my $lonidsdir=$r->dir_config('lonIDsDir'); + if ($handle=~/^publicuser\_/) { +# For "public user" - remove it, we apparently really want to login + unlink($r->dir_config('lonIDsDir')."/$handle.id"); + } else { # Indeed, a valid token is found - &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(); - $r->print( - $start_page - .''.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].' - ,'','','','') - .'
' - .'' - .$end_page - ); - return OK; + &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(); + my $dest = '/adm/roles'; + if ($env{'form.firsturl'} ne '') { + $dest = $env{'form.firsturl'}; + } + $r->print( + $start_page + .''.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].' + ,'','','','') + .'
' + .$end_page + ); + return OK; + } } # ---------------------------------------------------- No valid token, continue @@ -233,11 +288,25 @@ sub handler { return OK; } } + if (!&Apache::lonnet::domain($form{'udom'})) { &failed($r,'The domain you provided is not a valid LON-CAPA domain.',\%form); return OK; } - my ($key,$firsturl)=split(/&/,$tmpinfo); + + my ($key,$firsturl,$rolestr,$symbstr)=split(/&/,$tmpinfo); + if ($rolestr) { + $rolestr = &unescape($rolestr); + } + if ($symbstr) { + $symbstr= &unescape($symbstr); + } + if ($rolestr =~ /^role=/) { + (undef,$form{'role'}) = split('=',$rolestr); + } + if ($symbstr =~ /^symb=/) { + (undef,$form{'symb'}) = split('=',$symbstr); + } my $keybin=pack("H16",$key); @@ -277,8 +346,10 @@ sub handler { if (grep(/^login$/,@cancreate)) { $defaultauth = 1; } + my $clientcancheckhost = 1; my $authhost=Apache::lonnet::authenticate($form{'uname'},$upass, - $form{'udom'},$defaultauth); + $form{'udom'},$defaultauth, + $clientcancheckhost); # --------------------------------------------------------------------- Failed? @@ -290,10 +361,11 @@ sub handler { 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', '',{'no_inline_link' => 1,}); - my $domdesc = &Apache::lonnet::domain($form{'udom'},'description'); my $lonhost = $r->dir_config('lonHostID'); my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'}; my $contacts = @@ -343,10 +415,13 @@ sub handler { } } + &check_can_host($r,\%form,$authhost); + if ($r->dir_config("lonBalancer") eq 'yes') { &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef, \%form); - $r->internal_redirect('/adm/switchserver'); + my ($otherserver) = &Apache::lonnet::choose_server($form{'udom'}); + $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver); } else { &success($r,$form{'uname'},$form{'udom'},$authhost,$firsturl,undef, \%form); @@ -354,6 +429,64 @@ sub handler { return OK; } +sub check_can_host { + my ($r,$form,$authhost,$domdesc) = @_; + return unless (ref($form) eq 'HASH'); + my $canhost = 1; + my $lonhost = $r->dir_config('lonHostID'); + my $udom = $form->{'udom'}; + my @intdoms = &Apache::lonnet::get_internet_names($lonhost); + my $uprimary_id = &Apache::lonnet::domain($udom,'primary'); + my $uint_dom = &Apache::lonnet::internet_dom($uprimary_id); + unless ($uint_dom ne '' && grep(/^\Q$uint_dom\E$/,@intdoms)) { + my $machine_dom = &Apache::lonnet::host_domain($lonhost); + my $hostname = &Apache::lonnet::hostname($lonhost); + my $serverhomeID = &Apache::lonnet::get_server_homeID($hostname); + my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID); + my %defdomdefaults = &Apache::lonnet::get_domain_defaults($serverhomedom); + my %udomdefaults = &Apache::lonnet::get_domain_defaults($udom); + my $loncaparev; + if ($authhost eq 'no_account_on_host') { + $loncaparev = &Apache::lonnet::get_server_loncaparev($machine_dom); + } else { + $loncaparev = &Apache::lonnet::get_server_loncaparev($machine_dom,$lonhost); + } + $canhost = &Apache::lonnet::can_host_session($udom,$lonhost,$loncaparev, + $udomdefaults{'remotesessions'}, + $defdomdefaults{'hostedsessions'}); + } + unless ($canhost) { + if ($authhost eq 'no_account_on_host') { + my ($login_host,$hostname) = &Apache::lonnet::choose_server($udom); + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + if ($login_host ne '') { + my $protocol = $Apache::lonnet::protocol{$login_host}; + $protocol = 'http' if ($protocol ne 'https'); + my $newurl = $protocol.'://'.$hostname.'/adm/createaccount'; + $r->print(&Apache::loncommon::start_page('Create a user account in LON-CAPA'). + ''.&mt('You will be able to create one by logging into a LON-CAPA server within the [_1] domain.',$domdesc).'
'. + ''.&mt('[_1]Log in[_2]','',''). + &Apache::loncommon::end_page()); + } else { + $r->print(&Apache::loncommon::start_page('Access to LON-CAPA unavailable'). + '
'.&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); + my ($otherserver) = &Apache::lonnet::choose_server($udom); + $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver); + } + } +} + 1; __END__