--- loncom/interface/loncreateuser.pm 2024/07/04 00:56:21 1.406.2.21 +++ loncom/interface/loncreateuser.pm 2016/02/19 02:39:07 1.409 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.406.2.21 2024/07/04 00:56:21 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.409 2016/02/19 02:39:07 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -71,7 +71,6 @@ use Apache::longroup; use Apache::lonuserutils; use Apache::loncoursequeueadmin; use LONCAPA qw(:DEFAULT :match); -use HTML::Entities; my $loginscript; # piece of javascript used in two separate instances my $authformnop; @@ -161,8 +160,7 @@ END_SCRIPT '<h3>'.$lt{'usrt'}.'</h3>'."\n". &Apache::loncommon::start_data_table(); - if ((&Apache::lonnet::allowed('mut',$ccdomain)) || - (&Apache::lonnet::allowed('udp',$ccdomain))) { + if (&Apache::lonnet::allowed('mut',$ccdomain)) { $output .= &build_tools_display($ccuname,$ccdomain,'tools'); } @@ -267,7 +265,7 @@ sub build_tools_display { $colspan = ' colspan="2"'; %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$ccdomain); - $isadv = &Apache::lonnet::is_advanced_user($ccdomain,$ccuname); + $isadv = &Apache::lonnet::is_advanced_user($ccuname,$ccdomain); } elsif ($context eq 'requestauthor') { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, 'requestauthor'); @@ -428,9 +426,7 @@ sub build_tools_display { } $output .= ' <td'.$colspan.'>'.$custom_access.(' 'x4). $lt{'avai'}.': '.$currdisp.'</td>'."\n". - &Apache::loncommon::end_data_table_row()."\n"; - unless (&Apache::lonnet::allowed('udp',$ccdomain)) { - $output .= + &Apache::loncommon::end_data_table_row()."\n". &Apache::loncommon::start_data_table_row()."\n". ' <td style="vertical-align:top;"><span class="LC_nobreak">'. $lt{'chse'}.': <label>'. @@ -439,7 +435,6 @@ 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; } @@ -642,8 +637,7 @@ sub curr_requestauthor { # =================================================================== Phase one sub print_username_entry_form { - my ($r,$context,$response,$srch,$forcenewuser,$crstype,$brcrum, - $permission) = @_; + my ($r,$context,$response,$srch,$forcenewuser,$crstype,$brcrum) = @_; my $defdom=$env{'request.role.domain'}; my $formtoset = 'crtuser'; if (exists($env{'form.startrolename'})) { @@ -669,27 +663,11 @@ sub print_username_entry_form { } my $helpitem = 'Course_Change_Privileges'; if ($env{'form.action'} eq 'custom') { - if ($context eq 'course') { - $helpitem = 'Course_Editing_Custom_Roles'; - } elsif ($context eq 'domain') { - $helpitem = 'Domain_Editing_Custom_Roles'; - } + $helpitem = 'Course_Editing_Custom_Roles'; } elsif ($env{'form.action'} eq 'singlestudent') { $helpitem = 'Course_Add_Student'; - } elsif ($env{'form.action'} eq 'accesslogs') { - $helpitem = 'Domain_User_Access_Logs'; - } elsif ($context eq 'author') { - $helpitem = 'Author_Change_Privileges'; - } elsif ($context eq 'domain') { - if ($permission->{'cusr'}) { - $helpitem = 'Domain_Change_Privileges'; - } elsif ($permission->{'view'}) { - $helpitem = 'Domain_View_Privileges'; - } else { - undef($helpitem); - } } - my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$defdom); + my %breadcrumb_text = &singleuser_breadcrumb($crstype); if ($env{'form.action'} eq 'custom') { push(@{$brcrum}, {href=>"javascript:backPage(document.crtuser)", @@ -717,8 +695,6 @@ 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", @@ -765,29 +741,18 @@ 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') { - if ($response) { - $r->print("\n<div>$response</div>". - '<br clear="all" />'); - } + $r->print("\n".$response); } - $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,$fixeddom)); + $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype)); } } @@ -830,7 +795,7 @@ END } sub entry_form { - my ($dom,$srch,$forcenewuser,$context,$responsemsg,$crstype,$fixeddom) = @_; + my ($dom,$srch,$forcenewuser,$context,$responsemsg,$crstype) = @_; my ($usertype,$inexact); if (ref($srch) eq 'HASH') { if (($srch->{'srchin'} eq 'dom') && @@ -846,27 +811,18 @@ sub entry_form { $inexact = 1; } } - my ($cancreate,$noinstd); - if ($env{'form.action'} eq 'accesslogs') { - $noinstd = 1; - } else { - $cancreate = - &Apache::lonuserutils::can_create_user($dom,$context,$usertype); - } - my ($userpicker,$cansearch) = + my $cancreate = + &Apache::lonuserutils::can_create_user($dom,$context,$usertype); + my $userpicker = &Apache::loncommon::user_picker($dom,$srch,$forcenewuser, - 'document.crtuser',$cancreate,$usertype,$context,$fixeddom,$noinstd); + 'document.crtuser',$cancreate,$usertype); 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; - if ($cansearch) { - $output = <<"ENDBLOCK"; + my $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" /> @@ -874,12 +830,7 @@ $userpicker <input name="userrole" type="button" value="$srchbutton" onclick="javascript:validateEntry(document.crtuser)" /> </form> ENDBLOCK - } 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'}))))) { + if ($env{'form.phase'} eq '') { my $defdom=$env{'request.role.domain'}; my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain'); my %lt=&Apache::lonlocal::texthash( @@ -995,13 +946,9 @@ 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", @@ -1011,16 +958,12 @@ ENDSCRIPT if ($context eq 'requestcrs') { $r->print('<div>'); } else { - my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$srch->{'srchdomain'}); + my %breadcrumb_text = &singleuser_breadcrumb($crstype); 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,'','')", @@ -1035,19 +978,9 @@ ENDSCRIPT ); $r->print(&Apache::loncommon::start_page('User Management',$jscript,{bread_crumbs => $brcrum})); if ($env{'form.action'} eq 'singleuser') { - 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("<b>$lt{'usrch'}</b><br />"); $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,$crstype)); - if ($readonly) { - $r->print('<h3>'.$lt{'suvr'}.'</h3>'); - } else { - $r->print('<h3>'.$lt{'usel'}.'</h3>'); - } + $r->print('<h3>'.$lt{'usel'}.'</h3>'); } elsif ($env{'form.action'} eq 'singlestudent') { $r->print($jscript."<b>"); if ($crstype eq 'Community') { @@ -1064,10 +997,6 @@ 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="">'. @@ -1147,8 +1076,7 @@ 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, - $permission); + &print_username_entry_form($r,$context,$usermsg,'','',$crstype,$brcrum); return; } my ($form,$formname); @@ -1187,18 +1115,12 @@ sub print_user_modification_page { } $response .= '<p class="LC_warning">' .&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.") - .' '; - 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 />'; + .' ' + .&mt('Please contact the [_1]helpdesk[_2] for assistance.' + ,'<a href="'.$helplink.'">','</a>') + .'</p><br />'; $env{'form.phase'} = ''; - &print_username_entry_form($r,$context,$response,undef,undef,$crstype,$brcrum, - $permission); + &print_username_entry_form($r,$context,$response,undef,undef,$crstype,$brcrum); return; } $newuser = 1; @@ -1222,8 +1144,7 @@ sub print_user_modification_page { 'username'); } $env{'form.phase'} = ''; - &print_username_entry_form($r,$context,$userchkmsg,undef,undef,$crstype,$brcrum, - $permission); + &print_username_entry_form($r,$context,$userchkmsg,undef,undef,$crstype,$brcrum); return; } } @@ -1244,14 +1165,10 @@ sub print_user_modification_page { my $js = &validation_javascript($context,$ccdomain,$pjump_def,$crstype, $groupslist,$newuser,$formname,\%loaditem); - my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$ccdomain); + my %breadcrumb_text = &singleuser_breadcrumb($crstype); 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)", @@ -1452,20 +1369,14 @@ ENDAUTH '"'.$ccuname.'"','"'.$ccdomain.'"'); } } else { - if ($permission->{'cusr'}) { - $title = &mt('Modify existing user: [_1] in domain [_2]', - '"'.$ccuname.'"','"'.$ccdomain.'"'); - } else { - $title = &mt('Existing user: [_1] in domain [_2]', + $title = &mt('Modify existing user: [_1] in domain [_2]', '"'.$ccuname.'"','"'.$ccdomain.'"'); - } } $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'}))) { + if (&Apache::lonnet::allowed('ccc',$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) { @@ -1480,17 +1391,15 @@ ENDAUTH my @order = ('auth','quota','tools','requestauthor'); my %user_text; my ($isadv,$isauthor) = - &Apache::lonnet::is_advanced_user($ccdomain,$ccuname); + &Apache::lonnet::is_advanced_user($ccuname,$ccdomain); if ((!$isauthor) && - ((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) || - (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) && - ($env{'request.role.domain'} eq $ccdomain)) { + (&Apache::lonnet::allowed('cau',$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,$crstype,$permission); + $user_text{'auth'} = &user_authentication($ccuname,$ccdomain,$formname); if ((&Apache::lonnet::allowed('mpq',$ccdomain)) || - (&Apache::lonnet::allowed('mut',$ccdomain)) || - (&Apache::lonnet::allowed('udp',$ccdomain))) { + (&Apache::lonnet::allowed('mut',$ccdomain))) { # Current user has quota modification privileges $user_text{'quota'} = &user_quotas($ccuname,$ccdomain); } @@ -1548,18 +1457,9 @@ 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,$showcredits,$statuses); + $roledom,$crstype); } } ## End of new user/old user logic if ($env{'form.action'} eq 'singlestudent') { @@ -1570,7 +1470,7 @@ ENDNOTOOLSPRIV $btntxt = &mt('Enroll Student'); } $r->print('<br /><input type="button" value="'.$btntxt.'" onclick="setSections(this.form)" />'."\n"); - } elsif ($permission->{'cusr'}) { + } else { $r->print('<div class="LC_left_float">'. '<fieldset><legend>'.&mt('Add Roles').'</legend>'); my $addrolesdisplay = 0; @@ -1613,7 +1513,7 @@ ENDNOTOOLSPRIV } sub singleuser_breadcrumb { - my ($crstype,$context,$domain) = @_; + my ($crstype) = @_; my %breadcrumb_text; if ($env{'form.action'} eq 'singlestudent') { if ($crstype eq 'Community') { @@ -1621,21 +1521,12 @@ sub singleuser_breadcrumb { } else { $breadcrumb_text{'search'} = 'Enroll a student'; } - $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'; + $breadcrumb_text{'userpicked'} = 'Select a user', + $breadcrumb_text{'modify'} = 'Set section/dates', } 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; } @@ -1705,22 +1596,8 @@ sub validation_javascript { sub display_existing_roles { my ($r,$ccuname,$ccdomain,$inccourses,$context,$roledom,$crstype, - $showcredits,$statuses) = @_; + $showcredits) = @_; 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", @@ -1784,13 +1661,6 @@ 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+)$}); @@ -1799,13 +1669,11 @@ sub display_existing_roles { my $sortkey=$role_code; my $class='Unknown'; my $credits=''; - my $csec; - if ($area =~ m{^/($match_domain)/($match_courseid)}) { + 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$/) { @@ -1863,13 +1731,12 @@ sub display_existing_roles { $thisrole.='.'.$role_code; } } - if ($area=~m{^/($match_domain/$match_courseid/(\w+))}) { - $csec = $2; - $carea.='<br />'.&mt('Section: [_1]',$csec); - $sortkey.="\0$csec"; + if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) { + $carea.='<br />'.&mt('Section: [_1]',$3); + $sortkey.="\0$3"; if (!$allowed) { - if ($env{'request.course.sec'} eq $csec) { - if (&Apache::lonnet::allowed('c'.$role_code,$1)) { + if ($env{'request.course.sec'} eq $3) { + if (&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2.'/'.$3)) { $allowed = 1; } } @@ -1911,30 +1778,29 @@ sub display_existing_roles { } } my $row = ''; - if ($showall) { - $row.= '<td>'; - if (($active) && ($allowed)) { - $row.= '<input type="checkbox" name="rev:'.$thisrole.'" />'; - } else { - 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.'" />'; + $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.=' '; } else { - $row.=' '; + $row.=&mt('expired or revoked'); } - $row.= '</td>'; + } + $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.=' '; } my $plaintext=''; if (!$croletitle) { @@ -1952,31 +1818,17 @@ sub display_existing_roles { '<br />', $croleuname.':'.$croleudom); } - $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>'; + $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>"; $sortrole{$sortkey}=$envkey; $roletext{$envkey}=$row; $roleclass{$envkey}=$class; - 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'; - } - } - } + $rolepriv{$envkey}=$allowed; } # end of foreach (table building loop) my $rolesdisplay = 0; @@ -2009,28 +1861,15 @@ sub display_existing_roles { } elsif ($env{'request.role'} =~ /^au\./) { $contextrole = &mt('Existing Co-Author Roles in your Authoring Space'); } else { - 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'); - } + $contextrole = &mt('Existing Roles in this Domain'); } $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()); - 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::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::end_data_table_header_row()); foreach my $type ('Authoring Space','Course','Community','Domain','System','Unknown') { if ($output{$type}) { @@ -2165,19 +2004,19 @@ sub new_domain_roles { } sub user_authentication { - my ($ccuname,$ccdomain,$formname,$crstype,$permission) = @_; + 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); @@ -2208,6 +2047,11 @@ ENDBADAUTH &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". @@ -2218,7 +2062,7 @@ ENDBADAUTH &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_row(). '<td>'.$authformnop; - if (($can_modify) && (&Apache::lonnet::allowed('mau',$ccdomain))) { + if ($can_modify) { $outcome .= '</td>'."\n". &Apache::loncommon::end_data_table_row(). &Apache::loncommon::start_data_table_row(). @@ -2228,77 +2072,14 @@ ENDBADAUTH $outcome .= ' ('.$authformcurrent.')</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"; - } + 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 (($currentauth =~ /^internal:/) && - (&Apache::lonuserutils::can_change_internalpass($ccuname,$ccdomain,$crstype,$permission))) { - $outcome = <<"ENDJS"; -<script type="text/javascript"> -// <![CDATA[ -function togglePwd(form) { - if (form.newintpwd.length) { - if (document.getElementById('LC_ownersetpwd')) { - for (var i=0; i<form.newintpwd.length; i++) { - if (form.newintpwd[i].checked) { - if (form.newintpwd[i].value == 1) { - document.getElementById('LC_ownersetpwd').style.display = 'inline-block'; - } else { - document.getElementById('LC_ownersetpwd').style.display = 'none'; - } - } - } - } - } -} -// ]]> -</script> -ENDJS - - $outcome .= '<h3>'.$lt{'ld'}.'</h3>'. - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_row(). - '<td>'.&mt('Internally authenticated').'<br />'.&mt("Change user's password?"). - '<label><input type="radio" name="newintpwd" value="0" checked="checked" onclick="togglePwd(this.form);" />'. - &mt('No').'</label>'.(' 'x2). - '<label><input type="radio" name="newintpwd" value="1" onclick="togglePwd(this.form);" />'.&mt('Yes').'</label>'. - '<div id="LC_ownersetpwd" style="display:none">'. - ' '.&mt('Password').' <input type="password" size="15" name="intarg" value="" />'. - '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.intarg.type='."'text'".' } else { this.form.intarg.type='."'password'".' }" />'.&mt('Visible input').'</label></div></td>'. - &Apache::loncommon::end_data_table_row(). - &Apache::loncommon::end_data_table(); - } - if (&Apache::lonnet::allowed('udp',$ccdomain)) { - # Current user has rights to view domain preferences for user's domain - my $result; - 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'})) { + if (&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.", @@ -2382,8 +2163,8 @@ sub modify_login_block { } sub personal_data_display { - my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,$now, - $captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded,$showsubmit) = @_; + my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray, + $now,$captchaform,$emailusername,$usertype,$recaptchaversion) = @_; my ($output,%userenv,%canmodify,%canmodify_status); my @userinfo = ('firstname','middlename','lastname','generation', 'permanentemail','id'); @@ -2410,7 +2191,6 @@ sub personal_data_display { 'inststatus' => "Affiliation", 'email' => 'E-mail address', 'valid' => 'Validation', - 'username' => 'Username', ); %canmodify_status = @@ -2429,7 +2209,7 @@ sub personal_data_display { if (ref($emailusername) eq 'HASH') { if (ref($emailusername->{$usertype}) eq 'HASH') { my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); - @userinfo = (); + @userinfo = (); if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) { foreach my $field (@{$infofields}) { if ($emailusername->{$usertype}->{$field}) { @@ -2459,38 +2239,9 @@ sub personal_data_display { $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>'; - } + '<input type="text" name="uname" size="25" value="" autocomplete="off" />'; $rowcount ++; $output .= &Apache::lonhtmlcommon::row_closure(1); my $upassone = '<input type="password" name="upass'.$now.'" size="20" autocomplete="off" />'; @@ -2505,20 +2256,6 @@ sub personal_data_display { 'LC_oddrow_value')."\n". $upasstwo. &Apache::lonhtmlcommon::row_closure()."\n"; - if ($usernameset eq 'free') { - my $onclick = "toggleUsernameDisp(this,'selfcreateusername');"; - $output .= &Apache::lonhtmlcommon::row_title($lt{'username'},undef,'LC_oddrow_value')."\n". - '<span class="LC_nobreak">'.&mt('Use e-mail address: '). - '<label><input type="radio" name="emailused" value="1" checked="checked" onclick="'.$onclick.'" />'. - &mt('Yes').'</label>'.(' 'x2). - '<label><input type="radio" name="emailused" value="0" onclick="'.$onclick.'" />'. - &mt('No').'</label></span>'."\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}; @@ -2614,22 +2351,21 @@ 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 />'. + $output .= &Apache::lonhtmlcommon::row_title($lt{'valid'}, + 'LC_pick_box_title')."\n"; + if ($recaptchaversion >=2) { + $output .= '<script src="https://www.google.com/recaptcha/api.js"></script>'."\n"; + } + $output .= $captchaform."\n".'<br /><br />'. &Apache::lonhtmlcommon::row_closure(1); $rowcount ++; } - if ($showsubmit) { - my $submit_text = &mt('Create account'); - $output .= &Apache::lonhtmlcommon::row_title()."\n". - '<br /><input type="submit" name="createaccount" value="'. - $submit_text.'" />'; - if ($usertype ne '') { - $output .= '<input type="hidden" name="type" value="'.$usertype.'" />'. - &Apache::lonhtmlcommon::row_closure(1); - } - } + 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) { @@ -2713,7 +2449,7 @@ sub get_inststatuses { # ================================================================= Phase Three sub update_user_data { - my ($r,$context,$crstype,$brcrum,$showcredits,$permission) = @_; + my ($r,$context,$crstype,$brcrum,$showcredits) = @_; my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'}, $env{'form.ccdomain'}); # Error messages @@ -2737,7 +2473,7 @@ sub update_user_data { $jsback."\n". '// ]]>'."\n". '</script>'."\n"; - my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$env{'form.ccdomain'}); + my %breadcrumb_text = &singleuser_breadcrumb($crstype); push (@{$brcrum}, {href => "javascript:backPage(document.userupdate)", text => $breadcrumb_text{'search'}, @@ -2754,10 +2490,6 @@ 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')", @@ -2979,7 +2711,7 @@ sub update_user_data { $env{'form.ccdomain'},$env{'form.ccuname'}); } } - $r->print('<br />'.&mt('Home Server').': '.$uhome.' '. + $r->print('<br />'.&mt('Home server').': '.$uhome.' '. &Apache::lonnet::hostname($uhome)); } elsif (($env{'form.login'} ne 'nochange') && ($env{'form.login'} ne '' )) { @@ -2994,19 +2726,12 @@ sub update_user_data { &Apache::lonnet::modifyuserauth( $env{'form.ccdomain'},$env{'form.ccuname'}, $amode,$genpwd)); - $r->print('<br />'.&mt('Home Server').': '.&Apache::lonnet::homeserver + $r->print('<br />'.&mt('Home server').': '.&Apache::lonnet::homeserver ($env{'form.ccuname'},$env{'form.ccdomain'})); } else { # Okay, this is a non-fatal error. - $r->print($error.&mt('You do not have privileges to modify the authentication configuration for this user.').$end); + $r->print($error.&mt('You do not have the authority to modify this users authentication information.').$end); } - } elsif (($env{'form.intarg'} ne '') && - (&Apache::lonnet::queryauthenticate($env{'form.ccuname'},$env{'form.ccdomain'}) =~ /^internal:/) && - (&Apache::lonuserutils::can_change_internalpass($env{'form.ccuname'},$env{'form.ccdomain'},$crstype,$permission))) { - $r->print('Modifying authentication: '. - &Apache::lonnet::modifyuserauth( - $env{'form.ccdomain'},$env{'form.ccuname'}, - 'internal',$env{'form.intarg'})); } $r->rflush(); # Finish display of header before time consuming actions start &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state); @@ -3388,7 +3113,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 = @@ -4427,9 +4152,9 @@ sub build_roles { # ========================================================== Custom Role Editor sub custom_role_editor { - my ($r,$context,$brcrum,$prefix,$permission) = @_; + my ($r,$brcrum) = @_; my $action = $env{'form.customroleaction'}; - my ($rolename,$helpitem); + my $rolename; if ($action eq 'new') { $rolename=$env{'form.newrolename'}; } else { @@ -4440,103 +4165,281 @@ sub custom_role_editor { if ($env{'request.course.id'}) { $crstype = &Apache::loncommon::course_type(); $context = 'course'; - $helpitem = 'Course_Editing_Custom_Roles'; } else { $context = 'domain'; - $crstype = 'course'; - $helpitem = 'Domain_Editing_Custom_Roles'; + $crstype = $env{'form.templatecrstype'}; } $rolename=~s/[^A-Za-z0-9]//gs; if (!$rolename || $env{'form.phase'} eq 'pickrole') { - &print_username_entry_form($r,$context,undef,undef,undef,$crstype,$brcrum, - $permission); + &print_username_entry_form($r,undef,undef,undef,undef,$crstype,$brcrum); return; } - my $formname = 'form1'; - my %privs=(); - my $body_top = '<h2>'; -# ------------------------------------------------------- Does this role exist? +# ------------------------------------------------------- What can be assigned? + my %full=(); + my %courselevel=(); + my %courselevelcurrent=(); + my $syspriv=''; + my $dompriv=''; + my $coursepriv=''; + my $body_top; + my $newrole; 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 - ($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'; + ($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef); + if ($crstype eq 'Community') { + $syspriv =~ s/bre\&S//; } } else { - $body_top .= &mt('New Role').' "'; - $roledef=''; + $newrole = 1; + $body_top .= &mt('New Role').' "'; + $roledef=''; } $body_top .= $rolename.'"</h2>'; - -# ------------------------------------------------------- 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); + 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; + } my ($jsback,$elements) = &crumb_utilities(); - my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype); - my $head_script = - &Apache::lonuserutils::custom_roledefs_js($context,$crstype,$formname, - \%full,\@templateroles,$jsback); + 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"; push (@{$brcrum}, - {href => "javascript:backPage(document.$formname,'pickrole','')", + {href => "javascript:backPage(document.form1,'pickrole','')", text => "Pick custom role", faq => 282,bug=>'Instructor Interface',}, - {href => "javascript:backPage(document.$formname,'','')", + {href => "javascript:backPage(document.form1,'','')", text => "Edit custom role", faq => 282, bug => 'Instructor Interface', - help => $helpitem} + help => 'Course_Editing_Custom_Roles'} ); my $args = { bread_crumbs => $brcrum, bread_crumbs_component => 'User Management'}; + $r->print(&Apache::loncommon::start_page('Custom Role Editor', $head_script,$args). $body_top); - $r->print('<form name="'.$formname.'" method="post" action="">'."\n". - &Apache::lonuserutils::custom_role_header($context,$crstype, - \@templateroles,$prefix)); + 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(<<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::lonuserutils::custom_role_table($crstype,\%full,\%levels, - \%levelscurrent,$prefix)); + $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::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,$prefix,$permission) = @_; + my ($r,$context,$brcrum) = @_; my $rolename=$env{'form.rolename'}; $rolename=~s/[^A-Za-z0-9]//gs; if (!$rolename) { - &custom_role_editor($r,$context,$brcrum,$prefix,$permission); + &custom_role_editor($r,$brcrum); return; } my ($jsback,$elements) = &crumb_utilities(); @@ -4545,10 +4448,6 @@ 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", @@ -4562,10 +4461,10 @@ sub set_custom_role { text => "Result", faq => 282, bug => 'Instructor Interface', - help => $helpitem,} + help => 'Course_Editing_Custom_Roles'}, ); 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; @@ -4582,13 +4481,38 @@ sub set_custom_role { $newrole = 1; } $r->print($rolename.'"</h3>'); -# ------------------------------------------------- Assign role and show result +# ------------------------------------------------------- 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; + } + } + 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; + } + } + # Assign role; Compile and show result 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'}); + my $result = + &Apache::lonnet::definerole($rolename,$sysrole,$domrole,$courole); if ($result ne 'ok') { $errmsg = ': '.$result; } @@ -4633,8 +4557,7 @@ sub handler { $r->send_http_header; return OK; } - my ($context,$crstype,$cid,$cnum,$cdom,$allhelpitems); - + my ($context,$crstype); if ($env{'request.course.id'}) { $context = 'course'; $crstype = &Apache::loncommon::course_type(); @@ -4644,69 +4567,6 @@ 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'}) || ($permission->{'selfenrollview'})) { - push(@allhelp,'Course_Approve_Selfenroll'); - } - } - if ($permission->{'grp_manage'}) { - push(@allhelp,'Course_Manage_Group'); - } - if ($permission->{'view'} || $permission->{'cusr'}) { - push(@allhelp,'Course_User_Logs'); - } - } elsif ($context eq 'author') { - push(@allhelp,('Author_Change_Privileges','Author_Create_Coauthor_List', - 'Author_View_Coauthor_List','Author_User_Logs')); - } else { - if ($permission->{'cusr'}) { - push(@allhelp,'Domain_Change_Privileges'); - if ($permission->{'activity'}) { - push(@allhelp,'Domain_User_Access_Logs'); - } - push(@allhelp,('Domain_Create_Users','Domain_View_Users_List')); - if ($permission->{'custom'}) { - push(@allhelp,'Domain_Editing_Custom_Roles'); - } - push(@allhelp,('Domain_Role_Approvals','Domain_Username_Approvals','Domain_Change_Logs')); - } elsif ($permission->{'view'}) { - push(@allhelp,'Domain_View_Privileges'); - if ($permission->{'activity'}) { - push(@allhelp,'Domain_User_Access_Logs'); - } - push(@allhelp,('Domain_View_Users_List','Domain_Change_Logs')); - } - } - if (@allhelp) { - $allhelpitems = join(',',@allhelp); - } - } - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['action','state','callingform','roletype','showrole','bulkaction','popup','phase', 'username','domain','srchterm','srchdomain','srchin','srchby','srchtype','queue']); @@ -4717,9 +4577,13 @@ sub handler { if (($env{'form.action'} ne 'dateselect') && ($env{'form.action'} ne 'displayuserreq')) { $brcrum = [{href=>"/adm/createuser", text=>"User Management", - help=>$allhelpitems} + 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'} ]; } + #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'); @@ -4751,16 +4615,10 @@ 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 => $helpitem, + help => 'Course_Create_Class_List', }); $bread_crumbs_component = 'Upload Users List'; $args = {bread_crumbs => $brcrum, @@ -4772,45 +4630,18 @@ sub handler { if (! exists($env{'form.state'})) { &Apache::lonuserutils::print_first_users_upload_form($r,$context); } elsif ($env{'form.state'} eq 'got_file') { - my $result = - &Apache::lonuserutils::print_upload_manager_form($r,$context, - $permission, - $crstype,$showcredits); - if ($result eq 'missingdata') { - delete($env{'form.state'}); - &Apache::lonuserutils::print_first_users_upload_form($r,$context); - } + &Apache::lonuserutils::print_upload_manager_form($r,$context,$permission, + $crstype,$showcredits); } elsif ($env{'form.state'} eq 'enrolling') { if ($env{'form.datatoken'}) { - my $result = &Apache::lonuserutils::upfile_drop_add($r,$context, - $permission, - $showcredits); - if ($result eq 'missingdata') { - delete($env{'form.state'}); - &Apache::lonuserutils::print_first_users_upload_form($r,$context); - } elsif ($result eq 'invalidhome') { - $env{'form.state'} = 'got_file'; - delete($env{'form.lcserver'}); - my $result = - &Apache::lonuserutils::print_upload_manager_form($r,$context,$permission, - $crstype,$showcredits); - if ($result eq 'missingdata') { - delete($env{'form.state'}); - &Apache::lonuserutils::print_first_users_upload_form($r,$context); - } - } - } else { - delete($env{'form.state'}); - &Apache::lonuserutils::print_first_users_upload_form($r,$context); + &Apache::lonuserutils::upfile_drop_add($r,$context,$permission, + $showcredits); } } else { &Apache::lonuserutils::print_first_users_upload_form($r,$context); } - $r->print('</form>'); - } 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'}))) { + } elsif ((($env{'form.action'} eq 'singleuser') || ($env{'form.action'} + eq 'singlestudent')) && ($permission->{'cusr'})) { my $phase = $env{'form.phase'}; my @search = ('srchterm','srchby','srchin','srchtype','srchdomain'); &Apache::loncreateuser::restore_prev_selections(); @@ -4819,7 +4650,7 @@ sub handler { $srch->{$item} = $env{'form.'.$item}; } if (($phase eq 'get_user_info') || ($phase eq 'userpicked') || - ($phase eq 'createnewuser') || ($phase eq 'activity')) { + ($phase eq 'createnewuser')) { if ($env{'form.phase'} eq 'createnewuser') { my $response; if ($env{'form.srchterm'} !~ /^$match_username$/) { @@ -4830,7 +4661,7 @@ sub handler { .'</span>'; $env{'form.phase'} = ''; &print_username_entry_form($r,$context,$response,$srch,undef, - $crstype,$brcrum,$permission); + $crstype,$brcrum,$showcredits); } else { my $ccuname =&LONCAPA::clean_username($srch->{'srchterm'}); my $ccdomain=&LONCAPA::clean_domain($srch->{'srchdomain'}); @@ -4849,8 +4680,8 @@ sub handler { &print_user_selection_page($r,$response,$srch,$results, \@search,$context,undef,$crstype, $brcrum); - } elsif (($currstate eq 'modify') || ($env{'form.action'} eq 'accesslogs')) { - my ($ccuname,$ccdomain,$uhome); + } elsif ($currstate eq 'modify') { + my ($ccuname,$ccdomain); if (($srch->{'srchby'} eq 'uname') && ($srch->{'srchtype'} eq 'exact')) { $ccuname = $srch->{'srchterm'}; @@ -4861,68 +4692,37 @@ sub handler { } $ccuname =&LONCAPA::clean_username($ccuname); $ccdomain=&LONCAPA::clean_domain($ccdomain); - 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); + if ($env{'form.forcenewuser'}) { + $response = ''; } + &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, - $permission); + $forcenewuser,$crstype,$brcrum); } } elsif ($env{'form.phase'} eq 'userpicked') { my $ccuname = &LONCAPA::clean_username($env{'form.seluname'}); my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'}); - 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); + &print_user_modification_page($r,$ccuname,$ccdomain,$srch,'', + $context,$permission,$crstype, + $brcrum); } } elsif ($env{'form.phase'} eq 'update_user_data') { - &update_user_data($r,$context,$crstype,$brcrum,$showcredits,$permission); + &update_user_data($r,$context,$crstype,$brcrum,$showcredits); } else { &print_username_entry_form($r,$context,undef,$srch,undef,$crstype, - $brcrum,$permission); + $brcrum); } } elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) { - my $prefix; if ($env{'form.phase'} eq 'set_custom_roles') { - &set_custom_role($r,$context,$brcrum,$prefix,$permission); + &set_custom_role($r,$context,$brcrum); } else { - &custom_role_editor($r,$context,$brcrum,$prefix,$permission); + &custom_role_editor($r,$brcrum); } } elsif (($env{'form.action'} eq 'processauthorreq') && ($permission->{'cusr'}) && @@ -5028,92 +4828,56 @@ sub handler { unless ($usertype) { $usertype = 'default'; } - my ($showstatus,$showemail,$pickstart); - my $numextras = 0; - my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); - if ((ref($types) eq 'ARRAY') && (@{$types} > 0)) { - if (ref($usertypes) eq 'HASH') { - if ($usertypes->{$usertype}) { - $showstatus = $usertypes->{$usertype}; - } else { - $showstatus = $othertitle; - } - if ($showstatus) { - $numextras ++; - } - } - } - if (($info{$uname}{'email'} ne '') && ($info{$uname}{'email'} ne $uname)) { - $showemail = $info{$uname}{'email'}; - $numextras ++; - } if (ref($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}) eq 'HASH') { if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) { - $pickstart = 1; $r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box()); - my ($num,$count); + my ($num,$count,$showstatus); $count = scalar(keys(%{$domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}})); - $count += $numextras; + unless ($usertype eq 'default') { + my ($othertitle,$usertypes,$types) = + &Apache::loncommon::sorted_inst_types($dom); + if (ref($usertypes) eq 'HASH') { + if ($usertypes->{$usertype}) { + $showstatus = $usertypes->{$usertype}; + $count ++; + } + } + } 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) { + if ($count == $num) { + $r->print(&Apache::lonhtmlcommon::row_closure(1)); + } else { $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; + if ($showstatus) { + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type (self-reported)')). + $showstatus. + &Apache::lonhtmlcommon::row_closure(1)); } - $r->print(&Apache::lonhtmlcommon::row_title(&mt('E-mail address')). - $showemail. - &Apache::lonhtmlcommon::row_closure($closure)); + $r->print(&Apache::lonhtmlcommon::end_pick_box().'</div>'); } - 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()); } - $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 => $helpitem}); + help => 'Course_View_Class_List'}); $bread_crumbs_component = 'Update Users'; $args = {bread_crumbs => $brcrum, bread_crumbs_component => $bread_crumbs_component}; @@ -5130,7 +4894,7 @@ sub handler { push(@{$brcrum}, {href => '/adm/createuser?action=listusers', text => "List Users", - help => $helpitem}); + help => 'Course_View_Class_List'}); $bread_crumbs_component = 'List Users'; $args = {bread_crumbs => $brcrum, bread_crumbs_component => $bread_crumbs_component}; @@ -5210,9 +4974,11 @@ 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') { - my %currsettings; - if ($permission->{selfenrolladmin} || $permission->{selfenrollview}) { - %currsettings = ( + if ($permission->{selfenrolladmin}) { + my $cid = $env{'request.course.id'}; + my $cdom = $env{'course.'.$cid.'.domain'}; + my $cnum = $env{'course.'.$cid.'.num'}; + my %currsettings = ( selfenroll_types => $env{'course.'.$cid.'.internal.selfenroll_types'}, selfenroll_registered => $env{'course.'.$cid.'.internal.selfenroll_registered'}, selfenroll_section => $env{'course.'.$cid.'.internal.selfenroll_section'}, @@ -5228,8 +4994,6 @@ sub handler { default_enrollment_end_date => $env{'course.'.$cid.'.default_enrollment_end_date'}, uniquecode => $env{'course.'.$cid.'.internal.uniquecode'}, ); - } - if ($permission->{selfenrolladmin}) { push(@{$brcrum}, {href => '/adm/createuser?action=selfenroll', text => "Configure Self-enrollment", @@ -5250,73 +5014,53 @@ sub handler { $r->print('<h3>'.&mt('Self-enrollment with a student role').'</h3>'."\n"); &update_selfenroll_config($r,$cid,$cdom,$cnum,$context,$crstype,\%currsettings); } - } elsif ($permission->{selfenrollview}) { - push(@{$brcrum}, - {href => '/adm/createuser?action=selfenroll', - text => "View Self-enrollment configuration", - help => 'Course_Self_Enrollment'}); - $args = { bread_crumbs => $brcrum, - bread_crumbs_component => 'Self-enrollment Settings'}; - $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,'',1); } 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') { - if ($permission->{selfenrolladmin}) { + 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') { push(@{$brcrum}, {href => '/adm/createuser?action=selfenrollqueue', - 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>'); + text => 'Result', + help => 'Course_Self_Enrollment'}); + $bread_crumbs_component = 'Enrollment result'; } - } elsif ($env{'form.action'} eq 'changelogs') { - 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>'); + $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)); } - } 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>'); + } elsif ($env{'form.action'} eq 'changelogs') { + my $helpitem; + if ($context eq 'course') { + $helpitem = 'Course_User_Logs'; } + 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, @@ -5568,26 +5312,6 @@ 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 => [ @@ -5596,7 +5320,7 @@ sub print_main_menu { icon => 'edit-redo.png', #help => 'Course_Change_Privileges', url => '/adm/createuser?action=singleuser', - permission => ($permission->{'view'} || $permission->{'cusr'}), + permission => $permission->{'cusr'}, linktitle => $linktitles{$linkcontext}{'singleuser'}, }, ]}, @@ -5626,18 +5350,8 @@ 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 { @@ -5669,7 +5383,7 @@ sub print_main_menu { icon => 'document-properties.png', #help => 'Course_User_Logs', url => '/adm/createuser?action=changelogs', - permission => ($permission->{'cusr'} || $permission->{'view'}), + permission => $permission->{'cusr'}, linktitle => 'View change log.', }, ); @@ -5725,15 +5439,7 @@ 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', @@ -5754,7 +5460,7 @@ sub print_main_menu { icon => 'document-properties.png', #help => 'Course_User_Logs', url => '/adm/createuser?action=changelogs', - permission => ($permission->{'view'} || $permission->{'cusr'}), + permission => $permission->{'cusr'}, linktitle => 'View change log.', }, ); @@ -5765,7 +5471,7 @@ sub print_main_menu { icon => 'selfenrl-queue.png', #help => 'Course_Approve_Selfenroll', url => '/adm/createuser?action=selfenrollqueue', - permission => $permission->{'selfenrolladmin'} || $permission->{'selfenrollview'}, + permission => $permission->{'selfenrolladmin'}, linktitle =>'Approve or reject enrollment requests.', }, ); @@ -5779,8 +5485,7 @@ sub print_main_menu { icon => 'roles.png', #help => 'Course_Automated_Enrollment', permission => (&Apache::lonnet::auto_run($cnum,$cdom) - && (($permission->{'cusr'}) || - ($permission->{'view'}))), + && $permission->{'cusr'}), url => '/adm/populate', linktitle => 'Automated enrollment manager.', } @@ -5792,7 +5497,7 @@ sub print_main_menu { icon => 'self_enroll.png', #help => 'Course_Self_Enrollment', url => '/adm/createuser?action=selfenroll', - permission => $permission->{'selfenrolladmin'} || $permission->{'selfenrollview'}, + permission => $permission->{'selfenrolladmin'}, linktitle => 'Configure user self-enrollment.', }, ); @@ -5829,7 +5534,7 @@ sub restore_prev_selections { } sub print_selfenroll_menu { - my ($r,$context,$cid,$cdom,$cnum,$currsettings,$additional,$readonly) = @_; + my ($r,$context,$cid,$cdom,$cnum,$currsettings,$additional) = @_; my $crstype = &Apache::loncommon::course_type(); my $formname = 'selfenroll'; my $nolink = 1; @@ -5842,10 +5547,6 @@ 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) { @@ -5978,13 +5679,12 @@ function validate_types(form) { } function check_types(num,countfail,needaction) { - var boxname = 'selfenroll_types_'+num; - var typeidx = getIndexByName(boxname); + var typeidx = getIndexByName('selfenroll_types_'+num); var count = 0; if (typeidx != -1) { - if (document.$formname.elements[boxname].length) { - for (var k=0; k<document.$formname.elements[boxname].length; k++) { - if (document.$formname.elements[boxname][k].checked) { + if (document.$formname.elements[typeidx].length) { + for (var k=0; k<document.$formname.elements[typeidx].length; k++) { + if (document.$formname.elements[typeidx][k].checked) { count ++; } } @@ -6041,7 +5741,8 @@ ENDSCRIPT '// ]]>'."\n". '</script>'."\n". '<h3>'.$lt->{'selfenroll'}.'</h3>'."\n"; - my $visactions = &cat_visibility($cdom); + + my $visactions = &cat_visibility(); my ($cathash,%cattype); my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom); if (ref($domconfig{'coursecategories'}) eq 'HASH') { @@ -6161,13 +5862,13 @@ ENDSCRIPT $output .= ' checked="checked" '; } $output .= 'onchange="javascript:update_types('. - "'selfenroll_all'".');"'.$disabled.' />'.&mt('Yes').'</label>'. + "'selfenroll_all'".');" />'.&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'".');"'.$disabled.' />'.&mt('No').'</label></td>'. + "'selfenroll_all'".');"/>'.&mt('No').'</label></td>'. &Apache::loncommon::end_data_table_row(). &Apache::loncommon::end_data_table(). &mt('Or').'<br />'. @@ -6189,10 +5890,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'".');"'.$disabled.' />' + .'name="selfenroll_delete" value="'.$num.'" onchange="javascript:update_types('."'selfenroll_delete','$num'".');" />' .&mt('Delete').'</label></span></td>'; $output .= '<td valign="top"> '.&mt('User types:').'<br />' - .&selfenroll_inst_types($num,$currdom,\@currinsttypes,$readonly).'</td>' + .&selfenroll_inst_types($num,$currdom,\@currinsttypes).'</td>' .&Apache::loncommon::end_data_table_row(); $num ++; } @@ -6207,7 +5908,7 @@ ENDSCRIPT $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,'','','',$readonly) + $includeempty,$showdomdesc) .'<input type="hidden" name="selfenroll_types_total" value="'.$num.'" />' .'</td>'.&Apache::loncommon::end_data_table_row() .&Apache::loncommon::end_data_table(); @@ -6228,15 +5929,15 @@ ENDSCRIPT } if ($registered) { $regon = ' checked="checked" '; - $regoff = ''; + $regoff = ' '; } else { - $regon = ''; + $regon = ' '; $regoff = ' checked="checked" '; } $output .= '<label>'. - '<input type="radio" name="selfenroll_registered" value="1"'.$regon.$disabled.' />'. + '<input type="radio" name="selfenroll_registered" value="1"'.$regon.'/>'. &mt('Yes').'</label> <label>'. - '<input type="radio" name="selfenroll_registered" value="0"'.$regoff.$disabled.' />'. + '<input type="radio" name="selfenroll_registered" value="0"'.$regoff.'/>'. &mt('No').'</label>'; } elsif ($item eq 'enroll_dates') { my ($starttime,$endtime); @@ -6258,10 +5959,10 @@ ENDSCRIPT } my $startform = &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_start_date',$starttime, - $disabled,undef,undef,undef,undef,undef,undef,$nolink); + undef,undef,undef,undef,undef,undef,undef,$nolink); my $endform = &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_end_date',$endtime, - $disabled,undef,undef,undef,undef,undef,undef,$nolink); + undef,undef,undef,undef,undef,undef,undef,$nolink); $output .= &selfenroll_date_forms($startform,$endform); } elsif ($item eq 'access_dates') { my ($starttime,$endtime); @@ -6283,10 +5984,10 @@ ENDSCRIPT } my $startform = &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_start_access',$starttime, - $disabled,undef,undef,undef,undef,undef,undef,$nolink); + undef,undef,undef,undef,undef,undef,undef,$nolink); my $endform = &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_end_access',$endtime, - $disabled,undef,undef,undef,undef,undef,undef,$nolink); + undef,undef,undef,undef,undef,undef,undef,$nolink); $output .= &selfenroll_date_forms($startform,$endform); } elsif ($item eq 'section') { my $currsec; @@ -6310,19 +6011,19 @@ ENDSCRIPT next; } my $sections_select = - &Apache::lonuserutils::course_sections(\%sections_count,'st',$currsec,$disabled); + &Apache::lonuserutils::course_sections(\%sections_count,'st',$currsec); $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.'"'.$disabled.' />'."\n". + '<input type="text" name="newsec" size="15" value="'.$newsecval.'" />'."\n". '<input type="hidden" name="sections" value="" />'."\n". '</td></tr></table>'."\n"; } elsif ($item eq 'approval') { my ($currnotified,$currapproval,%appchecked); my %selfdescs = &Apache::lonuserutils::selfenroll_default_descs(); - if (ref($currsettings) eq 'HASH') { + if (ref($currsettings) eq 'HASH') { $currnotified = $currsettings->{'selfenroll_notifylist'}; $currapproval = $currsettings->{'selfenroll_approval'}; } @@ -6338,8 +6039,8 @@ ENDSCRIPT 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); + $appchecked{$i}.' onclick="toggleNotify();" />'.$selfdescs{'approval'}{$i}. + '</label>'.(' 'x2); } my %advhash = &Apache::lonnet::get_course_adv_roles($cid,1); my (@ccs,%notified); @@ -6380,7 +6081,7 @@ ENDSCRIPT &Apache::loncommon::start_data_table_row() } $output .= '<td><span class="LC_nobreak"><label>'. - '<input type="checkbox" name="selfenroll_notify"'.$notifyon.' value="'.$cc.'"'.$disabled.' />'. + '<input type="checkbox" name="selfenroll_notify"'.$notifyon.' value="'.$cc.'" />'. &Apache::loncommon::plainname($ccuname,$ccudom). '</label></span></td>'; $count ++; @@ -6430,28 +6131,26 @@ ENDSCRIPT $nolimit = ' checked="checked" '; } $output .= '<table><tr><td><label>'. - '<input type="radio" name="selfenroll_limit" value="none"'.$nolimit.$disabled.'/>'. + '<input type="radio" name="selfenroll_limit" value="none"'.$nolimit.'/>'. &mt('No limit').'</label></td><td><label>'. - '<input type="radio" name="selfenroll_limit" value="allstudents"'.$crslimit.$disabled.'/>'. + '<input type="radio" name="selfenroll_limit" value="allstudents"'.$crslimit.'/>'. &mt('Limit by total students').'</label></td><td><label>'. - '<input type="radio" name="selfenroll_limit" value="selfenrolled"'.$selflimit.$disabled.'/>'. + '<input type="radio" name="selfenroll_limit" value="selfenrolled"'.$selflimit.'/>'. &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.'"'.$disabled.' /></td></tr></table>'; + '<input type="text" name="selfenroll_cap" size = "5" value="'.$currcap.'" /></td></tr></table>'; } $output .= &Apache::lonhtmlcommon::row_closure(1); } } - $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>'; + $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" />' + .'<input type="hidden" name="state" value="done" />'."\n". + $additional.'</form>'; $r->print($output); return; } @@ -6586,7 +6285,6 @@ sub visible_in_stdcat { } sub cat_visibility { - my ($cdom) = @_; 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.', @@ -6599,24 +6297,13 @@ sub cat_visibility { 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 catalog display of "Official courses (with institutional codes)".', + 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.', ); - if ($env{'request.role'} eq "dc./$cdom/") { - $visactions{'dc_chgconf'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to change the Catalog type for this domain.','»'); - $visactions{'dc_setcode'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to assign a six character code to the course.','»'); - $visactions{'dc_unhide'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to change the "Exclude from course catalog" setting.','»'); - $visactions{'dc_addinst'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to enable catalog display of "Official courses (with institutional codes)".','»'); - $visactions{'dc_instcode'} = &mt('Use: "Main menu" [_1] "View or modify a course or community" [_1] "View/Modify course owner, institutional code ... " to assign an institutional code (if this is an official course).','»'); - $visactions{'dc_catalog'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to enable or create at least one course category in the domain.','»'); - $visactions{'dc_categories'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to create a hierarchy of categories and sub categories for courses in the domain.','»'); - $visactions{'dc_chgcat'} = &mt('Use: "Main menu" [_1] "View or modify a course or community" [_1] "View/Modify catalog settings for course" to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','»'); - $visactions{'dc_addcat'} = &mt('Use: "Main menu" [_1] "View or modify a course or community" [_1] "View/Modify catalog settings for course" 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>"'); @@ -6646,16 +6333,12 @@ sub new_selfenroll_dom_row { } sub selfenroll_inst_types { - my ($num,$currdom,$currinsttypes,$readonly) = @_; + my ($num,$currdom,$currinsttypes) = @_; 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'; @@ -6680,7 +6363,7 @@ sub selfenroll_inst_types { $output .= 'checked="checked"'; } } - $output .= ' name="selfenroll_types_'.$num.'"'.$disabled.' />'.$usertypes->{$type}.'</label></span></td>'; + $output .= ' name="selfenroll_types_'.$num.'" />'.$usertypes->{$type}.'</label></span></td>'; } $count ++; } @@ -6703,7 +6386,7 @@ sub selfenroll_inst_types { } else { $output .= ' checked="checked"'; } - $output .= ' name="selfenroll_types_'.$num.'"'.$disabled.' />'.$othertitle.'</label></span></td></tr></table>'; + $output .= ' name="selfenroll_types_'.$num.'" />'.$othertitle.'</label></span></td></tr></table>'; } return $output; } @@ -6724,9 +6407,9 @@ sub selfenroll_date_forms { } sub print_userchangelogs_display { - my ($r,$context,$permission,$brcrum) = @_; + my ($r,$context,$permission) = @_; my $formname = 'rolelog'; - my ($username,$domain,$crstype,$viewablesec,%roleslog); + my ($username,$domain,$crstype,%roleslog); if ($context eq 'domain') { $domain = $env{'request.role.domain'}; %roleslog=&Apache::lonnet::dump_dom('nohist_rolelog',$domain); @@ -6735,7 +6418,6 @@ 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); @@ -6755,36 +6437,6 @@ 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 @@ -6817,9 +6469,7 @@ ENDSCRIPT my ($minshown,$maxshown); $minshown = 1; my $count = 0; - if ($curr{'show'} =~ /\D/) { - $curr{'page'} = 1; - } else { + if ($curr{'show'} ne &mt('all')) { $maxshown = $curr{'page'} * $curr{'show'}; if ($curr{'page'} > 1) { $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'}; @@ -6831,6 +6481,8 @@ ENDSCRIPT &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 @@ -6855,7 +6507,7 @@ ENDSCRIPT 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'} !~ /\D/) { + if ($curr{'show'} ne &mt('all')) { if ($count >= $curr{'page'} * $curr{'show'}) { $more_records = 1; last; @@ -6871,13 +6523,12 @@ ENDSCRIPT 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(&Apache::loncommon::start_data_table() + $r->print($nav_script + .$nav_links + .&Apache::loncommon::start_data_table() .$tableheader); $r->rflush(); $showntableheader = 1; @@ -6938,8 +6589,8 @@ ENDSCRIPT } if ($showntableheader) { # Table footer, if content displayed above - $r->print(&Apache::loncommon::end_data_table(). - &userlogdisplay_navlinks(\%curr,$more_records)); + $r->print(&Apache::loncommon::end_data_table() + .$nav_links); } else { # No content displayed above $r->print('<p class="LC_info">' .&mt('There are no records to display.') @@ -6955,378 +6606,15 @@ ENDSCRIPT return; } -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); +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"; <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 $heading = '<h3>'. - &mt('User access logs for: [_1]', - &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)).'</h3>'; - my $tableheader = $heading - .&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($heading.'<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 --; @@ -7337,30 +6625,28 @@ function chgPage(caller) { document.$formname.submit(); return; } +// ]]> +</script> ENDSCRIPT -} - -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'}) - .'" />'; + # 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'}) + .'" />'; + } } + $nav_links .= '</p>'; } - $nav_links .= '</p>'; - return $nav_links; + return ($nav_script,$nav_links); } sub role_display_filter { @@ -7417,12 +6703,12 @@ sub role_display_filter { &mt('Context:').'</b><br /><select name="chgcontext">'; my @posscontexts; if ($context eq 'course') { - @posscontexts = ('any','automated','updatenow','createcourse','course','domain','selfenroll','requestcourses','chgtype'); + @posscontexts = ('any','automated','updatenow','createcourse','course','domain','selfenroll','requestcourses'); } elsif ($context eq 'domain') { @posscontexts = ('any','domain','requestauthor','domconfig','server'); } else { @posscontexts = ('any','author','domain'); - } + } foreach my $chgtype (@posscontexts) { my $selstr = ''; if ($curr->{'chgcontext'} eq $chgtype) { @@ -7466,7 +6752,6 @@ sub rolechg_contexts { %lt = &Apache::lonlocal::texthash ( any => 'Any', automated => 'Automated Enrollment', - chgtype => 'Enrollment Type/Lock Change', updatenow => 'Roster Update', createcourse => 'Course Creation', course => 'User Management in course', @@ -7497,988 +6782,6 @@ 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) = @_; @@ -8523,29 +6826,13 @@ sub user_search_result { } } if ($response ne '') { - $response = '<span class="LC_warning">'.$response.'</span><br />'; + $response = '<span class="LC_warning">'.$response.'</span>'; } if ($srch->{'srchin'} eq 'instd') { - my $instd_chk = &instdirectorysrch_check($srch); + my $instd_chk = &directorysrch_check($srch); if ($instd_chk ne 'ok') { - 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 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 the LON-CAPA domain.'); - } - $response .= '<br />'; - } + $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 />'; } } if ($response ne '') { @@ -8575,9 +6862,6 @@ 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} = @@ -8644,7 +6928,7 @@ sub user_search_result { &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 /><br />'; } } } else { @@ -8712,38 +6996,18 @@ 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 /><br />'; } } } return ($currstate,$response,$forcenewuser,\%srch_results); } -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 { +sub directorysrch_check { my ($srch) = @_; my $can_search = 0; my $response; @@ -8865,11 +7129,7 @@ sub build_search_response { $currstate = 'select'; } else { if (keys(%srch_results) == 1) { - if ($env{'form.action'} eq 'accesslogs') { - $currstate = 'activity'; - } else { - $currstate = 'modify'; - } + $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'}); @@ -8889,7 +7149,7 @@ sub build_search_response { if ($srch->{'srchin'} ne 'alc') { $forcenewuser = 1; my $cansrchinst = 0; - if (($srch->{'srchdomain'}) && ($env{'form.action'} ne 'accesslogs')) { + if ($srch->{'srchdomain'}) { my %domconfig = &Apache::lonnet::get_dom('configuration',['directorysrch'],$srch->{'srchdomain'}); if (ref($domconfig{'directorysrch'}) eq 'HASH') { if ($domconfig{'directorysrch'}{'available'}) { @@ -8914,8 +7174,7 @@ sub build_search_response { $createdom = $env{'form.coursedom'}; } } - unless (($env{'form.action'} eq 'accesslogs') || (($srch->{'srchby'} eq 'uname') && ($srch->{'srchin'} eq 'dom') && - ($srch->{'srchtype'} eq 'exact') && ($srch->{'srchdomain'} eq $createdom))) { + if (!($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>'; @@ -8939,20 +7198,18 @@ sub build_search_response { .&mt("Click 'Search'") .'</li></ul><br />'; } else { - 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 />'; + 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 /><br />'; } } } @@ -9572,7 +7829,7 @@ sub update_selfenroll_config { } else { $r->print(&mt('No changes were made to the existing self-enrollment settings in this course.')); } - my $visactions = &cat_visibility($cdom); + my $visactions = &cat_visibility(); my ($cathash,%cattype); my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom); if (ref($domconfig{'coursecategories'}) eq 'HASH') {