--- loncom/auth/lonauth.pm 2010/08/18 19:39:42 1.101.8.3 +++ loncom/auth/lonauth.pm 2010/09/15 18:28:45 1.101.10.1 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.101.8.3 2010/08/18 19:39:42 raeburn Exp $ +# $Id: lonauth.pm,v 1.101.10.1 2010/09/15 18:28:45 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -209,33 +209,23 @@ 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::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; - } + &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; } # ---------------------------------------------------- No valid token, continue @@ -346,46 +336,35 @@ sub handler { if (grep(/^login$/,@cancreate)) { $defaultauth = 1; } - my $clientcancheckhost = 1; - my $authhost=Apache::lonnet::authenticate($form{'uname'},$upass, - $form{'udom'},$defaultauth, - $clientcancheckhost); + my $uname = $form{'uname'}; + my $authhost=Apache::lonnet::authenticate($uname,$upass, + $form{'udom'},$defaultauth); # --------------------------------------------------------------------- Failed? if ($authhost eq 'no_host') { - &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', - '',{'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($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('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); - } +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('