--- loncom/interface/loncoursequeueadmin.pm 2020/08/22 02:11:46 1.52.2.3.2.3 +++ loncom/interface/loncoursequeueadmin.pm 2023/08/19 23:23:05 1.68 @@ -1,7 +1,7 @@ # The LearningOnline Network # Utilities to administer domain course requests and course self-enroll requests # -# $Id: loncoursequeueadmin.pm,v 1.52.2.3.2.3 2020/08/22 02:11:46 raeburn Exp $ +# $Id: loncoursequeueadmin.pm,v 1.68 2023/08/19 23:23:05 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -144,7 +144,6 @@ sub send_selfserve_notification { push(@rawmsg,{ mt => $msgtxt, args => ["\n ".$contextdesc.",\n",$timestamp.",\n"], - }); if (ref($textstr) eq 'ARRAY') { push(@rawmsg,@{$textstr}); @@ -270,6 +269,52 @@ sub send_selfserve_notification { if (ref($textstr) eq 'ARRAY') { push(@rawmsg,@{$textstr}); } + } elsif ($context eq 'othdomroleuser') { + my $linktext = 'Roles'; + if ($notifylist =~ /^($match_username):($match_domain)$/) { + if (&Apache::loncommon::show_course($2,$1)) { + $linktext = 'Courses'; + } + } + $rawsubj = 'Role Assignment Approval'; + push(@rawmsg,{ + mt => 'A domain different to your own LON-CAPA domain [_1]wants to assign you a role in their domain.', + args => ["\n$contextdesc\n"], + }, + { + mt =>"[_1]Click $linktext at top right, then click 'Show pending' in the gray Functions bar ". + "to display a list of pending role assignments in other domain(s), which you can either accept or reject.", + args => ["\n\n"], + }); + } elsif ($context eq 'othdomroledc') { + $rawsubj = 'Role Assignment Authorization'; + push(@rawmsg,{ + mt => 'Another LON-CAPA domain wants to assign a role in their domain to a user from your domain.', + args => [], + }, + { + mt =>'[_1]As Domain Coordinator, use: [_2]Main Menu -> Create users or modify the roles and privileges of users + -> Queued Role Assignments (this domain) [_3]to display a list of pending requests, which you can either approve or reject.', + args => ["\n","\n\n ","\n\n"], + }); + } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { + $rawsubj = 'Status of Role Assignment Requests'; + if ($context eq 'othdombydc') { + push(@rawmsg,{ + mt =>'A Domain Coordinator in a domain different to your own LON-CAPA domain '. + 'has taken action on queued role assignment(s) in this domain for user(s) from that other domain [_1]', + args => ["\n$contextdesc\n"], + }); + } elsif ($context eq 'othdombyuser') { + push(@rawmsg,{ + mt => "Action has been taken by a user to whom you had assigned role(s) ". + "which had been queued, pending acceptance of the role(s).", + args => [], + }); + } + if (ref($textstr) eq 'ARRAY') { + push(@rawmsg,@{$textstr}); + } } my @to_notify = split(/,/,$notifylist); my $numsent = 0; @@ -308,7 +353,11 @@ sub send_selfserve_notification { $message = ''; foreach my $item (@rawmsg) { if (ref($item) eq 'HASH') { - $message .= &mt_user($sender_lh,$item->{mt},@{$item->{args}})."\n"; + if (ref($item->{args}) eq 'ARRAY') { + $message .= &mt_user($sender_lh,$item->{mt},@{$item->{args}})."\n"; + } else { + $message .= &mt_user($sender_lh,$item->{mt})."\n"; + } } } &Apache::lonmsg::process_sent_mail($subject,'',$numsent,$stamp,$uname,$udom,$msgcount,$cid,$$,$message, @@ -371,8 +420,8 @@ sub send_selfserve_notification { } sub display_queued_requests { - my ($context,$dom,$cnum) = @_; - my ($namespace,$formaction,$nextelement,%requesthash); + my ($context,$dom,$cnum,$secondary) = @_; + my ($namespace,$formaction,$nextelement,%requesthash,%reqstatus); if ($context eq 'course') { $formaction = '/adm/createuser'; $namespace = 'selfenrollrequests'; @@ -388,6 +437,35 @@ sub display_queued_requests { $namespace = 'usernamequeue'; %requesthash = &Apache::lonnet::dump_dom($namespace,$dom); $nextelement = ''; + } elsif ($context eq 'othdomqueue') { + $formaction = '/adm/createuser'; + $namespace = 'nohist_othdomqueued'; + if ($secondary eq 'domain') { + %requesthash = &Apache::lonnet::dump_dom($namespace,$dom); + foreach my $key (keys(%requesthash)) { + delete($requesthash{$key}) if ($key =~ /:(ca|aa)$/); + } + } elsif ($secondary eq 'author') { + %requesthash = &Apache::lonnet::dump($namespace,$dom,$cnum); + if ($cnum eq &Apache::lonnet::get_domainconfiguser($dom)) { + foreach my $key (keys(%requesthash)) { + delete($requesthash{$key}) if ($key !~ /:(ca|aa)$/); + } + } + } else { + %requesthash = &Apache::lonnet::dump($namespace,$dom,$cnum); + } + } elsif ($context eq 'othdomaction') { + $namespace = 'nohist_queuedrolereqs'; + if ($secondary eq 'domain') { + $formaction = '/adm/createuser'; + my $confname = &Apache::lonnet::get_domainconfiguser($dom); + %requesthash = &Apache::lonnet::dump($namespace,$dom,$confname); + } else { + $formaction = '/adm/roles'; + %requesthash = &Apache::lonnet::dump($namespace,$dom,$cnum); + } + $nextelement = ''; } else { $formaction = '/adm/createcourse'; $namespace = 'courserequestqueue'; @@ -404,9 +482,6 @@ sub display_queued_requests { } my ($output,%queue_by_date); if (keys(%requesthash) > 0) { - $output = '
'."\n". - ''."\n". - $nextelement."\n"; foreach my $item (keys(%requesthash)) { my ($timestamp,$entry,$pending); if ($context eq 'course') { @@ -418,9 +493,27 @@ sub display_queued_requests { } elsif ($context eq 'requestusername') { $timestamp = $requesthash{$item}; ($entry) = (&unescape($item) =~ /^($match_username)_approval$/); + } elsif ($context eq 'othdomqueue') { + if (ref($requesthash{$item}) eq 'HASH') { + my ($puname,$pudom,$prole,$psec) = split(/:/,$item); + $timestamp = $requesthash{$item}{'timestamp'}; + my $adj = $requesthash{$item}{'adj'}; + $entry = join(':',$puname,$pudom,$prole,$adj, + &escape($requesthash{$item}{'requester'}), + $psec); + } elsif ($item =~ /^status&/) { + my ($dummy,$key) = split(/&/,$item,2); + $reqstatus{$key} = $requesthash{$item}; + } + } elsif ($context eq 'othdomaction') { + next unless ($item =~ /^pending:/); + if (ref($requesthash{$item}) eq 'HASH') { + $timestamp = $requesthash{$item}{'timestamp'}; + $entry = &escape($item).':'.&escape($requesthash{$item}{'requester'}); + } } else { - $timestamp = $requesthash{$item}{'timestamp'}; if (ref($requesthash{$item}) eq 'HASH') { + $timestamp = $requesthash{$item}{'timestamp'}; my ($cnum,$disposition) = split('_',$item); $entry = $cnum.':'.$requesthash{$item}{'ownername'}.':'. $requesthash{$item}{'ownerdom'}.':'; @@ -440,50 +533,64 @@ sub display_queued_requests { } } } - if (keys(%queue_by_date) > 0) { - if ($context eq 'course') { - $output .= '

