'.&mt('Requests are validated against institutional data to confirm that the requestor is an instructor of record.').'
';
- } else {
- $output .= ''.&mt('Any course/community requests which are successfully validated will be created immediately.').' '.&mt('Unvalidated requests will be listed for manual approval/rejection.').'
';
- } else {
+ ''.&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') && ($context ne 'othdomqueue')) {
$output .= '';
if ($context eq 'course') {
$output .= &mt('There are currently no enrollment requests awaiting approval.');
- } elsif ($context eq 'pending') {
+ } elsif (($context eq 'pending') || ($context eq 'displaypending')) {
$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 '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('There are currently no pending role assignments for you in other domains, queued pending your acceptance of the role.');
+ } elsif ($secondary eq 'domain') {
+ $output .= &mt('There are currently no pending role assignments in other domains, queued pending domain coordinator approval in this domain.');
+ }
} else {
$output .= &mt('There are currently no course or community requests awaiting approval.');
}
@@ -346,19 +608,38 @@ sub display_queued_requests {
}
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') {
+ 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').' ';
- } elsif ($context eq 'pending' || $context eq 'stillpending') {
+ } elsif ($context eq 'requestauthor') {
+ $output .= '
'.&mt('Date requested').' ';
+ } 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').' '.
'
'.&mt('Details').' ';
@@ -367,6 +648,8 @@ sub build_queue_display {
official => 'Official course',
unofficial => 'Unofficial course',
community => 'Community',
+ textbook => 'Textbook course',
+ placement => 'Placement test',
);
$output .= '
'.&mt('Type').' '.
'
'.&mt('Date requested').' '.
@@ -379,7 +662,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);
@@ -392,12 +676,106 @@ sub build_queue_display {
$namelink = &Apache::loncommon::aboutmewrapper(
&Apache::loncommon::plainname($puname,$pudom),
$puname,$pudom);
+ } elsif ($context eq 'requestauthor') {
+ if (&Apache::lonnet::homeserver($request,$dom) ne 'no_host') {
+ $approve = $count.':'.$request;
+ $reject = $request;
+ $namelink = &Apache::loncommon::aboutmewrapper(
+ &Apache::loncommon::plainname($request,$dom),
+ $request,$dom);
+ }
+ } elsif ($context eq 'requestusername') {
+ if (&Apache::lonnet::homeserver($request,$dom) eq 'no_host') {
+ my $queued = 'approval';
+ $approve = $count.':'.$request;
+ $reject = $request;
+ $detailslink='
'.$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('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'};
+ $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($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($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 $queue = 'approval';
- if ($context eq 'pending' || $context eq 'stillpending') {
+ my $queued = 'approval';
+ if ($context eq 'pending' || $context eq 'displaypending' || $context eq 'stillpending') {
($cnum,$ownername,$ownerdom,$instcode,$cdesc)=split(/:/,$request,5);
- $queue = 'pending';
+ $queued = 'pending';
} else {
($cnum,$ownername,$ownerdom,$type,$cdesc)=split(/:/,$request,5);
$crstype = $type;
@@ -406,25 +784,46 @@ sub build_queue_display {
}
}
$detailslink='
'.$cdesc.' ';
+ "'$dom','$cnum','$queued'".');">'.$cdesc.'';
$approve = $count.':'.$cnum;
$reject = $cnum;
$namelink = &Apache::loncommon::aboutmewrapper(
&Apache::loncommon::plainname($ownername,$ownerdom),
$ownername,$ownerdom);
}
- unless ($context eq 'pending') {
+ unless (($context eq 'pending') || ($context eq 'displaypending') ||
+ ($context eq 'helpdesk')) {
$row = '
'.
- ' '.
- ' ';
+ '
'.&mt('Approve').''.
+ '
'.(' 'x2).
+ ' '.
+ '
'.(' 'x2).
+ ' ';
+ }
+ unless ($context eq 'othdomaction') {
+ $row .= '
'.$namelink.' '."\n";
}
- $row .= '
'.$namelink.' '."\n";
if ($context eq 'course') {
$row .= '
'.$showsec.' '."\n".
'
'.$showtime.' '."\n";
- } else {
- if ($context eq 'pending' || $context eq 'stillpending') {
+ } elsif ($context eq 'requestauthor') {
+ $row .= '
'.$showtime.' '."\n";
+ } 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";
} else {
$row .= '
'.$crstype.' '."\n";
@@ -443,17 +842,332 @@ 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 .= '';
+ if (($curr->{'page'} > 1) && ($curr->{'show'} !~ /\D/)) {
+ $nav_links .= '
';
+ }
+ return $nav_links;
+}
+
+sub print_filter_menu {
+ my ($context,$formname,$curr,$crstype) = @_;
+
+ my $nolink = 1;
+ my $output = ''.
+ ''.&mt('Changes/page:').' ';
+ 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('Time window in which role was requested').': '.&mt('After:').
+ ' '.$startform.' '.&mt('Before:').' '.
+ ''.$endform.'
'.
+ ' '.
+ ''.&mt('Requested role').': {'role'} eq 'any') {
+ $output .= ' selected="selected"';
+ }
+ $output .= '>'.&mt('Any').' '."\n";
+ my @roles = &Apache::lonuserutils::roles_by_context($context,1,$crstype);
+ foreach my $role (@roles) {
+ my $plrole;
+ if ($role eq 'cr') {
+ $plrole = &mt('Custom Role');
+ } else {
+ $plrole=&Apache::lonnet::plaintext($role,$crstype);
+ }
+ my $selstr = '';
+ if ($role eq $curr->{'role'}) {
+ $selstr = ' selected="selected"';
+ }
+ $output .= ' '.$plrole.' ';
+ }
+ $output .= ' '.
+ ''.
+ &mt('Request status').': '.
+ '{'chgstatus'} eq 'any') {
+ $output .= ' selected="selected"';
+ }
+ $output .= '>'.&mt('Any').' '."\n";
+ my @possstatus = ('pending','approved','rejected');
+ foreach my $statustype (@possstatus) {
+ my $selstr = '';
+ if ($curr->{'chgstatus'} eq $statustype) {
+ $selstr = ' selected="selected"';
+ }
+ $output .= ''.$lt{$statustype}.' '."\n";
+ }
+ $output .= ' '.
+ ''.
+ &mt('Adjudicator').': '.
+ '{'adj'} eq 'any') {
+ $output .= ' selected="selected"';
+ }
+ $output .= '>'.&mt('Any').' '."\n";
+ my @possadj = ('domain','user');
+ foreach my $adjtype (@possadj) {
+ my $selstr = '';
+ if ($curr->{'chgadj'} eq $adjtype) {
+ $selstr = ' selected="selected"';
+ }
+ $output .= ''.$lt{$adjtype}.' '."\n";
+ }
+ $output .= '
';
+
+ # Update Display button
+ $output .= ''.
+ '
'.
+ ''.&mt('The following requests were approved:').'
';
+ foreach my $uname (@completed) {
+ my $userlink =
+ &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$cdom),$uname,$cdom);
+ $output .= ''.$userlink.' ';
+ }
+ $output .= ' ';
+ }
+ if (@rejections) {
+ $rejectedlist = join("\n",@rejections);
+ $output .= ''.&mt('The following requests were rejected:').'
';
+ foreach my $uname (@rejections) {
+ my $userlink =
+ &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$cdom),$uname,$cdom);
+ $output .= ''.$userlink.' ';
+ }
+ $output .= ' ';
+ }
+ if ($notifylist ne '') {
+ &send_selfserve_notification($notifylist,$chgmsg,undef,$domdesc,
+ $now,'authormanagers',$sender,
+ $approvedlist,$rejectedlist);
+ }
+ } elsif ($context eq 'requestusername') {
+ $chgmsg = "'Action was taken on the following LON-CAPA account requests by [_1].',$namelink";
+ if (@completed) {
+ $approvedlist = join("\n",@completed);
+ $output .= ''.&mt('The following requests were approved:').'
';
+ foreach my $uname (@completed) {
+ $output .= ''.$uname.' ';
+
+ }
+ $output .= ' ';
+ }
+ if (@rejections) {
+ $rejectedlist = join("\n",@rejections);
+ $output .= ''.&mt('The following requests were rejected:').'
';
+ foreach my $uname (@rejections) {
+ $output .= ''.$uname.' ';
+ }
+ $output .= ' ';
+ }
+ if ($notifylist ne '') {
+ &send_selfserve_notification($notifylist,$chgmsg,undef,$domdesc,
+ $now,'usernamemanagers',$sender,
+ $approvedlist,$rejectedlist);
+ }
+ } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) {
+ $chgmsg = "'Action was taken on the following role requests by [_1].',$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:').'
'.
+ &get_othdombydc_results('approved',\@completed,\%approvals_by_requester,\%requestedby,\%for_requester).
+ ' ';
+ }
+ if (@rejectedreqs) {
+ $output .= ''.&mt('The following role assignments in other domain(s) for user(s) in this domain were rejected:').'
'.
+ &get_othdombydc_results('rejected',\@rejectedreqs,\%rejections_by_requester,\%requestedby,\%for_requester).
+ ' ';
+ }
+ foreach my $key (sort(keys(%for_requester))) {
+ if (ref($approvals_by_requester{$key}) eq 'ARRAY') {
+ if (@{$approvals_by_requester{$key}} > 0) {
+ $approvedlist = join("\n\n",@{$approvals_by_requester{$key}});
+ }
+ }
+ if (ref($rejections_by_requester{$key}) eq 'ARRAY') {
+ if (@{$rejections_by_requester{$key}} > 0) {
+ $rejectedlist = join("\n\n",@{$rejections_by_requester{$key}});
+ }
+ }
+ if (($approvedlist ne '') || ($rejectedlist ne '')) {
+ &send_selfserve_notification($key,$chgmsg,'',$domdesc,$now,
+ $context,$sender,$approvedlist,
+ $rejectedlist);
+ }
+ }
} else {
$chgmsg = "'Action was taken on the following course and community requests by [_1].',$namelink";
if (@completed) {
@@ -842,6 +2110,9 @@ sub update_request_queue {
}
my $syllabuslink =
&Apache::loncommon::syllabuswrapper($showcourse,$cnum,$cdom);
+ if ($codes{$cnum}) {
+ $syllabuslink .= ' '.&mt('Unique code: [_1]',$codes{$cnum});
+ }
$output .= ''.$syllabuslink.' ';
}
$output .= '';
@@ -866,6 +2137,10 @@ sub update_request_queue {
$approvedlist,$rejectedlist,$crstype);
}
}
+ } else {
+ if (($context eq 'requestauthor') || ($context eq 'requestusername') || ($context eq 'othdombydc')) {
+ push(@warn_dels,@changes);
+ }
}
}
if (@existing) {
@@ -875,6 +2150,14 @@ sub update_request_queue {
$output .= ''.$user.' ';
}
$output .= '';
+ } elsif ($context eq 'requestauthor') {
+ $output .= ''.&mt('Authoring Space requests from the following users were deleted because one already exists:').'
';
+ foreach my $uname (@existing) {
+ my $userlink =
+ &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$cdom),$uname,$cdom);
+ $output .= ''.$userlink.' ';
+ }
+ $output .= ' ';
} else {
$output .= ''.&mt('The following course/community creation requests were deleted because the course or community has already been created:').'
';
foreach my $cnum (@existing) {
@@ -897,13 +2180,20 @@ sub update_request_queue {
$output .= ''.$user.' ';
}
$output .= ' ';
+ } elsif ($context eq 'requestauthor') {
+ $output .= ''.&mt('The following requests were ignored because the request is no longer in the queue:').'
';
+ foreach my $uname (@missingreq) {
+ my $userlink =
+ &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$cdom),$uname,$cdom);
+ $output .= ''.$userlink.' ';
+ }
+ $output .= ' ';
} else {
$output .= ''.&mt('The following course/community creation requests were ignored because the request is no longer in the queue:').'
';
foreach my $cnum (@missingreq) {
$output .= ''.$cnum.' ';
}
$output .= ' ';
-
}
}
if (@invalidusers) {
@@ -913,6 +2203,14 @@ sub update_request_queue {
$output .= ''.$user.' ';
}
$output .= '';
+ } elsif ($context eq 'requestauthor') {
+ $output .= ''.&mt('The following Authoring Space requests were deleted because the requestor does not have a LON-CAPA account:').'
';
+ foreach my $uname (@invalidusers) {
+ my $userlink =
+ &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$cdom),$uname,$cdom);
+ $output .= ''.$userlink.' ';
+ }
+ $output .= ' ';
}
}
if (@limitexceeded) {
@@ -925,17 +2223,27 @@ sub update_request_queue {
}
}
if (@nopermissions) {
- $output .= ''.&mt('The following course/community creation requests could not be processed because the owner does not have rights to create this type of course:').'
';
- foreach my $cnum (@nopermissions) {
- my $showcourse;
- if (ref($requesthash{$cnum.'_'.$queue})) {
- $showcourse = $requesthash{$cnum.'_'.$queue}{'description'};
- } else {
- $showcourse = $cnum;
+ if ($context eq 'course') {
+ $output .= ''.&mt('The following course/community creation requests could not be processed because the owner does not have rights to create this type of course:').'
';
+ foreach my $cnum (@nopermissions) {
+ my $showcourse;
+ if (ref($requesthash{$cnum.'_'.$queue})) {
+ $showcourse = $requesthash{$cnum.'_'.$queue}{'description'};
+ } else {
+ $showcourse = $cnum;
+ }
+ $output .= ''.$showcourse.' ';
}
- $output .= ''.$showcourse.' ';
+ $output .= ' ';
+ } elsif ($context eq 'requestauthor') {
+ $output .= ''.&mt('The following requests could not be processed because the requestor does not have rights to request an Authoring Space:').'
';
+ foreach my $uname (@nopermissions) {
+ my $userlink =
+ &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$cdom),$uname,$cdom);
+ $output .= ''.$userlink.' ';
+ }
+ $output .= ' ';
}
- $output .= ' ';
}
if (@processing_errors) {
if ($context eq 'course') {
@@ -944,6 +2252,20 @@ sub update_request_queue {
$output .= ''.$user.' ';
}
$output .= '';
+ } elsif ($context eq 'requestauthor') {
+ $output .= ''.&mt('The following requests could not be processed because an error occurred:').'
';
+ foreach my $uname (@processing_errors) {
+ my $userlink =
+ &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$cdom),$uname,$cdom);
+ $output .= ''.$userlink.' ';
+ }
+ $output .= ' ';
+ } elsif ($context eq 'requestusername') {
+ $output .= ''.&mt('The following requests could not be processed because an error occurred:').'
';
+ foreach my $uname (@processing_errors) {
+ $output .= ''.$uname.' ';
+ }
+ $output .= ' ';
} else {
$output .= ''.&mt('The following course/community creation requests could not be processed because an error occurred:').'
';
foreach my $cnum (@processing_errors) {
@@ -978,6 +2300,22 @@ sub update_request_queue {
$output .= ''.$user.' ';
}
$output .= ' ';
+ } elsif ($context eq 'requestauthor') {
+ $output .= ''.&mt("For the following users, an error occurred when updating the user's own author request record:").'
';
+ foreach my $uname (@warn_approves,@warn_rejects) {
+ my $userlink =
+ &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$cdom),$uname,$cdom);
+ $output .= ''.$userlink.' ';
+ }
+ $output .= ' ';
+ } elsif ($context eq 'requestusername') {
+ $output .= ''.&mt("For the following users, an error occurred when updating the account request record for the user:").'
';
+ foreach my $uname (@warn_approves,@warn_rejects) {
+ $output .= ''.$uname.' ';
+ }
+ $output .= ' ';
+ } elsif ($context eq 'othdombydc') {
+
} else {
$output .= ''.&mt("For the following course/community requests an error occurred when updating the requestor's own requests record:").'
';
foreach my $cnum (@warn_approves,@warn_rejects) {
@@ -993,21 +2331,135 @@ sub update_request_queue {
}
}
if (@warn_dels) {
- $output .= ''.&mt("For the following course/community requests an error occurred when removing requests for the following from the pending queue:").'
';
- foreach my $cnum (@warn_dels) {
- my $showcourse;
- if (ref($requesthash{$cnum.'_'.$queue})) {
- $showcourse = $requesthash{$cnum.'_'.$queue}{'description'};
- } else {
- $showcourse = $cnum;
+ if ($context eq 'requestauthor') {
+ $output .= ''.&mt("For the following requests an error occurred when removing the request from the queue:").'
';
+ foreach my $uname (@warn_dels) {
+ my $userlink =
+ &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$cdom),$uname,$cdom);
+ $output .= ''.$userlink.' ';
}
- $output .= ''.$showcourse.' ';
+ $output .= ' ';
+ } elsif ($context eq 'requestusername') {
+ $output .= ''.&mt("For the following requests an error occurred when removing the request from the queue:").'
';
+ foreach my $item (@warn_dels) {
+ my ($escuname) = split(/_/,$item);
+ $output .= ''.&unescape($escuname).' ';
+ }
+ $output .= ' ';
+ } elsif ($context eq 'othdombydc') {
+ $output .= ''.
+ &mt("For the following queued role assignments an error occurred when removing the item from the queue:").
+ '
'.&get_othdombydc_results('dequeue_error',\@warn_dels).' '.
+ '';
+ } else {
+ $output .= ''.&mt("For the following course/community requests an error occurred when removing requests from the pending queue:").'
';
+ foreach my $cnum (@warn_dels) {
+ my $showcourse;
+ if (ref($requesthash{$cnum.'_'.$queue})) {
+ $showcourse = $requesthash{$cnum.'_'.$queue}{'description'};
+ } else {
+ $showcourse = $cnum;
+ }
+ $output .= ''.$showcourse.' ';
+ }
+ $output .= ' ';
}
- $output .= ' ';
}
return $output;
}
+sub get_othdombydc_results {
+ my ($action,$items,$results,$requestedby,$for_requester) = @_;
+ return unless (ref($items) eq 'ARRAY');
+ unless ($action eq 'dequeue_error') {
+ return unless ((ref($results) eq 'HASH') && (ref($requestedby) eq 'HASH') &&
+ (ref($for_requester) eq 'HASH'));
+ }
+ my $output;
+ foreach my $item (@{$items}) {
+ my ($extent,$role,$uname,$udom);
+ if ($action eq 'approved') {
+ (my $num,$extent,$role,$uname,$udom) = split(/:/,$item);
+ } elsif ($action eq 'rejected') {
+ ($extent,$role,$uname,$udom) = split(/:/,$item);
+ } elsif ($action eq 'dequeue_error') {
+ (my $oldstatus,$uname,$extent,$role) = split(/:/,$item);
+ $udom = $env{'request.role.domain'};
+ }
+ my @text = (&mt('User: [_1]',$uname));
+ if (($role eq 'ca') || ($role eq 'aa')) {
+ my $plainrole = &Apache::lonnet::plaintext($role);
+ my ($audom,$auname) = ($extent =~ m{^/($match_domain)/($match_username)$});
+ my $title = &Apache::loncommon::plainname($auname,$audom);
+ push(@text,(&mt('Role: [_1]',$plainrole),
+ &mt('Domain: [_1]',&Apache::lonnet::domain($audom)),
+ &mt('Authoring Space belonging to: [_1]',$title)));
+ } elsif ($extent =~ m{^/($match_domain)/$}) {
+ my $domain = $1;
+ my $plainrole = &Apache::lonnet::plaintext($role);
+ if (&Apache::lonnet::domain($domain) ne '') {
+ push(@text,(&mt('Role: [_1]',$plainrole),
+ &mt('Domain: [_1]',&Apache::lonnet::domain($domain))));
+ }
+ } else {
+ my ($crsdom,$crsnum,$csec) = ($extent =~ m{^/($match_domain)/($match_courseid)(?:|/([^/]+)$)});
+ if (($crsdom ne '') && ($crsnum ne '')) {
+ my %info = &Apache::lonnet::coursedescription("$crsdom/$crsnum");
+ my $plainrole = &Apache::lonnet::plaintext($role,$info{'type'});
+ push(@text,(&mt('Role: [_1]',$plainrole),
+ &mt('Domain: [_1]',&Apache::lonnet::domain($crsdom)),
+ &mt("$info{'type'}: [_1]",$info{'description'})));
+ if ($csec ne '') {
+ push(@text,&mt('Section: [_1]',$csec));
+ }
+ }
+ }
+ $output .= ''.&mt('Enrollment requests pending Course Coordinator approval').' '.&mt('Enrollment requests pending Course Coordinator approval').' '.$output.' '.$output.' '.
+ &mt('An Authoring Space has already been assigned to you.').'',
+ ' ').' ';
+ }
+ unless ($env{'environment.canrequest.author'}) {
+ return ''.
+ &mt('You do not currently have rights to request an Authoring Space.').'',
+ ' ').' ';
+ }
+ my $queued = &reqauthor_check();
+ if ($queued =~ /^approval:(\d+)$/) {
+ my $timestamp = $1;
+ return ''.
+ &mt('A request for Authoring Space submitted on [_1] is awaiting approval',
+ &Apache::lonlocal::locallocaltime($timestamp)).
+ ' ';
+ } elsif ($queued =~ /^approved:(\d+)$/) {
+ my $timestamp = $1;
+ my %roleshash = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles',
+ ['active'],['au'],[$env{'user.domain'}]);
+ if (keys(%roleshash) > 0) {
+ return ''.
+ &mt('A request for Authoring Space submitted on [_1] has been approved.',
+ &Apache::lonlocal::locallocaltime($timestamp)).
+ ' ';
+ }
+ }
+ my ($output,@inststatuses,%domconfig);
+ %domconfig = &Apache::lonnet::get_dom('configuration',['requestauthor'],
+ $env{'user.domain'});
+ my $val = &get_processtype('requestauthor',$env{'user.name'},$env{'user.domain'},
+ $env{'user.adv'},$env{'user.domain'},undef,
+ \@inststatuses,\%domconfig);
+ my $now = time;
+ if ($val eq 'automatic') {
+ my $start = $now-1;
+ if (&Apache::lonnet::assignrole($env{'user.domain'},$env{'user.name'},'/'.$env{'user.domain'}.'/',
+ 'au',undef,$start,undef,undef,'requestauthor') eq 'ok') {
+ $output = ''.
+ &mt('Access to Authoring Space has been activated').' '.
+ &mt('An error occurred while activating your access to Authoring Space');
+ }
+ } elsif ($val eq 'approval') {
+ my $domconfiguser = &Apache::lonnet::get_domainconfiguser($env{'user.domain'});
+ if (&Apache::lonnet::put('requestauthorqueue',{ $env{'user.name'}.'_'.$val => $now },
+ $env{'user.domain'},$domconfiguser) eq 'ok') {
+ my %userrequest = (
+ author => {
+ timestamp => $now,
+ status => $val,
+ },
+ author_status => $val,
+ );
+ my $req_notifylist;
+ if (ref($domconfig{'requestauthor'}) eq 'HASH') {
+ if (ref($domconfig{'requestauthor'}{'notify'}) eq 'HASH') {
+ my $req_notifylist = $domconfig{'requestauthor'}{'notify'}{'approval'};
+ if ($req_notifylist) {
+ my $fullname = &Apache::loncommon::plainname($env{'user.name'},
+ $env{'user.domain'});
+ my $sender = $env{'user.name'}.':'.$env{'user.domain'};
+ my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
+ &send_selfserve_notification($req_notifylist,
+ "$fullname ($env{'user.name'}:$env{'user.domain'})",
+ undef,$domdesc,$now,'authorreq',$sender);
+ }
+ }
+ }
+ my $userresult =
+ &Apache::lonnet::put('requestauthor',\%userrequest,$env{'user.domain'},$env{'user.name'});
+ $output = ''.
+ &mt('Your request for Authoring Space has been submitted for approval.').
+ ' ';
+ &Apache::lonnet::appenv({'environment.requestauthorqueued' => $val.':'.$now});
+ } else {
+ $output = ''.
+ &mt('An error occurred saving your request for Authoring Space.').
+ ' ';
+ }
+ }
+ return $output;
}
1;