$lt{'wel'}
$lt{'mes'}
$lt{'pro'}
-$remoteinfo
-$maincall
$continuelink
$end_page
ENDSUCCESS
@@ -209,23 +200,29 @@ 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('You are already logged in!').'
'
- .''.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].'
+ &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();
+ $r->print(
+ $start_page
+ .'
'.&mt('You are already logged in!').'
'
+ .''.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].'
,'','','','')
- .'
'
- .''.&mt('Login problems?').'
'
- .$end_page
- );
- return OK;
+ .''
+ .$end_page
+ );
+ return OK;
+ }
}
# ---------------------------------------------------- No valid token, continue
@@ -336,35 +333,43 @@ sub handler {
if (grep(/^login$/,@cancreate)) {
$defaultauth = 1;
}
- my $uname = $form{'uname'};
- my $authhost=Apache::lonnet::authenticate($uname,$upass,
+ my $authhost=Apache::lonnet::authenticate($form{'uname'},$upass,
$form{'udom'},$defaultauth);
# --------------------------------------------------------------------- Failed?
if ($authhost eq 'no_host') {
- my $lc_uname = lc($form{'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 $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 =
+ &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('Account creation').'
'.
+ &mt('Although your username and password were authenticated, you do not currently have a LON-CAPA account at this institution.').'
'.
+ $output.&Apache::loncommon::end_page());
return OK;
} else {
- $authhost=Apache::lonnet::authenticate($lc_uname,$upass,
- $form{'udom'},$defaultauth);
- if ($authhost eq 'no_host') {
- &failed($r,'Username (in lower case) and/or password could not be authenticated.',
- \%form);
- return OK;
- } elsif ($authhost eq 'no_account_on_host') {
- &create_account($r,\%form,\@cancreate,$lc_uname,$contact_name);
- return OK;
- } else {
- $form{'uname'} = $lc_uname;
- }
+ &failed($r,'Although your username and password were authenticated, you do not currently have a LON-CAPA account in this domain, and you are not permitted to create one.',\%form);
+ return OK;
}
- } elsif ($authhost eq 'no_account_on_host') {
- &create_account($r,\%form,\@cancreate,$uname);
- return OK;
}
if (($firsturl eq '') ||
@@ -405,38 +410,6 @@ sub handler {
return OK;
}
-sub create_account {
- my ($r,$form,$cancreate,$uname,$contact_name) = @_;
- return unless((ref($form) eq 'HASH') && (ref($cancreate) eq 'ARRAY'));
- my %domconfig =
- &Apache::lonnet::get_dom('configuration',['usercreation'],$form->{'udom'});
- if (grep(/^login$/,@{$cancreate})) {
- 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 =
- &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(''.&mt('Account creation').'
'.
- &mt('Although your username and password were authenticated, you do not currently have a LON-CAPA account at this institution.').'
'.
- $output.&Apache::loncommon::end_page());
- } else {
- &failed($r,'Although your username and password were authenticated, you do not currently have a LON-CAPA account in this domain, and you are not permitted to create one.',$form);
- }
- return;
-}
-
1;
__END__