$lt{'wel'}
$lt{'mes'}
$lt{'pro'}
-$remoteinfo
-$maincall
$continuelink
$end_page
ENDSUCCESS
@@ -158,8 +149,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})) {
@@ -216,12 +206,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'};
@@ -362,10 +352,11 @@ 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',
- '',{'no_inline_link' => 1,});
+ &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 =
@@ -415,13 +406,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'});
$r->internal_redirect('/adm/switchserver?otherserver='.$otherserver.'&origurl='.$firsturl);
+ return OK;
} else {
# ------------------------------------------------------- Do the load balancing
@@ -443,12 +437,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 {
@@ -503,7 +498,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);
@@ -511,6 +505,7 @@ sub check_can_host {
$r->internal_redirect('/adm/switchserver?otherserver='.$otherserver);
}
}
+ return $canhost;
}
1;