--- loncom/interface/loncoursequeueadmin.pm 2022/12/01 01:28:26 1.64 +++ loncom/interface/loncoursequeueadmin.pm 2023/06/20 14:03:52 1.67 @@ -1,7 +1,7 @@ # The LearningOnline Network # Utilities to administer domain course requests and course self-enroll requests # -# $Id: loncoursequeueadmin.pm,v 1.64 2022/12/01 01:28:26 raeburn Exp $ +# $Id: loncoursequeueadmin.pm,v 1.67 2023/06/20 14:03:52 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -271,16 +271,18 @@ sub send_selfserve_notification { } } elsif ($context eq 'othdomroleuser') { my $linktext = 'Roles'; - if (&Apache::loncommon::show_course()) { - $linktext = 'Courses'; + 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.', + 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 'Manage Role Requests' in the gray Functions bar ". + 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"], }); @@ -295,13 +297,24 @@ sub send_selfserve_notification { -> 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') { + } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { $rawsubj = 'Status of Role Assignment Requests'; - 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"], - }); + 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; @@ -340,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, @@ -390,13 +407,6 @@ sub send_selfserve_notification { if ($rejectedlist) { $message .= "\n\n".&mt_user($sender_lh,'Rejected LON-CAPA account requests:')."\n".$rejectedlist; } - } elsif ($context eq 'othdombydc') { - if ($approvedlist) { - $message .= "\n\n".&mt_user($sender_lh,'Approved LON-CAPA role assignments:')."\n".$approvedlist; - } - if ($rejectedlist) { - $message .= "\n\n".&mt_user($sender_lh,'Rejected LON-CAPA role assignments:')."\n".$rejectedlist; - } } $status .= &Apache::lonmsg::user_normal_msg($ccname,$ccdom,$subject,$message,undef,undef,undef,1, \%sentmessage,undef,undef,undef,1,$recipid).','; @@ -411,7 +421,7 @@ sub send_selfserve_notification { sub display_queued_requests { my ($context,$dom,$cnum,$secondary) = @_; - my ($namespace,$formaction,$nextelement,%requesthash); + my ($namespace,$formaction,$nextelement,%requesthash,%reqstatus); if ($context eq 'course') { $formaction = '/adm/createuser'; $namespace = 'selfenrollrequests'; @@ -446,12 +456,13 @@ sub display_queued_requests { %requesthash = &Apache::lonnet::dump($namespace,$dom,$cnum); } } elsif ($context eq 'othdomaction') { - $formaction = '/adm/createuser'; $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 = ''; @@ -484,13 +495,15 @@ sub display_queued_requests { ($entry) = (&unescape($item) =~ /^($match_username)_approval$/); } elsif ($context eq 'othdomqueue') { if (ref($requesthash{$item}) eq 'HASH') { - next unless ($requesthash{'status&'.$item} eq 'pending'); 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:/); @@ -539,25 +552,30 @@ sub display_queued_requests { $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, queued pending approval').'

'; + $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, queued pending approval').'

'; + $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, queued pending approval').'

'; + $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, queued pending approval').'

'; + $output .= '

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

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

'.&mt('Role assignments for you in other domains, queued pending your acceptance of the role.').'

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

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

'; } } else { $output .= '

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

'; - } - $output .= &build_queue_display($dom,$context,\%queue_by_date,$secondary). - ''; + } + 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"; + } + } if ($context eq 'pending') { $output .= '