'.&mt('Self-enrollment requests queued pending approval by a Coordinator').'

'; - } elsif (($context eq 'pending') || ($context eq 'displaypending')) { - $output .= '

'.&mt('Requests for official courses queued pending validation').'

'. - '

'.&mt('Requests are validated against institutional data to confirm that the requestor is an instructor of record.').'
'. - &mt('Validation is attempted when the request is submitted.').' '. - &mt('If unvalidated, the request will be held in a queue.').' '. - &mt('Validation of pending requests is automatically repeated daily.').'

'; - } elsif ($context eq 'requestauthor') { - $output .= '

'.&mt('Requests for Authoring Space queued pending approval by a Domain Coordinator').'

'; - } elsif ($context eq 'requestusername') { - $output .= '

'.&mt('Requests for LON-CAPA accounts queued pending approval by a Domain Coordinator').'

'; - } else { - $output .= '

'.&mt('Course/Community requests queued pending approval by a Domain Coordinator').'

'; - } - $output .= &build_queue_display($dom,$context,\%queue_by_date). - ''; + } + if (keys(%queue_by_date) > 0) { + $output = ''."\n". + ''."\n". + $nextelement."\n"; + if ($context eq 'course') { + $output .= '

'.&mt('Self-enrollment requests queued pending approval by a Coordinator').'

'; + } elsif (($context eq 'pending') || ($context eq 'displaypending')) { + $output .= '

'.&mt('Requests for official courses queued pending validation').'

'. + '

'.&mt('Requests are validated against institutional data to confirm that the requestor is an instructor of record.').'
'. + &mt('Validation is attempted when the request is submitted.').' '. + &mt('If unvalidated, the request will be held in a queue.').' '. + &mt('Validation of pending requests is automatically repeated daily.').'

'; + } elsif ($context eq 'requestauthor') { + $output .= '

'.&mt('Requests for Authoring Space queued pending approval by a Domain Coordinator').'

'; + } elsif ($context eq 'requestusername') { + $output .= '

'.&mt('Requests for LON-CAPA accounts queued pending approval by a Domain Coordinator').'

'; + } elsif ($context eq 'othdomqueue') { + if ($secondary eq 'domain') { + $output .= '

'.&mt('Domain role assignments for users from another domain which were/are queued for approval').'

'; + } elsif ($secondary eq 'author') { + $output .= '

'.&mt('Co-author role assignments for users from another domain which were/are queued for approval').'

'; + } elsif ($secondary eq 'course') { + $output .= '

'.&mt('Course role assignments for users from another domain which were/are queued for approval').'

'; + } elsif ($secondary eq 'community') { + $output .= '

'.&mt('Community role assignments for users from another domain which were/are queued for approval').'

'; + } + } elsif ($context eq 'othdomaction') { + unless ($secondary eq 'user') { + $output .= '

'.&mt('Role assignments in other domains, queued pending domain coordinator approval in this domain.').'

'; + } } else { - $output .= '
'; - if ($context eq 'course') { - $output .= &mt('There are currently no enrollment requests awaiting approval.'); - } elsif ($context eq 'pending') { - $output .= &mt('There are currently no requests for official courses awaiting validation.'); - } elsif ($context eq 'requestauthor') { - $output .= &mt('There are currently no requests for Authoring Space awaiting approval.'); - } elsif ($context eq 'requestusername') { - $output .= &mt('There are currently no requests for LON-CAPA accounts awaiting approval.'); - } elsif ($context eq 'domain') { - $output .= &mt('There are currently no course or community requests awaiting approval.'); + $output .= '

'.&mt('Course/Community requests queued pending approval by a Domain Coordinator').'

'; + } + if ($context eq 'othdomqueue') { + $output .= &queued_role_display($secondary,\%queue_by_date,\%reqstatus); + } else { + $output .= &build_queue_display($dom,$context,\%queue_by_date,$secondary). + ''; + if ($secondary eq 'user') { + $output .= "\n".''."\n"; } - $output .= '
'; } if ($context eq 'pending') { $output .= '

'."\n". '

'.&mt('Any course/community requests which are successfully validated will be created immediately.').' '. &mt('Unvalidated requests will be listed for manual approval/rejection.').'

