--- loncom/auth/lonauth.pm 2008/05/30 19:09:50 1.92 +++ loncom/auth/lonauth.pm 2009/07/03 10:22:00 1.99 @@ -1,7 +1,7 @@ # The LearningOnline Network # User Authentication Module # -# $Id: lonauth.pm,v 1.92 2008/05/30 19:09:50 bisitz Exp $ +# $Id: lonauth.pm,v 1.99 2009/07/03 10:22:00 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -78,14 +78,16 @@ sub success { my $remoteinfo=&Apache::lonmenu::load_remote_msg($lowerurl); my $setflags=&Apache::lonmenu::setflags(); my $maincall=&Apache::lonmenu::maincall(); + my $brcrum = [{'href' => '', + 'text' => 'Successful Login'},]; my $start_page=&Apache::loncommon::start_page('Successful Login', - $startupremote, - {'no_inline_link' => 1,}); + $startupremote, + {'no_inline_link' => 1, + 'bread_crumbs' => $brcrum,}); my $end_page =&Apache::loncommon::end_page(); my $continuelink; - if (($env{'browser.interface'} eq 'textual') || - ($env{'environment.remote'} eq 'off')) { + if ($env{'environment.remote'} eq 'off') { $continuelink="".&mt('Continue').""; } # ------------------------------------------------- Output for successful login @@ -126,7 +128,7 @@ sub failed { $r->print( $start_page .'
'.&mt($message).'
' + .''.&mt($message).'
' .''.&mt('Please [_1]log in again[_2].' ,"{'uname'}&domain=$form->{'udom'}\">",'') .'
' @@ -172,7 +174,7 @@ sub handler { $r->print( $start_page .''.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_4].' + .'
'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].' ,'','','','') .'
' .'' @@ -212,6 +214,7 @@ sub handler { 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 @@ -230,6 +233,10 @@ sub handler { return OK; } } + 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)=split(/&/,$tmpinfo); my $keybin=pack("H16",$key); @@ -287,19 +294,21 @@ sub handler { &Apache::loncommon::start_page('Create a user account in LON-CAPA', '',{'no_inline_link' => 1,}); my $domdesc = &Apache::lonnet::domain($form{'udom'},'description'); - my ($output,$checkfail) = &Apache::createaccount::username_check($form{'uname'}, - $form{'udom'},$domdesc); + 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); - my $msg = '