'."\n". @@ -568,7 +586,11 @@ sub display_queued_requests { } $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')) { @@ -579,24 +601,28 @@ sub display_queued_requests { $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 queued pending approval'); + $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 queued pending approval'); + $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 queued pending approval'); + $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 queued pending approval'); + $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('There are currently no pending role assignments for you in other domains, queued pending your acceptance of the role.'); + $output .= &mt('No role assignments for you in other domains currently awaiting your acceptance'); } elsif ($secondary eq 'domain') { - $output .= &mt('There are currently no pending role assignments in other domains, queued pending domain coordinator approval in this 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; } @@ -605,16 +631,13 @@ sub build_queue_display { my ($dom,$context,$queue,$secondary) = @_; return unless (ref($queue) eq 'HASH'); my (%crstypes,%roles_by_context,$output); - if ($context eq 'othdomqueue') { - $output = &print_filter_menu($context); - } $output .= &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(); unless (($context eq 'pending') || ($context eq 'displaypending') || - ($context eq 'helpdesk') || ($context eq 'othdomqueue')) { + ($context eq 'helpdesk')) { $output .= ''.&mt('Action').''; } - unless (($context eq 'othdomqueue') || (($context eq 'othdomaction') && ($secondary eq 'user'))) { + unless (($context eq 'othdomaction') && ($secondary eq 'user')) { $output .= ''.&mt('Requestor').''; } if ($context eq 'course') { @@ -625,14 +648,6 @@ sub build_queue_display { } elsif ($context eq 'requestusername') { $output .= ''.&mt('Date requested').''. ''.&mt('Details').''; - } elsif ($context eq 'othdomqueue') { - $output .= ''.&mt('Date requested').''. - ''.&mt('Role').''; - if ($secondary eq 'course') { - $output .= ''.&mt('Section').''; - } - $output .= ''.&mt('Requested for').''. - ''.&mt('Approval needed from').''; } elsif ($context eq 'othdomaction') { $output .= ''.&mt('Date requested').''. ''.&mt('Role type').''. @@ -698,25 +713,6 @@ sub build_queue_display { "'$dom','$request','$queued'".');">'.$request.''; $namelink = $request; } - } elsif ($context eq 'othdomqueue') { - my ($uname,$udom,$role,$adj,$requester,$sec) = split(/:/,$request); - if ($adj eq 'user') { - $adjudicator = &mt('Role Assignee'); - } elsif ($adj eq 'domain') { - $adjudicator = &mt("[_1] in user's domain", - &Apache::lonnet::plaintext('dc')); - } - my $crstype; - $showrole = &Apache::lonnet::plaintext($role,$crstype); - unless (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') { - $namelink = &Apache::loncommon::plainname($uname,$udom)." ($uname:$udom)"; - } - if ($secondary eq 'course') { - $showsec = $sec; - if ($showsec eq '') { - $showsec = &mt('none'); - } - } } elsif ($context eq 'othdomaction') { my ($status,$extent,$role,$crstype); my ($info,$requester) = map { &unescape($_); } split(/:/,$request); @@ -737,13 +733,15 @@ sub build_queue_display { } if (($role eq 'ca') || ($role eq 'aa')) { my ($audom,$auname) = ($extent =~ m{^/($match_domain)/($match_username)$}); - $location = &mt('Author').': '.&Apache::loncommon::plainname($auname,$audom); + $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('Community').': '.$info{'description'}; + $location = &mt('Domain').': '.&Apache::lonnet::domain($cdom,'description').'
'. + &mt('Community').': '.$info{'description'}; $showrole = &Apache::lonnet::plaintext($role,'Community'); } } elsif ($role =~ m{^cr/}) { @@ -752,7 +750,8 @@ sub build_queue_display { if (&Apache::lonnet::is_course($cdom,$cnum)) { my %info = &Apache::lonnet::coursedescription("$cdom/$cnum",{'one_time' => 1}); $crstype = $info{'type'}; - $location = &mt($crstype).': '.$info{'description'}; + $location = &mt('Domain').': '.&Apache::lonnet::domain($cdom,'description').'
'. + &mt($crstype).': '.$info{'description'}; if ($csec ne '') { $location .= '
'.&mt('Section').': '.$csec; } @@ -765,13 +764,14 @@ sub build_queue_display { if (&Apache::lonnet::is_course($cdom,$cnum)) { my %info = &Apache::lonnet::coursedescription("$cdom/$cnum",{'one_time' => 1}); $crstype = $info{'type'}; - $location = &mt($crstype).': '.$info{'description'}; + $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)/}); + my ($domain) = ($extent =~ m{^/($match_domain)/$}); $location = &mt('Domain').': '.&Apache::lonnet::domain($domain,'description'); } last; @@ -816,7 +816,7 @@ sub build_queue_display { $ownername,$ownerdom); } unless (($context eq 'pending') || ($context eq 'displaypending') || - ($context eq 'helpdesk') || ($context eq 'othdomqueue')) { + ($context eq 'helpdesk')) { $row = ''. '
'; } - unless (($context eq 'othdomqueue') || ($context eq 'othdomaction')) { + unless ($context eq 'othdomaction') { $row .= ''.$namelink.''."\n"; } if ($context eq 'course') { @@ -836,14 +836,6 @@ sub build_queue_display { } elsif ($context eq 'requestusername') { $row .= ''.$showtime.''."\n". ''.$detailslink.''."\n"; - } elsif ($context eq 'othdomqueue') { - $row .= ''.$showtime.''."\n". - ''.$showrole.''."\n"; - if ($secondary eq 'course') { - $row .= ''.$showsec.''."\n"; - } - $row .= ''.$namelink.''."\n". - ''.$adjudicator.''."\n"; } elsif ($context eq 'othdomaction') { if ($secondary eq 'domain') { $row .= ''.$showrequester.''."\n"; @@ -874,10 +866,311 @@ sub build_queue_display { return $output; } -sub print_filter_menu { - my ($context) = @_; +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) = @_; @@ -982,8 +1275,8 @@ sub update_request_queue { if ($context eq 'othdombydc') { $confname = &Apache::lonnet::get_domainconfiguser($cdom); %requesthash = &Apache::lonnet::dump($namespace,$cdom,$confname); - } else { - %requesthash = &Apache::lonnet::dump($namespace,$cdom,$cnum); + } elsif ($context eq 'othdombyuser') { + %requesthash = &Apache::lonnet::dump($namespace); } $domdesc = &Apache::lonnet::domain($cdom); $dbname = 'nohist_othdomqueued'; @@ -1212,126 +1505,139 @@ sub update_request_queue { } push(@toremove,@invalidusers); } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { + my ($num,$extent,$role,$uname,$udom,$key,$logmsg,$result); if ($context eq 'othdombydc') { - my ($num,$extent,$role,$uname,$udom) = split(/:/,$item); - my ($logmsg,$result); + ($num,$extent,$role,$uname,$udom) = split(/:/,$item); if ($udom eq $cdom) { - my $key = 'pending:'.$uname.':'.$extent.':'.$role; - if (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 ((&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') && - (&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); - } - } + $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; } - } - } 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); - } - } + 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 =~ 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 '')) { + } + } 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 (&requester_has_perm($crsdom,$crsnum,$mrole,$requesteractive{$requester})) { + if ($requesteractive{$requester}{"$crsnum:$crsdom:$role"}) { ($logmsg,$result) = - &Apache::loncommon::commit_customrole($udom,$uname,$extent,$crudom,$cruname, - $rolename,$start,$end,$reqcontext); + &Apache::loncommon::commit_standardrole($udom,$uname,$extent,$role,$start, + $end,$crsdom,$crsnum,'', + $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 { + } + } 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; } - 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); - } - } - } + } else { + $typeok = 1; } - } else { - my ($domain) = ($extent =~ m{^/($match_domain)/}); - if (&Apache::lonnet::domain($domain) ne '') { + if ($typeok) { 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); + 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); + } } } } - last; + } 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; } } } @@ -1352,26 +1658,23 @@ sub update_request_queue { $statusres = &Apache::lonnet::put($dbname,{'status&'.$id => 'approved'},$crsdom,$crsnum); } if ($statusres eq 'ok') { - my $newkey = 'approved:'.$uname.':'.$extent.':'.$role; + 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,$extent,$role) = split(/:/,$item); - if (exists($requesthash{$extent.':'.$role})) { - if (ref($requesthash{$extent.':'.$role}) eq 'HASH') { -#FIXME -#check if extent is valid -#check if role is valid -#check requester privs - } - } } } else { my ($num,$cnum) = split(':',$item); @@ -1573,36 +1876,45 @@ sub update_request_queue { 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') { - my ($extent,$role,$uname,$udom) = split(/:/,$item); - my $oldkey = 'pending:'.$uname.':'.$extent.':'.$role; - my $newkey = 'rejected:'.$uname.':'.$extent.':'.$role; - my $dbname = 'nohist_othdomqueued'; - if (exists($requesthash{$oldkey})) { - if (ref($requesthash{$oldkey}) eq 'HASH') { + ($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'}; - 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)/$}) { - 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') { - $requestedby{$item} = $requesthash{$newkey}->{'requester'}; - push(@rejectedreqs,$item); - } + $requestedby{$item} = $requesthash{$newkey}->{'requester'}; + push(@rejectedreqs,$item); + } else { + push(@warn_rejects,$oldkey); } } } @@ -1692,12 +2004,19 @@ sub update_request_queue { } } } - unless ($context eq 'othdombydc') { + unless (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { @toremove = map {$_.'_approval'} (@toremove); } - my $delresult = &Apache::lonnet::del_dom($namespace,\@toremove,$cdom); - if (($delresult ne 'ok') && ($context eq 'othdombydc')) { - push(@warn_dels,@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) { @@ -1707,7 +2026,9 @@ sub update_request_queue { } 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); } @@ -1797,32 +2118,61 @@ sub update_request_queue { $approvedlist,$rejectedlist); } } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) { - $chgmsg = "'Action was taken on the following role requests by [_1].',$namelink"; + 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) { - $output .= '

'.&mt('The following roles in other domain(s) were assigned for user(s) in this domain:').'