'; - } elsif (($context ne 'helpdesk') && ($context ne 'displaypending')) { + } elsif (($context ne 'helpdesk') && ($context ne 'displaypending') && ($context ne 'othdomqueue')) { $output .= '
'; } $output .= '
'; } else { - $output .= '
'; + if (($context eq 'othdomaction') && ($secondary eq 'user')) { + $output .= ''; + } else { + $output .= '
'; + } if ($context eq 'course') { $output .= &mt('There are currently no enrollment requests awaiting approval.'); } elsif (($context eq 'pending') || ($context eq 'displaypending')) { @@ -492,24 +599,47 @@ sub display_queued_requests { $output .= &mt('There are currently no requests for Authoring Space awaiting approval.'); } elsif ($context eq 'requestusername') { $output .= &mt('There are currently no requests for LON-CAPA accounts awaiting approval.'); + } elsif ($context eq 'othdomqueue') { + if ($secondary eq 'domain') { + $output .= &mt('There are currently no domain role assignment(s) for user(s) from another domain which were/are queued for approval'); + } elsif ($secondary eq 'author') { + $output .= &mt('There are currently no co-author role assignment(s) for user(s) from another domain which were/are queued for approval'); + } elsif ($secondary eq 'course') { + $output .= &mt('There are currently no course role assignment(s) for user(s) from another domain which were/are queued for approval'); + } elsif ($secondary eq 'community') { + $output .= &mt('There are currently no community role assignment(s) for user(s) from another domain which were/are queued for approval'); + } + } elsif ($context eq 'othdomaction') { + if ($secondary eq 'user') { + $output .= &mt('No role assignments for you in other domains currently awaiting your acceptance'); + } elsif ($secondary eq 'domain') { + $output .= &mt('No role assignments in other domains currently awaiting domain coordinator approval'); + } } else { $output .= &mt('There are currently no course or community requests awaiting approval.'); } - $output .= '
'; + if (($context eq 'othdomaction') && ($secondary eq 'user')) { + $output .= ''; + } else { + $output .= '
'; + } } return $output; } sub build_queue_display { - my ($dom,$context,$queue) = @_; + my ($dom,$context,$queue,$secondary) = @_; return unless (ref($queue) eq 'HASH'); - my %crstypes; - my $output = &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row(); - unless (($context eq 'pending') || ($context eq 'displaypending') || ($context eq 'helpdesk')) { + my (%crstypes,%roles_by_context,$output); + $output .= &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(); + unless (($context eq 'pending') || ($context eq 'displaypending') || + ($context eq 'helpdesk')) { $output .= ''.&mt('Action').''; } - $output .= ''.&mt('Requestor').''; + unless (($context eq 'othdomaction') && ($secondary eq 'user')) { + $output .= ''.&mt('Requestor').''; + } if ($context eq 'course') { $output .= ''.&mt('Section').''. ''.&mt('Date requested').''; @@ -518,6 +648,17 @@ sub build_queue_display { } elsif ($context eq 'requestusername') { $output .= ''.&mt('Date requested').''. ''.&mt('Details').''; + } elsif ($context eq 'othdomaction') { + $output .= ''.&mt('Date requested').''. + ''.&mt('Role type').''. + ''.&mt('Location').''; + if ($secondary eq 'domain') { + $output .= ''.&mt('Affected User').''; + } + foreach my $type ('domain','course') { + my @possroles = &Apache::lonuserutils::roles_by_context($type); + $roles_by_context{$type} = \@possroles; + } } elsif ($context eq 'pending' || $context eq 'displaypending' || $context eq 'stillpending') { $output .= ''.&mt('Institutional code').''. ''.&mt('Date requested').''. @@ -528,6 +669,7 @@ sub build_queue_display { unofficial => 'Unofficial course', community => 'Community', textbook => 'Textbook course', + placement => 'Placement test', ); $output .= ''.&mt('Type').''. ''.&mt('Date requested').''. @@ -540,7 +682,8 @@ sub build_queue_display { if (ref($queue->{$item}) eq 'ARRAY') { foreach my $request (sort(@{$queue->{$item}})) { my ($row,$approve,$reject,$showtime,$showsec,$namelink, - $detailslink,$crstype,$instcode); + $detailslink,$crstype,$instcode,$showrole,$adjudicator, + $location,$showrequester); $showtime = &Apache::lonlocal::locallocaltime($item); if ($context eq 'course') { my ($puname,$pudom,$pusec) = split(/:/,$request); @@ -556,7 +699,7 @@ sub build_queue_display { } elsif ($context eq 'requestauthor') { if (&Apache::lonnet::homeserver($request,$dom) ne 'no_host') { $approve = $count.':'.$request; - $reject = $request; + $reject = $request; $namelink = &Apache::loncommon::aboutmewrapper( &Apache::loncommon::plainname($request,$dom), $request,$dom); @@ -570,6 +713,87 @@ sub build_queue_display { "'$dom','$request','$queued'".');">'.$request.''; $namelink = $request; } + } elsif ($context eq 'othdomaction') { + my ($status,$extent,$role,$crstype); + my ($info,$requester) = map { &unescape($_); } split(/:/,$request); + if ($secondary eq 'user') { + ($status,$extent,$role) = split(/:/,$info); + $approve = $count.':'.$extent.':'.$role; + $reject = $extent.':'.$role; + } elsif ($secondary eq 'domain') { + ($status,my $uname,$extent,$role) = split(/:/,$info); + $approve = $count.':'.$extent.':'.$role.':'.$uname.':'.$dom; + $reject = $extent.':'.$role.':'.$uname.':'.$dom; + unless (&Apache::lonnet::homeserver($uname,$dom) eq 'no_host') { + $namelink = &Apache::loncommon::plainname($uname,$dom); + unless ($namelink eq $uname.':'.$dom) { + $namelink .= ' ('.$uname.':'.$dom.')'; + } + } + } + if (($role eq 'ca') || ($role eq 'aa')) { + my ($audom,$auname) = ($extent =~ m{^/($match_domain)/($match_username)$}); + $location = &mt('Domain').': '.&Apache::lonnet::domain($audom,'description').'
'. + &mt('Author').': '.&Apache::loncommon::plainname($auname,$audom); + } elsif ($role eq 'co') { + my ($cdom,$cnum) = ($extent =~ m{^/($match_domain)/($match_courseid)}); + if (&Apache::lonnet::is_course($cdom,$cnum)) { + my %info = &Apache::lonnet::coursedescription("$cdom/$cnum",{'one_time' => 1}); + $crstype = $info{'type'}; + $location = &mt('Domain').': '.&Apache::lonnet::domain($cdom,'description').'
'. + &mt('Community').': '.$info{'description'}; + $showrole = &Apache::lonnet::plaintext($role,'Community'); + } + } elsif ($role =~ m{^cr/}) { + $showrole = &Apache::lonnet::plaintext($role,$crstype); + my ($cdom,$cnum,$csec) = ($extent =~ m{^/($match_domain)/($match_courseid)(?:|/(\w+))$}); + if (&Apache::lonnet::is_course($cdom,$cnum)) { + my %info = &Apache::lonnet::coursedescription("$cdom/$cnum",{'one_time' => 1}); + $crstype = $info{'type'}; + $location = &mt('Domain').': '.&Apache::lonnet::domain($cdom,'description').'
'. + &mt($crstype).': '.$info{'description'}; + if ($csec ne '') { + $location .= '
'.&mt('Section').': '.$csec; + } + } + } else { + foreach my $type ('course','domain') { + if (grep(/^\Q$role\E$/,@{$roles_by_context{$type}})) { + if ($type eq 'course') { + my ($cdom,$cnum,$csec) = ($extent =~ m{^/($match_domain)/($match_courseid)(?:|/(\w+))$}); + if (&Apache::lonnet::is_course($cdom,$cnum)) { + my %info = &Apache::lonnet::coursedescription("$cdom/$cnum",{'one_time' => 1}); + $crstype = $info{'type'}; + $location = &mt('Domain').': '.&Apache::lonnet::domain($cdom,'description').'
'. + &mt($crstype).': '.$info{'description'}; + if ($csec ne '') { + $location .= '
'.&mt('Section').': '.$csec; + } + } + } else { + my ($domain) = ($extent =~ m{^/($match_domain)/$}); + $location = &mt('Domain').': '.&Apache::lonnet::domain($domain,'description'); + } + last; + } + } + } + if ($role =~ m{^cr/($match_domain)/($match_username)/(\w+)$}) { + my ($crudom,$cruname,$rolename) = ($1,$2,$3); + my $creator = &Apache::loncommon::plainname($cruname,$crudom); + unless ($creator eq $cruname.':'.$crudom) { + $creator .= ' ('.$cruname.':'.$crudom.')'; + } + $showrole = &mt('Custom role').': '.$rolename.'
'. + &mt('Created by').' '.$creator; + } else { + $showrole = &Apache::lonnet::plaintext($role,$crstype); + } + my ($requname,$requdom) = split(/:/,$requester); + $showrequester = &Apache::loncommon::plainname($requname,$requdom); + unless ($showrequester eq $requname.':'.$requdom) { + $showrequester .= ' ('.$requname.':'.$requdom.')'; + } } else { my ($cnum,$ownername,$ownerdom,$type,$cdesc); my $queued = 'approval'; @@ -591,7 +815,8 @@ sub build_queue_display { &Apache::loncommon::plainname($ownername,$ownerdom), $ownername,$ownerdom); } - unless (($context eq 'pending') || ($context eq 'displaypending') || ($context eq 'helpdesk')) { + unless (($context eq 'pending') || ($context eq 'displaypending') || + ($context eq 'helpdesk')) { $row = ''. '
'; } - $row .= ''.$namelink.''."\n"; + unless ($context eq 'othdomaction') { + $row .= ''.$namelink.''."\n"; + } if ($context eq 'course') { $row .= ''.$showsec.''."\n". ''.$showtime.''."\n"; @@ -609,6 +836,16 @@ sub build_queue_display { } elsif ($context eq 'requestusername') { $row .= ''.$showtime.''."\n". ''.$detailslink.''."\n"; + } elsif ($context eq 'othdomaction') { + if ($secondary eq 'domain') { + $row .= ''.$showrequester.''."\n"; + } + $row .= ''.$showtime.''."\n". + ''.$showrole.''."\n". + ''.$location.''."\n"; + if ($secondary eq 'domain') { + $row .= ''.$namelink.''."\n"; + } } else { if ($context eq 'pending' || $context eq 'displaypending' || $context eq 'stillpending') { $row .= ''.$instcode.''."\n"; @@ -629,6 +866,312 @@ sub build_queue_display { return $output; } +sub queued_role_display { + my ($context,$queue,$status) = @_; + return unless ((ref($queue) eq 'HASH') && (ref($status) eq 'HASH')); + my (%curr,$minshown,$maxshown,$more_records,$crstype,$viewablesec,$output); + my $formname = 'changequeue'; + if ($context eq 'course') { + $crstype = &Apache::loncommon::course_type(); + my ($permission,$allowed) = + &Apache::lonuserutils::get_permission($context,$crstype); + $viewablesec = &Apache::lonuserutils::viewable_section($permission); + my %saveable_parameters = ('show' => 'scalar',); + &Apache::loncommon::store_course_settings('roles_req', + \%saveable_parameters); + &Apache::loncommon::restore_course_settings('roles_req', + \%saveable_parameters); + } + +# Create navigation javascript + my $jsnav = &queued_log_js($formname); + + $output = (< +// + +ENDSCRIPT + + my $now = time(); + my $defstart = $now - (7*24*3600); #7 days ago + my %defaults = ( + page => '1', + show => '10', + role => 'any', + chgstatus => 'any', + chgadj => 'any', + rolereq_start_date => $defstart, + rolereq_end_date => $now, + ); + $more_records = 0; + my %lt = &othdomrole_contexts(); + + foreach my $item ('show','page','role','chgstatus','chgadj') { + $curr{$item} = $env{'form.'.$item}; + } + ($curr{'rolereq_start_date'},$curr{'rolereq_end_date'}) = + &Apache::lonuserutils::get_dates_from_form('rolereq_start_date','rolereq_end_date'); + foreach my $key (keys(%defaults)) { + if ($curr{$key} eq '') { + $curr{$key} = $defaults{$key}; + } + } + $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'}; + } + } + $output .= &print_filter_menu($context,'changequeue',\%curr,$crstype); + + my $showntableheader = 0; + + # Table Header + my $tableheader = + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + ''.&mt('Date requested').''. + ''.&mt('Role').''; + if ($context eq 'course') { + $tableheader .= ''.&mt('Section').''; + } + $tableheader .= ''.&mt('Requested for').''. + ''.&mt('Request status').''. + ''.&mt('Adjudicator').''. + &Apache::loncommon::end_data_table_header_row(); + + my @sortedtimes = sort {$a <=> $b} (keys(%{$queue})); + my $count = 0; + foreach my $item (@sortedtimes) { + next if (($item < $curr{'rolereq_start_date'}) || + ($item > $curr{'rolereq_end_date'})); + if (ref($queue->{$item}) eq 'ARRAY') { + foreach my $request (sort(@{$queue->{$item}})) { + if ($curr{'show'} !~ /\D/) { + if ($count >= $curr{'page'} * $curr{'show'}) { + $more_records = 1; + last; + } + } + my ($showtime,$showsec,$namelink,$showrole,$showadj, + $showstatus,$id); + $showtime = &Apache::lonlocal::locallocaltime($item); + my ($uname,$udom,$role,$adj,$requester,$sec) = split(/:/,$request); + $id = join(':',($uname,$udom,$role)); + if ($context eq 'course') { + $id .= ':'.$sec; + } + if ($curr{'role'} ne 'any') { + if ($curr{'role'} eq 'cr') { + next unless ($role =~ m{^cr/}); + } else { + next unless ($role eq $curr{'role'}); + } + } + if ($curr{'chgstatus'} ne 'any') { + next if ($status->{$id} ne $curr{'chgstatus'}); + } + if ($curr{'chgadj'} ne 'any') { + next if ($adj ne $curr{'chgadj'}); + } + if (($context eq 'course') && ($viewablesec ne '')) { + next if ($sec ne $viewablesec); + } + $count ++; + next if ($count < $minshown); + unless ($showntableheader) { + $output .= $tableheader; + $showntableheader = 1; + } + $showrole = &Apache::lonnet::plaintext($role,$crstype); + $showstatus = $lt{$status->{$id}}; + $showadj = $lt{$adj}; + unless (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') { + $namelink = &Apache::loncommon::plainname($uname,$udom)." ($uname:$udom)"; + } + if ($context eq 'course') { + $showsec = $sec; + if ($showsec eq '') { + $showsec = &mt('none'); + } + } + $output .= &Apache::loncommon::start_data_table_row()."\n". + ''.$showtime.''."\n". + ''.$showrole.''."\n"; + if ($context eq 'course') { + $output .= ''.$showsec.''."\n"; + } + $output .= ''.$namelink.''."\n". + ''.$showstatus.''."\n". + ''.$showadj.''."\n". + &Apache::loncommon::end_data_table_row()."\n"; + } + } + } + + if ($showntableheader) { # Table footer, if content displayed above + $output .= &Apache::loncommon::end_data_table(). + &queued_role_navlinks(\%curr,$more_records); + } else { # No content displayed above + $output .= '

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

