--- loncom/interface/loncreateuser.pm 2017/03/26 22:19:24 1.437 +++ loncom/interface/loncreateuser.pm 2021/12/24 19:42:37 1.458 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.437 2017/03/26 22:19:24 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.458 2021/12/24 19:42:37 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -71,6 +71,7 @@ use Apache::longroup; use Apache::lonuserutils; use Apache::loncoursequeueadmin; use LONCAPA qw(:DEFAULT :match); +use HTML::Entities; my $loginscript; # piece of javascript used in two separate instances my $authformnop; @@ -78,6 +79,7 @@ my $authformkrb; my $authformint; my $authformfsys; my $authformloc; +my $authformlti; sub initialize_authen_forms { my ($dom,$formname,$curr_authtype,$mode) = @_; @@ -88,7 +90,7 @@ sub initialize_authen_forms { domain => $dom, ); my %abv_auth = &auth_abbrev(); - if ($curr_authtype =~ /^(krb4|krb5|internal|localauth|unix):(.*)$/) { + if ($curr_authtype =~ /^(krb4|krb5|internal|localauth|unix|lti):(.*)$/) { my $long_auth = $1; my $curr_autharg = $2; my %abv_auth = &auth_abbrev(); @@ -107,6 +109,7 @@ sub initialize_authen_forms { $authformint = &Apache::loncommon::authform_internal(%param); $authformfsys = &Apache::loncommon::authform_filesystem(%param); $authformloc = &Apache::loncommon::authform_local(%param); + $authformlti = &Apache::loncommon::authform_lti(%param); } sub auth_abbrev { @@ -116,6 +119,7 @@ sub auth_abbrev { internal => 'int', localauth => 'loc', unix => 'fsys', + lti => 'lti', ); return %abv_auth; } @@ -253,14 +257,15 @@ sub build_tools_display { 'community' => 'Can request creation of communities', 'textbook' => 'Can request creation of textbook courses', 'placement' => 'Can request creation of placement tests', + 'lti' => 'Can request creation of LTI courses', 'requestauthor' => 'Can request author space', ); if ($context eq 'requestcourses') { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, 'requestcourses.official','requestcourses.unofficial', 'requestcourses.community','requestcourses.textbook', - 'requestcourses.placement'); - @usertools = ('official','unofficial','community','textbook','placement'); + 'requestcourses.placement','requestcourses.lti'); + @usertools = ('official','unofficial','community','textbook','placement','lti'); @options =('norequest','approval','autolimit','validate'); %validations = &Apache::lonnet::auto_courserequest_checks($ccdomain); %reqtitles = &courserequest_titles(); @@ -543,6 +548,7 @@ sub courserequest_titles { community => 'Communities', textbook => 'Textbook', placement => 'Placement Tests', + lti => 'LTI Provider', norequest => 'Not allowed', approval => 'Approval by Dom. Coord.', validate => 'With validation', @@ -647,7 +653,8 @@ sub curr_requestauthor { # =================================================================== Phase one sub print_username_entry_form { - my ($r,$context,$response,$srch,$forcenewuser,$crstype,$brcrum) = @_; + my ($r,$context,$response,$srch,$forcenewuser,$crstype,$brcrum, + $permission) = @_; my $defdom=$env{'request.role.domain'}; my $formtoset = 'crtuser'; if (exists($env{'form.startrolename'})) { @@ -673,11 +680,25 @@ sub print_username_entry_form { } my $helpitem = 'Course_Change_Privileges'; if ($env{'form.action'} eq 'custom') { - $helpitem = 'Course_Editing_Custom_Roles'; + if ($context eq 'course') { + $helpitem = 'Course_Editing_Custom_Roles'; + } elsif ($context eq 'domain') { + $helpitem = 'Domain_Editing_Custom_Roles'; + } } elsif ($env{'form.action'} eq 'singlestudent') { $helpitem = 'Course_Add_Student'; } elsif ($env{'form.action'} eq 'accesslogs') { $helpitem = 'Domain_User_Access_Logs'; + } elsif ($context eq 'author') { + $helpitem = 'Author_Change_Privileges'; + } elsif ($context eq 'domain') { + if ($permission->{'cusr'}) { + $helpitem = 'Domain_Change_Privileges'; + } elsif ($permission->{'view'}) { + $helpitem = 'Domain_View_Privileges'; + } else { + undef($helpitem); + } } my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$defdom); if ($env{'form.action'} eq 'custom') { @@ -768,6 +789,7 @@ sub print_username_entry_form { } elsif (($env{'form.action'} eq 'singleuser') && ($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$defdom))) { $actiontext = $lt{'srvu'}; + $fixeddom = 1; } $r->print("

$actiontext

