$message
-$lt{'please'}
- -$end_page -ENDFAILED -} + $r->print( + $start_page + .''.&mt($message).'
' + .''.&mt('Please [_1]log in again[_2].','','') + .'
' + .'' + .$end_page + ); + } # ------------------------------------------------------------------ Rerouting! @@ -150,8 +188,8 @@ sub reroute { my ($r) = @_; &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - my $msg='Please either continue the current session or -logout.
- -$end_page -ENDFAILED - 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 @@ -221,13 +252,14 @@ ENDFAILED # split user logging in and "su"-user ($form{'uname'},$form{'suname'})=split(/\:/,$form{'uname'}); - $form{'uname'} =~ s/\W//g; - $form{'suname'} =~ s/\W//g; - $form{'udom'} =~ s/\W//g; + $form{'uname'} = &LONCAPA::clean_username($form{'uname'}); + $form{'suname'}= &LONCAPA::clean_username($form{'suname'}); + $form{'udom'} = &LONCAPA::clean_domain( $form{'udom'}); my $role = $r->dir_config('lonRole'); my $domain = $r->dir_config('lonDefDomain'); my $prodir = $r->dir_config('lonUsersDir'); + my $contact_name = &mt('LON-CAPA helpdesk'); # ---------------------------------------- Get the information from login token @@ -246,7 +278,25 @@ ENDFAILED return OK; } } - my ($key,$firsturl)=split(/&/,$tmpinfo); + + 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,$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); @@ -270,15 +320,50 @@ ENDFAILED } # ---------------------------------------------------------------- Authenticate - my $authhost=Apache::lonnet::authenticate($form{'uname'}, - $upass, - $form{'udom'}); + my @cancreate; + my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$form{'udom'}); + if (ref($domconfig{'usercreation'}) eq 'HASH') { + if (ref($domconfig{'usercreation'}{'cancreate'}) eq 'HASH') { + if (ref($domconfig{'usercreation'}{'cancreate'}{'selfcreate'}) eq 'ARRAY') { + @cancreate = @{$domconfig{'usercreation'}{'cancreate'}{'selfcreate'}}; + } elsif (($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne 'none') && + ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'} ne '')) { + @cancreate = ($domconfig{'usercreation'}{'cancreate'}{'selfcreate'}); + } + } + } + my $defaultauth; + if (grep(/^login$/,@cancreate)) { + $defaultauth = 1; + } + 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); + my $lc_uname = lc($form{'uname'}); + if ($uname eq $lc_uname) { + &failed($r,'Username and/or password could not be authenticated.', + \%form); + 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; + } + } + } elsif ($authhost eq 'no_account_on_host') { + &create_account($r,\%form,\@cancreate,$uname); return OK; } @@ -320,6 +405,38 @@ ENDFAILED 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('