+$welcome
$continuelink $end_page @@ -266,7 +274,8 @@ sub handler { my $tmpinfo=Apache::lonnet::reply('tmpget:'.$form{'logtoken'}, $form{'serverid'}); - if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) { + if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost') || + ($tmpinfo eq 'no_such_host')) { &failed($r,'Information needed to verify your login information is missing, inaccessible or expired.',\%form); return OK; } else { @@ -352,7 +361,9 @@ sub handler { &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); + 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'); my $lonhost = $r->dir_config('lonHostID'); @@ -404,13 +415,16 @@ sub handler { } } - &check_can_host($r,\%form,$authhost); + unless (&check_can_host($r,\%form,$authhost)) { + return OK; + } if ($r->dir_config("lonBalancer") eq 'yes') { &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef, \%form); - my ($otherserver) = &Apache::lonnet::choose_server($form{'udom'}); + my $otherserver = &Apache::lonnet::spareserver(30000,undef,1,$form{'udom'}); $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl); + return OK; } else { # ------------------------------------------------------- Do the load balancing @@ -432,12 +446,13 @@ sub handler { &success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect', undef,\%form); $r->internal_redirect('/adm/switchserver?otherserver='.$unloaded.'&origurl='.$firsturl); + return OK; } } &success($r,$form{'uname'},$form{'udom'},$authhost,$firsturl,undef, \%form); + return OK; } - return OK; } sub check_can_host { @@ -492,7 +507,6 @@ sub check_can_host { ''.&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); @@ -500,6 +514,7 @@ sub check_can_host { $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver); } } + return $canhost; } 1;