"); if ($env{'form.origform'} ne 'crtusername') { @@ -835,11 +857,16 @@ sub entry_form { $inexact = 1; } } - my $cancreate = - &Apache::lonuserutils::can_create_user($dom,$context,$usertype); + my ($cancreate,$noinstd); + if ($env{'form.action'} eq 'accesslogs') { + $noinstd = 1; + } else { + $cancreate = + &Apache::lonuserutils::can_create_user($dom,$context,$usertype); + } my ($userpicker,$cansearch) = &Apache::loncommon::user_picker($dom,$srch,$forcenewuser, - 'document.crtuser',$cancreate,$usertype,$context,$fixeddom); + 'document.crtuser',$cancreate,$usertype,$context,$fixeddom,$noinstd); my $srchbutton = &mt('Search'); if ($env{'form.action'} eq 'singlestudent') { $srchbutton = &mt('Search and Enroll'); @@ -865,7 +892,15 @@ ENDBLOCK (!(($env{'form.action'} eq 'singleuser') && ($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))))) { my $defdom=$env{'request.role.domain'}; - my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain'); + my ($trusted,$untrusted); + if ($context eq 'course') { + ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('enroll',$defdom); + } elsif ($context eq 'author') { + ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('othcoau',$defdom); + } elsif ($context eq 'domain') { + ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('domroles',$defdom); + } + my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain',undef,undef,undef,$trusted,$untrusted); my %lt=&Apache::lonlocal::texthash( 'enro' => 'Enroll one student', 'enrm' => 'Enroll one member', @@ -1001,6 +1036,10 @@ ENDSCRIPT $helpitem = 'Course_Change_Privileges'; } elsif ($env{'form.action'} eq 'singlestudent') { $helpitem = 'Course_Add_Student'; + } elsif ($context eq 'author') { + $helpitem = 'Author_Change_Privileges'; + } elsif ($context eq 'domain') { + $helpitem = 'Domain_Change_Privileges'; } push (@{$brcrum}, {href => "javascript:backPage(document.usersrchform,'','')", @@ -1046,7 +1085,7 @@ ENDSCRIPT $r->print(''); } elsif ($env{'form.action'} eq 'accesslogs') { $r->print("$lt{'srcva'}
"); - $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,'accesslogs',undef,undef,1)); + $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,undef,1)); $r->print('

'.$lt{'vacsel'}.'

'); } } @@ -1127,7 +1166,8 @@ sub print_user_modification_page { if (($ccuname eq '') || ($ccdomain eq '')) { my $usermsg = &mt('No username and/or domain provided.'); $env{'form.phase'} = ''; - &print_username_entry_form($r,$context,$usermsg,'','',$crstype,$brcrum); + &print_username_entry_form($r,$context,$usermsg,'','',$crstype,$brcrum, + $permission); return; } my ($form,$formname); @@ -1176,7 +1216,8 @@ sub print_user_modification_page { } $response .= '


'; $env{'form.phase'} = ''; - &print_username_entry_form($r,$context,$response,undef,undef,$crstype,$brcrum); + &print_username_entry_form($r,$context,$response,undef,undef,$crstype,$brcrum, + $permission); return; } $newuser = 1; @@ -1200,7 +1241,8 @@ sub print_user_modification_page { 'username'); } $env{'form.phase'} = ''; - &print_username_entry_form($r,$context,$userchkmsg,undef,undef,$crstype,$brcrum); + &print_username_entry_form($r,$context,$userchkmsg,undef,undef,$crstype,$brcrum, + $permission); return; } } @@ -1225,6 +1267,10 @@ sub print_user_modification_page { my $helpitem = 'Course_Change_Privileges'; if ($env{'form.action'} eq 'singlestudent') { $helpitem = 'Course_Add_Student'; + } elsif ($context eq 'author') { + $helpitem = 'Author_Change_Privileges'; + } elsif ($context eq 'domain') { + $helpitem = 'Domain_Change_Privileges'; } push (@{$brcrum}, {href => "javascript:backPage($form)", @@ -1439,15 +1485,21 @@ ENDAUTH $inst_results{$ccuname.':'.$ccdomain})); if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) || (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) { - $r->print('

'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'