'; + } + $output .= ''; + return $output; +} + +sub queued_log_js { + my ($formname) = @_; + return <<"ENDSCRIPT"; + +function chgPage(caller) { + if (caller == 'previous') { + document.$formname.page.value --; + } + if (caller == 'next') { + document.$formname.page.value ++; + } + document.$formname.submit(); + return; +} +ENDSCRIPT +} + +sub queued_role_navlinks { + my ($curr,$more_records) = @_; + return unless(ref($curr) eq 'HASH'); + # Navigation Buttons + my $nav_links; + if (($curr->{'page'} > 1) || ($more_records)) { + $nav_links = '

'; + if (($curr->{'page'} > 1) && ($curr->{'show'} !~ /\D/)) { + $nav_links .= ' '; + } + if ($more_records) { + $nav_links .= ''; + } + $nav_links .= '

'; + } + return $nav_links; +} + +sub print_filter_menu { + my ($context,$formname,$curr,$crstype) = @_; + + my $nolink = 1; + my $output = ''; + my $startform = + &Apache::lonhtmlcommon::date_setter($formname,'rolereq_start_date', + $curr->{'rolereq_start_date'},undef, + undef,undef,undef,undef,undef,undef,$nolink); + my $endform = + &Apache::lonhtmlcommon::date_setter($formname,'rolereq_end_date', + $curr->{'rolereq_end_date'},undef, + undef,undef,undef,undef,undef,undef,$nolink); + my %lt = &othdomrole_contexts(); + $output .= ''. + ''. + ''. + ''. + ''. + ''. + '' + .'
'. + ''.&mt('Changes/page:').'
'. + &Apache::lonmeta::selectbox('show',$curr->{'show'},'',undef, + (&mt('all'),5,10,20,50,100,1000,10000)). + '		  '.&mt('Time window in which role was requested').':
'. + ''. + ''. + '
'.&mt('After:'). + ''.$startform.'
'.&mt('Before:').''.$endform.'
'. + '		  '.&mt('Requested role').':
'. + '		  '. + &mt('Request status').':
'. + '		  '. + &mt('Adjudicator').':
'. + '
'; + + # Update Display button + $output .= '

