--- loncom/interface/loncreateuser.pm 2013/12/24 19:15:10 1.384 +++ loncom/interface/loncreateuser.pm 2017/08/11 00:24:53 1.446 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.384 2013/12/24 19:15:10 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.446 2017/08/11 00:24:53 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -126,9 +126,7 @@ sub user_quotas { my ($ccuname,$ccdomain) = @_; my %lt = &Apache::lonlocal::texthash( 'usrt' => "User Tools", - 'cuqu' => "Current quota", 'cust' => "Custom quota", - 'defa' => "Default", 'chqu' => "Change quota", ); @@ -162,13 +160,14 @@ END_SCRIPT '<h3>'.$lt{'usrt'}.'</h3>'."\n". &Apache::loncommon::start_data_table(); - if (&Apache::lonnet::allowed('mut',$ccdomain)) { + if ((&Apache::lonnet::allowed('mut',$ccdomain)) || + (&Apache::lonnet::allowed('udp',$ccdomain))) { $output .= &build_tools_display($ccuname,$ccdomain,'tools'); } my %titles = &Apache::lonlocal::texthash ( portfolio => "Disk space allocated to user's portfolio files", - author => "Disk space allocated to user's authoring space (if role assigned)", + author => "Disk space allocated to user's Authoring Space (if role assigned)", ); foreach my $name ('portfolio','author') { my ($currquota,$quotatype,$inststatus,$defquota) = @@ -211,8 +210,8 @@ END_SCRIPT ' <td>'.$titles{$name}.'</td>'."\n". ' </tr>'."\n". &Apache::loncommon::start_data_table_row()."\n". - ' <td>'.$lt{'cuqu'}.': '. - $currquota.' MB. '. + ' <td><span class="LC_nobreak">'. + &mt('Current quota: [_1] MB',$currquota).'</span> '. $defaultinfo.'</td>'."\n". &Apache::loncommon::end_data_table_row()."\n". &Apache::loncommon::start_data_table_row()."\n". @@ -220,13 +219,14 @@ END_SCRIPT ': <label>'. '<input type="radio" name="custom_'.$name.'quota" id="custom_'.$name.'quota_off" '. 'value="0" '.$custom_off.' onchange="javascript:quota_changes('."'custom','$name'".');"'. - ' />'.$lt{'defa'}.' ('.$defquota.' MB).</label> '. + ' /><span class="LC_nobreak">'. + &mt('Default ([_1] MB)',$defquota).'</span></label> '. ' <label><input type="radio" name="custom_'.$name.'quota" id="custom_'.$name.'quota_on" '. 'value="1" '.$custom_on.' onchange="javascript:quota_changes('."'custom','$name'".');"'. ' />'.$lt{'cust'}.':</label> '. '<input type="text" name="'.$name.'quota" id="'.$name.'quota" size ="5" '. 'value="'.$showquota.'" onfocus="javascript:quota_changes('."'quota','$name'".');"'. - ' /> MB</span></td>'."\n". + ' /> '.&mt('MB').'</span></td>'."\n". &Apache::loncommon::end_data_table_row()."\n"; } } @@ -241,7 +241,7 @@ sub build_tools_display { my %lt = &Apache::lonlocal::texthash ( 'blog' => "Personal User Blog", 'aboutme' => "Personal Information Page", - 'webdav' => "WebDAV access to authoring spaces (if SSL and author/co-author)", + 'webdav' => "WebDAV access to Authoring Spaces (if SSL and author/co-author)", 'portfolio' => "Personal User Portfolio", 'avai' => "Available", 'cusa' => "availability", @@ -252,13 +252,15 @@ sub build_tools_display { 'unofficial' => 'Can request creation of unofficial courses', 'community' => 'Can request creation of communities', 'textbook' => 'Can request creation of textbook courses', + 'placement' => 'Can request creation of placement tests', 'requestauthor' => 'Can request author space', ); if ($context eq 'requestcourses') { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, 'requestcourses.official','requestcourses.unofficial', - 'requestcourses.community','requestcourses.textbook'); - @usertools = ('official','unofficial','community','textbook'); + 'requestcourses.community','requestcourses.textbook', + 'requestcourses.placement'); + @usertools = ('official','unofficial','community','textbook','placement'); @options =('norequest','approval','autolimit','validate'); %validations = &Apache::lonnet::auto_courserequest_checks($ccdomain); %reqtitles = &courserequest_titles(); @@ -266,7 +268,7 @@ sub build_tools_display { $colspan = ' colspan="2"'; %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$ccdomain); - $isadv = &Apache::lonnet::is_advanced_user($ccuname,$ccdomain); + $isadv = &Apache::lonnet::is_advanced_user($ccdomain,$ccuname); } elsif ($context eq 'requestauthor') { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, 'requestauthor'); @@ -333,6 +335,7 @@ sub build_tools_display { ' <td'.$colspan.'>'.$lt{$item}.'</td>'."\n". ' </tr>'."\n". &Apache::loncommon::start_data_table_row()."\n"; + if (($context eq 'requestcourses') || ($context eq 'requestauthor')) { my ($curroption,$currlimit); my $envkey = $context.'.'.$item; @@ -427,7 +430,9 @@ sub build_tools_display { } $output .= ' <td'.$colspan.'>'.$custom_access.(' 'x4). $lt{'avai'}.': '.$currdisp.'</td>'."\n". - &Apache::loncommon::end_data_table_row()."\n". + &Apache::loncommon::end_data_table_row()."\n"; + unless (&Apache::lonnet::allowed('udp',$ccdomain)) { + $output .= &Apache::loncommon::start_data_table_row()."\n". ' <td style="vertical-align:top;"><span class="LC_nobreak">'. $lt{'chse'}.': <label>'. @@ -436,6 +441,7 @@ sub build_tools_display { '<label><input type="radio" name="custom'.$item.'" value="1" '. $cust_on.'/>'.$lt{'uscu'}.'</label>'.$custradio.'</td>'. &Apache::loncommon::end_data_table_row()."\n"; + } } return $output; } @@ -448,12 +454,14 @@ sub coursereq_externaluser { 'unofficial' => 'Can request creation of unofficial courses', 'community' => 'Can request creation of communities', 'textbook' => 'Can request creation of textbook courses', + 'placement' => 'Can request creation of placement tests', ); %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, 'reqcrsotherdom.official','reqcrsotherdom.unofficial', - 'reqcrsotherdom.community','reqcrsotherdom.textbook'); - @usertools = ('official','unofficial','community','textbook'); + 'reqcrsotherdom.community','reqcrsotherdom.textbook', + 'reqcrsotherdom.placement'); + @usertools = ('official','unofficial','community','textbook','placement'); @options = ('approval','validate','autolimit'); %validations = &Apache::lonnet::auto_courserequest_checks($cdom); my $optregex = join('|',@options); @@ -534,6 +542,7 @@ sub courserequest_titles { unofficial => 'Unofficial', community => 'Communities', textbook => 'Textbook', + placement => 'Placement Tests', norequest => 'Not allowed', approval => 'Approval by Dom. Coord.', validate => 'With validation', @@ -638,7 +647,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'})) { @@ -664,11 +674,27 @@ 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); + my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$defdom); if ($env{'form.action'} eq 'custom') { push(@{$brcrum}, {href=>"javascript:backPage(document.crtuser)", @@ -696,6 +722,8 @@ sub print_username_entry_form { 'srst' => 'Search for a user and enroll as a student', 'srme' => 'Search for a user and enroll as a member', 'srad' => 'Search for a user and modify/add user information or roles', + 'srvu' => 'Search for a user and view user information and roles', + 'srva' => 'Search for a user and view access log information', 'usr' => "Username", 'dom' => "Domain", 'ecrp' => "Define or Edit Custom Role", @@ -742,18 +770,29 @@ sub print_username_entry_form { } } else { my $actiontext = $lt{'srad'}; + my $fixeddom; if ($env{'form.action'} eq 'singlestudent') { if ($crstype eq 'Community') { $actiontext = $lt{'srme'}; } else { $actiontext = $lt{'srst'}; } + } elsif ($env{'form.action'} eq 'accesslogs') { + $actiontext = $lt{'srva'}; + $fixeddom = 1; + } elsif (($env{'form.action'} eq 'singleuser') && + ($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$defdom))) { + $actiontext = $lt{'srvu'}; + $fixeddom = 1; } $r->print("<h3>$actiontext</h3>"); if ($env{'form.origform'} ne 'crtusername') { - $r->print("\n".$response); + if ($response) { + $r->print("\n<div>$response</div>". + '<br clear="all" />'); + } } - $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype)); + $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,$fixeddom)); } } @@ -796,7 +835,7 @@ END } sub entry_form { - my ($dom,$srch,$forcenewuser,$context,$responsemsg,$crstype) = @_; + my ($dom,$srch,$forcenewuser,$context,$responsemsg,$crstype,$fixeddom) = @_; my ($usertype,$inexact); if (ref($srch) eq 'HASH') { if (($srch->{'srchin'} eq 'dom') && @@ -812,18 +851,27 @@ sub entry_form { $inexact = 1; } } - my $cancreate = - &Apache::lonuserutils::can_create_user($dom,$context,$usertype); - my $userpicker = + 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); + 'document.crtuser',$cancreate,$usertype,$context,$fixeddom,$noinstd); my $srchbutton = &mt('Search'); if ($env{'form.action'} eq 'singlestudent') { $srchbutton = &mt('Search and Enroll'); + } elsif ($env{'form.action'} eq 'accesslogs') { + $srchbutton = &mt('Search'); } elsif ($cancreate && $responsemsg ne '' && $inexact) { $srchbutton = &mt('Search or Add New User'); } - my $output = <<"ENDBLOCK"; + my $output; + if ($cansearch) { + $output = <<"ENDBLOCK"; <form action="/adm/createuser" method="post" name="crtuser"> <input type="hidden" name="action" value="$env{'form.action'}" /> <input type="hidden" name="phase" value="get_user_info" /> @@ -831,9 +879,22 @@ $userpicker <input name="userrole" type="button" value="$srchbutton" onclick="javascript:validateEntry(document.crtuser)" /> </form> ENDBLOCK - if ($env{'form.phase'} eq '') { + } else { + $output = '<p>'.$userpicker.'</p>'; + } + if (($env{'form.phase'} eq '') && ($env{'form.action'} ne 'accesslogs') && + (!(($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', @@ -947,9 +1008,13 @@ ENDSCRIPT 'usrch' => "User Search to add/modify roles", 'stusrch' => "User Search to enroll student", 'memsrch' => "User Search to enroll member", + 'srcva' => "Search for a user and view access log information", + 'usrvu' => "User Search to view user roles", 'usel' => "Select a user to add/modify roles", + 'suvr' => "Select a user to view roles", 'stusel' => "Select a user to enroll as a student", 'memsel' => "Select a user to enroll as a member", + 'vacsel' => "Select a user to view access log", 'username' => "username", 'domain' => "domain", 'lastname' => "last name", @@ -959,12 +1024,16 @@ ENDSCRIPT if ($context eq 'requestcrs') { $r->print('<div>'); } else { - my %breadcrumb_text = &singleuser_breadcrumb($crstype); + my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$srch->{'srchdomain'}); my $helpitem; if ($env{'form.action'} eq 'singleuser') { $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,'','')", @@ -979,9 +1048,19 @@ ENDSCRIPT ); $r->print(&Apache::loncommon::start_page('User Management',$jscript,{bread_crumbs => $brcrum})); if ($env{'form.action'} eq 'singleuser') { - $r->print("<b>$lt{'usrch'}</b><br />"); + my $readonly; + if (($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$srch->{'srchdomain'}))) { + $readonly = 1; + $r->print("<b>$lt{'usrvu'}</b><br />"); + } else { + $r->print("<b>$lt{'usrch'}</b><br />"); + } $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,$crstype)); - $r->print('<h3>'.$lt{'usel'}.'</h3>'); + if ($readonly) { + $r->print('<h3>'.$lt{'suvr'}.'</h3>'); + } else { + $r->print('<h3>'.$lt{'usel'}.'</h3>'); + } } elsif ($env{'form.action'} eq 'singlestudent') { $r->print($jscript."<b>"); if ($crstype eq 'Community') { @@ -998,6 +1077,10 @@ ENDSCRIPT $r->print($lt{'stusel'}); } $r->print('</h3>'); + } elsif ($env{'form.action'} eq 'accesslogs') { + $r->print("<b>$lt{'srcva'}</b><br />"); + $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,undef,1)); + $r->print('<h3>'.$lt{'vacsel'}.'</h3>'); } } $r->print('<form name="usersrchform" method="post" action="">'. @@ -1077,7 +1160,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); @@ -1116,12 +1200,18 @@ sub print_user_modification_page { } $response .= '<p class="LC_warning">' .&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.") - .' ' - .&mt('Please contact the [_1]helpdesk[_2] for assistance.' - ,'<a href="'.$helplink.'">','</a>') - .'</p><br />'; + .' '; + if ($context eq 'domain') { + $response .= &mt('Please contact a [_1] for assistance.', + &Apache::lonnet::plaintext('dc')); + } else { + $response .= &mt('Please contact the [_1]helpdesk[_2] for assistance.' + ,'<a href="'.$helplink.'">','</a>'); + } + $response .= '</p><br />'; $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; @@ -1145,7 +1235,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; } } @@ -1166,10 +1257,14 @@ sub print_user_modification_page { my $js = &validation_javascript($context,$ccdomain,$pjump_def,$crstype, $groupslist,$newuser,$formname,\%loaditem); - my %breadcrumb_text = &singleuser_breadcrumb($crstype); + my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$ccdomain); 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)", @@ -1230,6 +1325,7 @@ ENDFORMINFO } } } + my $title = ''; if ($newuser) { my ($portfolioform,$domroleform); if ((&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) || @@ -1243,10 +1339,6 @@ ENDFORMINFO } &initialize_authen_forms($ccdomain,$formname); my %lt=&Apache::lonlocal::texthash( - 'cnu' => 'Create New User', - 'ast' => 'as a student', - 'ame' => 'as a member', - 'ind' => 'in domain', 'lg' => 'Login Data', 'hs' => "Home Server", ); @@ -1260,20 +1352,24 @@ $loginscript // ]]> </script> <input type='hidden' name='makeuser' value='1' /> -<h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain ENDTITLE if ($env{'form.action'} eq 'singlestudent') { if ($crstype eq 'Community') { - $r->print(' ('.$lt{'ame'}.')'); + $title = &mt('Create New User [_1] in domain [_2] as a member', + '"'.$ccuname.'"','"'.$ccdomain.'"'); } else { - $r->print(' ('.$lt{'ast'}.')'); + $title = &mt('Create New User [_1] in domain [_2] as a student', + '"'.$ccuname.'"','"'.$ccdomain.'"'); } + } else { + $title = &mt('Create New User [_1] in domain [_2]', + '"'.$ccuname.'"','"'.$ccdomain.'"'); } - $r->print('</h2>'."\n".'<div class="LC_left_float">'); - my $personal_table = - &personal_data_display($ccuname,$ccdomain,$newuser,$context, - $inst_results{$ccuname.':'.$ccdomain}); - $r->print($personal_table); + $r->print('<h2>'.$title.'</h2>'."\n"); + $r->print('<div class="LC_left_float">'); + $r->print(&personal_data_display($ccuname,$ccdomain,$newuser,$context, + $inst_results{$ccuname.':'.$ccdomain})); + # Option to disable student/employee ID conflict checking not offerred for new users. my ($home_server_pick,$numlib) = &Apache::loncommon::home_server_form_item($ccdomain,'hserver', 'default','hide'); @@ -1359,43 +1455,39 @@ ENDAUTH } $r->print('</div><div class="LC_clear_float_footer"></div>'); } else { # user already exists - my %lt=&Apache::lonlocal::texthash( - 'cup' => "Modify existing user: ", - 'ens' => "Enroll one student: ", - 'enm' => "Enroll one member: ", - 'id' => "in domain", - ); - $r->print(<<ENDCHANGEUSER); -$start_page -$forminfo -<h2> -ENDCHANGEUSER + $r->print($start_page.$forminfo); if ($env{'form.action'} eq 'singlestudent') { if ($crstype eq 'Community') { - $r->print($lt{'enm'}); + $title = &mt('Enroll one member: [_1] in domain [_2]', + '"'.$ccuname.'"','"'.$ccdomain.'"'); } else { - $r->print($lt{'ens'}); + $title = &mt('Enroll one student: [_1] in domain [_2]', + '"'.$ccuname.'"','"'.$ccdomain.'"'); } } else { - $r->print($lt{'cup'}); - } - $r->print(' "'.$ccuname.'" '.$lt{'id'}.' "'.$ccdomain.'"</h2>'. - "\n".'<div class="LC_left_float">'); - my ($personal_table,$showforceid) = - &personal_data_display($ccuname,$ccdomain,$newuser,$context, - $inst_results{$ccuname.':'.$ccdomain}); - $r->print($personal_table); - if ($showforceid) { - $r->print('<table>'.&Apache::lonuserutils::forceid_change($context).'</table>'); + if ($permission->{'cusr'}) { + $title = &mt('Modify existing user: [_1] in domain [_2]', + '"'.$ccuname.'"','"'.$ccdomain.'"'); + } else { + $title = &mt('Existing user: [_1] in domain [_2]', + '"'.$ccuname.'"','"'.$ccdomain.'"'); + } } - if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { + $r->print('<h2>'.$title.'</h2>'."\n"); + $r->print('<div class="LC_left_float">'); + $r->print(&personal_data_display($ccuname,$ccdomain,$newuser,$context, + $inst_results{$ccuname.':'.$ccdomain})); + if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) || + (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) { $r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'. &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'})); + if (&Apache::lonnet::will_trust('reqcrs',$ccdomain,$env{'request.role.domain'})) { + $r->print(&coursereq_externaluser($ccuname,$ccdomain, + $env{'request.role.domain'})); + } } $r->print(&Apache::loncommon::end_data_table()); } @@ -1403,23 +1495,25 @@ ENDCHANGEUSER my @order = ('auth','quota','tools','requestauthor'); my %user_text; my ($isadv,$isauthor) = - &Apache::lonnet::is_advanced_user($ccuname,$ccdomain); + &Apache::lonnet::is_advanced_user($ccdomain,$ccuname); if ((!$isauthor) && - (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) - && ($env{'request.role.domain'} eq $ccdomain)) { + ((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) || + (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) && + ($env{'request.role.domain'} eq $ccdomain)) { $user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain); } $user_text{'auth'} = &user_authentication($ccuname,$ccdomain,$formname); if ((&Apache::lonnet::allowed('mpq',$ccdomain)) || - (&Apache::lonnet::allowed('mut',$ccdomain))) { + (&Apache::lonnet::allowed('mut',$ccdomain)) || + (&Apache::lonnet::allowed('udp',$ccdomain))) { # Current user has quota modification privileges $user_text{'quota'} = &user_quotas($ccuname,$ccdomain); } if (!&Apache::lonnet::allowed('mpq',$ccdomain)) { if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) { my %lt=&Apache::lonlocal::texthash( - 'dska' => "Disk quotas for user's portfolio and authoring space", - 'youd' => "You do not have privileges to modify the portfolio and/or authoring space quotas for this user.", + 'dska' => "Disk quotas for user's portfolio and Authoring Space", + 'youd' => "You do not have privileges to modify the portfolio and/or Authoring Space quotas for this user.", 'ichr' => "If a change is required, contact a domain coordinator for the domain", ); $user_text{'quota'} = <<ENDNOPORTPRIV; @@ -1469,9 +1563,18 @@ ENDNOTOOLSPRIV if ($gotdiv) { $r->print('</div><div class="LC_clear_float_footer"></div>'); } + my $statuses; + if (($context eq 'domain') && (&Apache::lonnet::allowed('udp',$ccdomain)) && + (!&Apache::lonnet::allowed('mau',$ccdomain))) { + $statuses = ['active']; + } elsif (($context eq 'course') && ((&Apache::lonnet::allowed('vcl',$env{'request.course.id'})) || + ($env{'request.course.sec'} && + &Apache::lonnet::allowed('vcl',$env{'request.course.id'}.'/'.$env{'request.course.sec'})))) { + $statuses = ['active']; + } if ($env{'form.action'} ne 'singlestudent') { &display_existing_roles($r,$ccuname,$ccdomain,\%inccourses,$context, - $roledom,$crstype); + $roledom,$crstype,$showcredits,$statuses); } } ## End of new user/old user logic if ($env{'form.action'} eq 'singlestudent') { @@ -1482,8 +1585,9 @@ ENDNOTOOLSPRIV $btntxt = &mt('Enroll Student'); } $r->print('<br /><input type="button" value="'.$btntxt.'" onclick="setSections(this.form)" />'."\n"); - } else { - $r->print('<fieldset><legend>'.&mt('Add Roles').'</legend>'); + } elsif ($permission->{'cusr'}) { + $r->print('<div class="LC_left_float">'. + '<fieldset><legend>'.&mt('Add Roles').'</legend>'); my $addrolesdisplay = 0; if ($context eq 'domain' || $context eq 'author') { $addrolesdisplay = &new_coauthor_roles($r,$ccuname,$ccdomain); @@ -1494,32 +1598,37 @@ ENDNOTOOLSPRIV $addrolesdisplay = $add_domainroles; } $r->print(&course_level_dc($env{'request.role.domain'},$showcredits)); - $r->print('</fieldset><br /><input type="button" value="'.&mt('Save').'" onclick="setCourse()" />'."\n"); + $r->print('</fieldset></div><div class="LC_clear_float_footer"></div>'. + '<br /><input type="button" value="'.&mt('Save').'" onclick="setCourse()" />'."\n"); } elsif ($context eq 'author') { if ($addrolesdisplay) { - $r->print('</fieldset><br /><input type="button" value="'.&mt('Save').'"'); + $r->print('</fieldset></div><div class="LC_clear_float_footer"></div>'. + '<br /><input type="button" value="'.&mt('Save').'"'); if ($newuser) { $r->print(' onclick="auth_check()" \>'."\n"); } else { $r->print('onclick="this.form.submit()" \>'."\n"); } } else { - $r->print('</fieldset><br /><a href="javascript:backPage(document.cu)">'. + $r->print('</fieldset></div>'. + '<div class="LC_clear_float_footer"></div>'. + '<br /><a href="javascript:backPage(document.cu)">'. &mt('Back to previous page').'</a>'); } } else { $r->print(&course_level_table(\%inccourses,$showcredits,$defaultcredits)); - $r->print('</fieldset><br /><input type="button" value="'.&mt('Save').'" onclick="setSections(this.form)" />'."\n"); + $r->print('</fieldset></div><div class="LC_clear_float_footer"></div>'. + '<br /><input type="button" value="'.&mt('Save').'" onclick="setSections(this.form)" />'."\n"); } } $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain'])); $r->print('<input type="hidden" name="currstate" value="" />'); - $r->print('<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" /></form>'); + $r->print('<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" /></form><br /><br />'); return; } sub singleuser_breadcrumb { - my ($crstype) = @_; + my ($crstype,$context,$domain) = @_; my %breadcrumb_text; if ($env{'form.action'} eq 'singlestudent') { if ($crstype eq 'Community') { @@ -1527,12 +1636,21 @@ sub singleuser_breadcrumb { } else { $breadcrumb_text{'search'} = 'Enroll a student'; } - $breadcrumb_text{'userpicked'} = 'Select a user', - $breadcrumb_text{'modify'} = 'Set section/dates', + $breadcrumb_text{'userpicked'} = 'Select a user'; + $breadcrumb_text{'modify'} = 'Set section/dates'; + } elsif ($env{'form.action'} eq 'accesslogs') { + $breadcrumb_text{'search'} = 'View access logs for a user'; + $breadcrumb_text{'userpicked'} = 'Select a user'; + $breadcrumb_text{'activity'} = 'Activity'; + } elsif (($env{'form.action'} eq 'singleuser') && ($context eq 'domain') && + (!&Apache::lonnet::allowed('mau',$domain))) { + $breadcrumb_text{'search'} = "View user's roles"; + $breadcrumb_text{'userpicked'} = 'Select a user'; + $breadcrumb_text{'modify'} = 'User roles'; } else { $breadcrumb_text{'search'} = 'Create/modify a user'; - $breadcrumb_text{'userpicked'} = 'Select a user', - $breadcrumb_text{'modify'} = 'Set user role', + $breadcrumb_text{'userpicked'} = 'Select a user'; + $breadcrumb_text{'modify'} = 'Set user role'; } return %breadcrumb_text; } @@ -1602,8 +1720,22 @@ sub validation_javascript { sub display_existing_roles { my ($r,$ccuname,$ccdomain,$inccourses,$context,$roledom,$crstype, - $showcredits) = @_; + $showcredits,$statuses) = @_; my $now=time; + my $showall = 1; + my ($showexpired,$showactive); + if ((ref($statuses) eq 'ARRAY') && (@{$statuses} > 0)) { + $showall = 0; + if (grep(/^expired$/,@{$statuses})) { + $showexpired = 1; + } + if (grep(/^active$/,@{$statuses})) { + $showactive = 1; + } + if ($showexpired && $showactive) { + $showall = 1; + } + } my %lt=&Apache::lonlocal::texthash( 'rer' => "Existing Roles", 'rev' => "Revoke", @@ -1667,6 +1799,13 @@ sub display_existing_roles { $area =~ s/\_\w\w$//; my ($role_code,$role_end_time,$role_start_time) = split(/_/,$role); + my $active=1; + $active=0 if (($role_end_time) && ($now>$role_end_time)); + if ($active) { + next unless($showall || $showactive); + } else { + next unless($showall || $showexpired); + } # Is this a custom role? Get role owner and title. my ($croleudom,$croleuname,$croletitle)= ($role_code=~m{^cr/($match_domain)/($match_username)/(\w+)$}); @@ -1675,11 +1814,13 @@ sub display_existing_roles { my $sortkey=$role_code; my $class='Unknown'; my $credits=''; - if ($area =~ m{^/($match_domain)/($match_courseid)} ) { + my $csec; + if ($area =~ m{^/($match_domain)/($match_courseid)}) { $class='Course'; my ($coursedom,$coursedir) = ($1,$2); my $cid = $1.'_'.$2; # $1.'_'.$2 is the course id (eg. 103_12345abcef103l3). + next if ($envkey =~ m{^/$match_domain/$match_courseid/[A-Za-z0-9]+_gr$}); my %coursedata= &Apache::lonnet::coursedescription($cid); if ($coursedir =~ /^$match_community$/) { @@ -1737,12 +1878,13 @@ sub display_existing_roles { $thisrole.='.'.$role_code; } } - if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) { - $carea.='<br />'.&mt('Section: [_1]',$3); - $sortkey.="\0$3"; + if ($area=~m{^/($match_domain/$match_courseid/(\w+))}) { + $csec = $2; + $carea.='<br />'.&mt('Section: [_1]',$csec); + $sortkey.="\0$csec"; if (!$allowed) { - if ($env{'request.course.sec'} eq $3) { - if (&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2.'/'.$3)) { + if ($env{'request.course.sec'} eq $csec) { + if (&Apache::lonnet::allowed('c'.$role_code,$1)) { $allowed = 1; } } @@ -1784,29 +1926,30 @@ sub display_existing_roles { } } my $row = ''; - $row.= '<td>'; - my $active=1; - $active=0 if (($role_end_time) && ($now>$role_end_time)); - if (($active) && ($allowed)) { - $row.= '<input type="checkbox" name="rev:'.$thisrole.'" />'; - } else { - if ($active) { - $row.=' '; + if ($showall) { + $row.= '<td>'; + if (($active) && ($allowed)) { + $row.= '<input type="checkbox" name="rev:'.$thisrole.'" />'; } else { - $row.=&mt('expired or revoked'); + if ($active) { + $row.=' '; + } else { + $row.=&mt('expired or revoked'); + } } - } - $row.='</td><td>'; - if ($allowed && !$active) { - $row.= '<input type="checkbox" name="ren:'.$thisrole.'" />'; - } else { - $row.=' '; - } - $row.='</td><td>'; - if ($delallowed) { - $row.= '<input type="checkbox" name="del:'.$thisrole.'" />'; - } else { - $row.=' '; + $row.='</td><td>'; + if ($allowed && !$active) { + $row.= '<input type="checkbox" name="ren:'.$thisrole.'" />'; + } else { + $row.=' '; + } + $row.='</td><td>'; + if ($delallowed) { + $row.= '<input type="checkbox" name="del:'.$thisrole.'" />'; + } else { + $row.=' '; + } + $row.= '</td>'; } my $plaintext=''; if (!$croletitle) { @@ -1819,22 +1962,36 @@ sub display_existing_roles { } } else { $plaintext= - &mt('Customrole [_1][_2]defined by [_3]', + &mt('Custom role [_1][_2]defined by [_3]', '"'.$croletitle.'"', '<br />', $croleuname.':'.$croleudom); } - $row.= '</td><td>'.$plaintext. - '</td><td>'.$area. - '</td><td>'.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time) - : ' ' ). - '</td><td>'.($role_end_time ?&Apache::lonlocal::locallocaltime($role_end_time) - : ' ' ) - ."</td>"; + $row.= '<td>'.$plaintext.'</td>'. + '<td>'.$area.'</td>'. + '<td>'.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time) + : ' ' ).'</td>'. + '<td>'.($role_end_time ?&Apache::lonlocal::locallocaltime($role_end_time) + : ' ' ).'</td>'; $sortrole{$sortkey}=$envkey; $roletext{$envkey}=$row; $roleclass{$envkey}=$class; - $rolepriv{$envkey}=$allowed; + if ($allowed) { + $rolepriv{$envkey}='edit'; + } else { + if ($context eq 'domain') { + if ((&Apache::lonnet::allowed('vur',$ccdomain)) && + ($envkey=~m{^/$ccdomain/})) { + $rolepriv{$envkey}='view'; + } + } elsif ($context eq 'course') { + if ((&Apache::lonnet::allowed('vcl',$env{'request.course.id'})) || + ($env{'request.course.sec'} && ($env{'request.course.sec'} eq $csec) && + &Apache::lonnet::allowed('vcl',$env{'request.course.id'}.'/'.$env{'request.course.sec'}))) { + $rolepriv{$envkey}='view'; + } + } + } } # end of foreach (table building loop) my $rolesdisplay = 0; @@ -1867,15 +2024,28 @@ sub display_existing_roles { } elsif ($env{'request.role'} =~ /^au\./) { $contextrole = &mt('Existing Co-Author Roles in your Authoring Space'); } else { - $contextrole = &mt('Existing Roles in this Domain'); + if ($showall) { + $contextrole = &mt('Existing Roles in this Domain'); + } elsif ($showactive) { + $contextrole = &mt('Unexpired Roles in this Domain'); + } elsif ($showexpired) { + $contextrole = &mt('Expired or Revoked Roles in this Domain'); + } } - $r->print('<div>'. + $r->print('<div class="LC_left_float">'. '<fieldset><legend>'.$contextrole.'</legend>'. &Apache::loncommon::start_data_table("LC_createuser"). -&Apache::loncommon::start_data_table_header_row(). -'<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}. -'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}. -'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'. +&Apache::loncommon::start_data_table_header_row()); + if ($showall) { + $r->print( +'<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}.'</th>' + ); + } elsif ($showexpired) { + $r->print('<th>'.$lt{'rev'}.'</th>'); + } + $r->print( +'<th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.'</th>'. +'<th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'. &Apache::loncommon::end_data_table_header_row()); foreach my $type ('Authoring Space','Course','Community','Domain','System','Unknown') { if ($output{$type}) { @@ -1975,11 +2145,20 @@ sub new_domain_roles { '<th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'. &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", @@ -2013,16 +2192,16 @@ sub user_authentication { my ($ccuname,$ccdomain,$formname) = @_; my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain); my $outcome; + my %lt=&Apache::lonlocal::texthash( + 'err' => "ERROR", + 'uuas' => "This user has an unrecognized authentication scheme", + 'adcs' => "Please alert a domain coordinator of this situation", + 'sldb' => "Please specify login data below", + 'ld' => "Login Data" + ); # Check for a bad authentication type if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth):/) { # bad authentication scheme - my %lt=&Apache::lonlocal::texthash( - 'err' => "ERROR", - 'uuas' => "This user has an unrecognized authentication scheme", - 'adcs' => "Please alert a domain coordinator of this situation", - 'sldb' => "Please specify login data below", - 'ld' => "Login Data" - ); if (&Apache::lonnet::allowed('mau',$ccdomain)) { &initialize_authen_forms($ccdomain,$formname); @@ -2048,16 +2227,12 @@ $lt{'uuas'} ($currentauth). $lt{'adcs'}. ENDBADAUTH } } else { # Authentication type is valid + &initialize_authen_forms($ccdomain,$formname,$currentauth,'modifyuser'); my ($authformcurrent,$can_modify,@authform_others) = &modify_login_block($ccdomain,$currentauth); if (&Apache::lonnet::allowed('mau',$ccdomain)) { # Current user has login modification privileges - my %lt=&Apache::lonlocal::texthash ( - 'ld' => "Login Data", - 'ccld' => "Change Current Login Data", - 'enld' => "Enter New Login Data" - ); $outcome = '<script type="text/javascript" language="Javascript">'."\n". '// <![CDATA['."\n". @@ -2068,7 +2243,7 @@ ENDBADAUTH &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_row(). '<td>'.$authformnop; - if ($can_modify) { + if (($can_modify) && (&Apache::lonnet::allowed('mau',$ccdomain))) { $outcome .= '</td>'."\n". &Apache::loncommon::end_data_table_row(). &Apache::loncommon::start_data_table_row(). @@ -2078,14 +2253,40 @@ ENDBADAUTH $outcome .= ' ('.$authformcurrent.')</td>'. &Apache::loncommon::end_data_table_row()."\n"; } - foreach my $item (@authform_others) { - $outcome .= &Apache::loncommon::start_data_table_row(). - '<td>'.$item.'</td>'. - &Apache::loncommon::end_data_table_row()."\n"; + if (&Apache::lonnet::allowed('mau',$ccdomain)) { + foreach my $item (@authform_others) { + $outcome .= &Apache::loncommon::start_data_table_row(). + '<td>'.$item.'</td>'. + &Apache::loncommon::end_data_table_row()."\n"; + } } $outcome .= &Apache::loncommon::end_data_table(); } else { - if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) { + if (&Apache::lonnet::allowed('udp',$ccdomain)) { + # Current user has rights to view domain preferences for user's domain + my $result; + if ($currentauth =~ /^krb(4|5):([^:]*)$/) { + my ($krbver,$krbrealm) = ($1,$2); + if ($krbrealm eq '') { + $result = &mt('Currently Kerberos authenticated, Version [_1].',$krbver); + } else { + $result = &mt('Currently Kerberos authenticated with domain [_1] Version [_2].', + $krbrealm,$krbver); + } + } elsif ($currentauth =~ /^internal:/) { + $result = &mt('Currently internally authenticated.'); + } elsif ($currentauth =~ /^localauth:/) { + $result = &mt('Currently using local (institutional) authentication.'); + } elsif ($currentauth =~ /^unix:/) { + $result = &mt('Currently Filesystem Authenticated.'); + } + $outcome = '<h3>'.$lt{'ld'}.'</h3>'. + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_row(). + '<td>'.$result.'</td>'. + &Apache::loncommon::end_data_table_row()."\n". + &Apache::loncommon::end_data_table(); + } elsif (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) { my %lt=&Apache::lonlocal::texthash( 'ccld' => "Change Current Login Data", 'yodo' => "You do not have privileges to modify the authentication configuration for this user.", @@ -2169,13 +2370,38 @@ sub modify_login_block { } sub personal_data_display { - my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray) = @_; - my ($output,$showforceid,%userenv,%canmodify,%canmodify_status); + my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray, + $now,$captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded) = @_; + my ($output,%userenv,%canmodify,%canmodify_status); my @userinfo = ('firstname','middlename','lastname','generation', 'permanentemail','id'); my $rowcount = 0; my $editable = 0; - %canmodify_status = + my %textboxsize = ( + firstname => '15', + middlename => '15', + lastname => '15', + generation => '5', + permanentemail => '25', + id => '15', + ); + + my %lt=&Apache::lonlocal::texthash( + 'pd' => "Personal Data", + 'firstname' => "First Name", + 'middlename' => "Middle Name", + 'lastname' => "Last Name", + 'generation' => "Generation", + 'permanentemail' => "Permanent e-mail address", + 'id' => "Student/Employee ID", + 'lg' => "Login Data", + 'inststatus' => "Affiliation", + 'email' => 'E-mail address', + 'valid' => 'Validation', + 'username' => 'Username', + ); + + %canmodify_status = &Apache::lonuserutils::can_modify_userinfo($context,$ccdomain, ['inststatus'],$rolesarray); if (!$newuser) { @@ -2187,31 +2413,100 @@ sub personal_data_display { &Apache::lonuserutils::can_modify_userinfo($context,$ccdomain, \@userinfo,$rolesarray); } elsif ($context eq 'selfcreate') { - %canmodify = &selfcreate_canmodify($context,$ccdomain,\@userinfo, - $inst_results,$rolesarray); + if ($newuser eq 'email') { + if (ref($emailusername) eq 'HASH') { + if (ref($emailusername->{$usertype}) eq 'HASH') { + my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); + @userinfo = (); + if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) { + foreach my $field (@{$infofields}) { + if ($emailusername->{$usertype}->{$field}) { + push(@userinfo,$field); + $canmodify{$field} = 1; + unless ($textboxsize{$field}) { + $textboxsize{$field} = 25; + } + unless ($lt{$field}) { + $lt{$field} = $infotitles->{$field}; + } + if ($emailusername->{$usertype}->{$field} eq 'required') { + $lt{$field} .= '<b>*</b>'; + } + } + } + } + } + } + } else { + %canmodify = &selfcreate_canmodify($context,$ccdomain,\@userinfo, + $inst_results,$rolesarray); + } } - my %lt=&Apache::lonlocal::texthash( - 'pd' => "Personal Data", - 'firstname' => "First Name", - 'middlename' => "Middle Name", - 'lastname' => "Last Name", - 'generation' => "Generation", - 'permanentemail' => "Permanent e-mail address", - 'id' => "Student/Employee ID", - 'lg' => "Login Data", - 'inststatus' => "Affiliation", - ); - my %textboxsize = ( - firstname => '15', - middlename => '15', - lastname => '15', - generation => '5', - permanentemail => '25', - id => '15', - ); + my $genhelp=&Apache::loncommon::help_open_topic('Generation'); $output = '<h3>'.$lt{'pd'}.'</h3>'. &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'}.'<b>*</b>',undef, + 'LC_oddrow_value')."\n". + '<input type="text" name="uname" size="'.$size.'" value="" autocomplete="off" />'; + if ($condition) { + $output .= $condition; + } elsif ($excluded) { + $output .= '<br /><span style="font-size: smaller">'.&mt('You must use an e-mail address that does not end with [_1]', + $excluded).'</span>'; + } + if ($usernameset eq 'first') { + $output .= '<br /><span style="font-size: smaller">'; + 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 .= '</span>'; + } + $rowcount ++; + $output .= &Apache::lonhtmlcommon::row_closure(1); + my $upassone = '<input type="password" name="upass'.$now.'" size="20" autocomplete="off" />'; + my $upasstwo = '<input type="password" name="upasscheck'.$now.'" size="20" autocomplete="off" />'; + $output .= &Apache::lonhtmlcommon::row_title(&mt('Password').'<b>*</b>', + 'LC_pick_box_title', + 'LC_oddrow_value')."\n". + $upassone."\n". + &Apache::lonhtmlcommon::row_closure(1)."\n". + &Apache::lonhtmlcommon::row_title(&mt('Confirm password').'<b>*</b>', + 'LC_pick_box_title', + '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: '). + '<label><input type="radio" name="emailused" value="1" checked="checked" onclick="'.$onclick.'" />'.&mt('Yes').'</label>'."\n". + (' 'x2). + '<label><input type="radio" name="emailused" value="0" onclick="'.$onclick.'" />'.&mt('No').'</label>'."\n". + '<div id="selfcreateusername" style="display: none; font-size: smaller">'. + '<br /><span class="LC_nobreak">'.&mt('Preferred username'). + ' <input type="text" name="username" value="" size="20" autocomplete="off"/>'. + '</span></div>'."\n".&Apache::lonhtmlcommon::row_closure(1); + $rowcount ++; + } + } foreach my $item (@userinfo) { my $rowtitle = $lt{$item}; my $hiderow = 0; @@ -2225,8 +2520,8 @@ sub personal_data_display { $row .= '<input type="hidden" name="c'.$item.'" value="'.$inst_results->{$item}.'" />'.$inst_results->{$item}; } else { if ($context eq 'selfcreate') { - if ($canmodify{$item}) { - $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />'; + if ($canmodify{$item}) { + $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" autocomplete="off" />'; $editable ++; } else { $hiderow = 1; @@ -2237,15 +2532,15 @@ sub personal_data_display { } } else { if ($context eq 'selfcreate') { - if (($item eq 'permanentemail') && ($newuser eq 'email')) { - $row .= $ccuname; - } else { - if ($canmodify{$item}) { - $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />'; - $editable ++; + if ($canmodify{$item}) { + if ($newuser eq 'email') { + $row .= '<input type="text" name="'.$item.'" size="'.$textboxsize{$item}.'" value="" autocomplete="off" />'; } else { - $hiderow = 1; + $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" autocomplete="off" />'; } + $editable ++; + } else { + $hiderow = 1; } } else { $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />'; @@ -2254,12 +2549,12 @@ sub personal_data_display { } else { if ($canmodify{$item}) { $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="'.$userenv{$item}.'" />'; + if (($item eq 'id') && (!$newuser)) { + $row .= '<br />'.&Apache::lonuserutils::forceid_change($context); + } } else { $row .= $userenv{$item}; } - if ($item eq 'id') { - $showforceid = $canmodify{$item}; - } } $row .= &Apache::lonhtmlcommon::row_closure(1); if (!$hiderow) { @@ -2294,7 +2589,7 @@ sub personal_data_display { } } if (!$hiderow) { - my $row = &Apache::lonhtmlcommon::row_title(&mt('Affliations'),undef,'LC_oddrow_value')."\n". + my $row = &Apache::lonhtmlcommon::row_title(&mt('Affiliations'),undef,'LC_oddrow_value')."\n". $shown.&Apache::lonhtmlcommon::row_closure(1); if ($context eq 'selfcreate') { $rowcount ++; @@ -2304,12 +2599,27 @@ sub personal_data_display { } } } + if (($context eq 'selfcreate') && ($newuser eq 'email')) { + if ($captchaform) { + $output .= &Apache::lonhtmlcommon::row_title($lt{'valid'}.'*', + 'LC_pick_box_title')."\n". + $captchaform."\n".'<br /><br />'. + &Apache::lonhtmlcommon::row_closure(1); + $rowcount ++; + } + my $submit_text = &mt('Create account'); + $output .= &Apache::lonhtmlcommon::row_title()."\n". + '<br /><input type="submit" name="createaccount" value="'. + $submit_text.'" />'. + '<input type="hidden" name="type" value="'.$usertype.'" />'. + &Apache::lonhtmlcommon::row_closure(1); + } $output .= &Apache::lonhtmlcommon::end_pick_box(); if (wantarray) { if ($context eq 'selfcreate') { return($output,$rowcount,$editable); } else { - return ($output,$showforceid); + return $output; } } else { return $output; @@ -2410,7 +2720,7 @@ sub update_user_data { $jsback."\n". '// ]]>'."\n". '</script>'."\n"; - my %breadcrumb_text = &singleuser_breadcrumb($crstype); + my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$env{'form.ccdomain'}); push (@{$brcrum}, {href => "javascript:backPage(document.userupdate)", text => $breadcrumb_text{'search'}, @@ -2427,6 +2737,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')", @@ -2474,9 +2788,12 @@ sub update_user_data { if (! exists($env{'form.makeuser'})) { # Modifying an existing user, so check the validity of the name if ($uhome eq 'no_host') { - $r->print($error.&mt('Unable to determine home server for '). - $env{'form.ccuname'}.&mt(' in domain '). - $env{'form.ccdomain'}.'.'); + $r->print( + $error + .'<p class="LC_error">' + .&mt('Unable to determine home server for [_1] in domain [_2].', + '"'.$env{'form.ccuname'}.'"','"'.$env{'form.ccdomain'}.'"') + .'</p>'); return; } } @@ -2516,7 +2833,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'); + my @requestcourses = ('official','unofficial','community','textbook','placement'); my @requestauthor = ('requestauthor'); my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($env{'form.ccdomain'}); @@ -2654,7 +2971,7 @@ sub update_user_data { $r->print($error.'Invalid login mode or password'.$end.$rtnlink); return; } - # Only allow authentification modification if the person has authority + # Only allow authentication modification if the person has authority if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) { $r->print('Modifying authentication: '. &Apache::lonnet::modifyuserauth( @@ -2664,7 +2981,7 @@ sub update_user_data { ($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 authentification information').'.'.$end); + $r->print($error.&mt('You do not have the authority to modify this users authentication information.').$end); } } $r->rflush(); # Finish display of header before time consuming actions start @@ -2689,7 +3006,7 @@ sub update_user_data { 'requestcourses.community','requestcourses.textbook', 'reqcrsotherdom.official','reqcrsotherdom.unofficial', 'reqcrsotherdom.community','reqcrsotherdom.textbook', - 'requestauthor'], + 'reqcrsotherdom.placement','requestauthor'], $env{'form.ccdomain'},$env{'form.ccuname'}); my ($tmp) = keys(%userenv); if ($tmp =~ /^(con_lost|error)/i) { @@ -2966,8 +3283,8 @@ sub update_user_data { } } foreach my $name ('portfolio','author') { - $oldsettings{'quota'}{$name} = $oldquota{$name}.' MB'; - $newsettings{'quota'}{$name} = $newquota{$name}.' MB'; + $oldsettings{'quota'}{$name} = &mt('[_1] MB',$oldquota{$name}); + $newsettings{'quota'}{$name} = &mt('[_1] MB',$newquota{$name}); } if ((keys(%namechanged) > 0) || (keys(%changed) > 0)) { my ($chgresult,$namechgresult); @@ -2980,8 +3297,9 @@ sub update_user_data { ($env{'user.domain'} eq $env{'form.ccdomain'})) { my %newenvhash; foreach my $key (keys(%changed)) { - if (($key eq 'official') || ($key eq 'unofficial') - || ($key eq 'community')) { + if (($key eq 'official') || ($key eq 'unofficial') || + ($key eq 'community') || ($key eq 'textbook') || + ($key eq 'placement')) { $newenvhash{'environment.requestcourses.'.$key} = $changeHash{'requestcourses.'.$key}; if ($changeHash{'requestcourses.'.$key}) { @@ -3047,7 +3365,7 @@ sub update_user_data { \%newsettingstext); if ($env{'form.cid'} ne $userenv{'id'}) { &Apache::lonnet::idput($env{'form.ccdomain'}, - ($env{'form.ccuname'} => $env{'form.cid'})); + {$env{'form.ccuname'} => $env{'form.cid'}},$uhome,'ids'); if (($recurseid) && (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) { my $idresult = @@ -3066,9 +3384,12 @@ sub update_user_data { &Apache::lonnet::appenv(\%newenvhash); } } else { # error occurred - $r->print('<span class="LC_error">'.&mt('Unable to successfully change environment for').' '. - $env{'form.ccuname'}.' '.&mt('in domain').' '. - $env{'form.ccdomain'}.'</span><br />'); + $r->print( + '<p class="LC_error">' + .&mt('Unable to successfully change environment for [_1] in domain [_2].', + '"'.$env{'form.ccuname'}.'"', + '"'.$env{'form.ccdomain'}.'"') + .'</p>'); } } else { # End of if ($env ... ) logic # They did not want to change the users name, quota, tool availability, @@ -3086,9 +3407,9 @@ sub update_user_data { $rolestr = &mt('No roles'); } if ($context eq 'course') { - $contextname = &mt('course'); + $contextname = 'course'; } elsif ($context eq 'author') { - $contextname = &mt('co-author'); + $contextname = 'co-author'; } $r->print(&mt('The following fields were not updated: ').'<ul>'); my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); @@ -3097,9 +3418,9 @@ sub update_user_data { } $r->print('</ul>'); if (@mod_disallowed == 1) { - $r->print(&mt("You do not have the authority to change this field given the user's current set of active/future [_1] roles:",$contextname)); + $r->print(&mt("You do not have the authority to change this field given the user's current set of active/future $contextname roles:")); } else { - $r->print(&mt("You do not have the authority to change these fields given the user's current set of active/future [_1] roles:",$contextname)); + $r->print(&mt("You do not have the authority to change these fields given the user's current set of active/future $contextname roles:")); } my $helplink = 'javascript:helpMenu('."'display'".')'; $r->print('<span class="LC_cusr_emph">'.$rolestr.'</span><br />' @@ -3116,13 +3437,14 @@ sub update_user_data { if ($env{'form.action'} eq 'singlestudent') { &enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context, $crstype,$showcredits,$defaultcredits); - $r->print('<p><a href="javascript:backPage(document.userupdate)">'); - if ($crstype eq 'Community') { - $r->print(&mt('Enroll Another Member')); - } else { - $r->print(&mt('Enroll Another Student')); - } - $r->print('</a></p>'); + my $linktext = ($crstype eq 'Community' ? + &mt('Enroll Another Member') : &mt('Enroll Another Student')); + $r->print( + &Apache::lonhtmlcommon::actionbox([ + '<a href="javascript:backPage(document.userupdate)">' + .($crstype eq 'Community' ? + &mt('Enroll Another Member') : &mt('Enroll Another Student')) + .'</a>'])); } else { my @rolechanges = &update_roles($r,$context,$showcredits); if (keys(%namechanged) > 0) { @@ -3177,7 +3499,7 @@ sub display_userinfo { 'id' => 'Student/Employee ID', 'permanentemail' => 'Permanent e-mail address', 'portfolioquota' => 'Disk space allocated to portfolio files', - 'authorquota' => 'Disk space allocated to authoring space', + 'authorquota' => 'Disk space allocated to Authoring Space', 'blog' => 'Blog Availability', 'webdav' => 'WebDAV Availability', 'aboutme' => 'Personal Information Page Availability', @@ -3186,6 +3508,7 @@ sub display_userinfo { 'unofficial' => 'Can Request Unofficial Courses', 'community' => 'Can Request Communities', 'textbook' => 'Can Request Textbook Courses', + 'placement' => 'Can Request Placement Tests', 'requestauthor' => 'Can Request Author Role', 'inststatus' => "Affiliation", 'prvs' => 'Previous Value:', @@ -3558,7 +3881,7 @@ sub update_roles { my @rolechanges; my %disallowed; $r->print('<h3>'.&mt('Modifying Roles').'</h3>'); - foreach my $key (keys (%env)) { + foreach my $key (keys(%env)) { next if (! $env{$key}); next if ($key eq 'form.action'); # Revoke roles @@ -3740,7 +4063,7 @@ sub update_roles { } else { my %curr_groups = &Apache::longroup::coursegroups($one,$two); - foreach my $sec (sort {$a cmp $b} keys %sections) { + foreach my $sec (sort {$a cmp $b} keys(%sections)) { if (($sec eq 'none') || ($sec eq 'all') || exists($curr_groups{$sec})) { $disallowed{$sec} = $url; @@ -3786,7 +4109,7 @@ sub update_roles { my %curr_groups = &Apache::longroup::coursegroups($one,$two); my $emptysec = 0; - foreach my $sec (sort {$a cmp $b} keys %sections) { + foreach my $sec (sort {$a cmp $b} keys(%sections)) { $sec =~ s/\W//g; if ($sec ne '') { if (($sec eq 'none') || ($sec eq 'all') || @@ -3826,7 +4149,7 @@ sub update_roles { $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$two,$start,$end,$one,undef,'',$context)); } else { my $emptysec = 0; - foreach my $sec (sort {$a cmp $b} keys %sections) { + foreach my $sec (sort {$a cmp $b} keys(%sections)) { if ($sec ne '') { my $securl = $url.'/'.$sec; $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$two,$start,$end,$one,undef,$sec,$context)); @@ -3944,11 +4267,11 @@ sub enroll_single_student { } $r->print('.<br />'.$showstart.'; '.$showend); if ($startdate <= $now && !$newuser) { - $r->print('<p> '); + $r->print('<p class="LC_info">'); if ($crstype eq 'Community') { - $r->print(&mt('If the member is currently logged-in to LON-CAPA, the new role will be available when the member next logs in.')); + $r->print(&mt('If the member is currently logged-in to LON-CAPA, the new role can be displayed by using the "Check for changes" link on the Roles/Courses page.')); } else { - $r->print(&mt('If the student is currently logged-in to LON-CAPA, the new role will be available when the student next logs in.')); + $r->print(&mt('If the student is currently logged-in to LON-CAPA, the new role can be displayed by using the "Check for changes" link on the Roles/Courses page.')); } $r->print('</p>'); } @@ -4082,9 +4405,9 @@ sub build_roles { # ========================================================== Custom Role Editor sub custom_role_editor { - my ($r,$brcrum) = @_; + 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 { @@ -4095,279 +4418,103 @@ 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 = $env{'form.templatecrstype'}; + $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; } -# ------------------------------------------------------- What can be assigned? - my %full=(); - my %courselevel=(); - my %courselevelcurrent=(); - my $syspriv=''; - my $dompriv=''; - my $coursepriv=''; - my $body_top; + my $formname = 'form1'; + my %privs=(); + my $body_top = '<h2>'; +# ------------------------------------------------------- Does this role exist? my ($rdummy,$roledef)= &Apache::lonnet::get('roles',["rolesdef_$rolename"]); -# ------------------------------------------------------- Does this role exist? - $body_top .= '<h2>'; if (($rdummy ne 'con_lost') && ($roledef ne '')) { - $body_top .= &mt('Existing Role').' "'; + $body_top .= &mt('Existing Role').' "'; # ------------------------------------------------- Get current role privileges - ($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef); - if ($crstype eq 'Community') { - $syspriv =~ s/bre\&S//; + ($privs{'system'},$privs{'domain'},$privs{'course'})=split(/\_/,$roledef); + if ($privs{'system'} =~ /bre\&S/) { + if ($context eq 'domain') { + $crstype = 'Course'; + } elsif ($crstype eq 'Community') { + $privs{'system'} =~ s/bre\&S//; + } + } elsif ($context eq 'domain') { + $crstype = 'Course'; } } else { - $body_top .= &mt('New Role').' "'; - $roledef=''; + $body_top .= &mt('New Role').' "'; + $roledef=''; } $body_top .= $rolename.'"</h2>'; - foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) { - my ($priv,$restrict)=split(/\&/,$item); - if (!$restrict) { $restrict='F'; } - $courselevel{$priv}=$restrict; - if ($coursepriv=~/\:$priv/) { - $courselevelcurrent{$priv}=1; - } - $full{$priv}=1; - } - my %domainlevel=(); - my %domainlevelcurrent=(); - foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) { - my ($priv,$restrict)=split(/\&/,$item); - if (!$restrict) { $restrict='F'; } - $domainlevel{$priv}=$restrict; - if ($dompriv=~/\:$priv/) { - $domainlevelcurrent{$priv}=1; - } - $full{$priv}=1; - } - my %systemlevel=(); - my %systemlevelcurrent=(); - foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) { - my ($priv,$restrict)=split(/\&/,$item); - if (!$restrict) { $restrict='F'; } - $systemlevel{$priv}=$restrict; - if ($syspriv=~/\:$priv/) { - $systemlevelcurrent{$priv}=1; - } - $full{$priv}=1; - } + +# ------------------------------------------------------- What can be assigned? + my %full=(); + my %levels=( + course => {}, + domain => {}, + system => {}, + ); + my %levelscurrent=( + course => {}, + domain => {}, + system => {}, + ); + &Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent); my ($jsback,$elements) = &crumb_utilities(); - my $button_code = "\n"; - my $head_script = "\n"; - $head_script .= '<script type="text/javascript">'."\n" - .'// <![CDATA['."\n"; - my @template_roles = ("in","ta","ep"); - if ($context eq 'domain') { - push(@template_roles,"ad"); - } - push(@template_roles,"st"); - if ($crstype eq 'Community') { - unshift(@template_roles,'co'); - } else { - unshift(@template_roles,'cc'); - } - foreach my $role (@template_roles) { - $head_script .= &make_script_template($role,$crstype); - $button_code .= &make_button_code($role,$crstype).' '; - } - my $context_code; - if ($context eq 'domain') { - my $checkedCommunity = ''; - my $checkedCourse = ' checked="checked"'; - if ($env{'form.templatecrstype'} eq 'Community') { - $checkedCommunity = $checkedCourse; - $checkedCourse = ''; - } - $context_code = '<label>'. - '<input type="radio" name="templatecrstype" value="Course"'.$checkedCourse.' onclick="this.form.submit();">'. - &mt('Course'). - '</label>'.(' ' x2). - '<label>'. - '<input type="radio" name="templatecrstype" value="Community"'.$checkedCommunity.' onclick="this.form.submit();">'. - &mt('Community'). - '</label>'. - '</fieldset>'. - '<input type="hidden" name="customroleaction" value="'. - $action.'" />'; - if ($env{'form.customroleaction'} eq 'new') { - $context_code .= '<input type="hidden" name="newrolename" value="'. - $rolename.'" />'; - } else { - $context_code .= '<input type="hidden" name="rolename" value="'. - $rolename.'" />'; - } - $context_code .= '<input type="hidden" name="action" value="custom" />'. - '<input type="hidden" name="phase" value="selected_custom_edit" />'; - } - - $head_script .= "\n".$jsback."\n" - .'// ]]>'."\n" - .'</script>'."\n"; + my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype); + my $head_script = + &Apache::lonuserutils::custom_roledefs_js($context,$crstype,$formname, + \%full,\@templateroles,$jsback); push (@{$brcrum}, - {href => "javascript:backPage(document.form1,'pickrole','')", + {href => "javascript:backPage(document.$formname,'pickrole','')", text => "Pick custom role", faq => 282,bug=>'Instructor Interface',}, - {href => "javascript:backPage(document.form1,'','')", + {href => "javascript:backPage(document.$formname,'','')", 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'}; - $r->print(&Apache::loncommon::start_page('Custom Role Editor', $head_script,$args). $body_top); - my %lt=&Apache::lonlocal::texthash( - 'prv' => "Privilege", - 'crl' => "Course Level", - 'dml' => "Domain Level", - 'ssl' => "System Level"); - - $r->print('<div class="LC_left_float">' - .'<form action=""><fieldset>' - .'<legend>'.&mt('Select a Template').'</legend>' - .$button_code - .'</fieldset></form></div>'); - if ($context_code) { - $r->print('<div class="LC_left_float">' - .'<form action="/adm/createuser" method="post"><fieldset>' - .'<legend>'.&mt('Context').'</legend>' - .$context_code - .'</form>' - .'</div>' - ); - } - $r->print('<br clear="all" />'); + $r->print('<form name="'.$formname.'" method="post" action="">'."\n". + &Apache::lonuserutils::custom_role_header($context,$crstype, + \@templateroles,$prefix)); $r->print(<<ENDCCF); -<form name="form1" method="post" action=""> <input type="hidden" name="phase" value="set_custom_roles" /> <input type="hidden" name="rolename" value="$rolename" /> ENDCCF - $r->print(&Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row(). -'<th>'.$lt{'prv'}.'</th><th>'.$lt{'crl'}.'</th><th>'.$lt{'dml'}. -'</th><th>'.$lt{'ssl'}.'</th>'. - &Apache::loncommon::end_data_table_header_row()); - foreach my $priv (sort(keys(%full))) { - my $privtext = &Apache::lonnet::plaintext($priv,$crstype); - $r->print(&Apache::loncommon::start_data_table_row(). - '<td>'.$privtext.'</td><td>'. - ($courselevel{$priv}?'<input type="checkbox" name="'.$priv.'_c"'. - ($courselevelcurrent{$priv}?' checked="checked"':'').' />':' '). - '</td><td>'. - ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d"'. - ($domainlevelcurrent{$priv}?' checked="checked"':'').' />':' '). - '</td><td>'); - if ($priv eq 'bre' && $crstype eq 'Community') { - $r->print(' '); - } else { - $r->print($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s"'. - ($systemlevelcurrent{$priv}?' checked="checked"':'').' />':' '); - } - $r->print('</td>'. - &Apache::loncommon::end_data_table_row()); - } + $r->print(&Apache::lonuserutils::custom_role_table($crstype,\%full,\%levels, + \%levelscurrent,$prefix)); $r->print(&Apache::loncommon::end_data_table(). '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'. '<input type="hidden" name="startrolename" value="'.$env{'form.rolename'}. - '" />'."\n".'<input type="hidden" name="currstate" value="" />'."\n". + '" />'."\n".'<input type="hidden" name="currstate" value="" />'."\n". '<input type="reset" value="'.&mt("Reset").'" />'."\n". '<input type="submit" value="'.&mt('Save').'" /></form>'); } -# -------------------------------------------------------- -sub make_script_template { - my ($role,$crstype) = @_; - my %full_c=(); - my %full_d=(); - my %full_s=(); - my $return_script; - foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) { - my ($priv,$restrict)=split(/\&/,$item); - $full_c{$priv}=1; - } - foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) { - my ($priv,$restrict)=split(/\&/,$item); - $full_d{$priv}=1; - } - foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) { - next if (($crstype eq 'Community') && ($item eq 'bre&S')); - my ($priv,$restrict)=split(/\&/,$item); - $full_s{$priv}=1; - } - $return_script .= 'function set_'.$role.'() {'."\n"; - my @temp = split(/:/,$Apache::lonnet::pr{$role.':c'}); - my %role_c; - foreach my $priv (@temp) { - my ($priv_item, $dummy) = split(/\&/,$priv); - $role_c{$priv_item} = 1; - } - my %role_d; - @temp = split(/:/,$Apache::lonnet::pr{$role.':d'}); - foreach my $priv(@temp) { - my ($priv_item, $dummy) = split(/\&/,$priv); - $role_d{$priv_item} = 1; - } - my %role_s; - @temp = split(/:/,$Apache::lonnet::pr{$role.':s'}); - foreach my $priv(@temp) { - my ($priv_item, $dummy) = split(/\&/,$priv); - $role_s{$priv_item} = 1; - } - foreach my $priv_item (keys(%full_c)) { - my ($priv, $dummy) = split(/\&/,$priv_item); - if ((exists($role_c{$priv})) || (exists($role_d{$priv})) || - (exists($role_s{$priv}))) { - $return_script .= "document.form1.$priv"."_c.checked = true;\n"; - } else { - $return_script .= "document.form1.$priv"."_c.checked = false;\n"; - } - } - foreach my $priv_item (keys(%full_d)) { - my ($priv, $dummy) = split(/\&/,$priv_item); - if ((exists($role_d{$priv})) || (exists($role_s{$priv}))) { - $return_script .= "document.form1.$priv"."_d.checked = true;\n"; - } else { - $return_script .= "document.form1.$priv"."_d.checked = false;\n"; - } - } - foreach my $priv_item (keys(%full_s)) { - my ($priv, $dummy) = split(/\&/,$priv_item); - if (exists($role_s{$priv})) { - $return_script .= "document.form1.$priv"."_s.checked = true;\n"; - } else { - $return_script .= "document.form1.$priv"."_s.checked = false;\n"; - } - } - $return_script .= '}'."\n"; - return ($return_script); -} -# ---------------------------------------------------------- -sub make_button_code { - my ($role,$crstype) = @_; - my $label = &Apache::lonnet::plaintext($role,$crstype); - my $button_code = '<input type="button" onclick="set_'.$role.'()" value="'.$label.'" />'; - return ($button_code); -} + # ---------------------------------------------------------- Call to definerole sub set_custom_role { - my ($r,$context,$brcrum) = @_; + 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); + &custom_role_editor($r,$context,$brcrum,$prefix,$permission); return; } my ($jsback,$elements) = &crumb_utilities(); @@ -4376,6 +4523,10 @@ sub set_custom_role { .$jsback."\n" .'// ]]>'."\n" .'</script>'."\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", @@ -4389,12 +4540,13 @@ 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'}; + bread_crumbs_component => 'User Management'}; $r->print(&Apache::loncommon::start_page('Save Custom Role',$jscript,$args)); + my $newrole; my ($rdummy,$roledef)= &Apache::lonnet::get('roles',["rolesdef_$rolename"]); @@ -4405,55 +4557,49 @@ sub set_custom_role { } else { $r->print(&mt('New Role').' "'); $roledef=''; + $newrole = 1; } $r->print($rolename.'"</h3>'); -# ------------------------------------------------------- What can be assigned? - my $sysrole=''; - my $domrole=''; - my $courole=''; - - foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) { - my ($priv,$restrict)=split(/\&/,$item); - if (!$restrict) { $restrict=''; } - if ($env{'form.'.$priv.'_c'}) { - $courole.=':'.$item; - } - } +# ------------------------------------------------- Assign role and show result - foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) { - my ($priv,$restrict)=split(/\&/,$item); - if (!$restrict) { $restrict=''; } - if ($env{'form.'.$priv.'_d'}) { - $domrole.=':'.$item; - } - } - - foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) { - my ($priv,$restrict)=split(/\&/,$item); - if (!$restrict) { $restrict=''; } - if ($env{'form.'.$priv.'_s'}) { - $sysrole.=':'.$item; - } - } - $r->print('<br />Defining Role: '. - &Apache::lonnet::definerole($rolename,$sysrole,$domrole,$courole)); + my $errmsg; + my %newprivs = &Apache::lonuserutils::custom_role_update($rolename,$prefix); + # Assign role and return result + my $result = &Apache::lonnet::definerole($rolename,$newprivs{'s'},$newprivs{'d'}, + $newprivs{'c'}); + if ($result ne 'ok') { + $errmsg = ': '.$result; + } + my $message = + &Apache::lonhtmlcommon::confirm_success( + &mt('Defining Role').$errmsg, ($result eq 'ok' ? 0 : 1)); if ($env{'request.course.id'}) { my $url='/'.$env{'request.course.id'}; $url=~s/\_/\//g; - $r->print('<br />'.&mt('Assigning Role to Self').': '. - &Apache::lonnet::assigncustomrole($env{'user.domain'}, - $env{'user.name'}, - $url, - $env{'user.domain'}, - $env{'user.name'}, - $rolename,undef,undef,undef,$context)); + $result = + &Apache::lonnet::assigncustomrole( + $env{'user.domain'},$env{'user.name'}, + $url, + $env{'user.domain'},$env{'user.name'}, + $rolename,undef,undef,undef,$context); + if ($result ne 'ok') { + $errmsg = ': '.$result; + } + $message .= + '<br />' + .&Apache::lonhtmlcommon::confirm_success( + &mt('Assigning Role to Self').$errmsg, ($result eq 'ok' ? 0 : 1)); } $r->print( - '<p><a href="javascript:backPage(document.customresult,'."'pickrole'".')">' - .&mt('Create or edit another custom role') - .'</a></p>' + &Apache::loncommon::confirmwrapper($message) + .'<br />' + .&Apache::lonhtmlcommon::actionbox([ + '<a href="javascript:backPage(document.customresult,'."'pickrole'".')">' + .&mt('Create or edit another custom role') + .'</a>']) .'<form name="customresult" method="post" action="">' - .&Apache::lonhtmlcommon::echo_form_input([]).'</form>' + .&Apache::lonhtmlcommon::echo_form_input([]) + .'</form>' ); } @@ -4465,7 +4611,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(); @@ -4475,23 +4622,82 @@ 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']); + 'username','domain','srchterm','srchdomain','srchin','srchby','srchtype','queue']); &Apache::lonhtmlcommon::clear_breadcrumbs(); my $args; my $brcrum = []; my $bread_crumbs_component = 'User Management'; - if ($env{'form.action'} ne 'dateselect') { + 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'); @@ -4523,10 +4729,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, @@ -4548,8 +4760,10 @@ sub handler { } else { &Apache::lonuserutils::print_first_users_upload_form($r,$context); } - } elsif ((($env{'form.action'} eq 'singleuser') || ($env{'form.action'} - eq 'singlestudent')) && ($permission->{'cusr'})) { + } elsif (((($env{'form.action'} eq 'singleuser') || ($env{'form.action'} + eq 'singlestudent')) && ($permission->{'cusr'})) || + (($env{'form.action'} eq 'singleuser') && ($permission->{'view'})) || + (($env{'form.action'} eq 'accesslogs') && ($permission->{'activity'}))) { my $phase = $env{'form.phase'}; my @search = ('srchterm','srchby','srchin','srchtype','srchdomain'); &Apache::loncreateuser::restore_prev_selections(); @@ -4558,7 +4772,7 @@ sub handler { $srch->{$item} = $env{'form.'.$item}; } if (($phase eq 'get_user_info') || ($phase eq 'userpicked') || - ($phase eq 'createnewuser')) { + ($phase eq 'createnewuser') || ($phase eq 'activity')) { if ($env{'form.phase'} eq 'createnewuser') { my $response; if ($env{'form.srchterm'} !~ /^$match_username$/) { @@ -4569,7 +4783,7 @@ sub handler { .'</span>'; $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'}); @@ -4588,8 +4802,8 @@ sub handler { &print_user_selection_page($r,$response,$srch,$results, \@search,$context,undef,$crstype, $brcrum); - } elsif ($currstate eq 'modify') { - my ($ccuname,$ccdomain); + } elsif (($currstate eq 'modify') || ($env{'form.action'} eq 'accesslogs')) { + my ($ccuname,$ccdomain,$uhome); if (($srch->{'srchby'} eq 'uname') && ($srch->{'srchtype'} eq 'exact')) { $ccuname = $srch->{'srchterm'}; @@ -4600,44 +4814,75 @@ sub handler { } $ccuname =&LONCAPA::clean_username($ccuname); $ccdomain=&LONCAPA::clean_domain($ccdomain); - if ($env{'form.forcenewuser'}) { - $response = ''; + if ($env{'form.action'} eq 'accesslogs') { + my $uhome; + if (($ccuname ne '') && ($ccdomain ne '')) { + $uhome = &Apache::lonnet::homeserver($ccuname,$ccdomain); + } + if (($uhome eq '') || ($uhome eq 'no_host')) { + $env{'form.phase'} = ''; + undef($forcenewuser); + #if ($response) { + # unless ($response =~ m{\Q<br /><br />\E$}) { + # $response .= '<br /><br />'; + # } + #} + &print_username_entry_form($r,$context,$response,$srch, + $forcenewuser,$crstype,$brcrum, + $permission); + } else { + &print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum); + } + } else { + if ($env{'form.forcenewuser'}) { + $response = ''; + } + &print_user_modification_page($r,$ccuname,$ccdomain, + $srch,$response,$context, + $permission,$crstype,$brcrum); } - &print_user_modification_page($r,$ccuname,$ccdomain, - $srch,$response,$context, - $permission,$crstype,$brcrum); } elsif ($currstate eq 'query') { &print_user_query_page($r,'createuser',$brcrum); } 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'}); my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'}); - &print_user_modification_page($r,$ccuname,$ccdomain,$srch,'', - $context,$permission,$crstype, - $brcrum); + if ($env{'form.action'} eq 'accesslogs') { + &print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum); + } else { + &print_user_modification_page($r,$ccuname,$ccdomain,$srch,'', + $context,$permission,$crstype, + $brcrum); + } + } elsif ($env{'form.action'} eq 'accesslogs') { + my $ccuname = &LONCAPA::clean_username($env{'form.accessuname'}); + my $ccdomain = &LONCAPA::clean_domain($env{'form.accessudom'}); + &print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum); } } elsif ($env{'form.phase'} eq 'update_user_data') { &update_user_data($r,$context,$crstype,$brcrum,$showcredits); } 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); + &set_custom_role($r,$context,$brcrum,$prefix,$permission); } else { - &custom_role_editor($r,$brcrum); + &custom_role_editor($r,$context,$brcrum,$prefix,$permission); } } elsif (($env{'form.action'} eq 'processauthorreq') && ($permission->{'cusr'}) && (&Apache::lonnet::allowed('cau',$env{'request.role.domain'}))) { push(@{$brcrum}, {href => '/adm/createuser?action=processauthorreq', - text => 'Authoring space requests', + text => 'Authoring Space requests', help => 'Domain_Role_Approvals'}); $bread_crumbs_component = 'Authoring requests'; if ($env{'form.state'} eq 'done') { @@ -4649,7 +4894,8 @@ sub handler { } $args = { bread_crumbs => $brcrum, bread_crumbs_component => $bread_crumbs_component}; - $r->print(&header(undef,$args)); + my $js = &usernamerequest_javascript(); + $r->print(&header(&add_script($js),$args)); if (!exists($env{'form.state'})) { $r->print(&Apache::loncoursequeueadmin::display_queued_requests('requestauthor', $env{'request.role.domain'})); @@ -4658,15 +4904,169 @@ sub handler { $r->print(&Apache::loncoursequeueadmin::update_request_queue('requestauthor', $env{'request.role.domain'})); } + } elsif (($env{'form.action'} eq 'processusernamereq') && + ($permission->{'cusr'}) && + (&Apache::lonnet::allowed('cau',$env{'request.role.domain'}))) { + push(@{$brcrum}, + {href => '/adm/createuser?action=processusernamereq', + text => 'LON-CAPA account requests', + help => 'Domain_Username_Approvals'}); + $bread_crumbs_component = 'Account requests'; + if ($env{'form.state'} eq 'done') { + push(@{$brcrum}, + {href => '/adm/createuser?action=usernamereqqueue', + text => 'Result', + help => 'Domain_Username_Approvals'}); + $bread_crumbs_component = 'LON-CAPA account request result'; + } + $args = { bread_crumbs => $brcrum, + bread_crumbs_component => $bread_crumbs_component}; + my $js = &usernamerequest_javascript(); + $r->print(&header(&add_script($js),$args)); + if (!exists($env{'form.state'})) { + $r->print(&Apache::loncoursequeueadmin::display_queued_requests('requestusername', + $env{'request.role.domain'})); + } elsif ($env{'form.state'} eq 'done') { + $r->print('<h3>'.&mt('LON-CAPA account request processing').'</h3>'."\n"); + $r->print(&Apache::loncoursequeueadmin::update_request_queue('requestusername', + $env{'request.role.domain'})); + } + } elsif (($env{'form.action'} eq 'displayuserreq') && + ($permission->{'cusr'})) { + my $dom = $env{'form.domain'}; + my $uname = $env{'form.username'}; + my $warning; + if (($dom =~ /^$match_domain$/) && (&Apache::lonnet::domain($dom) ne '')) { + if (($dom eq $env{'request.role.domain'}) && (&Apache::lonnet::allowed('ccc',$dom))) { + if (($uname =~ /^$match_username$/) && ($env{'form.queue'} eq 'approval')) { + my $uhome = &Apache::lonnet::homeserver($uname,$dom); + if ($uhome eq 'no_host') { + my $queue = $env{'form.queue'}; + my $reqkey = &escape($uname).'_'.$queue; + my $namespace = 'usernamequeue'; + my $domconfig = &Apache::lonnet::get_domainconfiguser($dom); + my %queued = + &Apache::lonnet::get($namespace,[$reqkey],$dom,$domconfig); + unless ($queued{$reqkey}) { + $warning = &mt('No information was found for this LON-CAPA account request.'); + } + } else { + $warning = &mt('A LON-CAPA account already exists for the requested username and domain.'); + } + } else { + $warning = &mt('LON-CAPA account request status check is for an invalid username.'); + } + } else { + $warning = &mt('You do not have rights to view LON-CAPA account requests in the domain specified.'); + } + } else { + $warning = &mt('LON-CAPA account request status check is for an invalid domain.'); + } + my $args = { only_body => 1 }; + $r->print(&header(undef,$args). + '<h3>'.&mt('LON-CAPA Account Request Details').'</h3>'); + if ($warning ne '') { + $r->print('<div class="LC_warning">'.$warning.'</div>'); + } else { + my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); + my $domconfiguser = &Apache::lonnet::get_domainconfiguser($dom); + my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom); + if (ref($domconfig{'usercreation'}) eq 'HASH') { + if (ref($domconfig{'usercreation'}{'cancreate'}) eq 'HASH') { + if (ref($domconfig{'usercreation'}{'cancreate'}{'emailusername'}) eq 'HASH') { + my %info = + &Apache::lonnet::get('nohist_requestedusernames',[$uname],$dom,$domconfiguser); + if (ref($info{$uname}) eq 'HASH') { + my $usertype = $info{$uname}{'inststatus'}; + 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('<div>'.&Apache::lonhtmlcommon::start_pick_box()); + my ($num,$count); + $count = scalar(keys(%{$domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}})); + $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 ++; + unless ($count == $num) { + $r->print(&Apache::lonhtmlcommon::row_closure()); + } + } + } + } + if ($numextras) { + unless ($pickstart) { + $r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box()); + $pickstart = 1; + } + if ($showemail) { + my $closure = ''; + unless ($showstatus) { + $closure = 1; + } + $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)','<br />')). + $showstatus. + &Apache::lonhtmlcommon::row_closure(1)); + } + } + if ($pickstart) { + $r->print(&Apache::lonhtmlcommon::end_pick_box().'</div>'); + } else { + $r->print('<div>'.&mt('No information to display for this account request.').'</div>'); + } + } else { + $r->print('<div>'.&mt('No information available for this account request.').'</div>'); + } + } + } + } + } + $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}; @@ -4683,7 +5083,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}; @@ -4763,69 +5163,100 @@ sub handler { '<span class="LC_error">'.&mt('You do not have permission to modify dates or sections for users').'</span>'); } } elsif ($env{'form.action'} eq 'selfenroll') { - push(@{$brcrum}, - {href => '/adm/createuser?action=selfenroll', - text => "Configure Self-enrollment", - help => 'Course_Self_Enrollment'}); - if (!exists($env{'form.state'})) { - $args = { bread_crumbs => $brcrum, - bread_crumbs_component => 'Configure Self-enrollment'}; - $r->print(&header(undef,$args)); - $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n"); - &print_selfenroll_menu($r,$context,$permission); - } elsif ($env{'form.state'} eq 'done') { - push (@{$brcrum}, - {href=>'/adm/createuser?action=selfenroll', - text=>"Result"}); - $args = { bread_crumbs => $brcrum, - bread_crumbs_component => 'Self-enrollment result'}; - $r->print(&header(undef,$args)); - $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n"); - &update_selfenroll_config($r,$context,$permission); + if ($permission->{selfenrolladmin}) { + my %currsettings = ( + selfenroll_types => $env{'course.'.$cid.'.internal.selfenroll_types'}, + selfenroll_registered => $env{'course.'.$cid.'.internal.selfenroll_registered'}, + selfenroll_section => $env{'course.'.$cid.'.internal.selfenroll_section'}, + selfenroll_notifylist => $env{'course.'.$cid.'.internal.selfenroll_notifylist'}, + selfenroll_approval => $env{'course.'.$cid.'.internal.selfenroll_approval'}, + selfenroll_limit => $env{'course.'.$cid.'.internal.selfenroll_limit'}, + selfenroll_cap => $env{'course.'.$cid.'.internal.selfenroll_cap'}, + selfenroll_start_date => $env{'course.'.$cid.'.internal.selfenroll_start_date'}, + selfenroll_end_date => $env{'course.'.$cid.'.internal.selfenroll_end_date'}, + selfenroll_start_access => $env{'course.'.$cid.'.internal.selfenroll_start_access'}, + selfenroll_end_access => $env{'course.'.$cid.'.internal.selfenroll_end_access'}, + default_enrollment_start_date => $env{'course.'.$cid.'.default_enrollment_start_date'}, + default_enrollment_end_date => $env{'course.'.$cid.'.default_enrollment_end_date'}, + uniquecode => $env{'course.'.$cid.'.internal.uniquecode'}, + ); + push(@{$brcrum}, + {href => '/adm/createuser?action=selfenroll', + text => "Configure Self-enrollment", + help => 'Course_Self_Enrollment'}); + if (!exists($env{'form.state'})) { + $args = { bread_crumbs => $brcrum, + bread_crumbs_component => 'Configure Self-enrollment'}; + $r->print(&header(undef,$args)); + $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n"); + &print_selfenroll_menu($r,'course',$cid,$cdom,$cnum,\%currsettings); + } elsif ($env{'form.state'} eq 'done') { + push (@{$brcrum}, + {href=>'/adm/createuser?action=selfenroll', + text=>"Result"}); + $args = { bread_crumbs => $brcrum, + bread_crumbs_component => 'Self-enrollment result'}; + $r->print(&header(undef,$args)); + $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n"); + &update_selfenroll_config($r,$cid,$cdom,$cnum,$context,$crstype,\%currsettings); + } + } else { + $r->print(&header(undef,{'no_nav_bar' => 1}). + '<span class="LC_error">'.&mt('You do not have permission to configure self-enrollment').'</span>'); } } elsif ($env{'form.action'} eq 'selfenrollqueue') { - push(@{$brcrum}, - {href => '/adm/createuser?action=selfenrollqueue', - text => 'Enrollment requests', - help => 'Course_Self_Enrollment'}); - $bread_crumbs_component = 'Enrollment requests'; - if ($env{'form.state'} eq 'done') { + if ($permission->{selfenrolladmin}) { push(@{$brcrum}, {href => '/adm/createuser?action=selfenrollqueue', - text => 'Result', - help => 'Course_Self_Enrollment'}); - $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('<h3>'.&mt('Pending enrollment requests').'</h3>'."\n"); - $r->print(&Apache::loncoursequeueadmin::display_queued_requests($context, - $cdom,$cnum)); - } elsif ($env{'form.state'} eq 'done') { - $r->print('<h3>'.&mt('Enrollment request processing').'</h3>'."\n"); - $r->print(&Apache::loncoursequeueadmin::update_request_queue($context, - $cdom,$cnum,$coursedesc)); + text => 'Enrollment requests', + 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_Approve_Selfenroll'}); + $bread_crumbs_component = 'Enrollment result'; + } + $args = { bread_crumbs => $brcrum, + bread_crumbs_component => $bread_crumbs_component}; + $r->print(&header(undef,$args)); + my $coursedesc = $env{'course.'.$cid.'.description'}; + if (!exists($env{'form.state'})) { + $r->print('<h3>'.&mt('Pending enrollment requests').'</h3>'."\n"); + $r->print(&Apache::loncoursequeueadmin::display_queued_requests($context, + $cdom,$cnum)); + } elsif ($env{'form.state'} eq 'done') { + $r->print('<h3>'.&mt('Enrollment request processing').'</h3>'."\n"); + $r->print(&Apache::loncoursequeueadmin::update_request_queue($context, + $cdom,$cnum,$coursedesc)); + } + } else { + $r->print(&header(undef,{'no_nav_bar' => 1}). + '<span class="LC_error">'.&mt('You do not have permission to manage self-enrollment').'</span>'); } } elsif ($env{'form.action'} eq 'changelogs') { - my $helpitem; - if ($context eq 'course') { - $helpitem = 'Course_User_Logs'; + if ($permission->{cusr} || $permission->{view}) { + &print_userchangelogs_display($r,$context,$permission,$brcrum); + } else { + $r->print(&header(undef,{'no_nav_bar' => 1}). + '<span class="LC_error">'.&mt('You do not have permission to view change logs').'</span>'); + } + } elsif ($env{'form.action'} eq 'helpdesk') { + if (($permission->{'owner'}) || ($permission->{'co-owner'})) { + if ($env{'form.state'} eq 'process') { + if ($permission->{'owner'}) { + &update_helpdeskaccess($r,$permission,$brcrum); + } else { + &print_helpdeskaccess_display($r,$permission,$brcrum); + } + } else { + &print_helpdeskaccess_display($r,$permission,$brcrum); + } + } else { + $r->print(&header(undef,{'no_nav_bar' => 1}). + '<span class="LC_error">'.&mt('You do not have permission to view helpdesk access').'</span>'); } - push (@{$brcrum}, - {href => '/adm/createuser?action=changelogs', - text => 'User Management Logs', - help => $helpitem}); - $bread_crumbs_component = 'User Changes'; - $args = { bread_crumbs => $brcrum, - bread_crumbs_component => $bread_crumbs_component}; - $r->print(&header(undef,$args)); - &print_userchangelogs_display($r,$context,$permission); } else { $bread_crumbs_component = 'User Management'; $args = { bread_crumbs => $brcrum, @@ -4857,6 +5288,32 @@ sub add_script { .'</script>'."\n"; } +sub usernamerequest_javascript { + my $js = <<ENDJS; + +function openusernamereqdisplay(dom,uname,queue) { + var url = '/adm/createuser?action=displayuserreq'; + url += '&domain='+dom+'&username='+uname+'&queue='+queue; + var title = 'Account_Request_Browser'; + var options = 'scrollbars=1,resizable=1,menubar=0'; + options += ',width=700,height=600'; + var stdeditbrowser = open(url,title,options,'1'); + stdeditbrowser.focus(); + return; +} + +ENDJS +} + +sub close_popup_form { + my $close= &mt('Close Window'); + return << "END"; +<p><form name="displayreq" action="" method="post"> +<input type="button" name="closeme" value="$close" onclick="javascript:self.close();" /> +</form></p> +END +} + sub verify_user_display { my ($context) = @_; my %lt = &Apache::lonlocal::texthash ( @@ -5051,6 +5508,26 @@ sub print_main_menu { listusers => 'Show and manage users in this community.', }, ); + if ($linkcontext eq 'domain') { + unless ($permission->{'cusr'}) { + $links{'domain'}{'singleuser'} = 'View a User'; + $linktitles{'domain'}{'singleuser'} = 'View information about a user in the domain'; + } + } elsif ($linkcontext eq 'course') { + unless ($permission->{'cusr'}) { + $links{'course'}{'singleuser'} = 'View a Course User'; + $linktitles{'course'}{'singleuser'} = 'View information about a user in this course'; + $links{'course'}{'listusers'} = 'List Course Users'; + $linktitles{'course'}{'listusers'} = 'Show information about users in this course'; + } + } elsif ($linkcontext eq 'community') { + unless ($permission->{'cusr'}) { + $links{'community'}{'singleuser'} = 'View a Community User'; + $linktitles{'community'}{'singleuser'} = 'View information about a user in this community'; + $links{'community'}{'listusers'} = 'List Community Users'; + $linktitles{'community'}{'listusers'} = 'Show information about users in this community'; + } + } my @menu = ( {categorytitle => 'Single Users', items => [ @@ -5059,7 +5536,7 @@ sub print_main_menu { icon => 'edit-redo.png', #help => 'Course_Change_Privileges', url => '/adm/createuser?action=singleuser', - permission => $permission->{'cusr'}, + permission => ($permission->{'view'} || $permission->{'cusr'}), linktitle => $linktitles{$linkcontext}{'singleuser'}, }, ]}, @@ -5089,8 +5566,18 @@ sub print_main_menu { {categorytitle => 'Administration', items => [ ]}, ); - + if ($context eq 'domain'){ + push(@{ $menu[0]->{items} }, # Single Users + { + linktext => 'User Access Log', + icon => 'document-properties.png', + #help => 'Domain_User_Access_Logs', + url => '/adm/createuser?action=accesslogs', + permission => $permission->{'activity'}, + linktitle => 'View user access log.', + } + ); push(@{ $menu[2]->{items} }, #Category: Administration { @@ -5110,11 +5597,19 @@ sub print_main_menu { linktitle => 'Approve or reject author role requests', }, { + linktext => 'LON-CAPA Account Requests', + icon => 'list-add.png', + #help => 'Domain_Username_Approvals', + url => '/adm/createuser?action=processusernamereq', + permission => $permission->{'cusr'}, + linktitle => 'Approve or reject LON-CAPA account requests', + }, + { linktext => 'Change Log', icon => 'document-properties.png', #help => 'Course_User_Logs', url => '/adm/createuser?action=changelogs', - permission => $permission->{'cusr'}, + permission => ($permission->{'cusr'} || $permission->{'view'}), linktitle => 'View change log.', }, ); @@ -5134,6 +5629,7 @@ sub print_main_menu { groups => 'Community Groups', }, ); + $linktext{'Placement'} = $linktext{'Course'}; my %linktitle = ( 'Course' => { @@ -5148,6 +5644,8 @@ sub print_main_menu { }, ); + $linktitle{'Placement'} = $linktitle{'Course'}; + push(@{ $menu[0]->{items} }, #Category: Single Users { linktext => $linktext{$crstype}{'single'}, @@ -5170,7 +5668,15 @@ sub print_main_menu { }, ); push(@{ $menu[2]->{items} }, #Category: Administration - { + { + linktext => 'Helpdesk Access', + icon => 'helpdesk-access.png', + #help => 'Course_Helpdesk_Access', + url => '/adm/createuser?action=helpdesk', + permission => ($permission->{'owner'} || $permission->{'co-owner'}), + linktitle => 'Helpdesk access options', + }, + { linktext => 'Custom Roles', icon => 'emblem-photos.png', #help => 'Course_Editing_Custom_Roles', @@ -5191,18 +5697,18 @@ sub print_main_menu { icon => 'document-properties.png', #help => 'Course_User_Logs', url => '/adm/createuser?action=changelogs', - permission => $permission->{'cusr'}, + permission => ($permission->{'view'} || $permission->{'cusr'}), linktitle => 'View change log.', }, ); if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) { push(@{ $menu[2]->{items} }, - { + { linktext => 'Enrollment Requests', icon => 'selfenrl-queue.png', #help => 'Course_Approve_Selfenroll', url => '/adm/createuser?action=selfenrollqueue', - permission => $permission->{'cusr'}, + permission => $permission->{'selfenrolladmin'}, linktitle =>'Approve or reject enrollment requests.', }, ); @@ -5216,7 +5722,8 @@ sub print_main_menu { icon => 'roles.png', #help => 'Course_Automated_Enrollment', permission => (&Apache::lonnet::auto_run($cnum,$cdom) - && $permission->{'cusr'}), + && (($permission->{'cusr'}) || + ($permission->{'view'}))), url => '/adm/populate', linktitle => 'Automated enrollment manager.', } @@ -5228,7 +5735,7 @@ sub print_main_menu { icon => 'self_enroll.png', #help => 'Course_Self_Enrollment', url => '/adm/createuser?action=selfenroll', - permission => $permission->{'cusr'}, + permission => $permission->{'selfenrolladmin'}, linktitle => 'Configure user self-enrollment.', }, ); @@ -5265,11 +5772,11 @@ sub restore_prev_selections { } sub print_selfenroll_menu { - my ($r,$context,$permission) = @_; + my ($r,$context,$cid,$cdom,$cnum,$currsettings,$additional,$readonly) = @_; my $crstype = &Apache::loncommon::course_type(); - my $formname = 'enrollstudent'; + my $formname = 'selfenroll'; my $nolink = 1; - my ($row,$lt) = &get_selfenroll_titles(); + my ($row,$lt) = &Apache::lonuserutils::get_selfenroll_titles(); my $groupslist = &Apache::lonuserutils::get_groupslist(); my $setsec_js = &Apache::lonuserutils::setsections_javascript($formname,$groupslist); @@ -5278,6 +5785,11 @@ sub print_selfenroll_menu { butn => 'but no user types have been checked.', wilf => "Please uncheck 'activate' or check at least one type.", ); + my $disabled; + if ($readonly) { + $disabled = ' disabled="disabled"'; + } + &js_escape(\%alerts); my $selfenroll_js = <<"ENDSCRIPT"; function update_types(caller,num) { var delidx = getIndexByName('selfenroll_delete'); @@ -5388,7 +5900,7 @@ function validate_types(form) { } } else { if (document.$formname.selfenroll_activate.checked) { - var num = document.enrollstudent.selfenroll_activate.value; + var num = document.$formname.selfenroll_activate.value; countfail = check_types(num,countfail,needaction) } } @@ -5409,12 +5921,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<document.$formname.elements[typeidx].length; k++) { - if (document.$formname.elements[typeidx][k].checked) { + if (document.$formname.elements[boxname].length) { + for (var k=0; k<document.$formname.elements[boxname].length; k++) { + if (document.$formname.elements[boxname][k].checked) { count ++; } } @@ -5435,6 +5948,26 @@ function check_types(num,countfail,needa return countfail; } +function toggleNotify() { + var selfenrollApproval = 0; + if (document.$formname.selfenroll_approval.length) { + for (var i=0; i<document.$formname.selfenroll_approval.length; i++) { + if (document.$formname.selfenroll_approval[i].checked) { + selfenrollApproval = document.$formname.selfenroll_approval[i].value; + break; + } + } + } + if (document.getElementById('notified')) { + if (selfenrollApproval == 0) { + document.getElementById('notified').style.display='none'; + } else { + document.getElementById('notified').style.display='block'; + } + } + return; +} + function getIndexByName(item) { for (var i=0;i<document.$formname.elements.length;i++) { if (document.$formname.elements[i].name == item) { @@ -5444,8 +5977,6 @@ function getIndexByName(item) { return -1; } ENDSCRIPT - my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; my $output = '<script type="text/javascript">'."\n". '// <![CDATA['."\n". @@ -5453,25 +5984,71 @@ ENDSCRIPT '// ]]>'."\n". '</script>'."\n". '<h3>'.$lt->{'selfenroll'}.'</h3>'."\n"; - my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum); - if (ref($visactions) eq 'HASH') { - if ($visible) { - $output .= '<p class="LC_info">'.$visactions->{'vis'}.'</p>'; + + my $visactions = &cat_visibility(); + my ($cathash,%cattype); + my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom); + if (ref($domconfig{'coursecategories'}) eq 'HASH') { + $cathash = $domconfig{'coursecategories'}{'cats'}; + $cattype{'auth'} = $domconfig{'coursecategories'}{'auth'}; + $cattype{'unauth'} = $domconfig{'coursecategories'}{'unauth'}; + if ($cattype{'auth'} eq '') { + $cattype{'auth'} = 'std'; + } + if ($cattype{'unauth'} eq '') { + $cattype{'unauth'} = 'std'; + } + } else { + $cathash = {}; + $cattype{'auth'} = 'std'; + $cattype{'unauth'} = 'std'; + } + if (($cattype{'auth'} eq 'none') && ($cattype{'unauth'} eq 'none')) { + $r->print('<br /><span class="LC_warning">'.$visactions->{'miss'}.'</span><br />'.$visactions->{'yous'}. + '<br />'. + '<br />'.$visactions->{'take'}.'<ul>'. + '<li>'.$visactions->{'dc_chgconf'}.'</li>'. + '</ul>'); + } elsif (($cattype{'auth'} !~ /^(std|domonly)$/) && ($cattype{'unauth'} !~ /^(std|domonly)$/)) { + if ($currsettings->{'uniquecode'}) { + $r->print('<span class="LC_info">'.$visactions->{'vis'}.'</span>'); } else { - $output .= '<p class="LC_warning">'.$visactions->{'miss'}.'</p>' - .$visactions->{'yous'}. - '<p>'.$visactions->{'gen'}.'<br />'.$visactions->{'coca'}; - if (ref($vismsgs) eq 'ARRAY') { - $output .= '<br />'.$visactions->{'make'}.'<ul>'; - foreach my $item (@{$vismsgs}) { - $output .= '<li>'.$visactions->{$item}.'</li>'; + $r->print('<br /><span class="LC_warning">'.$visactions->{'miss'}.'</span><br />'.$visactions->{'yous'}. + '<br />'. + '<br />'.$visactions->{'take'}.'<ul>'. + '<li>'.$visactions->{'dc_setcode'}.'</li>'. + '</ul><br />'); + } + } else { + my ($visible,$cansetvis,$vismsgs) = &visible_in_stdcat($cdom,$cnum,\%domconfig); + if (ref($visactions) eq 'HASH') { + if ($visible) { + $output .= '<p class="LC_info">'.$visactions->{'vis'}.'</p>'; + } else { + $output .= '<p class="LC_warning">'.$visactions->{'miss'}.'</p>' + .$visactions->{'yous'}. + '<p>'.$visactions->{'gen'}.'<br />'.$visactions->{'coca'}; + if (ref($vismsgs) eq 'ARRAY') { + $output .= '<br />'.$visactions->{'make'}.'<ul>'; + foreach my $item (@{$vismsgs}) { + $output .= '<li>'.$visactions->{$item}.'</li>'; + } + $output .= '</ul>'; } - $output .= '</ul>'; + $output .= '</p>'; } - $output .= '</p>'; } } - $output .= '<form name="'.$formname.'" method="post" action="/adm/createuser">'."\n". + my $actionhref = '/adm/createuser'; + if ($context eq 'domain') { + $actionhref = '/adm/modifycourse'; + } + + my %noedit; + unless ($context eq 'domain') { + %noedit = &get_noedit_fields($cdom,$cnum,$crstype,$row); + } + $output .= '<form name="'.$formname.'" method="post" action="'.$actionhref.'">'."\n". &Apache::lonhtmlcommon::start_pick_box(); if (ref($row) eq 'ARRAY') { foreach my $item (@{$row}) { @@ -5481,7 +6058,41 @@ ENDSCRIPT } $output .= &Apache::lonhtmlcommon::row_title($title); if ($item eq 'types') { - my $curr_types = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_types'}; + my $curr_types; + if (ref($currsettings) eq 'HASH') { + $curr_types = $currsettings->{'selfenroll_types'}; + } + if ($noedit{$item}) { + if ($curr_types eq '*') { + $output .= &mt('Any user in any domain'); + } else { + my @entries = split(/;/,$curr_types); + if (@entries > 0) { + $output .= '<ul>'; + foreach my $entry (@entries) { + my ($currdom,$typestr) = split(/:/,$entry); + next if ($typestr eq ''); + my $domdesc = &Apache::lonnet::domain($currdom); + my @currinsttypes = split(',',$typestr); + my ($othertitle,$usertypes,$types) = + &Apache::loncommon::sorted_inst_types($currdom); + if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) { + $usertypes->{'any'} = &mt('any user'); + if (keys(%{$usertypes}) > 0) { + $usertypes->{'other'} = &mt('other users'); + } + my @longinsttypes = map { $usertypes->{$_}; } @currinsttypes; + $output .= '<li>'.$domdesc.':'.join(', ',@longinsttypes).'</li>'; + } + } + $output .= '</ul>'; + } else { + $output .= &mt('None'); + } + } + $output .= '<br />'.&mt('(Set by Domain Coordinator)'); + next; + } my $showdomdesc = 1; my $includeempty = 1; my $num = 0; @@ -5494,13 +6105,13 @@ ENDSCRIPT $output .= ' checked="checked" '; } $output .= 'onchange="javascript:update_types('. - "'selfenroll_all'".');" />'.&mt('Yes').'</label>'. + "'selfenroll_all'".');"'.$disabled.' />'.&mt('Yes').'</label>'. ' <input type="radio" name="selfenroll_all" value="0" '; if ($curr_types ne '*') { $output .= ' checked="checked" '; } $output .= ' onchange="javascript:update_types('. - "'selfenroll_all'".');"/>'.&mt('No').'</label></td>'. + "'selfenroll_all'".');"'.$disabled.' />'.&mt('No').'</label></td>'. &Apache::loncommon::end_data_table_row(). &Apache::loncommon::end_data_table(). &mt('Or').'<br />'. @@ -5522,10 +6133,10 @@ ENDSCRIPT .'</b><input type="hidden" name="selfenroll_dom_'.$num .'" value="'.$currdom.'" /></span><br />' .'<span class="LC_nobreak"><label><input type="checkbox" ' - .'name="selfenroll_delete" value="'.$num.'" onchange="javascript:update_types('."'selfenroll_delete','$num'".');" />' + .'name="selfenroll_delete" value="'.$num.'" onchange="javascript:update_types('."'selfenroll_delete','$num'".');"'.$disabled.' />' .&mt('Delete').'</label></span></td>'; $output .= '<td valign="top"> '.&mt('User types:').'<br />' - .&selfenroll_inst_types($num,$currdom,\@currinsttypes).'</td>' + .&selfenroll_inst_types($num,$currdom,\@currinsttypes,$readonly).'</td>' .&Apache::loncommon::end_data_table_row(); $num ++; } @@ -5537,61 +6148,96 @@ ENDSCRIPT } elsif ($curr_types eq '') { $add_domtitle = &mt('Users in other domain:'); } + my ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('enroll',$cdom); $output .= &Apache::loncommon::start_data_table_row() .'<td colspan="2"><span class="LC_nobreak">'.$add_domtitle.'</span><br />' .&Apache::loncommon::select_dom_form('','selfenroll_newdom', - $includeempty,$showdomdesc) + $includeempty,$showdomdesc,'',$trusted,$untrusted,$readonly) .'<input type="hidden" name="selfenroll_types_total" value="'.$num.'" />' .'</td>'.&Apache::loncommon::end_data_table_row() .&Apache::loncommon::end_data_table(); } elsif ($item eq 'registered') { my ($regon,$regoff); - if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_registered'}) { + my $registered; + if (ref($currsettings) eq 'HASH') { + $registered = $currsettings->{'selfenroll_registered'}; + } + if ($noedit{$item}) { + if ($registered) { + $output .= &mt('Must be registered in course'); + } else { + $output .= &mt('No requirement'); + } + $output .= '<br />'.&mt('(Set by Domain Coordinator)'); + next; + } + if ($registered) { $regon = ' checked="checked" '; - $regoff = ' '; + $regoff = ''; } else { - $regon = ' '; + $regon = ''; $regoff = ' checked="checked" '; } $output .= '<label>'. - '<input type="radio" name="selfenroll_registered" value="1"'.$regon.'/>'. + '<input type="radio" name="selfenroll_registered" value="1"'.$regon.$disabled.' />'. &mt('Yes').'</label> <label>'. - '<input type="radio" name="selfenroll_registered" value="0"'.$regoff.'/>'. + '<input type="radio" name="selfenroll_registered" value="0"'.$regoff.$disabled.' />'. &mt('No').'</label>'; } elsif ($item eq 'enroll_dates') { - my $starttime = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_start_date'}; - my $endtime = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_end_date'}; - if ($starttime eq '') { - $starttime = $env{'course.'.$env{'request.course.id'}.'.default_enrollment_start_date'}; - } - if ($endtime eq '') { - $endtime = $env{'course.'.$env{'request.course.id'}.'.default_enrollment_end_date'}; + my ($starttime,$endtime); + if (ref($currsettings) eq 'HASH') { + $starttime = $currsettings->{'selfenroll_start_date'}; + $endtime = $currsettings->{'selfenroll_end_date'}; + if ($starttime eq '') { + $starttime = $currsettings->{'default_enrollment_start_date'}; + } + if ($endtime eq '') { + $endtime = $currsettings->{'default_enrollment_end_date'}; + } + } + if ($noedit{$item}) { + $output .= &mt('From: [_1], to: [_2]',&Apache::lonlocal::locallocaltime($starttime), + &Apache::lonlocal::locallocaltime($endtime)); + $output .= '<br />'.&mt('(Set by Domain Coordinator)'); + next; } my $startform = &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_start_date',$starttime, - undef,undef,undef,undef,undef,undef,undef,$nolink); + $disabled,undef,undef,undef,undef,undef,undef,$nolink); my $endform = &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_end_date',$endtime, - undef,undef,undef,undef,undef,undef,undef,$nolink); + $disabled,undef,undef,undef,undef,undef,undef,$nolink); $output .= &selfenroll_date_forms($startform,$endform); } elsif ($item eq 'access_dates') { - my $starttime = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_start_access'}; - my $endtime = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_end_access'}; - if ($starttime eq '') { - $starttime = $env{'course.'.$env{'request.course.id'}.'.default_enrollment_start_date'}; - } - if ($endtime eq '') { - $endtime = $env{'course.'.$env{'request.course.id'}.'.default_enrollment_end_date'}; + my ($starttime,$endtime); + if (ref($currsettings) eq 'HASH') { + $starttime = $currsettings->{'selfenroll_start_access'}; + $endtime = $currsettings->{'selfenroll_end_access'}; + if ($starttime eq '') { + $starttime = $currsettings->{'default_enrollment_start_date'}; + } + if ($endtime eq '') { + $endtime = $currsettings->{'default_enrollment_end_date'}; + } + } + if ($noedit{$item}) { + $output .= &mt('From: [_1], to: [_2]',&Apache::lonlocal::locallocaltime($starttime), + &Apache::lonlocal::locallocaltime($endtime)); + $output .= '<br />'.&mt('(Set by Domain Coordinator)'); + next; } my $startform = &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_start_access',$starttime, - undef,undef,undef,undef,undef,undef,undef,$nolink); + $disabled,undef,undef,undef,undef,undef,undef,$nolink); my $endform = &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_end_access',$endtime, - undef,undef,undef,undef,undef,undef,undef,$nolink); + $disabled,undef,undef,undef,undef,undef,undef,$nolink); $output .= &selfenroll_date_forms($startform,$endform); } elsif ($item eq 'section') { - my $currsec = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_section'}; + my $currsec; + if (ref($currsettings) eq 'HASH') { + $currsec = $currsettings->{'selfenroll_section'}; + } my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum); my $newsecval; if ($currsec ne 'none' && $currsec ne '') { @@ -5599,33 +6245,47 @@ ENDSCRIPT $newsecval = $currsec; } } + if ($noedit{$item}) { + if ($currsec ne '') { + $output .= $currsec; + } else { + $output .= &mt('No specific section'); + } + $output .= '<br />'.&mt('(Set by Domain Coordinator)'); + next; + } my $sections_select = - &Apache::lonuserutils::course_sections(\%sections_count,'st',$currsec); + &Apache::lonuserutils::course_sections(\%sections_count,'st',$currsec,$disabled); $output .= '<table class="LC_createuser">'."\n". '<tr class="LC_section_row">'."\n". '<td align="center">'.&mt('Existing sections')."\n". '<br />'.$sections_select.'</td><td align="center">'. &mt('New section').'<br />'."\n". - '<input type="text" name="newsec" size="15" value="'.$newsecval.'" />'."\n". + '<input type="text" name="newsec" size="15" value="'.$newsecval.'"'.$disabled.' />'."\n". '<input type="hidden" name="sections" value="" />'."\n". - '<input type="hidden" name="state" value="done" />'."\n". '</td></tr></table>'."\n"; } elsif ($item eq 'approval') { - my ($appon,$appoff); - my $cid = $env{'request.course.id'}; - my $currnotified = $env{'course.'.$cid.'.internal.selfenroll_notifylist'}; - if ($env{'course.'.$cid.'.internal.selfenroll_approval'}) { - $appon = ' checked="checked" '; - $appoff = ' '; - } else { - $appon = ' '; - $appoff = ' checked="checked" '; + my ($currnotified,$currapproval,%appchecked); + my %selfdescs = &Apache::lonuserutils::selfenroll_default_descs(); + if (ref($currsettings) eq 'HASH') { + $currnotified = $currsettings->{'selfenroll_notifylist'}; + $currapproval = $currsettings->{'selfenroll_approval'}; + } + if ($currapproval !~ /^[012]$/) { + $currapproval = 0; + } + if ($noedit{$item}) { + $output .= $selfdescs{'approval'}{$currapproval}. + '<br />'.&mt('(Set by Domain Coordinator)'); + next; + } + $appchecked{$currapproval} = ' checked="checked"'; + for my $i (0..2) { + $output .= '<label>'. + '<input type="radio" name="selfenroll_approval" value="'.$i.'"'. + $appchecked{$i}.' onclick="toggleNotify();"'.$disabled.' />'. + $selfdescs{'approval'}{$i}.'</label>'.(' 'x2); } - $output .= '<label>'. - '<input type="radio" name="selfenroll_approval" value="1"'.$appon.'/>'. - &mt('Yes').'</label> <label>'. - '<input type="radio" name="selfenroll_approval" value="0"'.$appoff.'/>'. - &mt('No').'</label>'; my %advhash = &Apache::lonnet::get_course_adv_roles($cid,1); my (@ccs,%notified); my $ccrole = 'cc'; @@ -5644,7 +6304,13 @@ ENDSCRIPT } } if (@ccs) { - $output .= '<br />'.&mt('Personnel to be notified when an enrollment request needs approval, or has been approved:').' '.&Apache::loncommon::start_data_table(). + my $style; + unless ($currapproval) { + $style = ' style="display: none;"'; + } + $output .= '<br /><div id="notified"'.$style.'>'. + &mt('Personnel to be notified when an enrollment request needs approval, or has been approved:').' '. + &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_row(); my $count = 0; my $numcols = 4; @@ -5659,7 +6325,7 @@ ENDSCRIPT &Apache::loncommon::start_data_table_row() } $output .= '<td><span class="LC_nobreak"><label>'. - '<input type="checkbox" name="selfenroll_notify"'.$notifyon.' value="'.$cc.'" />'. + '<input type="checkbox" name="selfenroll_notify"'.$notifyon.' value="'.$cc.'"'.$disabled.' />'. &Apache::loncommon::plainname($ccuname,$ccudom). '</label></span></td>'; $count ++; @@ -5672,14 +6338,29 @@ ENDSCRIPT } } $output .= &Apache::loncommon::end_data_table_row(). - &Apache::loncommon::end_data_table(); + &Apache::loncommon::end_data_table(). + '</div>'; } } elsif ($item eq 'limit') { - my ($crslimit,$selflimit,$nolimit); - my $cid = $env{'request.course.id'}; - my $currlim = $env{'course.'.$cid.'.internal.selfenroll_limit'}; - my $currcap = $env{'course.'.$cid.'.internal.selfenroll_cap'}; - $nolimit = ' checked="checked" '; + my ($crslimit,$selflimit,$nolimit,$currlim,$currcap); + if (ref($currsettings) eq 'HASH') { + $currlim = $currsettings->{'selfenroll_limit'}; + $currcap = $currsettings->{'selfenroll_cap'}; + } + if ($noedit{$item}) { + if (($currlim eq 'allstudents') || ($currlim eq 'selfenrolled')) { + if ($currlim eq 'allstudents') { + $output .= &mt('Limit by total students'); + } elsif ($currlim eq 'selfenrolled') { + $output .= &mt('Limit by total self-enrolled students'); + } + $output .= ' '.&mt('Maximum: [_1]',$currcap). + '<br />'.&mt('(Set by Domain Coordinator)'); + } else { + $output .= &mt('No limit').'<br />'.&mt('(Set by Domain Coordinator)'); + } + next; + } if ($currlim eq 'allstudents') { $crslimit = ' checked="checked" '; $selflimit = ' '; @@ -5691,61 +6372,73 @@ ENDSCRIPT } else { $crslimit = ' '; $selflimit = ' '; + $nolimit = ' checked="checked" '; } $output .= '<table><tr><td><label>'. - '<input type="radio" name="selfenroll_limit" value="none"'.$nolimit.'/>'. + '<input type="radio" name="selfenroll_limit" value="none"'.$nolimit.$disabled.'/>'. &mt('No limit').'</label></td><td><label>'. - '<input type="radio" name="selfenroll_limit" value="allstudents"'.$crslimit.'/>'. + '<input type="radio" name="selfenroll_limit" value="allstudents"'.$crslimit.$disabled.'/>'. &mt('Limit by total students').'</label></td><td><label>'. - '<input type="radio" name="selfenroll_limit" value="selfenrolled"'.$selflimit.'/>'. + '<input type="radio" name="selfenroll_limit" value="selfenrolled"'.$selflimit.$disabled.'/>'. &mt('Limit by total self-enrolled students'). '</td></tr><tr>'. '<td> </td><td colspan="2"><span class="LC_nobreak">'. (' 'x3).&mt('Maximum number allowed: '). - '<input type="text" name="selfenroll_cap" size = "5" value="'.$currcap.'" /></td></tr></table>'; + '<input type="text" name="selfenroll_cap" size = "5" value="'.$currcap.'"'.$disabled.' /></td></tr></table>'; } $output .= &Apache::lonhtmlcommon::row_closure(1); } } - $output .= &Apache::lonhtmlcommon::end_pick_box(). - '<br /><input type="button" name="selfenrollconf" value="' - .&mt('Save').'" onclick="validate_types(this.form);" />' - .'<input type="hidden" name="action" value="selfenroll" /></form>'; + $output .= &Apache::lonhtmlcommon::end_pick_box().'<br />'; + unless ($readonly) { + $output .= '<input type="button" name="selfenrollconf" value="' + .&mt('Save').'" onclick="validate_types(this.form);" />'; + } + $output .= '<input type="hidden" name="action" value="selfenroll" />' + .'<input type="hidden" name="state" value="done" />'."\n" + .$additional.'</form>'; $r->print($output); return; } -sub visible_in_cat { - my ($cdom,$cnum) = @_; - my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom); - my ($cathash,%settable,@vismsgs,$cansetvis); - my %visactions = &Apache::lonlocal::texthash( - vis => 'Your course/community currently appears in the Course/Community Catalog for this domain.', - gen => 'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.', - miss => 'Your course/community does not currently appear in the Course/Community Catalog for this domain.', - yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding your course.', - coca => 'Courses can be absent from the Catalog, because they do not have an institutional code, have no assigned category, or have been specifically excluded.', - make => 'Make any changes to self-enrollment settings below, click "Save", then take action to include the course in the Catalog:', - take => 'Take the following action to ensure the course appears in the Catalog:', - dc_unhide => 'Ask a domain coordinator to change the "Exclude from course catalog" setting.', - dc_addinst => 'Ask a domain coordinator to enable display the catalog of "Official courses (with institutional codes)".', - dc_instcode => 'Ask a domain coordinator to assign an institutional code (if this is an official course).', - dc_catalog => 'Ask a domain coordinator to enable or create at least one course category in the domain.', - dc_categories => 'Ask a domain coordinator to create a hierarchy of categories and sub categories for courses in the domain.', - dc_chgcat => 'Ask a domain coordinator to change the category assigned to the course, as the one currently assigned is no longer used in the domain', - dc_addcat => 'Ask a domain coordinator to assign a category to the course.', - ); - $visactions{'unhide'} = &mt('Use [_1]Categorize course[_2] to change the "Exclude from course catalog" setting.','<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"'); - $visactions{'chgcat'} = &mt('Use [_1]Categorize course[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','"<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"'); - $visactions{'addcat'} = &mt('Use [_1]Categorize course[_2] to assign a category to the course.','"<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"'); - if (ref($domconf{'coursecategories'}) eq 'HASH') { - if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') { +sub get_noedit_fields { + my ($cdom,$cnum,$crstype,$row) = @_; + my %noedit; + if (ref($row) eq 'ARRAY') { + my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook', + 'internal.selfenrollmgrdc', + 'internal.selfenrollmgrcc'],$cdom,$cnum); + my $type = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$crstype,\%settings); + my (%specific_managebydc,%specific_managebycc,%default_managebydc); + map { $specific_managebydc{$_} = 1; } (split(/,/,$settings{'internal.selfenrollmgrdc'})); + map { $specific_managebycc{$_} = 1; } (split(/,/,$settings{'internal.selfenrollmgrcc'})); + my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom); + map { $default_managebydc{$_} = 1; } (split(/,/,$domdefaults{$type.'selfenrolladmdc'})); + + foreach my $item (@{$row}) { + next if ($specific_managebycc{$item}); + if (($specific_managebydc{$item}) || ($default_managebydc{$item})) { + $noedit{$item} = 1; + } + } + } + return %noedit; +} + +sub visible_in_stdcat { + my ($cdom,$cnum,$domconf) = @_; + my ($cathash,%settable,@vismsgs,$cansetvis,$visible); + unless (ref($domconf) eq 'HASH') { + return ($visible,$cansetvis,\@vismsgs); + } + if (ref($domconf->{'coursecategories'}) eq 'HASH') { + if ($domconf->{'coursecategories'}{'togglecats'} eq 'crs') { $settable{'togglecats'} = 1; } - if ($domconf{'coursecategories'}{'categorize'} eq 'crs') { + if ($domconf->{'coursecategories'}{'categorize'} eq 'crs') { $settable{'categorize'} = 1; } - $cathash = $domconf{'coursecategories'}{'cats'}; + $cathash = $domconf->{'coursecategories'}{'cats'}; } if ($settable{'togglecats'} && $settable{'categorize'}) { $cansetvis = &mt('You are able to both assign a course category and choose to exclude this course from the catalog.'); @@ -5760,10 +6453,10 @@ sub visible_in_cat { my %currsettings = &Apache::lonnet::get('environment',['hidefromcat','categories','internal.coursecode'], $cdom,$cnum); - my $visible = 0; + $visible = 0; if ($currsettings{'internal.coursecode'} ne '') { - if (ref($domconf{'coursecategories'}) eq 'HASH') { - $cathash = $domconf{'coursecategories'}{'cats'}; + if (ref($domconf->{'coursecategories'}) eq 'HASH') { + $cathash = $domconf->{'coursecategories'}{'cats'}; if (ref($cathash) eq 'HASH') { if ($cathash->{'instcode::0'} eq '') { push(@vismsgs,'dc_addinst'); @@ -5787,8 +6480,8 @@ sub visible_in_cat { } if ($currsettings{'categories'} ne '') { my $cathash; - if (ref($domconf{'coursecategories'}) eq 'HASH') { - $cathash = $domconf{'coursecategories'}{'cats'}; + if (ref($domconf->{'coursecategories'}) eq 'HASH') { + $cathash = $domconf->{'coursecategories'}{'cats'}; if (ref($cathash) eq 'HASH') { if (keys(%{$cathash}) == 0) { push(@vismsgs,'dc_catalog'); @@ -5834,7 +6527,33 @@ sub visible_in_cat { unshift(@vismsgs,'dc_unhide') } } - return ($visible,$cansetvis,\@vismsgs,\%visactions); + return ($visible,$cansetvis,\@vismsgs); +} + +sub cat_visibility { + my %visactions = &Apache::lonlocal::texthash( + vis => 'This course/community currently appears in the Course/Community Catalog for this domain.', + gen => 'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.', + miss => 'This course/community does not currently appear in the Course/Community Catalog for this domain.', + none => 'Display of a course catalog is disabled for this domain.', + yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding this course.', + coca => 'Courses can be absent from the Catalog, because they do not have an institutional code, have no assigned category, or have been specifically excluded.', + make => 'Make any changes to self-enrollment settings below, click "Save", then take action to include the course in the Catalog:', + take => 'Take the following action to ensure the course appears in the Catalog:', + dc_chgconf => 'Ask a domain coordinator to change the Catalog type for this domain.', + dc_setcode => 'Ask a domain coordinator to assign a six character code to the course', + dc_unhide => 'Ask a domain coordinator to change the "Exclude from course catalog" setting.', + dc_addinst => 'Ask a domain coordinator to enable display the catalog of "Official courses (with institutional codes)".', + dc_instcode => 'Ask a domain coordinator to assign an institutional code (if this is an official course).', + dc_catalog => 'Ask a domain coordinator to enable or create at least one course category in the domain.', + dc_categories => 'Ask a domain coordinator to create a hierarchy of categories and sub categories for courses in the domain.', + dc_chgcat => 'Ask a domain coordinator to change the category assigned to the course, as the one currently assigned is no longer used in the domain', + dc_addcat => 'Ask a domain coordinator to assign a category to the course.', + ); + $visactions{'unhide'} = &mt('Use [_1]Categorize course[_2] to change the "Exclude from course catalog" setting.','<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"'); + $visactions{'chgcat'} = &mt('Use [_1]Categorize course[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','"<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"'); + $visactions{'addcat'} = &mt('Use [_1]Categorize course[_2] to assign a category to the course.','"<a href="/adm/courseprefs?phase=display&actions=courseinfo">','</a>"'); + return \%visactions; } sub new_selfenroll_dom_row { @@ -5860,12 +6579,16 @@ sub new_selfenroll_dom_row { } sub selfenroll_inst_types { - my ($num,$currdom,$currinsttypes) = @_; + my ($num,$currdom,$currinsttypes,$readonly) = @_; my $output; my $numinrow = 4; my $count = 0; my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($currdom); my $othervalue = 'any'; + my $disabled; + if ($readonly) { + $disabled = ' disabled="disabled"'; + } if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) { if (keys(%{$usertypes}) > 0) { $othervalue = 'other'; @@ -5890,7 +6613,7 @@ sub selfenroll_inst_types { $output .= 'checked="checked"'; } } - $output .= ' name="selfenroll_types_'.$num.'" />'.$usertypes->{$type}.'</label></span></td>'; + $output .= ' name="selfenroll_types_'.$num.'"'.$disabled.' />'.$usertypes->{$type}.'</label></span></td>'; } $count ++; } @@ -5913,7 +6636,7 @@ sub selfenroll_inst_types { } else { $output .= ' checked="checked"'; } - $output .= ' name="selfenroll_types_'.$num.'" />'.$othertitle.'</label></span></td></tr></table>'; + $output .= ' name="selfenroll_types_'.$num.'"'.$disabled.' />'.$othertitle.'</label></span></td></tr></table>'; } return $output; } @@ -5934,9 +6657,9 @@ sub selfenroll_date_forms { } sub print_userchangelogs_display { - my ($r,$context,$permission) = @_; + my ($r,$context,$permission,$brcrum) = @_; my $formname = 'rolelog'; - my ($username,$domain,$crstype,%roleslog); + my ($username,$domain,$crstype,$viewablesec,%roleslog); if ($context eq 'domain') { $domain = $env{'request.role.domain'}; %roleslog=&Apache::lonnet::dump_dom('nohist_rolelog',$domain); @@ -5945,6 +6668,7 @@ sub print_userchangelogs_display { $domain = $env{'course.'.$env{'request.course.id'}.'.domain'}; $username = $env{'course.'.$env{'request.course.id'}.'.num'}; $crstype = &Apache::loncommon::course_type(); + $viewablesec = &Apache::lonuserutils::viewable_section($permission); my %saveable_parameters = ('show' => 'scalar',); &Apache::loncommon::store_course_settings('roles_log', \%saveable_parameters); @@ -5964,6 +6688,36 @@ sub print_userchangelogs_display { } if ((keys(%roleslog))[0]=~/^error\:/) { undef(%roleslog); } + 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', + text => 'User Management Logs', + help => $helpitem}); + my $bread_crumbs_component = 'User Changes'; + my $args = { bread_crumbs => $brcrum, + bread_crumbs_component => $bread_crumbs_component}; + + # Create navigation javascript + my $jsnav = &userlogdisplay_js($formname); + + my $jscript = (<<ENDSCRIPT); +<script type="text/javascript"> +// <![CDATA[ +$jsnav +// ]]> +</script> +ENDSCRIPT + + # print page header + $r->print(&header($jscript,$args)); + # set defaults my $now = time(); my $defstart = $now - (7*24*3600); #7 days ago @@ -5996,7 +6750,9 @@ sub print_userchangelogs_display { my ($minshown,$maxshown); $minshown = 1; my $count = 0; - if ($curr{'show'} ne &mt('all')) { + if ($curr{'show'} =~ /\D/) { + $curr{'page'} = 1; + } else { $maxshown = $curr{'page'} * $curr{'show'}; if ($curr{'page'} > 1) { $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'}; @@ -6008,8 +6764,6 @@ sub print_userchangelogs_display { &role_display_filter($context,$formname,$domain,$username,\%curr, $version,$crstype)); - # Create navigation - my ($nav_script,$nav_links) = &userlogdisplay_nav($formname,\%curr,$more_records); my $showntableheader = 0; # Table Header @@ -6034,7 +6788,7 @@ sub print_userchangelogs_display { foreach my $id (sort { $roleslog{$b}{'exe_time'}<=>$roleslog{$a}{'exe_time'} } (keys(%roleslog))) { next if (($roleslog{$id}{'exe_time'} < $curr{'rolelog_start_date'}) || ($roleslog{$id}{'exe_time'} > $curr{'rolelog_end_date'})); - if ($curr{'show'} ne &mt('all')) { + if ($curr{'show'} !~ /\D/) { if ($count >= $curr{'page'} * $curr{'show'}) { $more_records = 1; last; @@ -6050,12 +6804,13 @@ sub print_userchangelogs_display { next if ($roleslog{$id}{'logentry'}{'context'} ne $curr{'chgcontext'}); } } + if (($context eq 'course') && ($viewablesec ne '')) { + next if ($roleslog{$id}{'logentry'}{'section'} ne $viewablesec); + } $count ++; next if ($count < $minshown); unless ($showntableheader) { - $r->print($nav_script - .$nav_links - .&Apache::loncommon::start_data_table() + $r->print(&Apache::loncommon::start_data_table() .$tableheader); $r->rflush(); $showntableheader = 1; @@ -6116,8 +6871,8 @@ sub print_userchangelogs_display { } if ($showntableheader) { # Table footer, if content displayed above - $r->print(&Apache::loncommon::end_data_table() - .$nav_links); + $r->print(&Apache::loncommon::end_data_table(). + &userlogdisplay_navlinks(\%curr,$more_records)); } else { # No content displayed above $r->print('<p class="LC_info">' .&mt('There are no records to display.') @@ -6133,15 +6888,377 @@ sub print_userchangelogs_display { return; } -sub userlogdisplay_nav { - my ($formname,$curr,$more_records) = @_; - my ($nav_script,$nav_links); - if (ref($curr) eq 'HASH') { - # Create Navigation: - # Navigation Script - $nav_script = <<"ENDSCRIPT"; +sub print_useraccesslogs_display { + my ($r,$uname,$udom,$permission,$brcrum) = @_; + my $formname = 'accesslog'; + my $form = 'document.accesslog'; + +# set breadcrumbs + my %breadcrumb_text = &singleuser_breadcrumb('','domain',$udom); + my $prevphasestr; + if ($env{'form.popup'}) { + $brcrum = []; + } else { + push (@{$brcrum}, + {href => "javascript:backPage($form)", + text => $breadcrumb_text{'search'}}); + my @prevphases; + if ($env{'form.prevphases'}) { + @prevphases = split(/,/,$env{'form.prevphases'}); + $prevphasestr = $env{'form.prevphases'}; + } + if (($env{'form.phase'} eq 'userpicked') || (grep(/^userpicked$/,@prevphases))) { + push(@{$brcrum}, + {href => "javascript:backPage($form,'get_user_info','select')", + text => $breadcrumb_text{'userpicked'}}); + if ($env{'form.phase'} eq 'userpicked') { + $prevphasestr = 'userpicked'; + } + } + } + push(@{$brcrum}, + {href => '/adm/createuser?action=accesslogs', + text => 'User access logs', + help => 'Domain_User_Access_Logs'}); + my $bread_crumbs_component = 'User Access Logs'; + my $args = { bread_crumbs => $brcrum, + bread_crumbs_component => 'User Management'}; + if ($env{'form.popup'}) { + $args->{'no_nav_bar'} = 1; + $args->{'bread_crumbs_nomenu'} = 1; + } + +# set javascript + my ($jsback,$elements) = &crumb_utilities(); + my $jsnav = &userlogdisplay_js($formname); + + my $jscript = (<<ENDSCRIPT); <script type="text/javascript"> // <![CDATA[ + +$jsback +$jsnav + +// ]]> +</script> + +ENDSCRIPT + +# print page header + $r->print(&header($jscript,$args)); + +# early out unless log data can be displayed. + unless ($permission->{'activity'}) { + $r->print('<p class="LC_warning">' + .&mt('You do not have rights to display user access logs.') + .'</p>'); + if ($env{'form.popup'}) { + $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a></p>'); + } else { + $r->print(&earlyout_accesslog_form($formname,$prevphasestr,$udom)); + } + return; + } + + unless ($udom eq $env{'request.role.domain'}) { + $r->print('<p class="LC_warning">' + .&mt("User's domain must match role's domain") + .'</p>' + .&earlyout_accesslog_form($formname,$prevphasestr,$udom)); + return; + } + + if (($uname eq '') || ($udom eq '')) { + $r->print('<p class="LC_warning">' + .&mt('Invalid username or domain') + .'</p>' + .&earlyout_accesslog_form($formname,$prevphasestr,$udom)); + return; + } + + if (&Apache::lonnet::privileged($uname,$udom, + [$env{'request.role.domain'}],['dc','su'])) { + unless (&Apache::lonnet::privileged($env{'user.name'},$env{'user.domain'}, + [$env{'request.role.domain'}],['dc','su'])) { + $r->print('<p class="LC_warning">' + .&mt('You need to be a privileged user to display user access logs for [_1]', + &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom), + $uname,$udom)) + .'</p>'); + if ($env{'form.popup'}) { + $r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a></p>'); + } else { + $r->print(&earlyout_accesslog_form($formname,$prevphasestr,$udom)); + } + return; + } + } + +# set defaults + my $now = time(); + my $defstart = $now - (7*24*3600); + my %defaults = ( + page => '1', + show => '10', + activity => 'any', + accesslog_start_date => $defstart, + accesslog_end_date => $now, + ); + my $more_records = 0; + +# set current + my %curr; + foreach my $item ('show','page','activity') { + $curr{$item} = $env{'form.'.$item}; + } + my ($startdate,$enddate) = + &Apache::lonuserutils::get_dates_from_form('accesslog_start_date','accesslog_end_date'); + $curr{'accesslog_start_date'} = $startdate; + $curr{'accesslog_end_date'} = $enddate; + foreach my $key (keys(%defaults)) { + if ($curr{$key} eq '') { + $curr{$key} = $defaults{$key}; + } + } + my ($minshown,$maxshown); + $minshown = 1; + my $count = 0; + if ($curr{'show'} =~ /\D/) { + $curr{'page'} = 1; + } else { + $maxshown = $curr{'page'} * $curr{'show'}; + if ($curr{'page'} > 1) { + $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'}; + } + } + +# form header + $r->print('<form action="/adm/createuser" method="post" name="'.$formname.'">'. + &activity_display_filter($formname,\%curr)); + + my $showntableheader = 0; + my ($nav_script,$nav_links); + +# table header + my $tableheader = '<h3>'. + &mt('User access logs for: [_1]', + &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)).'</h3>' + .&Apache::loncommon::start_data_table_header_row() + .'<th> </th>' + .'<th>'.&mt('When').'</th>' + .'<th>'.&mt('HostID').'</th>' + .'<th>'.&mt('Event').'</th>' + .'<th>'.&mt('Other data').'</th>' + .&Apache::loncommon::end_data_table_header_row(); + + my %filters=( + start => $curr{'accesslog_start_date'}, + end => $curr{'accesslog_end_date'}, + action => $curr{'activity'}, + ); + + my $reply = &Apache::lonnet::userlog_query($uname,$udom,%filters); + unless ( ($reply =~/^timeout/) || ($reply =~/^error/) ) { + my (%courses,%missing); + my @results = split(/\&/,$reply); + foreach my $item (reverse(@results)) { + my ($timestamp,$host,$event) = split(/:/,$item); + next unless ($event =~ /^(Log|Role)/); + if ($curr{'show'} !~ /\D/) { + if ($count >= $curr{'page'} * $curr{'show'}) { + $more_records = 1; + last; + } + } + $count ++; + next if ($count < $minshown); + unless ($showntableheader) { + $r->print($nav_script + .&Apache::loncommon::start_data_table() + .$tableheader); + $r->rflush(); + $showntableheader = 1; + } + my ($shown,$extra); + my ($event,$data) = split(/\s+/,&unescape($event),2); + if ($event eq 'Role') { + my ($rolecode,$extent) = split(/\./,$data,2); + next if ($extent eq ''); + my ($crstype,$desc,$info); + if ($extent =~ m{^/($match_domain)/($match_courseid)(?:/(\w+)|)$}) { + my ($cdom,$cnum,$sec) = ($1,$2,$3); + my $cid = $cdom.'_'.$cnum; + if (exists($courses{$cid})) { + $crstype = $courses{$cid}{'type'}; + $desc = $courses{$cid}{'description'}; + } elsif ($missing{$cid}) { + $crstype = 'Course'; + $desc = 'Course/Community'; + } else { + my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,undef,undef,'.'); + if (ref($crsinfo{$cdom.'_'.$cnum}) eq 'HASH') { + $courses{$cid} = $crsinfo{$cid}; + $crstype = $crsinfo{$cid}{'type'}; + $desc = $crsinfo{$cid}{'description'}; + } else { + $missing{$cid} = 1; + } + } + $extra = &mt($crstype).': <a href="/public/'.$cdom.'/'.$cnum.'/syllabus">'.$desc.'</a>'; + if ($sec ne '') { + $extra .= ' ('.&mt('Section: [_1]',$sec).')'; + } + } elsif ($extent =~ m{^/($match_domain)/($match_username|$)}) { + my ($dom,$name) = ($1,$2); + if ($rolecode eq 'au') { + $extra = ''; + } elsif ($rolecode =~ /^(ca|aa)$/) { + $extra = &mt('Authoring Space: [_1]',$name.':'.$dom); + } elsif ($rolecode =~ /^(li|dg|dh|dc|sc)$/) { + $extra = &mt('Domain: [_1]',$dom); + } + } + my $rolename; + if ($rolecode =~ m{^cr/($match_domain)/($match_username)/(\w+)}) { + my $role = $3; + my $owner = "($2:$1)"; + if ($2 eq $1.'-domainconfig') { + $owner = '(ad hoc)'; + } + $rolename = &mt('Custom role: [_1]',$role.' '.$owner); + } else { + $rolename = &Apache::lonnet::plaintext($rolecode,$crstype); + } + $shown = &mt('Role selection: [_1]',$rolename); + } else { + $shown = &mt($event); + if ($data =~ /^webdav/) { + my ($path,$clientip) = split(/\s+/,$data,2); + $path =~ s/^webdav//; + if ($clientip ne '') { + $extra = &mt('Client IP address: [_1]',$clientip); + } + if ($path ne '') { + $shown .= ' '.&mt('(WebDAV access to [_1])',$path); + } + } elsif ($data ne '') { + $extra = &mt('Client IP address: [_1]',$data); + } + } + $r->print( + &Apache::loncommon::start_data_table_row() + .'<td>'.$count.'</td>' + .'<td>'.&Apache::lonlocal::locallocaltime($timestamp).'</td>' + .'<td>'.$host.'</td>' + .'<td>'.$shown.'</td>' + .'<td>'.$extra.'</td>' + .&Apache::loncommon::end_data_table_row()."\n"); + } + } + + if ($showntableheader) { # Table footer, if content displayed above + $r->print(&Apache::loncommon::end_data_table(). + &userlogdisplay_navlinks(\%curr,$more_records)); + } else { # No content displayed above + $r->print('<p class="LC_info">' + .&mt('There are no records to display.') + .'</p>'); + } + + if ($env{'form.popup'} == 1) { + $r->print('<input type="hidden" name="popup" value="1" />'."\n"); + } + + # Form Footer + $r->print( + '<input type="hidden" name="currstate" value="" />' + .'<input type="hidden" name="accessuname" value="'.$uname.'" />' + .'<input type="hidden" name="accessudom" value="'.$udom.'" />' + .'<input type="hidden" name="page" value="'.$curr{'page'}.'" />' + .'<input type="hidden" name="prevphases" value="'.$prevphasestr.'" />' + .'<input type="hidden" name="phase" value="activity" />' + .'<input type="hidden" name="action" value="accesslogs" />' + .'<input type="hidden" name="srchdomain" value="'.$udom.'" />' + .'<input type="hidden" name="srchby" value="'.$env{'form.srchby'}.'" />' + .'<input type="hidden" name="srchtype" value="'.$env{'form.srchtype'}.'" />' + .'<input type="hidden" name="srchterm" value="'.&HTML::Entities::encode($env{'form.srchterm'},'<>"&').'" />' + .'<input type="hidden" name="srchin" value="'.$env{'form.srchin'}.'" />' + .'</form>'); + return; +} + +sub earlyout_accesslog_form { + my ($formname,$prevphasestr,$udom) = @_; + my $srchterm = &HTML::Entities::encode($env{'form.srchterm'},'<>"&'); + return <<"END"; +<form action="/adm/createuser" method="post" name="$formname"> +<input type="hidden" name="currstate" value="" /> +<input type="hidden" name="prevphases" value="$prevphasestr" /> +<input type="hidden" name="phase" value="activity" /> +<input type="hidden" name="action" value="accesslogs" /> +<input type="hidden" name="srchdomain" value="$udom" /> +<input type="hidden" name="srchby" value="$env{'form.srchby'}" /> +<input type="hidden" name="srchtype" value="$env{'form.srchtype'}" /> +<input type="hidden" name="srchterm" value="$srchterm" /> +<input type="hidden" name="srchin" value="$env{'form.srchin'}" /> +</form> +END +} + +sub activity_display_filter { + my ($formname,$curr) = @_; + my $nolink = 1; + my $output = '<table><tr><td valign="top">'. + '<span class="LC_nobreak"><b>'.&mt('Actions/page:').'</b></span><br />'. + &Apache::lonmeta::selectbox('show',$curr->{'show'},undef, + (&mt('all'),5,10,20,50,100,1000,10000)). + '</td><td> </td>'; + my $startform = + &Apache::lonhtmlcommon::date_setter($formname,'accesslog_start_date', + $curr->{'accesslog_start_date'},undef, + undef,undef,undef,undef,undef,undef,$nolink); + my $endform = + &Apache::lonhtmlcommon::date_setter($formname,'accesslog_end_date', + $curr->{'accesslog_end_date'},undef, + undef,undef,undef,undef,undef,undef,$nolink); + my %lt = &Apache::lonlocal::texthash ( + activity => 'Activity', + Role => 'Role selection', + log => 'Log-in or Logout', + ); + $output .= '<td valign="top"><b>'.&mt('Window during which actions occurred:').'</b><br />'. + '<table><tr><td>'.&mt('After:'). + '</td><td>'.$startform.'</td></tr>'. + '<tr><td>'.&mt('Before:').'</td>'. + '<td>'.$endform.'</td></tr></table>'. + '</td>'. + '<td> </td>'. + '<td valign="top"><b>'.&mt('Activities').'</b><br />'. + '<select name="activity"><option value="any"'; + if ($curr->{'activity'} eq 'any') { + $output .= ' selected="selected"'; + } + $output .= '>'.&mt('Any').'</option>'."\n"; + foreach my $activity ('Role','log') { + my $selstr = ''; + if ($activity eq $curr->{'activity'}) { + $selstr = ' selected="selected"'; + } + $output .= '<option value="'.$activity.'"'.$selstr.'>'.$lt{$activity}.'</option>'; + } + $output .= '</select></td>'. + '</tr></table>'; + # Update Display button + $output .= '<p>' + .'<input type="submit" value="'.&mt('Update Display').'" />' + .'</p><hr />'; + return $output; +} + +sub userlogdisplay_js { + my ($formname) = @_; + return <<"ENDSCRIPT"; + function chgPage(caller) { if (caller == 'previous') { document.$formname.page.value --; @@ -6152,28 +7269,30 @@ function chgPage(caller) { document.$formname.submit(); return; } -// ]]> -</script> ENDSCRIPT - # Navigation Buttons - $nav_links = '<p>'; - if (($curr->{'page'} > 1) || ($more_records)) { - if ($curr->{'page'} > 1) { - $nav_links .= '<input type="button"' - .' onclick="javascript:chgPage('."'previous'".');"' - .' value="'.&mt('Previous [_1] changes',$curr->{'show'}) - .'" /> '; - } - if ($more_records) { - $nav_links .= '<input type="button"' - .' onclick="javascript:chgPage('."'next'".');"' - .' value="'.&mt('Next [_1] changes',$curr->{'show'}) - .'" />'; - } +} + +sub userlogdisplay_navlinks { + my ($curr,$more_records) = @_; + return unless(ref($curr) eq 'HASH'); + # Navigation Buttons + my $nav_links = '<p>'; + if (($curr->{'page'} > 1) || ($more_records)) { + if (($curr->{'page'} > 1) && ($curr->{'show'} !~ /\D/)) { + $nav_links .= '<input type="button"' + .' onclick="javascript:chgPage('."'previous'".');"' + .' value="'.&mt('Previous [_1] changes',$curr->{'show'}) + .'" /> '; + } + if ($more_records) { + $nav_links .= '<input type="button"' + .' onclick="javascript:chgPage('."'next'".');"' + .' value="'.&mt('Next [_1] changes',$curr->{'show'}) + .'" />'; } - $nav_links .= '</p>'; } - return ($nav_script,$nav_links); + $nav_links .= '</p>'; + return $nav_links; } sub role_display_filter { @@ -6309,6 +7428,988 @@ sub rolechg_contexts { return %lt; } +sub print_helpdeskaccess_display { + my ($r,$permission,$brcrum) = @_; + my $formname = 'helpdeskaccess'; + my $helpitem = 'Course_Helpdesk_Access'; + push (@{$brcrum}, + {href => '/adm/createuser?action=helpdesk', + text => 'Helpdesk Access', + help => $helpitem}); + my $bread_crumbs_component = 'Helpdesk Staff Access'; + my $args = { bread_crumbs => $brcrum, + bread_crumbs_component => $bread_crumbs_component}; + + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + my $confname = $cdom.'-domainconfig'; + my $crstype = &Apache::loncommon::course_type(); + + my @accesstypes = ('all','dh','da','none'); + my ($numstatustypes,@jsarray); + my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($cdom); + if (ref($types) eq 'ARRAY') { + if (@{$types} > 0) { + $numstatustypes = scalar(@{$types}); + push(@accesstypes,'status'); + @jsarray = ('bystatus'); + } + } + my %customroles = &get_domain_customroles($cdom,$confname); + my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh','da']); + if (keys(%domhelpdesk)) { + push(@accesstypes,('inc','exc')); + push(@jsarray,('notinc','notexc')); + } + push(@jsarray,'privs'); + my $hiddenstr = join("','",@jsarray); + my $rolestr = join("','",sort(keys(%customroles))); + + my $jscript; + my (%settings,%overridden); + if (keys(%customroles)) { + &get_adhocrole_settings($env{'request.course.id'},\@accesstypes, + $types,\%customroles,\%settings,\%overridden); + my %jsfull=(); + my %jslevels= ( + course => {}, + domain => {}, + system => {}, + ); + my %jslevelscurrent=( + course => {}, + domain => {}, + system => {}, + ); + my (%privs,%jsprivs); + &Apache::lonuserutils::custom_role_privs(\%privs,\%jsfull,\%jslevels,\%jslevelscurrent); + foreach my $priv (keys(%jsfull)) { + if ($jslevels{'course'}{$priv}) { + $jsprivs{$priv} = 1; + } + } + my (%elements,%stored); + foreach my $role (keys(%customroles)) { + $elements{$role.'_access'} = 'radio'; + $elements{$role.'_incrs'} = 'radio'; + if ($numstatustypes) { + $elements{$role.'_status'} = 'checkbox'; + } + if (keys(%domhelpdesk) > 0) { + $elements{$role.'_staff_inc'} = 'checkbox'; + $elements{$role.'_staff_exc'} = 'checkbox'; + } + $elements{$role.'_override'} = 'checkbox'; + if (ref($settings{$role}) eq 'HASH') { + if ($settings{$role}{'access'} ne '') { + my $curraccess = $settings{$role}{'access'}; + $stored{$role.'_access'} = $curraccess; + $stored{$role.'_incrs'} = 1; + if ($curraccess eq 'status') { + if (ref($settings{$role}{'status'}) eq 'ARRAY') { + $stored{$role.'_status'} = $settings{$role}{'status'}; + } + } elsif (($curraccess eq 'exc') || ($curraccess eq 'inc')) { + if (ref($settings{$role}{$curraccess}) eq 'ARRAY') { + $stored{$role.'_staff_'.$curraccess} = $settings{$role}{$curraccess}; + } + } + } else { + $stored{$role.'_incrs'} = 0; + } + $stored{$role.'_override'} = []; + if ($env{'course.'.$env{'request.course.id'}.'.internal.adhocpriv.'.$role}) { + if (ref($settings{$role}{'off'}) eq 'ARRAY') { + foreach my $priv (@{$settings{$role}{'off'}}) { + push(@{$stored{$role.'_override'}},$priv); + } + } + if (ref($settings{$role}{'on'}) eq 'ARRAY') { + foreach my $priv (@{$settings{$role}{'on'}}) { + unless (grep(/^$priv$/,@{$stored{$role.'_override'}})) { + push(@{$stored{$role.'_override'}},$priv); + } + } + } + } + } else { + $stored{$role.'_incrs'} = 0; + } + } + $jscript = &Apache::lonhtmlcommon::set_form_elements(\%elements,\%stored); + } + + my $js = <<"ENDJS"; +<script type="text/javascript"> +// <![CDATA[ +$jscript; + +function switchRoleTab(caller,role) { + if (document.getElementById(role+'_maindiv')) { + if (caller.id != 'LC_current_minitab') { + if (document.getElementById('LC_current_minitab')) { + document.getElementById('LC_current_minitab').id=null; + } + var roledivs = Array('$rolestr'); + if (roledivs.length > 0) { + for (var i=0; i<roledivs.length; i++) { + if (document.getElementById(roledivs[i]+'_maindiv')) { + document.getElementById(roledivs[i]+'_maindiv').style.display='none'; + } + } + } + caller.id = 'LC_current_minitab'; + document.getElementById(role+'_maindiv').style.display='block'; + } + } + return false; +} + +function helpdeskAccess(role) { + var curraccess = null; + if (document.$formname.elements[role+'_access'].length) { + for (var i=0; i<document.$formname.elements[role+'_access'].length; i++) { + if (document.$formname.elements[role+'_access'][i].checked) { + curraccess = document.$formname.elements[role+'_access'][i].value; + } + } + } + var shown = Array(); + var hidden = Array(); + if (curraccess == 'none') { + hidden = Array ('$hiddenstr'); + } else { + if (curraccess == 'status') { + shown = Array ('bystatus','privs'); + hidden = Array ('notinc','notexc'); + } else { + if (curraccess == 'exc') { + shown = Array ('notexc','privs'); + hidden = Array ('notinc','bystatus'); + } + if (curraccess == 'inc') { + shown = Array ('notinc','privs'); + hidden = Array ('notexc','bystatus'); + } + if (curraccess == 'all') { + shown = Array ('privs'); + hidden = Array ('notinc','notexc','bystatus'); + } + } + } + if (hidden.length > 0) { + for (var i=0; i<hidden.length; i++) { + if (document.getElementById(role+'_'+hidden[i])) { + document.getElementById(role+'_'+hidden[i]).style.display = 'none'; + } + } + } + if (shown.length > 0) { + for (var i=0; i<shown.length; i++) { + if (document.getElementById(role+'_'+shown[i])) { + if (shown[i] == 'privs') { + document.getElementById(role+'_'+shown[i]).style.display = 'block'; + } else { + document.getElementById(role+'_'+shown[i]).style.display = 'inline'; + } + } + } + } + return; +} + +function toggleAccess(role) { + if ((document.getElementById(role+'_setincrs')) && + (document.getElementById(role+'_setindom'))) { + for (var i=0; i<document.$formname.elements[role+'_incrs'].length; i++) { + if (document.$formname.elements[role+'_incrs'][i].checked) { + if (document.$formname.elements[role+'_incrs'][i].value == 1) { + document.getElementById(role+'_setindom').style.display = 'none'; + document.getElementById(role+'_setincrs').style.display = 'block'; + } else { + document.getElementById(role+'_setincrs').style.display = 'none'; + document.getElementById(role+'_setindom').style.display = 'block'; + } + break; + } + } + } + return; +} + +// ]]> +</script> +ENDJS + + $args->{add_entries} = {onload => "javascript:setFormElements(document.$formname)"}; + + # print page header + $r->print(&header($js,$args)); + # print form header + $r->print('<form action="/adm/createuser" method="post" name="'.$formname.'">'); + + if (keys(%customroles)) { + my %lt = &Apache::lonlocal::texthash( + 'aco' => 'As course owner you may override the defaults set in the domain for role usage and/or privileges.', + 'rou' => 'Role usage', + 'whi' => 'Which helpdesk personnel may use this role?', + 'udd' => 'Use domain default', + 'all' => 'All with domain helpdesk or helpdesk assistant role', + 'dh' => 'All with domain helpdesk role', + 'da' => 'All with domain helpdesk assistant role', + 'none' => 'None', + 'status' => 'Determined based on institutional status', + 'inc' => 'Include all, but exclude specific personnel', + 'exc' => 'Exclude all, but include specific personnel', + 'hel' => 'Helpdesk', + 'rpr' => 'Role privileges', + ); + $lt{'tfh'} = &mt("Custom [_1]ad hoc[_2] course roles available for use by the domain's helpdesk are as follows",'<i>','</i>'); + my %domconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$cdom); + my (%domcurrent,%ordered,%description,%domusage,$disabled); + if (ref($domconfig{'helpsettings'}) eq 'HASH') { + if (ref($domconfig{'helpsettings'}{'adhoc'}) eq 'HASH') { + %domcurrent = %{$domconfig{'helpsettings'}{'adhoc'}}; + } + } + my $count = 0; + foreach my $role (sort(keys(%customroles))) { + my ($order,$desc,$access_in_dom); + if (ref($domcurrent{$role}) eq 'HASH') { + $order = $domcurrent{$role}{'order'}; + $desc = $domcurrent{$role}{'desc'}; + $access_in_dom = $domcurrent{$role}{'access'}; + } + if ($order eq '') { + $order = $count; + } + $ordered{$order} = $role; + if ($desc ne '') { + $description{$role} = $desc; + } else { + $description{$role}= $role; + } + $count++; + } + %domusage = &domain_adhoc_access(\%customroles,\%domcurrent,\@accesstypes,$usertypes,$othertitle); + my @roles_by_num = (); + foreach my $item (sort {$a <=> $b } (keys(%ordered))) { + push(@roles_by_num,$ordered{$item}); + } + $r->print('<p>'.$lt{'tfh'}.': <i>'.join('</i>, <i>',map { $description{$_}; } @roles_by_num).'</i>.'); + if ($permission->{'owner'}) { + $r->print('<br />'.$lt{'aco'}.'</p><p>'); + $r->print('<input type="hidden" name="state" value="process" />'. + '<input type="submit" value="'.&mt('Save changes').'" />'); + } else { + if ($env{'course.'.$env{'request.course.id'}.'.internal.courseowner'}) { + my ($ownername,$ownerdom) = split(/:/,$env{'course.'.$env{'request.course.id'}.'.internal.courseowner'}); + $r->print('<br />'.&mt('The course owner -- [_1] -- can override the default access and/or privileges for these ad hoc roles.', + &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($ownername,$ownerdom),$ownername,$ownerdom))); + } + $disabled = ' disabled="disabled"'; + } + $r->print('</p>'); + + $r->print('<div id="LC_minitab_header"><ul>'); + my $count = 0; + my %visibility; + foreach my $role (@roles_by_num) { + my $id; + if ($count == 0) { + $id=' id="LC_current_minitab"'; + $visibility{$role} = ' style="display:block"'; + } else { + $visibility{$role} = ' style="display:none"'; + } + $count ++; + $r->print('<li'.$id.'><a href="#" onclick="javascript:switchRoleTab(this.parentNode,'."'$role'".');">'.$description{$role}.'</a></li>'); + } + $r->print('</ul></div>'); + + foreach my $role (@roles_by_num) { + my %usecheck = ( + all => ' checked="checked"', + ); + my %displaydiv = ( + status => 'none', + inc => 'none', + exc => 'none', + priv => 'block', + ); + my (%selected,$overridden,$incrscheck,$indomcheck,$indomvis,$incrsvis); + if (ref($settings{$role}) eq 'HASH') { + if ($settings{$role}{'access'} ne '') { + $indomvis = ' style="display:none"'; + $incrsvis = ' style="display:block"'; + $incrscheck = ' checked="checked"'; + if ($settings{$role}{'access'} ne 'all') { + $usecheck{$settings{$role}{'access'}} = $usecheck{'all'}; + delete($usecheck{'all'}); + if ($settings{$role}{'access'} eq 'status') { + my $access = 'status'; + $displaydiv{$access} = 'inline'; + if (ref($settings{$role}{$access}) eq 'ARRAY') { + $selected{$access} = $settings{$role}{$access}; + } + } elsif ($settings{$role}{'access'} =~ /^(inc|exc)$/) { + my $access = $1; + $displaydiv{$access} = 'inline'; + if (ref($settings{$role}{$access}) eq 'ARRAY') { + $selected{$access} = $settings{$role}{$access}; + } + } elsif ($settings{$role}{'access'} eq 'none') { + $displaydiv{'priv'} = 'none'; + } + } + } else { + $indomcheck = ' checked="checked"'; + $indomvis = ' style="display:block"'; + $incrsvis = ' style="display:none"'; + } + } else { + $indomcheck = ' checked="checked"'; + $indomvis = ' style="display:block"'; + $incrsvis = ' style="display:none"'; + } + $r->print('<div class="LC_left_float" id="'.$role.'_maindiv"'.$visibility{$role}.'>'. + '<fieldset><legend>'.$lt{'rou'}.'</legend>'. + '<p>'.$lt{'whi'}.' <span class="LC_nobreak">'. + '<label><input type="radio" name="'.$role.'_incrs" value="1"'.$incrscheck.' onclick="toggleAccess('."'$role'".');"'.$disabled.'>'. + &mt('Set here in [_1]',lc($crstype)).'</label>'. + '<span>'.(' 'x2). + '<label><input type="radio" name="'.$role.'_incrs" value="0"'.$indomcheck.' onclick="toggleAccess('."'$role'".');"'.$disabled.'>'. + $lt{'udd'}.'</label><span></p>'. + '<div id="'.$role.'_setindom"'.$indomvis.'>'. + '<span class="LC_cusr_emph">'.$domusage{$role}.'</span></div>'. + '<div id="'.$role.'_setincrs"'.$incrsvis.'>'); + foreach my $access (@accesstypes) { + $r->print('<p><label><input type="radio" name="'.$role.'_access" value="'.$access.'" '.$usecheck{$access}. + ' onclick="helpdeskAccess('."'$role'".');"'.$disabled.' />'.$lt{$access}.'</label>'); + if ($access eq 'status') { + $r->print('<div id="'.$role.'_bystatus" style="display:'.$displaydiv{$access}.'">'. + &Apache::lonuserutils::adhoc_status_types($cdom,undef,$role,$selected{$access}, + $othertitle,$usertypes,$types,$disabled). + '</div>'); + } elsif (($access eq 'inc') && (keys(%domhelpdesk) > 0)) { + $r->print('<div id="'.$role.'_notinc" style="display:'.$displaydiv{$access}.'">'. + &Apache::lonuserutils::adhoc_staff($access,undef,$role,$selected{$access}, + \%domhelpdesk,$disabled). + '</div>'); + } elsif (($access eq 'exc') && (keys(%domhelpdesk) > 0)) { + $r->print('<div id="'.$role.'_notexc" style="display:'.$displaydiv{$access}.'">'. + &Apache::lonuserutils::adhoc_staff($access,undef,$role,$selected{$access}, + \%domhelpdesk,$disabled). + '</div>'); + } + $r->print('</p>'); + } + $r->print('</div></fieldset>'); + my %full=(); + my %levels= ( + course => {}, + domain => {}, + system => {}, + ); + my %levelscurrent=( + course => {}, + domain => {}, + system => {}, + ); + &Apache::lonuserutils::custom_role_privs($customroles{$role},\%full,\%levels,\%levelscurrent); + $r->print('<fieldset id="'.$role.'_privs" style="display:'.$displaydiv{'priv'}.'">'. + '<legend>'.$lt{'rpr'}.'</legend>'. + &role_priv_table($role,$permission,$crstype,\%full,\%levels,\%levelscurrent,$overridden{$role}). + '</fieldset></div><div style="padding:0;clear:both;margin:0;border:0"></div>'); + } + if ($permission->{'owner'}) { + $r->print('<p><input type="submit" value="'.&mt('Save changes').'" /></p>'); + } + } else { + $r->print(&mt('Helpdesk roles have not yet been created in this domain.')); + } + # Form Footer + $r->print('<input type="hidden" name="action" value="helpdesk" />' + .'</form>'); + return; +} + +sub domain_adhoc_access { + my ($roles,$domcurrent,$accesstypes,$usertypes,$othertitle) = @_; + my %domusage; + return unless ((ref($roles) eq 'HASH') && (ref($domcurrent) eq 'HASH') && (ref($accesstypes) eq 'ARRAY')); + foreach my $role (keys(%{$roles})) { + if (ref($domcurrent->{$role}) eq 'HASH') { + my $access = $domcurrent->{$role}{'access'}; + if (($access eq '') || (!grep(/^\Q$access\E$/,@{$accesstypes}))) { + $access = 'all'; + $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',&Apache::lonnet::plaintext('dh'), + &Apache::lonnet::plaintext('da')); + } elsif ($access eq 'status') { + if (ref($domcurrent->{$role}{$access}) eq 'ARRAY') { + my @shown; + foreach my $type (@{$domcurrent->{$role}{$access}}) { + unless ($type eq 'default') { + if ($usertypes->{$type}) { + push(@shown,$usertypes->{$type}); + } + } + } + if (grep(/^default$/,@{$domcurrent->{$role}{$access}})) { + push(@shown,$othertitle); + } + if (@shown) { + my $shownstatus = join(' '.&mt('or').' ',@shown); + $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role, and institutional status: [_3]', + &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$shownstatus); + } else { + $domusage{$role} = &mt('No one in the domain'); + } + } + } elsif ($access eq 'inc') { + my @dominc = (); + if (ref($domcurrent->{$role}{'inc'}) eq 'ARRAY') { + foreach my $user (@{$domcurrent->{$role}{'inc'}}) { + my ($uname,$udom) = split(/:/,$user); + push(@dominc,&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)); + } + my $showninc = join(', ',@dominc); + if ($showninc ne '') { + $domusage{$role} = &mt('Include any user in domain with active [_1] or [_2] role, except: [_3]', + &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$showninc); + } else { + $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role', + &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da')); + } + } + } elsif ($access eq 'exc') { + my @domexc = (); + if (ref($domcurrent->{$role}{'exc'}) eq 'ARRAY') { + foreach my $user (@{$domcurrent->{$role}{'exc'}}) { + my ($uname,$udom) = split(/:/,$user); + push(@domexc,&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)); + } + } + my $shownexc = join(', ',@domexc); + if ($shownexc ne '') { + $domusage{$role} = &mt('Only the following in the domain with active [_1] or [_2] role: [_3]', + &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$shownexc); + } else { + $domusage{$role} = &mt('No one in the domain'); + } + } elsif ($access eq 'none') { + $domusage{$role} = &mt('No one in the domain'); + } elsif ($access eq 'dh') { + $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh')); + } elsif ($access eq 'da') { + $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('da')); + } elsif ($access eq 'all') { + $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role', + &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da')); + } + } else { + $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role', + &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da')); + } + } + return %domusage; +} + +sub get_domain_customroles { + my ($cdom,$confname) = @_; + my %existing=&Apache::lonnet::dump('roles',$cdom,$confname,'rolesdef_'); + my %customroles; + foreach my $key (keys(%existing)) { + if ($key=~/^rolesdef\_(\w+)$/) { + my $rolename = $1; + my %privs; + ($privs{'system'},$privs{'domain'},$privs{'course'}) = split(/\_/,$existing{$key}); + $customroles{$rolename} = \%privs; + } + } + return %customroles; +} + +sub role_priv_table { + my ($role,$permission,$crstype,$full,$levels,$levelscurrent,$overridden) = @_; + return unless ((ref($full) eq 'HASH') && (ref($levels) eq 'HASH') && + (ref($levelscurrent) eq 'HASH')); + my %lt=&Apache::lonlocal::texthash ( + 'crl' => 'Course Level Privilege', + 'def' => 'Domain Defaults', + 'ove' => 'Override in Course', + 'ine' => 'In effect', + 'dis' => 'Disabled', + 'ena' => 'Enabled', + ); + if ($crstype eq 'Community') { + $lt{'ove'} = 'Override in Community', + } + my @status = ('Disabled','Enabled'); + my (%on,%off); + if (ref($overridden) eq 'HASH') { + if (ref($overridden->{'on'}) eq 'ARRAY') { + map { $on{$_} = 1; } (@{$overridden->{'on'}}); + } + if (ref($overridden->{'off'}) eq 'ARRAY') { + map { $off{$_} = 1; } (@{$overridden->{'off'}}); + } + } + my $output=&Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + '<th>'.$lt{'crl'}.'</th><th>'.$lt{'def'}.'</th><th>'.$lt{'ove'}. + '</th><th>'.$lt{'ine'}.'</th>'. + &Apache::loncommon::end_data_table_header_row(); + foreach my $priv (sort(keys(%{$full}))) { + next unless ($levels->{'course'}{$priv}); + my $privtext = &Apache::lonnet::plaintext($priv,$crstype); + my ($default,$ineffect); + if ($levelscurrent->{'course'}{$priv}) { + $default = '<img src="/adm/lonIcons/navmap.correct.gif" alt="'.$lt{'ena'}.'" />'; + $ineffect = $default; + } + my ($customstatus,$checked); + $output .= &Apache::loncommon::start_data_table_row(). + '<td>'.$privtext.'</td>'. + '<td>'.$default.'</td><td>'; + if (($levelscurrent->{'course'}{$priv}) && ($off{$priv})) { + if ($permission->{'owner'}) { + $checked = ' checked="checked"'; + } + $customstatus = '<img src="/adm/lonIcons/navmap.wrong.gif" alt="'.$lt{'dis'}.'" />'; + $ineffect = $customstatus; + } elsif ((!$levelscurrent->{'course'}{$priv}) && ($on{$priv})) { + if ($permission->{'owner'}) { + $checked = ' checked="checked"'; + } + $customstatus = '<img src="/adm/lonIcons/navmap.correct.gif" alt="'.$lt{'ena'}.'" />'; + $ineffect = $customstatus; + } + if ($permission->{'owner'}) { + $output .= '<input type="checkbox" name="'.$role.'_override" value="'.$priv.'"'.$checked.' />'; + } else { + $output .= $customstatus; + } + $output .= '</td><td>'.$ineffect.'</td>'. + &Apache::loncommon::end_data_table_row(); + } + $output .= &Apache::loncommon::end_data_table(); + return $output; +} + +sub get_adhocrole_settings { + my ($cid,$accesstypes,$types,$customroles,$settings,$overridden) = @_; + return unless ((ref($accesstypes) eq 'ARRAY') && (ref($customroles) eq 'HASH') && + (ref($settings) eq 'HASH') && (ref($overridden) eq 'HASH')); + foreach my $role (split(/,/,$env{'course.'.$cid.'.internal.adhocaccess'})) { + my ($curraccess,$rest) = split(/=/,$env{'course.'.$cid.'.internal.adhoc.'.$role}); + if (($curraccess ne '') && (grep(/^\Q$curraccess\E$/,@{$accesstypes}))) { + $settings->{$role}{'access'} = $curraccess; + if (($curraccess eq 'status') && (ref($types) eq 'ARRAY')) { + my @status = split(/,/,$rest); + my @currstatus; + foreach my $type (@status) { + if ($type eq 'default') { + push(@currstatus,$type); + } elsif (grep(/^\Q$type\E$/,@{$types})) { + push(@currstatus,$type); + } + } + if (@currstatus) { + $settings->{$role}{$curraccess} = \@currstatus; + } elsif (($curraccess eq 'exc') || ($curraccess eq 'inc')) { + my @personnel = split(/,/,$rest); + $settings->{$role}{$curraccess} = \@personnel; + } + } + } + } + foreach my $role (keys(%{$customroles})) { + if ($env{'course.'.$cid.'.internal.adhocpriv.'.$role}) { + my %currentprivs; + if (ref($customroles->{$role}) eq 'HASH') { + if (exists($customroles->{$role}{'course'})) { + my %full=(); + my %levels= ( + course => {}, + domain => {}, + system => {}, + ); + my %levelscurrent=( + course => {}, + domain => {}, + system => {}, + ); + &Apache::lonuserutils::custom_role_privs($customroles->{$role},\%full,\%levels,\%levelscurrent); + %currentprivs = %{$levelscurrent{'course'}}; + } + } + foreach my $item (split(/,/,$env{'course.'.$cid.'.internal.adhocpriv.'.$role})) { + next if ($item eq ''); + my ($rule,$rest) = split(/=/,$item); + next unless (($rule eq 'off') || ($rule eq 'on')); + foreach my $priv (split(/:/,$rest)) { + if ($priv ne '') { + if ($rule eq 'off') { + push(@{$overridden->{$role}{'off'}},$priv); + if ($currentprivs{$priv}) { + push(@{$settings->{$role}{'off'}},$priv); + } + } else { + push(@{$overridden->{$role}{'on'}},$priv); + unless ($currentprivs{$priv}) { + push(@{$settings->{$role}{'on'}},$priv); + } + } + } + } + } + } + } + return; +} + +sub update_helpdeskaccess { + my ($r,$permission,$brcrum) = @_; + my $helpitem = 'Course_Helpdesk_Access'; + push (@{$brcrum}, + {href => '/adm/createuser?action=helpdesk', + text => 'Helpdesk Access', + help => $helpitem}, + {href => '/adm/createuser?action=helpdesk', + text => 'Result', + help => $helpitem} + ); + my $bread_crumbs_component = 'Helpdesk Staff Access'; + my $args = { bread_crumbs => $brcrum, + bread_crumbs_component => $bread_crumbs_component}; + + # print page header + $r->print(&header('',$args)); + unless ((ref($permission) eq 'HASH') && ($permission->{'owner'})) { + $r->print('<p class="LC_error">'.&mt('You do not have permission to change helpdesk access.').'</p>'); + return; + } + my @accesstypes = ('all','dh','da','none','status','inc','exc'); + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + my $confname = $cdom.'-domainconfig'; + my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($cdom); + my $crstype = &Apache::loncommon::course_type(); + my %customroles = &get_domain_customroles($cdom,$confname); + my (%settings,%overridden); + &get_adhocrole_settings($env{'request.course.id'},\@accesstypes, + $types,\%customroles,\%settings,\%overridden); + my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh','da']); + my (%changed,%storehash,@todelete); + + if (keys(%customroles)) { + my (%newsettings,@incrs); + foreach my $role (keys(%customroles)) { + $newsettings{$role} = { + access => '', + status => '', + exc => '', + inc => '', + on => '', + off => '', + }; + my %current; + if (ref($settings{$role}) eq 'HASH') { + %current = %{$settings{$role}}; + } + if (ref($overridden{$role}) eq 'HASH') { + $current{'overridden'} = $overridden{$role}; + } + if ($env{'form.'.$role.'_incrs'}) { + my $access = $env{'form.'.$role.'_access'}; + if (grep(/^\Q$access\E$/,@accesstypes)) { + push(@incrs,$role); + unless ($current{'access'} eq $access) { + $changed{$role}{'access'} = 1; + $storehash{'internal.adhoc.'.$role} = $access; + } + if ($access eq 'status') { + my @statuses = &Apache::loncommon::get_env_multiple('form.'.$role.'_status'); + my @stored; + my @shownstatus; + if (ref($types) eq 'ARRAY') { + foreach my $type (sort(@statuses)) { + if ($type eq 'default') { + push(@stored,$type); + } elsif (grep(/^\Q$type\E$/,@{$types})) { + push(@stored,$type); + push(@shownstatus,$usertypes->{$type}); + } + } + if (grep(/^default$/,@statuses)) { + push(@shownstatus,$othertitle); + } + $storehash{'internal.adhoc.'.$role} .= '='.join(',',@stored); + } + $newsettings{$role}{'status'} = join(' '.&mt('or').' ',@shownstatus); + if (ref($current{'status'}) eq 'ARRAY') { + my @diffs = &Apache::loncommon::compare_arrays(\@stored,$current{'status'}); + if (@diffs) { + $changed{$role}{'status'} = 1; + } + } elsif (@stored) { + $changed{$role}{'status'} = 1; + } + } elsif (($access eq 'inc') || ($access eq 'exc')) { + my @personnel = &Apache::loncommon::get_env_multiple('form.'.$role.'_staff_'.$access); + my @newspecstaff; + my @stored; + my @currstaff; + foreach my $person (sort(@personnel)) { + if ($domhelpdesk{$person}) { + push(@stored,$person); + } + } + if (ref($current{$access}) eq 'ARRAY') { + my @diffs = &Apache::loncommon::compare_arrays(\@stored,$current{$access}); + if (@diffs) { + $changed{$role}{$access} = 1; + } + } elsif (@stored) { + $changed{$role}{$access} = 1; + } + $storehash{'internal.adhoc.'.$role} .= '='.join(',',@stored); + foreach my $person (@stored) { + my ($uname,$udom) = split(/:/,$person); + push(@newspecstaff,&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom,'lastname'),$uname,$udom)); + } + $newsettings{$role}{$access} = join(', ',sort(@newspecstaff)); + } + $newsettings{$role}{'access'} = $access; + } + } else { + if (($current{'access'} ne '') && (grep(/^\Q$current{'access'}\E$/,@accesstypes))) { + $changed{$role}{'access'} = 1; + $newsettings{$role} = {}; + push(@todelete,'internal.adhoc.'.$role); + } + } + if (($env{'form.'.$role.'_incrs'}) && ($env{'form.'.$role.'_access'} eq 'none')) { + if (ref($current{'overridden'}) eq 'HASH') { + push(@todelete,'internal.adhocpriv.'.$role); + } + } else { + my %full=(); + my %levels= ( + course => {}, + domain => {}, + system => {}, + ); + my %levelscurrent=( + course => {}, + domain => {}, + system => {}, + ); + &Apache::lonuserutils::custom_role_privs($customroles{$role},\%full,\%levels,\%levelscurrent); + my (@updatedon,@updatedoff,@override); + @override = &Apache::loncommon::get_env_multiple('form.'.$role.'_override'); + if (@override) { + foreach my $priv (sort(keys(%full))) { + next unless ($levels{'course'}{$priv}); + if (grep(/^\Q$priv\E$/,@override)) { + if ($levelscurrent{'course'}{$priv}) { + push(@updatedoff,$priv); + } else { + push(@updatedon,$priv); + } + } + } + } + if (@updatedon) { + $newsettings{$role}{'on'} = join('</li><li>', map { &Apache::lonnet::plaintext($_,$crstype) } (@updatedon)); + } + if (@updatedoff) { + $newsettings{$role}{'off'} = join('</li><li>', map { &Apache::lonnet::plaintext($_,$crstype) } (@updatedoff)); + } + if (ref($current{'overridden'}) eq 'HASH') { + if (ref($current{'overridden'}{'on'}) eq 'ARRAY') { + if (@updatedon) { + my @diffs = &Apache::loncommon::compare_arrays(\@updatedon,$current{'overridden'}{'on'}); + if (@diffs) { + $changed{$role}{'on'} = 1; + } + } else { + $changed{$role}{'on'} = 1; + } + } elsif (@updatedon) { + $changed{$role}{'on'} = 1; + } + if (ref($current{'overridden'}{'off'}) eq 'ARRAY') { + if (@updatedoff) { + my @diffs = &Apache::loncommon::compare_arrays(\@updatedoff,$current{'overridden'}{'off'}); + if (@diffs) { + $changed{$role}{'off'} = 1; + } + } else { + $changed{$role}{'off'} = 1; + } + } elsif (@updatedoff) { + $changed{$role}{'off'} = 1; + } + } else { + if (@updatedon) { + $changed{$role}{'on'} = 1; + } + if (@updatedoff) { + $changed{$role}{'off'} = 1; + } + } + if (ref($changed{$role}) eq 'HASH') { + if (($changed{$role}{'on'} || $changed{$role}{'off'})) { + my $newpriv; + if (@updatedon) { + $newpriv = 'on='.join(':',@updatedon); + } + if (@updatedoff) { + $newpriv .= ($newpriv ? ',' : '' ).'off='.join(':',@updatedoff); + } + if ($newpriv eq '') { + push(@todelete,'internal.adhocpriv.'.$role); + } else { + $storehash{'internal.adhocpriv.'.$role} = $newpriv; + } + } + } + } + } + if (@incrs) { + $storehash{'internal.adhocaccess'} = join(',',@incrs); + } elsif (@todelete) { + push(@todelete,'internal.adhocaccess'); + } + if (keys(%changed)) { + my ($putres,$delres); + if (keys(%storehash)) { + $putres = &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum); + my %newenvhash; + foreach my $key (keys(%storehash)) { + $newenvhash{'course.'.$env{'request.course.id'}.'.'.$key} = $storehash{$key}; + } + &Apache::lonnet::appenv(\%newenvhash); + } + if (@todelete) { + $delres = &Apache::lonnet::del('environment',\@todelete,$cdom,$cnum); + foreach my $key (@todelete) { + &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.'.$key); + } + } + if (($putres eq 'ok') || ($delres eq 'ok')) { + my %domconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$cdom); + my (%domcurrent,%ordered,%description,%domusage); + if (ref($domconfig{'helpsettings'}) eq 'HASH') { + if (ref($domconfig{'helpsettings'}{'adhoc'}) eq 'HASH') { + %domcurrent = %{$domconfig{'helpsettings'}{'adhoc'}}; + } + } + my $count = 0; + foreach my $role (sort(keys(%customroles))) { + my ($order,$desc); + if (ref($domcurrent{$role}) eq 'HASH') { + $order = $domcurrent{$role}{'order'}; + $desc = $domcurrent{$role}{'desc'}; + } + if ($order eq '') { + $order = $count; + } + $ordered{$order} = $role; + if ($desc ne '') { + $description{$role} = $desc; + } else { + $description{$role}= $role; + } + $count++; + } + my @roles_by_num = (); + foreach my $item (sort {$a <=> $b } (keys(%ordered))) { + push(@roles_by_num,$ordered{$item}); + } + %domusage = &domain_adhoc_access(\%changed,\%domcurrent,\@accesstypes,$usertypes,$othertitle); + $r->print(&mt('Helpdesk access settings have been changed as follows').'<br />'); + $r->print('<ul>'); + foreach my $role (@roles_by_num) { + next unless (ref($changed{$role}) eq 'HASH'); + $r->print('<li>'.&mt('Ad hoc role').': <b>'.$description{$role}.'</b>'. + '<ul>'); + if ($changed{$role}{'access'} || $changed{$role}{'status'} || $changed{$role}{'inc'} || $changed{$role}{'exc'}) { + $r->print('<li>'); + if ($env{'form.'.$role.'_incrs'}) { + if ($newsettings{$role}{'access'} eq 'all') { + $r->print(&mt('All helpdesk staff can access '.lc($crstype).' with this role.')); + } elsif ($newsettings{$role}{'access'} eq 'dh') { + $r->print(&mt('Helpdesk staff can use this role if they have an active [_1] role', + &Apache::lonnet::plaintext('dh'))); + } elsif ($newsettings{$role}{'access'} eq 'da') { + $r->print(&mt('Helpdesk staff can use this role if they have an active [_1] role', + &Apache::lonnet::plaintext('da'))); + } elsif ($newsettings{$role}{'access'} eq 'none') { + $r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.')); + } elsif ($newsettings{$role}{'access'} eq 'status') { + if ($newsettings{$role}{'status'}) { + my ($access,$rest) = split(/=/,$storehash{'internal.adhoc.'.$role}); + if (split(/,/,$rest) > 1) { + $r->print(&mt('Helpdesk staff can use this role if their institutional type is one of: [_1].', + $newsettings{$role}{'status'})); + } else { + $r->print(&mt('Helpdesk staff can use this role if their institutional type is: [_1].', + $newsettings{$role}{'status'})); + } + } else { + $r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.')); + } + } elsif ($newsettings{$role}{'access'} eq 'exc') { + if ($newsettings{$role}{'exc'}) { + $r->print(&mt('Helpdesk staff who can use this role are as follows:').' '.$newsettings{$role}{'exc'}.'.'); + } else { + $r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.')); + } + } elsif ($newsettings{$role}{'access'} eq 'inc') { + if ($newsettings{$role}{'inc'}) { + $r->print(&mt('All helpdesk staff may use this role except the following:').' '.$newsettings{$role}{'inc'}.'.'); + } else { + $r->print(&mt('All helpdesk staff may use this role.')); + } + } + } else { + $r->print(&mt('Default access set in the domain now applies.').'<br />'. + '<span class="LC_cusr_emph">'.$domusage{$role}.'</span>'); + } + $r->print('</li>'); + } + unless ($newsettings{$role}{'access'} eq 'none') { + if ($changed{$role}{'off'}) { + if ($newsettings{$role}{'off'}) { + $r->print('<li>'.&mt('Privileges which are available by default for this ad hoc role, but are disabled for this specific '.lc($crstype).':'). + '<ul><li>'.$newsettings{$role}{'off'}.'</li></ul></li>'); + } else { + $r->print('<li>'.&mt('All privileges available by default for this ad hoc role are enabled.').'</li>'); + } + } + if ($changed{$role}{'on'}) { + if ($newsettings{$role}{'on'}) { + $r->print('<li>'.&mt('Privileges which are not available by default for this ad hoc role, but are enabled for this specific '.lc($crstype).':'). + '<ul><li>'.$newsettings{$role}{'on'}.'</li></ul></li>'); + } else { + $r->print('<li>'.&mt('None of the privileges unavailable by default for this ad hoc role are enabled.').'</li>'); + } + } + } + $r->print('</ul></li>'); + } + $r->print('</ul>'); + } + } else { + $r->print(&mt('No changes made to helpdesk access settings.')); + } + } + return; +} + #-------------------------------------------------- functions for &phase_two sub user_search_result { my ($context,$srch) = @_; @@ -6353,13 +8454,29 @@ sub user_search_result { } } if ($response ne '') { - $response = '<span class="LC_warning">'.$response.'</span>'; + $response = '<span class="LC_warning">'.$response.'</span><br />'; } if ($srch->{'srchin'} eq 'instd') { - my $instd_chk = &directorysrch_check($srch); + my $instd_chk = &instdirectorysrch_check($srch); if ($instd_chk ne 'ok') { - $response = '<span class="LC_warning">'.$instd_chk.'</span>'. - '<br />'.&mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').'<br /><br />'; + my $domd_chk = &domdirectorysrch_check($srch); + $response .= '<span class="LC_warning">'.$instd_chk.'</span><br />'; + if ($domd_chk eq 'ok') { + $response .= &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.'); + } + $response .= '<br />'; + } + } else { + unless (($context eq 'requestcrs') && ($srch->{'srchtype'} eq 'exact')) { + my $domd_chk = &domdirectorysrch_check($srch); + if (($domd_chk ne 'ok') && ($env{'form.action'} ne 'accesslogs')) { + my $instd_chk = &instdirectorysrch_check($srch); + $response .= '<span class="LC_warning">'.$domd_chk.'</span><br />'; + if ($instd_chk eq 'ok') { + $response .= &mt('You may want to search in the institutional directory instead of in the LON-CAPA domain.'); + } + $response .= '<br />'; + } } } if ($response ne '') { @@ -6389,6 +8506,9 @@ sub user_search_result { &build_search_response($context,$srch,%srch_results); } else { $currstate = 'modify'; + if ($env{'form.action'} eq 'accesslogs') { + $currstate = 'activity'; + } my $uname = $srch->{'srchterm'}; my $udom = $srch->{'srchdomain'}; $srch_results{$uname.':'.$udom} = @@ -6454,8 +8574,8 @@ sub user_search_result { $response = '<span class="LC_warning">'. &mt('Institutional directory search is not available in domain: [_1]',$showdom). '</span><br />'. - &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'). - '<br /><br />'; + &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.'). + '<br />'; } } } else { @@ -6523,18 +8643,38 @@ sub user_search_result { ($currstate,$response,$forcenewuser) = &build_search_response($context,$srch,%srch_results); } else { - my $showdom = &display_domain_info($srch->{'srchdomain'}); $response = '<span class="LC_warning">'. + my $showdom = &display_domain_info($srch->{'srchdomain'}); + $response = '<span class="LC_warning">'. &mt('Institutional directory search is not available in domain: [_1]',$showdom). '</span><br />'. - &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'). - '<br /><br />'; + &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.'). + '<br />'; } } } return ($currstate,$response,$forcenewuser,\%srch_results); } -sub directorysrch_check { +sub domdirectorysrch_check { + my ($srch) = @_; + my $response; + my %dom_inst_srch = &Apache::lonnet::get_dom('configuration', + ['directorysrch'],$srch->{'srchdomain'}); + my $showdom = &display_domain_info($srch->{'srchdomain'}); + if (ref($dom_inst_srch{'directorysrch'}) eq 'HASH') { + if ($dom_inst_srch{'directorysrch'}{'lcavailable'} eq '0') { + return &mt('LON-CAPA directory search is not available in domain: [_1]',$showdom); + } + if ($dom_inst_srch{'directorysrch'}{'lclocalonly'}) { + if ($env{'request.role.domain'} ne $srch->{'srchdomain'}) { + return &mt('LON-CAPA directory search in domain: [_1] is only allowed for users with a current role in the domain.',$showdom); + } + } + } + return 'ok'; +} + +sub instdirectorysrch_check { my ($srch) = @_; my $can_search = 0; my $response; @@ -6656,7 +8796,11 @@ sub build_search_response { $currstate = 'select'; } else { if (keys(%srch_results) == 1) { - $currstate = 'modify'; + if ($env{'form.action'} eq 'accesslogs') { + $currstate = 'activity'; + } else { + $currstate = 'modify'; + } $response = &mt("$single{$srch->{'srchtype'}} was found for the $names{$srch->{'srchby'}} ([_1]) in $names{$srch->{'srchin'}}.",$srch->{'srchterm'}); if ($srch->{'srchin'} eq 'dom' || $srch->{'srchin'} eq 'instd') { $response .= ': '.&display_domain_info($srch->{'srchdomain'}); @@ -6676,7 +8820,7 @@ sub build_search_response { if ($srch->{'srchin'} ne 'alc') { $forcenewuser = 1; my $cansrchinst = 0; - if ($srch->{'srchdomain'}) { + if (($srch->{'srchdomain'}) && ($env{'form.action'} ne 'accesslogs')) { my %domconfig = &Apache::lonnet::get_dom('configuration',['directorysrch'],$srch->{'srchdomain'}); if (ref($domconfig{'directorysrch'}) eq 'HASH') { if ($domconfig{'directorysrch'}{'available'}) { @@ -6701,7 +8845,8 @@ sub build_search_response { $createdom = $env{'form.coursedom'}; } } - if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $createdom)) { + unless (($env{'form.action'} eq 'accesslogs') || (($srch->{'srchby'} eq 'uname') && ($srch->{'srchin'} eq 'dom') && + ($srch->{'srchtype'} eq 'exact') && ($srch->{'srchdomain'} eq $createdom))) { my $cancreate = &Apache::lonuserutils::can_create_user($createdom,$context); my $targetdom = '<span class="LC_cusr_emph">'.$createdom.'</span>'; @@ -6725,18 +8870,20 @@ sub build_search_response { .&mt("Click 'Search'") .'</li></ul><br />'; } else { - my $helplink = ' href="javascript:helpMenu('."'display'".')"'; - $response .= '<br /><br />'; - if ($context eq 'requestcrs') { - $response .= &mt("You are not authorized to define new users in the new course's domain - [_1].",$targetdom); - } else { - $response .= &mt("You are not authorized to create new users in your current role's domain - [_1].",$targetdom); + unless (($context eq 'domain') && ($env{'form.action'} eq 'singleuser')) { + my $helplink = ' href="javascript:helpMenu('."'display'".')"'; + $response .= '<br /><br />'; + if ($context eq 'requestcrs') { + $response .= &mt("You are not authorized to define new users in the new course's domain - [_1].",$targetdom); + } else { + $response .= &mt("You are not authorized to create new users in your current role's domain - [_1].",$targetdom); + } + $response .= '<br />' + .&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.' + ,' <a'.$helplink.'>' + ,'</a>') + .'<br />'; } - $response .= '<br />' - .&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.' - ,' <a'.$helplink.'>' - ,'</a>') - .'<br /><br />'; } } } @@ -6847,13 +8994,13 @@ sub course_level_table { ((($role eq 'cc') || ($role eq 'co')) && ($isowner))) { $table .= &course_level_row($protectedcourse,$role,$area,$domain, $plrole,\%sections_count,\%lt, - $defaultcredits,$crstype); + $showcredits,$defaultcredits,$crstype); } elsif ($env{'request.course.sec'} ne '') { if (&Apache::lonnet::allowed('c'.$role,$thiscourse.'/'. $env{'request.course.sec'})) { $table .= &course_level_row($protectedcourse,$role,$area,$domain, $plrole,\%sections_count,\%lt, - $defaultcredits,$crstype); + $showcredits,$defaultcredits,$crstype); } } } @@ -6862,7 +9009,8 @@ sub course_level_table { next if ($crstype eq 'Community' && $customroles{$cust} =~ /bre\&S/); my $role = 'cr_cr_'.$env{'user.domain'}.'_'.$env{'user.name'}.'_'.$cust; $table .= &course_level_row($protectedcourse,$role,$area,$domain, - $cust,\%sections_count,\%lt); + $cust,\%sections_count,\%lt, + $showcredits,$defaultcredits,$crstype); } } } @@ -6876,7 +9024,11 @@ sub course_level_table { &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). '<th>'.$lt{'act'}.'</th><th>'.$lt{'rol'}.'</th>'."\n". -'<th>'.$lt{'ext'}.'</th><th>'.$lt{'crd'}.'</th>'."\n". +'<th>'.$lt{'ext'}.'</th><th>'."\n"; + if ($showcredits) { + $result .= $lt{'crd'}.'</th>'; + } + $result .= '<th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th>'."\n". '<th>'.$lt{'end'}.'</th>'. &Apache::loncommon::end_data_table_header_row(). @@ -6887,14 +9039,14 @@ $table. sub course_level_row { my ($protectedcourse,$role,$area,$domain,$plrole,$sections_count, - $lt,$defaultcredits,$crstype) = @_; + $lt,$showcredits,$defaultcredits,$crstype) = @_; my $creditem; my $row = &Apache::loncommon::start_data_table_row(). ' <td><input type="checkbox" name="act_'. $protectedcourse.'_'.$role.'" /></td>'."\n". ' <td>'.$plrole.'</td>'."\n". ' <td>'.$area.'<br />Domain: '.$domain.'</td>'."\n"; - if (($role eq 'st') && ($crstype eq 'Course')) { + if (($showcredits) && ($role eq 'st') && ($crstype eq 'Course')) { $row .= '<td><input type="text" name="credits_'.$protectedcourse.'_'. $role.'" size="3" value="'.$defaultcredits.'" /></td>'; @@ -6971,28 +9123,29 @@ sub course_level_dc { &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). '<th>'.$lt{'scc'}.'</th><th>'.$lt{'rol'}.'</th>'."\n". - '<th>'.$lt{'grs'}.'</th><th>'.$lt{'crd'}.'</th>'."\n". - '<th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'."\n". + '<th>'.$lt{'grs'}.'</th>'."\n"; + $header .= '<th>'.$lt{'crd'}.'</th>'."\n" if ($showcredits); + $header .= '<th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'."\n". &Apache::loncommon::end_data_table_header_row(); my $otheritems = &Apache::loncommon::start_data_table_row()."\n". '<td><br /><span class="LC_nobreak"><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc','','','','crstype'".')" />'. $courseform.(' ' x4).'</span></td>'."\n". - '<td valign><br /><select name="role">'."\n"; + '<td valign="top"><br /><select name="role">'."\n"; foreach my $role (@roles) { my $plrole=&Apache::lonnet::plaintext($role); - $otheritems .= ' <option value="'.$role.'">'.$plrole; + $otheritems .= ' <option value="'.$role.'">'.$plrole.'</option>'; } - if ( keys %customroles > 0) { - foreach my $cust (sort keys %customroles) { + if ( keys(%customroles) > 0) { + foreach my $cust (sort(keys(%customroles))) { my $custrole='cr_cr_'.$env{'user.domain'}. '_'.$env{'user.name'}.'_'.$cust; - $otheritems .= ' <option value="'.$custrole.'">'.$cust; + $otheritems .= ' <option value="'.$custrole.'">'.$cust.'</option>'; } } $otheritems .= '</select></td><td>'. '<table border="0" cellspacing="0" cellpadding="0">'. '<tr><td valign="top"><b>'.$lt{'exs'}.'</b><br /><select name="currsec">'. - ' <option value=""><--'.&mt('Pick course first').'</select></td>'. + ' <option value=""><--'.&mt('Pick course first').'</option></select></td>'. '<td> </td>'. '<td valign="top"> <b>'.$lt{'new'}.'</b><br />'. '<input type="text" name="newsec" value="" />'. @@ -7002,7 +9155,7 @@ sub course_level_dc { '</tr></table></td>'."\n"; if ($showcredits) { $otheritems .= '<td><br />'."\n". - '<input type="text" size="3" name="credits" value="" />'."\n"; + '<input type="text" size="3" name="credits" value="" /></td>'."\n"; } $otheritems .= <<ENDTIMEENTRY; <td><br /><input type="hidden" name="start" value='' /> @@ -7018,19 +9171,23 @@ ENDTIMEENTRY } sub update_selfenroll_config { - my ($r,$context,$permission) = @_; - my ($row,$lt) = &get_selfenroll_titles(); - my %curr_groups = &Apache::longroup::coursegroups(); + my ($r,$cid,$cdom,$cnum,$context,$crstype,$currsettings) = @_; + return unless (ref($currsettings) eq 'HASH'); + my ($row,$lt) = &Apache::lonuserutils::get_selfenroll_titles(); + my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum); my (%changes,%warning); - my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; my $curr_types; + my %noedit; + unless ($context eq 'domain') { + %noedit = &get_noedit_fields($cdom,$cnum,$crstype,$row); + } if (ref($row) eq 'ARRAY') { foreach my $item (@{$row}) { + next if ($noedit{$item}); if ($item eq 'enroll_dates') { my (%currenrolldate,%newenrolldate); foreach my $type ('start','end') { - $currenrolldate{$type} = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_'.$type.'_date'}; + $currenrolldate{$type} = $currsettings->{'selfenroll_'.$type.'_date'}; $newenrolldate{$type} = &Apache::lonhtmlcommon::get_date_from_form('selfenroll_'.$type.'_date'); if ($newenrolldate{$type} ne $currenrolldate{$type}) { $changes{'internal.selfenroll_'.$type.'_date'} = $newenrolldate{$type}; @@ -7039,15 +9196,14 @@ sub update_selfenroll_config { } elsif ($item eq 'access_dates') { my (%currdate,%newdate); foreach my $type ('start','end') { - $currdate{$type} = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_'.$type.'_access'}; + $currdate{$type} = $currsettings->{'selfenroll_'.$type.'_access'}; $newdate{$type} = &Apache::lonhtmlcommon::get_date_from_form('selfenroll_'.$type.'_access'); if ($newdate{$type} ne $currdate{$type}) { $changes{'internal.selfenroll_'.$type.'_access'} = $newdate{$type}; } } } elsif ($item eq 'types') { - $curr_types = - $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_'.$item}; + $curr_types = $currsettings->{'selfenroll_'.$item}; if ($env{'form.selfenroll_all'}) { if ($curr_types ne '*') { $changes{'internal.selfenroll_types'} = '*'; @@ -7116,9 +9272,9 @@ sub update_selfenroll_config { my $newlimit = $env{'form.selfenroll_limit'}; my $newcap = $env{'form.selfenroll_cap'}; $newcap =~s/\s+//g; - my $currlimit = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_limit'}; + my $currlimit = $currsettings->{'selfenroll_limit'}; $currlimit = 'none' if ($currlimit eq ''); - my $currcap = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_cap'}; + my $currcap = $currsettings->{'selfenroll_cap'}; if ($newlimit ne $currlimit) { if ($newlimit ne 'none') { if ($newcap =~ /^\d+$/) { @@ -7127,7 +9283,8 @@ sub update_selfenroll_config { } $changes{'internal.selfenroll_limit'} = $newlimit; } else { - $warning{$item} = &mt('Maximum enrollment setting unchanged.').'<br />'.&mt('The value provided was invalid - it must be a positive integer if enrollment is being limited.'); + $warning{$item} = &mt('Maximum enrollment setting unchanged.').'<br />'. + &mt('The value provided was invalid - it must be a positive integer if enrollment is being limited.'); } } elsif ($currcap ne '') { $changes{'internal.selfenroll_cap'} = ''; @@ -7139,13 +9296,14 @@ sub update_selfenroll_config { $changes{'internal.selfenroll_cap'} = $newcap; } } else { - $warning{$item} = &mt('Maximum enrollment setting unchanged.').'<br />'.&mt('The value provided was invalid - it must be a positive integer if enrollment is being limited.'); + $warning{$item} = &mt('Maximum enrollment setting unchanged.').'<br />'. + &mt('The value provided was invalid - it must be a positive integer if enrollment is being limited.'); } } } elsif ($item eq 'approval') { my (@currnotified,@newnotified); - my $currapproval = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}; - my $currnotifylist = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_notifylist'}; + my $currapproval = $currsettings->{'selfenroll_approval'}; + my $currnotifylist = $currsettings->{'selfenroll_notifylist'}; if ($currnotifylist ne '') { @currnotified = split(/,/,$currnotifylist); @currnotified = sort(@currnotified); @@ -7181,14 +9339,14 @@ sub update_selfenroll_config { } } } else { - my $curr_val = - $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_'.$item}; + my $curr_val = $currsettings->{'selfenroll_'.$item}; my $newval = $env{'form.selfenroll_'.$item}; if ($item eq 'section') { $newval = $env{'form.sections'}; if (defined($curr_groups{$newval})) { $newval = $curr_val; - $warning{$item} = &mt('Section for self-enrolled users unchanged as the proposed section is a group').'<br />'.&mt('Group names and section names must be distinct'); + $warning{$item} = &mt('Section for self-enrolled users unchanged as the proposed section is a group').'<br />'. + &mt('Group names and section names must be distinct'); } elsif ($newval eq 'all') { $newval = $curr_val; $warning{$item} = &mt('Section for self-enrolled users unchanged, as "all" is a reserved section name.'); @@ -7218,11 +9376,10 @@ sub update_selfenroll_config { my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.', $cnum,undef,undef,'Course'); my $chome = &Apache::lonnet::homeserver($cnum,$cdom); - if (ref($crsinfo{$env{'request.course.id'}}) eq 'HASH') { + if (ref($crsinfo{$cid}) eq 'HASH') { foreach my $item ('selfenroll_types','selfenroll_start_date','selfenroll_end_date') { if (exists($changes{'internal.'.$item})) { - $crsinfo{$env{'request.course.id'}}{$item} = - $changes{'internal.'.$item}; + $crsinfo{$cid}{$item} = $changes{'internal.'.$item}; } } my $crsputresult = @@ -7259,7 +9416,7 @@ sub update_selfenroll_config { if ($changes{'internal.selfenroll_cap'} ne '') { $newcap = $changes{'internal.selfenroll_cap'} } else { - $newcap = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_cap'}; + $newcap = $currsettings->{'selfenroll_cap'}; } if ($changes{'internal.selfenroll_limit'} eq 'none') { $newval = &mt('No limit'); @@ -7269,7 +9426,7 @@ sub update_selfenroll_config { } elsif ($changes{'internal.selfenroll_limit'} eq 'selfenrolled') { $newval = &mt('New self-enrollment no longer allowed when total number of self-enrolled students reaches [_1].',$newcap); } else { - my $currlimit = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_limit'}; + my $currlimit = $currsettings->{'selfenroll_limit'}; if ($currlimit eq 'allstudents') { $newval = &mt('New self-enrollment no longer allowed when total (all students) reaches [_1].',$newcap); } elsif ($changes{'internal.selfenroll_limit'} eq 'selfenrolled') { @@ -7281,24 +9438,24 @@ sub update_selfenroll_config { } elsif ($item eq 'approval') { if ((exists($changes{'internal.selfenroll_approval'})) || (exists($changes{'internal.selfenroll_notifylist'}))) { + my %selfdescs = &Apache::lonuserutils::selfenroll_default_descs(); my ($newval,$newnotify); if (exists($changes{'internal.selfenroll_notifylist'})) { $newnotify = $changes{'internal.selfenroll_notifylist'}; } else { - $newnotify = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_notifylist'}; + $newnotify = $currsettings->{'selfenroll_notifylist'}; } - if ($changes{'internal.selfenroll_approval'}) { - $newval = &mt('Yes'); - } elsif ($changes{'internal.selfenroll_approval'} eq '0') { - $newval = &mt('No'); + if (exists($changes{'internal.selfenroll_approval'})) { + if ($changes{'internal.selfenroll_approval'} !~ /^[012]$/) { + $changes{'internal.selfenroll_approval'} = '0'; + } + $newval = $selfdescs{'approval'}{$changes{'internal.selfenroll_approval'}}; } else { - my $currapproval = - $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}; - if ($currapproval) { - $newval = &mt('Yes'); - } else { - $newval = &mt('No'); + my $currapproval = $currsettings->{'selfenroll_approval'}; + if ($currapproval !~ /^[012]$/) { + $currapproval = 0; } + $newval = $selfdescs{'approval'}{$currapproval}; } $r->print('<li>'.&mt('"[_1]" set to "[_2]".',$title,$newval)); if ($newnotify) { @@ -7329,13 +9486,16 @@ sub update_selfenroll_config { } } $r->print('</ul>'); - my %newenvhash; - foreach my $key (keys(%changes)) { - $newenvhash{'course.'.$env{'request.course.id'}.'.'.$key} = $changes{$key}; + if ($env{'course.'.$cid.'.description'} ne '') { + my %newenvhash; + foreach my $key (keys(%changes)) { + $newenvhash{'course.'.$cid.'.'.$key} = $changes{$key}; + } + &Apache::lonnet::appenv(\%newenvhash); } - &Apache::lonnet::appenv(\%newenvhash); } else { - $r->print(&mt('An error occurred when saving changes to self-enrollment settings in this course.').'<br />'.&mt('The error was: [_1].',$putresult)); + $r->print(&mt('An error occurred when saving changes to self-enrollment settings in this course.').'<br />'. + &mt('The error was: [_1].',$putresult)); } } else { $r->print(&mt('No changes were made to the existing self-enrollment settings in this course.')); @@ -7343,39 +9503,54 @@ sub update_selfenroll_config { } else { $r->print(&mt('No changes were made to the existing self-enrollment settings in this course.')); } - my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum); - if (ref($visactions) eq 'HASH') { - if (!$visible) { + my $visactions = &cat_visibility(); + my ($cathash,%cattype); + my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom); + if (ref($domconfig{'coursecategories'}) eq 'HASH') { + $cathash = $domconfig{'coursecategories'}{'cats'}; + $cattype{'auth'} = $domconfig{'coursecategories'}{'auth'}; + $cattype{'unauth'} = $domconfig{'coursecategories'}{'unauth'}; + } else { + $cathash = {}; + $cattype{'auth'} = 'std'; + $cattype{'unauth'} = 'std'; + } + if (($cattype{'auth'} eq 'none') && ($cattype{'unauth'} eq 'none')) { + $r->print('<br /><span class="LC_warning">'.$visactions->{'miss'}.'</span><br />'.$visactions->{'yous'}. + '<br />'. + '<br />'.$visactions->{'take'}.'<ul>'. + '<li>'.$visactions->{'dc_chgconf'}.'</li>'. + '</ul>'); + } elsif (($cattype{'auth'} !~ /^(std|domonly)$/) && ($cattype{'unauth'} !~ /^(std|domonly)$/)) { + if ($currsettings->{'uniquecode'}) { + $r->print('<span class="LC_info">'.$visactions->{'vis'}.'</span>'); + } else { $r->print('<br /><span class="LC_warning">'.$visactions->{'miss'}.'</span><br />'.$visactions->{'yous'}. - '<br />'); - if (ref($vismsgs) eq 'ARRAY') { - $r->print('<br />'.$visactions->{'take'}.'<ul>'); - foreach my $item (@{$vismsgs}) { - $r->print('<li>'.$visactions->{$item}.'</li>'); + '<br />'. + '<br />'.$visactions->{'take'}.'<ul>'. + '<li>'.$visactions->{'dc_setcode'}.'</li>'. + '</ul><br />'); + } + } else { + my ($visible,$cansetvis,$vismsgs) = &visible_in_stdcat($cdom,$cnum,\%domconfig); + if (ref($visactions) eq 'HASH') { + if (!$visible) { + $r->print('<br /><span class="LC_warning">'.$visactions->{'miss'}.'</span><br />'.$visactions->{'yous'}. + '<br />'); + if (ref($vismsgs) eq 'ARRAY') { + $r->print('<br />'.$visactions->{'take'}.'<ul>'); + foreach my $item (@{$vismsgs}) { + $r->print('<li>'.$visactions->{$item}.'</li>'); + } + $r->print('</ul>'); } - $r->print('</ul>'); + $r->print($cansetvis); } - $r->print($cansetvis); } } return; } -sub get_selfenroll_titles { - my @row = ('types','registered','enroll_dates','access_dates','section', - 'approval','limit'); - my %lt = &Apache::lonlocal::texthash ( - types => 'Users allowed to self-enroll in this course', - registered => 'Restrict self-enrollment to students officially registered for the course', - enroll_dates => 'Dates self-enrollment available', - access_dates => 'Course access dates assigned to self-enrolling users', - section => 'Section assigned to self-enrolling users', - approval => 'Self-enrollment requests need approval?', - limit => 'Enrollment limit', - ); - return (\@row,\%lt); -} - #---------------------------------------------- end functions for &phase_two #--------------------------------- functions for &phase_two and &phase_three