'. - &Apache::loncommon::start_data_table()); - if ($env{'request.role.domain'} eq $ccdomain) { - $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses')); + $r->print('

'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'

'."\n"); + if (($env{'request.role.domain'} eq $ccdomain) || + (&Apache::lonnet::will_trust('reqcrs',$ccdomain,$env{'request.role.domain'}))) { + $r->print(&Apache::loncommon::start_data_table()); + if ($env{'request.role.domain'} eq $ccdomain) { + $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses')); + } else { + $r->print(&coursereq_externaluser($ccuname,$ccdomain, + $env{'request.role.domain'})); + } + $r->print(&Apache::loncommon::end_data_table()); } else { - $r->print(&coursereq_externaluser($ccuname,$ccdomain, - $env{'request.role.domain'})); + $r->print(&mt('Domain configuration for this domain prohibits course creation by users from domain: "[_1]"', + &Apache::lonnet::domain($ccdomain,'description'))); } - $r->print(&Apache::loncommon::end_data_table()); } $r->print(''); my @order = ('auth','quota','tools','requestauthor'); @@ -1460,7 +1512,7 @@ ENDAUTH ($env{'request.role.domain'} eq $ccdomain)) { $user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain); } - $user_text{'auth'} = &user_authentication($ccuname,$ccdomain,$formname); + $user_text{'auth'} = &user_authentication($ccuname,$ccdomain,$formname,$crstype,$permission); if ((&Apache::lonnet::allowed('mpq',$ccdomain)) || (&Apache::lonnet::allowed('mut',$ccdomain)) || (&Apache::lonnet::allowed('udp',$ccdomain))) { @@ -2103,11 +2155,20 @@ sub new_domain_roles { ''.&mt('Start').''.&mt('End').''. &Apache::loncommon::end_data_table_header_row(); my @allroles = &Apache::lonuserutils::roles_by_context('domain'); + my $uprimary = &Apache::lonnet::domain($env{'request.role.domain'},'primary'); + my $uintdom = &Apache::lonnet::internet_dom($uprimary); foreach my $thisdomain (sort(&Apache::lonnet::all_domains())) { foreach my $role (@allroles) { next if ($role eq 'ad'); next if (($role eq 'au') && ($ccdomain ne $thisdomain)); if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) { + if ($role eq 'dc') { + unless ($thisdomain eq $env{'request.role.domain'}) { + my $domprim = &Apache::lonnet::domain($thisdomain,'primary'); + my $intdom = &Apache::lonnet::internet_dom($domprim); + next unless ($uintdom eq $intdom); + } + } my $plrole=&Apache::lonnet::plaintext($role); my %lt=&Apache::lonlocal::texthash( 'ssd' => "Set Start Date", @@ -2138,7 +2199,7 @@ sub new_domain_roles { } sub user_authentication { - my ($ccuname,$ccdomain,$formname) = @_; + my ($ccuname,$ccdomain,$formname,$crstype,$permission) = @_; my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain); my $outcome; my %lt=&Apache::lonlocal::texthash( @@ -2149,7 +2210,7 @@ sub user_authentication { 'ld' => "Login Data" ); # Check for a bad authentication type - if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth):/) { + if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth|lti):/) { # bad authentication scheme if (&Apache::lonnet::allowed('mau',$ccdomain)) { &initialize_authen_forms($ccdomain,$formname); @@ -2211,6 +2272,43 @@ ENDBADAUTH } $outcome .= &Apache::loncommon::end_data_table(); } else { + if (($currentauth =~ /^internal:/) && + (&Apache::lonuserutils::can_change_internalpass($ccuname,$ccdomain,$crstype,$permission))) { + $outcome = <<"ENDJS"; + +ENDJS + + $outcome .= '

'.$lt{'ld'}.'

'. + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_row(). + ''.&mt('Internally authenticated').'
'.&mt("Change user's password?"). + ''.(' 'x2). + ''. + ''. + &Apache::loncommon::end_data_table_row(). + &Apache::loncommon::end_data_table(); + } if (&Apache::lonnet::allowed('udp',$ccdomain)) { # Current user has rights to view domain preferences for user's domain my $result; @@ -2228,6 +2326,8 @@ ENDBADAUTH $result = &mt('Currently using local (institutional) authentication.'); } elsif ($currentauth =~ /^unix:/) { $result = &mt('Currently Filesystem Authenticated.'); + } elsif ($currentauth =~ /^lti:/) { + $result = &mt('Currently LTI authenticated.'); } $outcome = '

'.$lt{'ld'}.'

'. &Apache::loncommon::start_data_table(). @@ -2266,6 +2366,9 @@ sub modify_login_block { if ($can_assign{'loc'}) { push(@authform_others,$authformloc); } + if ($can_assign{'lti'}) { + push(@authform_others,$authformlti); + } if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { $show_override_msg = 1; } @@ -2277,6 +2380,9 @@ sub modify_login_block { if ($can_assign{'loc'}) { push(@authform_others,$authformloc); } + if ($can_assign{'lti'}) { + push(@authform_others,$authformlti); + } if ($can_assign{'int'}) { $show_override_msg = 1; } @@ -2291,6 +2397,9 @@ sub modify_login_block { if ($can_assign{'loc'}) { push(@authform_others,$authformloc); } + if ($can_assign{'lti'}) { + push(@authform_others,$authformlti); + } if ($can_assign{'fsys'}) { $show_override_msg = 1; } @@ -2302,9 +2411,23 @@ sub modify_login_block { if ($can_assign{'int'}) { push(@authform_others,$authformint); } + if ($can_assign{'lti'}) { + push(@authform_others,$authformlti); + } if ($can_assign{'loc'}) { $show_override_msg = 1; } + } elsif ($currentauth=~/^lti:/) { + $authformcurrent=$authformlti; + if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { + push(@authform_others,$authformkrb); + } + if ($can_assign{'int'}) { + push(@authform_others,$authformint); + } + if ($can_assign{'loc'}) { + push(@authform_others,$authformloc); + } } if ($show_override_msg) { $authformcurrent = ''.&Apache::loncommon::end_data_table_row() .&Apache::loncommon::end_data_table(); @@ -6486,6 +6806,10 @@ sub print_userchangelogs_display { my $helpitem; if ($context eq 'course') { $helpitem = 'Course_User_Logs'; + } elsif ($context eq 'domain') { + $helpitem = 'Domain_Role_Logs'; + } elsif ($context eq 'author') { + $helpitem = 'Author_User_Logs'; } push (@{$brcrum}, {href => '/adm/createuser?action=changelogs', @@ -6831,9 +7155,10 @@ ENDSCRIPT my ($nav_script,$nav_links); # table header - my $tableheader = '

'. + my $heading = '

'. &mt('User access logs for: [_1]', - &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)).'

' + &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)).''; + my $tableheader = $heading .&Apache::loncommon::start_data_table_header_row() .'' .'' @@ -6951,7 +7276,7 @@ ENDSCRIPT $r->print(&Apache::loncommon::end_data_table(). &userlogdisplay_navlinks(\%curr,$more_records)); } else { # No content displayed above - $r->print('

' + $r->print($heading.'

' .&mt('There are no records to display.') .'

'); } @@ -7140,12 +7465,12 @@ sub role_display_filter { &mt('Context:').'
'.$authformcurrent. @@ -2319,8 +2442,8 @@ sub modify_login_block { } sub personal_data_display { - my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray, - $now,$captchaform,$emailusername,$usertype) = @_; + my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,$now, + $captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded,$showsubmit) = @_; my ($output,%userenv,%canmodify,%canmodify_status); my @userinfo = ('firstname','middlename','lastname','generation', 'permanentemail','id'); @@ -2347,6 +2470,7 @@ sub personal_data_display { 'inststatus' => "Affiliation", 'email' => 'E-mail address', 'valid' => 'Validation', + 'username' => 'Username', ); %canmodify_status = @@ -2365,7 +2489,7 @@ sub personal_data_display { if (ref($emailusername) eq 'HASH') { if (ref($emailusername->{$usertype}) eq 'HASH') { my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); - @userinfo = (); + @userinfo = (); if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) { foreach my $field (@{$infofields}) { if ($emailusername->{$usertype}->{$field}) { @@ -2395,9 +2519,38 @@ sub personal_data_display { $output = '

'.$lt{'pd'}.'

'. &Apache::lonhtmlcommon::start_pick_box(); if (($context eq 'selfcreate') && ($newuser eq 'email')) { + my $size = 25; + if ($condition) { + if ($condition =~ /^\@[^\@]+$/) { + $size = 10; + } else { + undef($condition); + } + } + if ($excluded) { + unless ($excluded =~ /^\@[^\@]+$/) { + undef($condition); + } + } $output .= &Apache::lonhtmlcommon::row_title($lt{'email'}.'*',undef, 'LC_oddrow_value')."\n". - ''; + ''; + if ($condition) { + $output .= $condition; + } elsif ($excluded) { + $output .= '
'.&mt('You must use an e-mail address that does not end with [_1]', + $excluded).''; + } + if ($usernameset eq 'first') { + $output .= '
'; + if ($condition) { + $output .= &mt('Your username in LON-CAPA will be the part of your e-mail address before [_1]', + $condition); + } else { + $output .= &mt('Your username in LON-CAPA will be the part of your e-mail address before the @'); + } + $output .= ''; + } $rowcount ++; $output .= &Apache::lonhtmlcommon::row_closure(1); my $upassone = ''; @@ -2412,6 +2565,20 @@ sub personal_data_display { 'LC_oddrow_value')."\n". $upasstwo. &Apache::lonhtmlcommon::row_closure()."\n"; + if ($usernameset eq 'free') { + my $onclick = "toggleUsernameDisp(this,'selfcreateusername');"; + $output .= &Apache::lonhtmlcommon::row_title($lt{'username'},undef,'LC_oddrow_value')."\n". + ''.&mt('Use e-mail address: '). + ''.(' 'x2). + ''."\n". + ''."\n".&Apache::lonhtmlcommon::row_closure(1); + $rowcount ++; + } } foreach my $item (@userinfo) { my $rowtitle = $lt{$item}; @@ -2513,12 +2680,17 @@ sub personal_data_display { &Apache::lonhtmlcommon::row_closure(1); $rowcount ++; } - my $submit_text = &mt('Create account'); - $output .= &Apache::lonhtmlcommon::row_title()."\n". - '
'. - ''. - &Apache::lonhtmlcommon::row_closure(1); + if ($showsubmit) { + my $submit_text = &mt('Create account'); + $output .= &Apache::lonhtmlcommon::row_title()."\n". + '
'; + if ($usertype ne '') { + $output .= ''; + } + $output .= &Apache::lonhtmlcommon::row_closure(1); + } } $output .= &Apache::lonhtmlcommon::end_pick_box(); if (wantarray) { @@ -2602,7 +2774,7 @@ sub get_inststatuses { # ================================================================= Phase Three sub update_user_data { - my ($r,$context,$crstype,$brcrum,$showcredits) = @_; + my ($r,$context,$crstype,$brcrum,$showcredits,$permission) = @_; my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'}, $env{'form.ccdomain'}); # Error messages @@ -2643,6 +2815,10 @@ sub update_user_data { my $helpitem = 'Course_Change_Privileges'; if ($env{'form.action'} eq 'singlestudent') { $helpitem = 'Course_Add_Student'; + } elsif ($context eq 'author') { + $helpitem = 'Author_Change_Privileges'; + } elsif ($context eq 'domain') { + $helpitem = 'Domain_Change_Privileges'; } push(@{$brcrum}, {href => "javascript:backPage(document.userupdate,'$env{'form.prevphase'}','modify')", @@ -2716,6 +2892,9 @@ sub update_user_data { $amode='localauth'; $genpwd=$env{'form.locarg'}; $genpwd=" " if (!$genpwd); + } elsif ($env{'form.login'} eq 'lti') { + $amode='lti'; + $genpwd=" "; } elsif (($env{'form.login'} eq 'nochange') || ($env{'form.login'} eq '' )) { # There is no need to tell the user we did not change what they @@ -2735,7 +2914,7 @@ sub update_user_data { my (%alerts,%rulematch,%inst_results,%curr_rules); my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id'); my @usertools = ('aboutme','blog','webdav','portfolio'); - my @requestcourses = ('official','unofficial','community','textbook','placement'); + my @requestcourses = ('official','unofficial','community','textbook','placement','lti'); my @requestauthor = ('requestauthor'); my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($env{'form.ccdomain'}); @@ -2864,7 +3043,7 @@ sub update_user_data { $env{'form.ccdomain'},$env{'form.ccuname'}); } } - $r->print('
'.&mt('Home server').': '.$uhome.' '. + $r->print('
'.&mt('Home Server').': '.$uhome.' '. &Apache::lonnet::hostname($uhome)); } elsif (($env{'form.login'} ne 'nochange') && ($env{'form.login'} ne '' )) { @@ -2879,12 +3058,19 @@ sub update_user_data { &Apache::lonnet::modifyuserauth( $env{'form.ccdomain'},$env{'form.ccuname'}, $amode,$genpwd)); - $r->print('
'.&mt('Home server').': '.&Apache::lonnet::homeserver + $r->print('
'.&mt('Home Server').': '.&Apache::lonnet::homeserver ($env{'form.ccuname'},$env{'form.ccdomain'})); } else { # Okay, this is a non-fatal error. - $r->print($error.&mt('You do not have the authority to modify this users authentication information.').$end); + $r->print($error.&mt('You do not have privileges to modify the authentication configuration for this user.').$end); } + } elsif (($env{'form.intarg'} ne '') && + (&Apache::lonnet::queryauthenticate($env{'form.ccuname'},$env{'form.ccdomain'}) =~ /^internal:/) && + (&Apache::lonuserutils::can_change_internalpass($env{'form.ccuname'},$env{'form.ccdomain'},$crstype,$permission))) { + $r->print('Modifying authentication: '. + &Apache::lonnet::modifyuserauth( + $env{'form.ccdomain'},$env{'form.ccuname'}, + 'internal',$env{'form.intarg'})); } $r->rflush(); # Finish display of header before time consuming actions start &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state); @@ -2906,9 +3092,10 @@ sub update_user_data { 'tools.aboutme','tools.blog','tools.webdav','tools.portfolio', 'requestcourses.official','requestcourses.unofficial', 'requestcourses.community','requestcourses.textbook', + 'requestcourses.lti','requestauthor', 'reqcrsotherdom.official','reqcrsotherdom.unofficial', 'reqcrsotherdom.community','reqcrsotherdom.textbook', - 'reqcrsotherdom.placement','requestauthor'], + 'reqcrsotherdom.placement'], $env{'form.ccdomain'},$env{'form.ccuname'}); my ($tmp) = keys(%userenv); if ($tmp =~ /^(con_lost|error)/i) { @@ -3201,7 +3388,7 @@ sub update_user_data { foreach my $key (keys(%changed)) { if (($key eq 'official') || ($key eq 'unofficial') || ($key eq 'community') || ($key eq 'textbook') || - ($key eq 'placement')) { + ($key eq 'placement') || ($key eq 'lti')) { $newenvhash{'environment.requestcourses.'.$key} = $changeHash{'requestcourses.'.$key}; if ($changeHash{'requestcourses.'.$key}) { @@ -3411,6 +3598,7 @@ sub display_userinfo { 'community' => 'Can Request Communities', 'textbook' => 'Can Request Textbook Courses', 'placement' => 'Can Request Placement Tests', + 'lti' => 'Can Request LTI Courses', 'requestauthor' => 'Can Request Author Role', 'inststatus' => "Affiliation", 'prvs' => 'Previous Value:', @@ -4307,9 +4495,9 @@ sub build_roles { # ========================================================== Custom Role Editor sub custom_role_editor { - my ($r,$brcrum,$prefix) = @_; + my ($r,$context,$brcrum,$prefix,$permission) = @_; my $action = $env{'form.customroleaction'}; - my $rolename; + my ($rolename,$helpitem); if ($action eq 'new') { $rolename=$env{'form.newrolename'}; } else { @@ -4320,14 +4508,17 @@ sub custom_role_editor { if ($env{'request.course.id'}) { $crstype = &Apache::loncommon::course_type(); $context = 'course'; + $helpitem = 'Course_Editing_Custom_Roles'; } else { $context = 'domain'; $crstype = 'course'; + $helpitem = 'Domain_Editing_Custom_Roles'; } $rolename=~s/[^A-Za-z0-9]//gs; if (!$rolename || $env{'form.phase'} eq 'pickrole') { - &print_username_entry_form($r,undef,undef,undef,undef,$crstype,$brcrum); + &print_username_entry_form($r,$context,undef,undef,undef,$crstype,$brcrum, + $permission); return; } @@ -4382,7 +4573,7 @@ sub custom_role_editor { text => "Edit custom role", faq => 282, bug => 'Instructor Interface', - help => 'Course_Editing_Custom_Roles'} + help => $helpitem} ); my $args = { bread_crumbs => $brcrum, bread_crumbs_component => 'User Management'}; @@ -4409,11 +4600,11 @@ ENDCCF # ---------------------------------------------------------- Call to definerole sub set_custom_role { - my ($r,$context,$brcrum,$prefix) = @_; + my ($r,$context,$brcrum,$prefix,$permission) = @_; my $rolename=$env{'form.rolename'}; $rolename=~s/[^A-Za-z0-9]//gs; if (!$rolename) { - &custom_role_editor($r,$brcrum,$prefix); + &custom_role_editor($r,$context,$brcrum,$prefix,$permission); return; } my ($jsback,$elements) = &crumb_utilities(); @@ -4422,6 +4613,10 @@ sub set_custom_role { .$jsback."\n" .'// ]]>'."\n" .''."\n"; + my $helpitem = 'Course_Editing_Custom_Roles'; + if ($context eq 'domain') { + $helpitem = 'Domain_Editing_Custom_Roles'; + } push(@{$brcrum}, {href => "javascript:backPage(document.customresult,'pickrole','')", text => "Pick custom role", @@ -4435,7 +4630,7 @@ sub set_custom_role { text => "Result", faq => 282, bug => 'Instructor Interface', - help => 'Course_Editing_Custom_Roles'}, + help => $helpitem,} ); my $args = { bread_crumbs => $brcrum, bread_crumbs_component => 'User Management'}; @@ -4506,7 +4701,8 @@ sub handler { $r->send_http_header; return OK; } - my ($context,$crstype); + my ($context,$crstype,$cid,$cnum,$cdom,$allhelpitems); + if ($env{'request.course.id'}) { $context = 'course'; $crstype = &Apache::loncommon::course_type(); @@ -4516,6 +4712,69 @@ sub handler { $context = 'domain'; } + my ($permission,$allowed) = + &Apache::lonuserutils::get_permission($context,$crstype); + + if ($allowed) { + my @allhelp; + if ($context eq 'course') { + $cid = $env{'request.course.id'}; + $cdom = $env{'course.'.$cid.'.domain'}; + $cnum = $env{'course.'.$cid.'.num'}; + + if ($permission->{'cusr'}) { + push(@allhelp,'Course_Create_Class_List'); + } + if ($permission->{'view'} || $permission->{'cusr'}) { + push(@allhelp,('Course_Change_Privileges','Course_View_Class_List')); + } + if ($permission->{'custom'}) { + push(@allhelp,'Course_Editing_Custom_Roles'); + } + if ($permission->{'cusr'}) { + push(@allhelp,('Course_Add_Student','Course_Drop_Student')); + } + unless ($permission->{'cusr_section'}) { + if (&Apache::lonnet::auto_run($cnum,$cdom) && (($permission->{'cusr'}) || ($permission->{'view'}))) { + push(@allhelp,'Course_Automated_Enrollment'); + } + if ($permission->{'selfenrolladmin'}) { + push(@allhelp,'Course_Approve_Selfenroll'); + } + } + if ($permission->{'grp_manage'}) { + push(@allhelp,'Course_Manage_Group'); + } + if ($permission->{'view'} || $permission->{'cusr'}) { + push(@allhelp,'Course_User_Logs'); + } + } elsif ($context eq 'author') { + push(@allhelp,('Author_Change_Privileges','Author_Create_Coauthor_List', + 'Author_View_Coauthor_List','Author_User_Logs')); + } else { + if ($permission->{'cusr'}) { + push(@allhelp,'Domain_Change_Privileges'); + if ($permission->{'activity'}) { + push(@allhelp,'Domain_User_Access_Logs'); + } + push(@allhelp,('Domain_Create_Users','Domain_View_Users_List')); + if ($permission->{'custom'}) { + push(@allhelp,'Domain_Editing_Custom_Roles'); + } + push(@allhelp,('Domain_Role_Approvals','Domain_Username_Approvals','Domain_Change_Logs')); + } elsif ($permission->{'view'}) { + push(@allhelp,'Domain_View_Privileges'); + if ($permission->{'activity'}) { + push(@allhelp,'Domain_User_Access_Logs'); + } + push(@allhelp,('Domain_View_Users_List','Domain_Change_Logs')); + } + } + if (@allhelp) { + $allhelpitems = join(',',@allhelp); + } + } + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['action','state','callingform','roletype','showrole','bulkaction','popup','phase', 'username','domain','srchterm','srchdomain','srchin','srchby','srchtype','queue']); @@ -4526,13 +4785,9 @@ sub handler { if (($env{'form.action'} ne 'dateselect') && ($env{'form.action'} ne 'displayuserreq')) { $brcrum = [{href=>"/adm/createuser", text=>"User Management", - help=>'Course_Create_Class_List,Course_Change_Privileges,Course_View_Class_List,Course_Editing_Custom_Roles,Course_Add_Student,Course_Drop_Student,Course_Automated_Enrollment,Course_Self_Enrollment,Course_Manage_Group'} + help=>$allhelpitems} ]; } - #SD Following files not added to help, because the corresponding .tex-files seem to - #be missing: Course_Approve_Selfenroll,Course_User_Logs, - my ($permission,$allowed) = - &Apache::lonuserutils::get_permission($context,$crstype); if (!$allowed) { if ($context eq 'course') { $r->internal_redirect('/adm/viewclasslist'); @@ -4564,10 +4819,16 @@ sub handler { $r->print(&header(undef,$args)); $r->print(&print_main_menu($permission,$context,$crstype)); } elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) { + my $helpitem = 'Course_Create_Class_List'; + if ($context eq 'author') { + $helpitem = 'Author_Create_Coauthor_List'; + } elsif ($context eq 'domain') { + $helpitem = 'Domain_Create_Users'; + } push(@{$brcrum}, { href => '/adm/createuser?action=upload&state=', text => 'Upload Users List', - help => 'Course_Create_Class_List', + help => $helpitem, }); $bread_crumbs_component = 'Upload Users List'; $args = {bread_crumbs => $brcrum, @@ -4579,16 +4840,41 @@ sub handler { if (! exists($env{'form.state'})) { &Apache::lonuserutils::print_first_users_upload_form($r,$context); } elsif ($env{'form.state'} eq 'got_file') { - &Apache::lonuserutils::print_upload_manager_form($r,$context,$permission, - $crstype,$showcredits); + my $result = + &Apache::lonuserutils::print_upload_manager_form($r,$context, + $permission, + $crstype,$showcredits); + if ($result eq 'missingdata') { + delete($env{'form.state'}); + &Apache::lonuserutils::print_first_users_upload_form($r,$context); + } } elsif ($env{'form.state'} eq 'enrolling') { if ($env{'form.datatoken'}) { - &Apache::lonuserutils::upfile_drop_add($r,$context,$permission, - $showcredits); + my $result = &Apache::lonuserutils::upfile_drop_add($r,$context, + $permission, + $showcredits); + if ($result eq 'missingdata') { + delete($env{'form.state'}); + &Apache::lonuserutils::print_first_users_upload_form($r,$context); + } elsif ($result eq 'invalidhome') { + $env{'form.state'} = 'got_file'; + delete($env{'form.lcserver'}); + my $result = + &Apache::lonuserutils::print_upload_manager_form($r,$context,$permission, + $crstype,$showcredits); + if ($result eq 'missingdata') { + delete($env{'form.state'}); + &Apache::lonuserutils::print_first_users_upload_form($r,$context); + } + } + } else { + delete($env{'form.state'}); + &Apache::lonuserutils::print_first_users_upload_form($r,$context); } } else { &Apache::lonuserutils::print_first_users_upload_form($r,$context); } + $r->print(''); } elsif (((($env{'form.action'} eq 'singleuser') || ($env{'form.action'} eq 'singlestudent')) && ($permission->{'cusr'})) || (($env{'form.action'} eq 'singleuser') && ($permission->{'view'})) || @@ -4612,7 +4898,7 @@ sub handler { .''; $env{'form.phase'} = ''; &print_username_entry_form($r,$context,$response,$srch,undef, - $crstype,$brcrum,$showcredits); + $crstype,$brcrum,$permission); } else { my $ccuname =&LONCAPA::clean_username($srch->{'srchterm'}); my $ccdomain=&LONCAPA::clean_domain($srch->{'srchdomain'}); @@ -4657,7 +4943,8 @@ sub handler { # } #} &print_username_entry_form($r,$context,$response,$srch, - $forcenewuser,$crstype,$brcrum); + $forcenewuser,$crstype,$brcrum, + $permission); } else { &print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum); } @@ -4674,7 +4961,8 @@ sub handler { } else { $env{'form.phase'} = ''; &print_username_entry_form($r,$context,$response,$srch, - $forcenewuser,$crstype,$brcrum); + $forcenewuser,$crstype,$brcrum, + $permission); } } elsif ($env{'form.phase'} eq 'userpicked') { my $ccuname = &LONCAPA::clean_username($env{'form.seluname'}); @@ -4692,17 +4980,17 @@ sub handler { &print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum); } } elsif ($env{'form.phase'} eq 'update_user_data') { - &update_user_data($r,$context,$crstype,$brcrum,$showcredits); + &update_user_data($r,$context,$crstype,$brcrum,$showcredits,$permission); } else { &print_username_entry_form($r,$context,undef,$srch,undef,$crstype, - $brcrum); + $brcrum,$permission); } } elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) { my $prefix; if ($env{'form.phase'} eq 'set_custom_roles') { - &set_custom_role($r,$context,$brcrum,$prefix); + &set_custom_role($r,$context,$brcrum,$prefix,$permission); } else { - &custom_role_editor($r,$brcrum,$prefix); + &custom_role_editor($r,$context,$brcrum,$prefix,$permission); } } elsif (($env{'form.action'} eq 'processauthorreq') && ($permission->{'cusr'}) && @@ -4808,56 +5096,92 @@ sub handler { unless ($usertype) { $usertype = 'default'; } + my ($showstatus,$showemail,$pickstart); + my $numextras = 0; + my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); + if ((ref($types) eq 'ARRAY') && (@{$types} > 0)) { + if (ref($usertypes) eq 'HASH') { + if ($usertypes->{$usertype}) { + $showstatus = $usertypes->{$usertype}; + } else { + $showstatus = $othertitle; + } + if ($showstatus) { + $numextras ++; + } + } + } + if (($info{$uname}{'email'} ne '') && ($info{$uname}{'email'} ne $uname)) { + $showemail = $info{$uname}{'email'}; + $numextras ++; + } if (ref($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}) eq 'HASH') { if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) { + $pickstart = 1; $r->print('
'.&Apache::lonhtmlcommon::start_pick_box()); - my ($num,$count,$showstatus); + my ($num,$count); $count = scalar(keys(%{$domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}})); - unless ($usertype eq 'default') { - my ($othertitle,$usertypes,$types) = - &Apache::loncommon::sorted_inst_types($dom); - if (ref($usertypes) eq 'HASH') { - if ($usertypes->{$usertype}) { - $showstatus = $usertypes->{$usertype}; - $count ++; - } - } - } + $count += $numextras; foreach my $field (@{$infofields}) { next unless ($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}{$field}); next unless ($infotitles->{$field}); $r->print(&Apache::lonhtmlcommon::row_title($infotitles->{$field}). $info{$uname}{$field}); $num ++; - if ($count == $num) { - $r->print(&Apache::lonhtmlcommon::row_closure(1)); - } else { + unless ($count == $num) { $r->print(&Apache::lonhtmlcommon::row_closure()); } } - if ($showstatus) { - $r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type (self-reported)')). - $showstatus. - &Apache::lonhtmlcommon::row_closure(1)); + } + } + if ($numextras) { + unless ($pickstart) { + $r->print('
'.&Apache::lonhtmlcommon::start_pick_box()); + $pickstart = 1; + } + if ($showemail) { + my $closure = ''; + unless ($showstatus) { + $closure = 1; } - $r->print(&Apache::lonhtmlcommon::end_pick_box().'
'); + $r->print(&Apache::lonhtmlcommon::row_title(&mt('E-mail address')). + $showemail. + &Apache::lonhtmlcommon::row_closure($closure)); + } + if ($showstatus) { + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type[_1](self-reported)','
')). + $showstatus. + &Apache::lonhtmlcommon::row_closure(1)); } } + if ($pickstart) { + $r->print(&Apache::lonhtmlcommon::end_pick_box().'
'); + } else { + $r->print('
'.&mt('No information to display for this account request.').'
'); + } + } else { + $r->print('
'.&mt('No information available for this account request.').'
'); } } } } - $r->print(&close_popup_form()); } + $r->print(&close_popup_form()); } elsif (($env{'form.action'} eq 'listusers') && ($permission->{'view'} || $permission->{'cusr'})) { + my $helpitem = 'Course_View_Class_List'; + if ($context eq 'author') { + $helpitem = 'Author_View_Coauthor_List'; + } elsif ($context eq 'domain') { + $helpitem = 'Domain_View_Users_List'; + } if ($env{'form.phase'} eq 'bulkchange') { push(@{$brcrum}, {href => '/adm/createuser?action=listusers', text => "List Users"}, {href => "/adm/createuser", text => "Result", - help => 'Course_View_Class_List'}); + help => $helpitem}); $bread_crumbs_component = 'Update Users'; $args = {bread_crumbs => $brcrum, bread_crumbs_component => $bread_crumbs_component}; @@ -4874,7 +5198,7 @@ sub handler { push(@{$brcrum}, {href => '/adm/createuser?action=listusers', text => "List Users", - help => 'Course_View_Class_List'}); + help => $helpitem}); $bread_crumbs_component = 'List Users'; $args = {bread_crumbs => $brcrum, bread_crumbs_component => $bread_crumbs_component}; @@ -4955,9 +5279,6 @@ sub handler { } } elsif ($env{'form.action'} eq 'selfenroll') { if ($permission->{selfenrolladmin}) { - my $cid = $env{'request.course.id'}; - my $cdom = $env{'course.'.$cid.'.domain'}; - my $cnum = $env{'course.'.$cid.'.num'}; my %currsettings = ( selfenroll_types => $env{'course.'.$cid.'.internal.selfenroll_types'}, selfenroll_registered => $env{'course.'.$cid.'.internal.selfenroll_registered'}, @@ -5003,21 +5324,18 @@ sub handler { push(@{$brcrum}, {href => '/adm/createuser?action=selfenrollqueue', text => 'Enrollment requests', - help => 'Course_Self_Enrollment'}); + help => 'Course_Approve_Selfenroll'}); $bread_crumbs_component = 'Enrollment requests'; if ($env{'form.state'} eq 'done') { push(@{$brcrum}, {href => '/adm/createuser?action=selfenrollqueue', text => 'Result', - help => 'Course_Self_Enrollment'}); + help => 'Course_Approve_Selfenroll'}); $bread_crumbs_component = 'Enrollment result'; } $args = { bread_crumbs => $brcrum, bread_crumbs_component => $bread_crumbs_component}; $r->print(&header(undef,$args)); - my $cid = $env{'request.course.id'}; - my $cdom = $env{'course.'.$cid.'.domain'}; - my $cnum = $env{'course.'.$cid.'.num'}; my $coursedesc = $env{'course.'.$cid.'.description'}; if (!exists($env{'form.state'})) { $r->print('

'.&mt('Pending enrollment requests').'

'."\n"); @@ -5718,12 +6036,13 @@ function validate_types(form) { } function check_types(num,countfail,needaction) { - var typeidx = getIndexByName('selfenroll_types_'+num); + var boxname = 'selfenroll_types_'+num; + var typeidx = getIndexByName(boxname); var count = 0; if (typeidx != -1) { - if (document.$formname.elements[typeidx].length) { - for (var k=0; k'.$add_domtitle.'
' .&Apache::loncommon::select_dom_form('','selfenroll_newdom', - $includeempty,$showdomdesc,'','','',$readonly) + $includeempty,$showdomdesc,'',$trusted,$untrusted,$readonly) .'' .'		 '.&mt('When').'