'. + ''. + '

'. + '
'; + return $output; +} + +sub othdomrole_contexts { + my %lt = &Apache::lonlocal::texthash( + pending => 'Queued', + approved => 'Approved', + rejected => 'Rejected', + user => 'User who acquires role', + ); + $lt{'domain'} = &mt("[_1] in user's domain", + &Apache::lonnet::plaintext('dc')); + return %lt; +} + sub update_request_queue { my ($context,$cdom,$cnum,$coursedesc) = @_; my ($output,$access_start,$access_end,$limit,$cap,$notifylist,$namespace, @@ -638,7 +1181,8 @@ sub update_request_queue { @processing_errors,@warn_approves,@warn_rejects,@approvals,@warn_dels, @rejections,@rejectionerrors,@nopermissions,%courseroles,@toremove, %communityroles,%domdefs,%approvalmsg,%rejectionmsg,$crstype,$queue, - $firsturl,$uniquecode,%codes); + $firsturl,$uniquecode,%codes,%roles_by_context,%requesteractive, + %gotroles,$confname,%requestedby,@rejectedreqs,$dbname); my $count=0; while (my $item = $env{'form.'.$count.'radioreq'}) { if ($item =~ /^\d+:/) { @@ -648,7 +1192,6 @@ sub update_request_queue { } $count ++; } - $now = time; $sender = $env{'user.name'}.':'.$env{'user.domain'}; if ($context eq 'course') { @@ -722,6 +1265,21 @@ sub update_request_queue { mt => 'Your request for a LON-CAPA account has not been approved.', }]; $domdesc = &Apache::lonnet::domain($cdom); + $dbname = 'nohist_requestedusernames'; + } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { + $namespace = 'nohist_queuedrolereqs'; + foreach my $type ('domain','course') { + my @possroles = &Apache::lonuserutils::roles_by_context($type); + $roles_by_context{$type} = \@possroles; + } + if ($context eq 'othdombydc') { + $confname = &Apache::lonnet::get_domainconfiguser($cdom); + %requesthash = &Apache::lonnet::dump($namespace,$cdom,$confname); + } elsif ($context eq 'othdombyuser') { + %requesthash = &Apache::lonnet::dump($namespace); + } + $domdesc = &Apache::lonnet::domain($cdom); + $dbname = 'nohist_othdomqueued'; } else { $domdesc = &Apache::lonnet::domain($cdom); $namespace = 'courserequestqueue'; @@ -876,7 +1434,6 @@ sub update_request_queue { push(@toremove,(@invalidusers,@nopermissions)); } elsif ($context eq 'requestusername') { my ($num,$uname) = split(/:/,$item); - my $dbname = 'nohist_requestedusernames'; my $domconfiguser = &Apache::lonnet::get_domainconfiguser($cdom); my %curr = &Apache::lonnet::get($dbname,[$uname],$cdom,$domconfiguser); @@ -947,6 +1504,178 @@ sub update_request_queue { push(@invalidusers,$uname); } push(@toremove,@invalidusers); + } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { + my ($num,$extent,$role,$uname,$udom,$key,$logmsg,$result); + if ($context eq 'othdombydc') { + ($num,$extent,$role,$uname,$udom) = split(/:/,$item); + if ($udom eq $cdom) { + $key = 'pending:'.$uname.':'.$extent.':'.$role; + } + } elsif ($context eq 'othdombyuser') { + ($num,$extent,$role) = split(/:/,$item); + $key = 'pending:'.$extent.':'.$role; + $uname = $env{'user.name'}; + $udom = $env{'user.domain'}; + } + if (($key) && (exists($requesthash{$key}))) { + if (ref($requesthash{$key}) eq 'HASH') { + my $requester = $requesthash{$key}->{'requester'}; + my ($requname,$requdom) = split(/:/,$requester); + my $start = $requesthash{$key}->{'start'}; + my $end = $requesthash{$key}->{'end'}; + my $credits = $requesthash{$key}->{'credits'}; + my $reqcontext = $requesthash{$key}->{'context'}; + if ((($context eq 'othdombydc') && + (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host')) || + ($context eq 'othdombyuser')) { + if (&Apache::lonnet::homeserver($requname,$requdom) ne 'no_host') { + if (($role eq 'ca') || ($role eq 'aa')) { + my ($audom,$auname) = ($extent =~ m{^/($match_domain)/($match_username)$}); + if (&Apache::lonnet::homeserver($auname,$audom) ne 'no_host') { + if ($requester eq $auname.':'.$audom) { + unless ($gotroles{$requester}) { + &requester_roles($auname,$audom,\%requesteractive); + $gotroles{$requester} = 1; + } + if (ref($requesteractive{$requester}) eq 'HASH') { + if ($requesteractive{$requester}{':'.$audom.':au'}) { + $result = &Apache::lonnet::assignrole($udom,$uname,$extent,$role, + $end,$start,'','',$reqcontext, + $context,$requester); + } + } + } + } + } elsif (($role eq 'co') || ($role eq 'cc')) { + my ($crsdom,$crsnum) = ($extent =~ m{^/($match_domain)/($match_courseid)}); + if (&Apache::lonnet::is_course($crsdom,$crsnum)) { + my %info = &Apache::lonnet::coursedescription("$crsdom/$crsnum",{'one_time' => 1}); + if ((($role eq 'co') && ($info{'type'} eq 'Community')) || + (($role eq 'cc') && ($info{'type'} ne 'Community'))) { + if ($info{'internal.courseowner'} eq $requester) { + unless ($gotroles{$requester}) { + &requester_roles($requname,$requdom,\%requesteractive); + $gotroles{$requester} = 1; + } + if (ref($requesteractive{$requester}) eq 'HASH') { + if ($requesteractive{$requester}{"$crsnum:$crsdom:$role"}) { + ($logmsg,$result) = + &Apache::loncommon::commit_standardrole($udom,$uname,$extent,$role,$start, + $end,$crsdom,$crsnum,'', + $reqcontext,'',$context, + $requester); + } + } + } + } + } + } elsif ($role =~ m{^(cr)/($match_domain)/($match_username)/(\w+)$}) { + my ($mrole,$crudom,$cruname,$rolename) = ($1,$2,$3,$4); + my ($crsdom,$crsnum,$csec) = + ($extent =~ m{^/($match_domain)/($match_courseid)(?:|/(\w+))$}); + if (&Apache::lonnet::is_course($crsdom,$crsnum)) { + my ($rdummy,$roledef) = + &Apache::lonnet::get('roles',["rolesdef_$rolename"],$crudom,$cruname); + if (($rdummy ne 'con_lost') && ($roledef ne '')) { + unless ($gotroles{$requester}) { + &requester_roles($requname,$requdom,\%requesteractive); + $gotroles{$requester} = 1; + } + if (ref($requesteractive{$requester}) eq 'HASH') { + if (&requester_has_perm($crsdom,$crsnum,$mrole,$requesteractive{$requester})) { + ($logmsg,$result) = + &Apache::loncommon::commit_customrole($udom,$uname,$extent,$crudom,$cruname, + $rolename,$start,$end,$reqcontext, + $context,$requester); + } + } + } + } + } else { + my $process; + foreach my $type ('course','domain') { + if (grep(/^\Q$role\E$/,@{$roles_by_context{$type}})) { + if ($type eq 'course') { + my ($crsdom,$crsnum,$csec) = ($extent =~ m{^/($match_domain)/($match_courseid)(?:|/(\w+))$}); + if (&Apache::lonnet::is_course($crsdom,$crsnum)) { + my $typeok; + if ($role eq 'cc') { + my %info = &Apache::lonnet::coursedescription("$crsdom/$crsnum",{'one_time' => 1}); + if ($info{'type'} eq 'Course') { + $typeok = 1; + } + } else { + $typeok = 1; + } + if ($typeok) { + unless ($gotroles{$requester}) { + &requester_roles($requname,$requdom,\%requesteractive); + $gotroles{$requester} = 1; + } + if (ref($requesteractive{$requester}) eq 'HASH') { + if (&requester_has_perm($crsdom,$crsnum,$role,$requesteractive{$requester})) { + ($logmsg,$result) = + &Apache::loncommon::commit_standardrole($udom,$uname,$extent,$role,$start, + $end,$crsdom,$crsnum,$csec, + $reqcontext,$credits,$context, + $requester); + } + } + } + } + } else { + my ($domain) = ($extent =~ m{^/($match_domain)/}); + if (&Apache::lonnet::domain($domain) ne '') { + unless ($gotroles{$requester}) { + &requester_roles($requname,$requdom,\%requesteractive); + $gotroles{$requester} = 1; + } + if (&requester_has_perm($domain,'',$role,$requesteractive{$requester})) { + $result = &Apache::lonnet::assignrole($udom,$uname,$extent,$role, + $end,$start,'','',$reqcontext, + $context,$requester); + } + } + } + last; + } + } + } + if ($result eq 'ok') { + $requestedby{$item} = $requester; + my $statusres; + my $id = $uname.':'.$udom.':'.$role; + if (($role eq 'ca') || ($role eq 'aa')) { + my ($audom,$auname) = ($extent =~ m{^/($match_domain)/($match_username)$}); + $statusres = &Apache::lonnet::put($dbname,{'status&'.$id => 'approved'},$audom,$auname); + } elsif ($extent =~ m{^/($match_domain)/$}) { + my $domain = $1; + my $configuser = &Apache::lonnet::get_domainconfiguser($domain); + $statusres = &Apache::lonnet::put($dbname,{'status&'.$id => 'approved'},$domain,$configuser); + } else { + my ($crsdom,$crsnum,$csec) = ($extent =~ m{^/($match_domain)/($match_courseid)(?:|/([^/]+))$}); + $id .= ':'.$csec; + $statusres = &Apache::lonnet::put($dbname,{'status&'.$id => 'approved'},$crsdom,$crsnum); + } + if ($statusres eq 'ok') { + my $newkey; + if ($context eq 'othdombydc') { + $newkey = 'approved:'.$uname.':'.$extent.':'.$role; + } elsif ($context eq 'othdombyuser') { + $newkey = 'approved:'.$extent.':'.$role; + } + $requesthash{$newkey} = $requesthash{$key}; + delete($requesthash{$key}); + push(@toremove,$key); + push(@completed,$item); + } + } else { + push(@warn_approves,$key); + } + } + } + } + } } else { my ($num,$cnum) = split(':',$item); if (ref($requesthash{$cnum.'_'.$queue}) eq 'HASH') { @@ -1146,6 +1875,49 @@ sub update_request_queue { if ($userresult ne 'ok') { push(@warn_rejects,$uname); } + } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { + my ($extent,$role,$uname,$udom,$oldkey,$newkey); + my $dbname = 'nohist_othdomqueued'; + if ($context eq 'othdombydc') { + ($extent,$role,$uname,$udom) = split(/:/,$item); + $oldkey = 'pending:'.$uname.':'.$extent.':'.$role; + $newkey = 'rejected:'.$uname.':'.$extent.':'.$role; + } elsif ($context eq 'othdombyuser') { + ($extent,$role) = split(/:/,$item); + $oldkey = 'pending:'.$extent.':'.$role; + $newkey = 'rejected:'.$extent.':'.$role; + $uname = $env{'user.name'}; + $udom = $env{'user.domain'}; + } + if (exists($requesthash{$oldkey})) { + if (ref($requesthash{$oldkey}) eq 'HASH') { + my $statusres; + my $id = $uname.':'.$udom.':'.$role; + if (($role eq 'ca') || ($role eq 'aa')) { + my ($audom,$auname) = ($extent =~ m{^/($match_domain)/($match_username)$}); + $statusres = &Apache::lonnet::put($dbname,{'status&'.$id => 'rejected'},$audom,$auname); + } elsif ($extent =~ m{^/($match_domain)/\Q$role\E$}) { + my $domain = $1; + my $configuser = &Apache::lonnet::get_domainconfiguser($domain); + $statusres = &Apache::lonnet::put($dbname,{'status&'.$id => 'rejected'},$domain,$configuser); + } else { + my ($crsdom,$crsnum,$csec) = ($extent =~ m{^/($match_domain)/($match_courseid)(?:|/([^/]+))$}); + $id .= ':'.$csec; + $statusres = &Apache::lonnet::put($dbname,{'status&'.$id => 'rejected'},$crsdom,$crsnum); + } + if ($statusres eq 'ok') { + $requesthash{$newkey} = $requesthash{$oldkey}; + delete($requesthash{$oldkey}); + push(@toremove,$oldkey); + $requesthash{$newkey}->{'timestamp'} = $now; + $requesthash{$newkey}->{'adjudicator'} = $env{'user.name'}.':'.$env{'user.domain'}; + $requestedby{$item} = $requesthash{$newkey}->{'requester'}; + push(@rejectedreqs,$item); + } else { + push(@warn_rejects,$oldkey); + } + } + } } else { my $cnum = $item; if (ref($requesthash{$cnum.'_'.$queue}) eq 'HASH') { @@ -1232,13 +2004,31 @@ sub update_request_queue { } } } - @toremove = map {$_.'_approval'} (@toremove); - my $delresult = &Apache::lonnet::del_dom($namespace,\@toremove,$cdom); + unless (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { + @toremove = map {$_.'_approval'} (@toremove); + } + if (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { + my $delresult; + if ($context eq 'othdombyuser') { + $delresult = &Apache::lonnet::del($namespace,\@toremove,$env{'user.domain'},$env{'user.name'}); + } else { + $delresult = &Apache::lonnet::del_dom($namespace,\@toremove,$cdom); + } + unless ($delresult eq 'ok') { + push(@warn_dels,@toremove); + } + } } if (@changes) { my $delresult; if ($context eq 'course') { $delresult = &Apache::lonnet::del($namespace,\@changes,$cdom,$cnum); + } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { + if ($context eq 'othdombydc') { + $delresult = &Apache::lonnet::put($namespace,\%requesthash,$cdom,$confname); + } elsif ($context eq 'othdombyuser') { + $delresult = &Apache::lonnet::put($namespace,\%requesthash,$env{'user.domain'},$env{'user.name'}); + } } else { $delresult = &Apache::lonnet::del_dom($namespace,\@changes,$cdom); } @@ -1285,7 +2075,6 @@ sub update_request_queue { my $userlink = &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$cdom),$uname,$cdom); $output .= '
  • '.$userlink.'
    • '; - } $output .= '

    '; } @@ -1328,6 +2117,66 @@ sub update_request_queue { $now,'usernamemanagers',$sender, $approvedlist,$rejectedlist); } + } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { + my @chgmsgs = ({ mt => 'Action was taken by [_1].', + args => [$namelink] }); + my (%approvals_by_requester,%rejections_by_requester,%for_requester); + my $sender = $env{'user.name'}.':'.$env{'user.domain'}; + if (@completed) { + my $msg; + if ($context eq 'othdombydc') { + $msg = &mt('The following roles in other domain(s) were assigned for user(s) in this domain:'); + } elsif ($context eq 'othdombyuser') { + $msg = &mt('The following roles in other domain(s) were assigned:'); + } + $output .= '

    '.$msg.'

    '; + } + if (@rejectedreqs) { + my $msg; + if ($context eq 'othdombydc') { + $msg = &mt('The following role assignments in other domain(s) for user(s) in this domain were rejected:'); + } elsif ($context eq 'othdombyuser') { + $msg = &mt('The following role assignments in other domain(s) were rejected:'); + } + $output .= '

    '.$msg.'

    '; + } + foreach my $key (sort(keys(%for_requester))) { + if (ref($approvals_by_requester{$key}) eq 'ARRAY') { + if (@{$approvals_by_requester{$key}} > 0) { + if ($context eq 'othdombydc') { + push(@chgmsgs,{ mt => '[_1]The following roles in other domain(s) were assigned:', + args => ["\n"]}); + } elsif ($context eq 'othdombyuser') { + push(@chgmsgs,{ mt => '[_1]The following roles in other domain(s) were accepted:', + args => ["\n"]}); + } + push(@chgmsgs,@{$approvals_by_requester{$key}}); + $approvedlist = $key; + } + } + if (ref($rejections_by_requester{$key}) eq 'ARRAY') { + if (@{$rejections_by_requester{$key}} > 0) { + if ($context eq 'othdombydc') { + push(@chgmsgs,{ mt => '[_1]The following roles in other domain(s) were rejected:', + args => ["\n"]}); + } elsif ($context eq 'othdombyuser') { + push(@chgmsgs,{ mt => '[_1]The following roles in other domain(s) were declined:', + args => ["\n"]}); + } + push(@chgmsgs,@{$rejections_by_requester{$key}}); + $rejectedlist = $key; + } + } + if (($approvedlist ne '') || ($rejectedlist ne '')) { + &send_selfserve_notification($key,\@chgmsgs,'',$domdesc,$now, + $context,$sender,$approvedlist, + $rejectedlist); + } + } } else { $chgmsg = "'Action was taken on the following course and community requests by [_1].',$namelink"; if (@completed) { @@ -1370,7 +2219,8 @@ sub update_request_queue { } } } else { - if (($context eq 'requestauthor') || ($context eq 'requestusername')) { + if (($context eq 'requestauthor') || ($context eq 'requestusername') || + ($context eq 'othdombydc') || ($context eq 'othdombyuser')) { push(@warn_dels,@changes); } } @@ -1546,6 +2396,21 @@ sub update_request_queue { $output .= '
  • '.$uname.'
    • '; } $output .= '

    '; + } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { + my $msg; + if ($context eq 'othdombydc') { + $msg = &mt("For the following assignments of roles in other domain(s) for users from this domain, an error occurred when updating status in the pending queue"); + } elsif ($context eq 'othdombyuser') { + $msg = &mt("For the following assignments of roles in other domain(s), an error occurred when updating status in the pending queue"); + } + $output .= '

    '.$msg.'

    '; } else { $output .= '

    '.&mt("For the following course/community requests an error occurred when updating the requestor's own requests record:").'

    '; + $output .= '

    '; + } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { + my $msg; + if ($context eq 'othdombydc') { + $msg = &mt("For the following queued role assignments an error occurred when removing the item from the queue:"); + } elsif ($context eq 'othdombyuser') { + $msg = &mt("For the following role assignments pending approval an error occurred when removing the item from the queue:"); + } + $output .= '

    '.$msg. + '

    '. + '

    '; } else { $output .= '

    '.&mt("For the following course/community requests an error occurred when removing requests from the pending queue:").'