--- loncom/interface/loncoursequeueadmin.pm 2014/05/06 20:42:27 1.48
+++ loncom/interface/loncoursequeueadmin.pm 2022/12/01 01:28:26 1.64
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Utilities to administer domain course requests and course self-enroll requests
#
-# $Id: loncoursequeueadmin.pm,v 1.48 2014/05/06 20:42:27 raeburn Exp $
+# $Id: loncoursequeueadmin.pm,v 1.64 2022/12/01 01:28:26 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -105,13 +105,13 @@ sub send_selfserve_notification {
$rawsubj = 'Self-enrollment requests processed';
push(@rawmsg,{
mt => 'Enrollment requests in the following course: [_1] have been processed.',
- args => ["\n$contextdesc"],
+ args => ["\n$contextdesc\n"],
});
} elsif ($context eq 'domainmanagers') {
$rawsubj = 'Course/Community requests reviewed';
push(@rawmsg,{
- mt => 'Course/Community creation requests in the following domain: "[_1]" have been reviewed.',
- args => ["\n$contextdesc"],
+ mt => 'Course/Community creation requests in the following domain: [_1] have been reviewed.',
+ args => ["\n$contextdesc\n"],
});
if (ref($textstr) eq 'ARRAY') {
push(@rawmsg,@{$textstr});
@@ -119,8 +119,8 @@ sub send_selfserve_notification {
} elsif ($context eq 'authormanagers') {
$rawsubj = 'Authoring Space requests reviewed';
push(@rawmsg,{
- mt => 'Authoring requests in the following domain: "[_1]" have been reviewed.',
- args => ["\n$contextdesc"],
+ mt => 'Authoring requests in the following domain: [_1] have been reviewed.',
+ args => ["\n$contextdesc\n"],
});
if (ref($textstr) eq 'ARRAY') {
push(@rawmsg,@{$textstr});
@@ -128,8 +128,8 @@ sub send_selfserve_notification {
} elsif ($context eq 'usernamemanagers') {
$rawsubj = 'LON-CAPA account requests reviewed';
push(@rawmsg,{
- mt => 'Account requests in the following domain: "[_1]" have been reviewed.',
- args => ["\n$contextdesc"],
+ mt => 'Account requests in the following domain: [_1] have been reviewed.',
+ args => ["\n$contextdesc\n"],
});
if (ref($textstr) eq 'ARRAY') {
push(@rawmsg,@{$textstr});
@@ -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,39 @@ sub send_selfserve_notification {
if (ref($textstr) eq 'ARRAY') {
push(@rawmsg,@{$textstr});
}
+ } elsif ($context eq 'othdomroleuser') {
+ my $linktext = 'Roles';
+ if (&Apache::loncommon::show_course()) {
+ $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 'Manage Role Requests' 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') {
+ $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"],
+ });
}
my @to_notify = split(/,/,$notifylist);
my $numsent = 0;
@@ -304,11 +336,11 @@ sub send_selfserve_notification {
my $stamp = time;
my $msgcount = &Apache::lonmsg::get_uniq();
my $sender_lh = &Apache::loncommon::user_lang($uname,$udom,$cid);
- $subject = &Apache::lonlocal::mt_user($sender_lh,$rawsubj);
+ $subject = &mt_user($sender_lh,$rawsubj);
$message = '';
foreach my $item (@rawmsg) {
if (ref($item) eq 'HASH') {
- $message .= &Apache::lonlocal::mt_user($sender_lh,$item->{mt},@{$item->{args}})."\n";
+ $message .= &mt_user($sender_lh,$item->{mt},@{$item->{args}})."\n";
}
}
&Apache::lonmsg::process_sent_mail($subject,'',$numsent,$stamp,$uname,$udom,$msgcount,$cid,$$,$message,
@@ -322,41 +354,48 @@ sub send_selfserve_notification {
foreach my $recip (sort(keys(%{$msgcc}))) {
my ($ccname,$ccdom) = split(/:/,$recip);
my $recip_lh = &Apache::loncommon::user_lang($ccname,$ccdom,$cid);
- my $subject = &Apache::lonlocal::mt_user($sender_lh,$rawsubj);
+ my $subject = &mt_user($sender_lh,$rawsubj);
my $message = '';
foreach my $item (@rawmsg) {
if (ref($item) eq 'HASH') {
- $message .= &Apache::lonlocal::mt_user($sender_lh,$item->{mt},
- @{$item->{args}})."\n";
+ $message .= &mt_user($sender_lh,$item->{mt},
+ @{$item->{args}})."\n";
}
}
if ($context eq 'coursemanagers') {
if ($approvedlist) {
- $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Approved enrollments:')."\n".$approvedlist;
+ $message .= "\n\n".&mt_user($sender_lh,'Approved enrollments:')."\n".$approvedlist;
}
if ($rejectedlist) {
- $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Rejected enrollments:')."\n".$rejectedlist;
+ $message .= "\n\n".&mt_user($sender_lh,'Rejected enrollments:')."\n".$rejectedlist;
}
} elsif ($context eq 'domainmanagers') {
if ($approvedlist) {
- $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Approved course requests:')."\n".$approvedlist;
+ $message .= "\n\n".&mt_user($sender_lh,'Approved course requests:')."\n".$approvedlist;
}
if ($rejectedlist) {
- $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Rejected course requests:')."\n".$rejectedlist;
+ $message .= "\n\n".&mt_user($sender_lh,'Rejected course requests:')."\n".$rejectedlist;
}
} elsif ($context eq 'authormanagers') {
if ($approvedlist) {
- $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Approved author role requests:')."\n".$approvedlist;
+ $message .= "\n\n".&mt_user($sender_lh,'Approved author role requests:')."\n".$approvedlist;
}
if ($rejectedlist) {
- $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Rejected author role requests:')."\n".$rejectedlist;
+ $message .= "\n\n".&mt_user($sender_lh,'Rejected author role requests:')."\n".$rejectedlist;
}
} elsif ($context eq 'usernamemanagers') {
if ($approvedlist) {
- $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Approved LON-CAPA account requests:')."\n".$approvedlist;
+ $message .= "\n\n".&mt_user($sender_lh,'Approved LON-CAPA account requests:')."\n".$approvedlist;
}
if ($rejectedlist) {
- $message .= "\n\n".&Apache::lonlocal::mt_user($sender_lh,'Rejected LON-CAPA account requests:')."\n".$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,
@@ -371,7 +410,7 @@ sub send_selfserve_notification {
}
sub display_queued_requests {
- my ($context,$dom,$cnum) = @_;
+ my ($context,$dom,$cnum,$secondary) = @_;
my ($namespace,$formaction,$nextelement,%requesthash);
if ($context eq 'course') {
$formaction = '/adm/createuser';
@@ -388,6 +427,34 @@ 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') {
+ $formaction = '/adm/createuser';
+ $namespace = 'nohist_queuedrolereqs';
+ if ($secondary eq 'domain') {
+ my $confname = &Apache::lonnet::get_domainconfiguser($dom);
+ %requesthash = &Apache::lonnet::dump($namespace,$dom,$confname);
+ } else {
+ %requesthash = &Apache::lonnet::dump($namespace,$dom,$cnum);
+ }
+ $nextelement = ' ';
} else {
$formaction = '/adm/createcourse';
$namespace = 'courserequestqueue';
@@ -396,15 +463,14 @@ sub display_queued_requests {
if ($context eq 'pending') {
$disposition = 'pending';
$nextphase = 'requestvalidation';
+ } elsif ($context eq 'displaypending') {
+ $disposition = 'pending';
}
%requesthash = &Apache::lonnet::dump_dom($namespace,$dom,'_'.$disposition);
$nextelement = ' ';
}
my ($output,%queue_by_date);
if (keys(%requesthash) > 0) {
- $output = '
'.&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('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 queued pending 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');
+ } elsif ($secondary eq 'course') {
+ $output .= &mt('There are currently no course role assignment(s) for user(s) from another domain queued pending approval');
+ } elsif ($secondary eq 'community') {
+ $output .= &mt('There are currently no community role assignment(s) for user(s) from another domain queued pending 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.');
}
@@ -496,15 +602,21 @@ 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);
+ 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')) {
$output .= '
'.&mt('Action').' ';
}
- $output .= '
'.&mt('Requestor').' ';
+ unless (($context eq 'othdomqueue') || (($context eq 'othdomaction') && ($secondary eq 'user'))) {
+ $output .= '
'.&mt('Requestor').' ';
+ }
if ($context eq 'course') {
$output .= '
'.&mt('Section').' '.
'
'.&mt('Date requested').' ';
@@ -513,7 +625,26 @@ sub build_queue_display {
} elsif ($context eq 'requestusername') {
$output .= '
'.&mt('Date requested').' '.
'
'.&mt('Details').' ';
- } elsif ($context eq 'pending' || $context eq 'stillpending') {
+ } 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').' '.
+ '
'.&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').' ';
@@ -523,6 +654,7 @@ sub build_queue_display {
unofficial => 'Unofficial course',
community => 'Community',
textbook => 'Textbook course',
+ placement => 'Placement test',
);
$output .= '
'.&mt('Type').' '.
'
'.&mt('Date requested').' '.
@@ -535,7 +667,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);
@@ -551,7 +684,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);
@@ -565,10 +698,106 @@ 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);
+ 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 $queued = 'approval';
- if ($context eq 'pending' || $context eq 'stillpending') {
+ if ($context eq 'pending' || $context eq 'displaypending' || $context eq 'stillpending') {
($cnum,$ownername,$ownerdom,$instcode,$cdesc)=split(/:/,$request,5);
$queued = 'pending';
} else {
@@ -586,7 +815,8 @@ sub build_queue_display {
&Apache::loncommon::plainname($ownername,$ownerdom),
$ownername,$ownerdom);
}
- unless ($context eq 'pending') {
+ unless (($context eq 'pending') || ($context eq 'displaypending') ||
+ ($context eq 'helpdesk') || ($context eq 'othdomqueue')) {
$row = '
'.
' '.&mt('Approve').' '.
''.(' 'x2).
@@ -595,7 +825,9 @@ sub build_queue_display {
' '.&mt('Decide Later').
' ';
}
- $row .= '
'.$namelink.' '."\n";
+ unless (($context eq 'othdomqueue') || ($context eq 'othdomaction')) {
+ $row .= '
'.$namelink.' '."\n";
+ }
if ($context eq 'course') {
$row .= '
'.$showsec.' '."\n".
'
'.$showtime.' '."\n";
@@ -604,8 +836,26 @@ sub build_queue_display {
} elsif ($context eq 'requestusername') {
$row .= '
'.$showtime.' '."\n".
'
'.$detailslink.' '."\n";
- } else {
- if ($context eq 'pending' || $context eq 'stillpending') {
+ } 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";
+ }
+ $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";
@@ -624,6 +874,11 @@ sub build_queue_display {
return $output;
}
+sub print_filter_menu {
+ my ($context) = @_;
+ return;
+}
+
sub update_request_queue {
my ($context,$cdom,$cnum,$coursedesc) = @_;
my ($output,$access_start,$access_end,$limit,$cap,$notifylist,$namespace,
@@ -633,7 +888,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+:/) {
@@ -643,7 +899,6 @@ sub update_request_queue {
}
$count ++;
}
-
$now = time;
$sender = $env{'user.name'}.':'.$env{'user.domain'};
if ($context eq 'course') {
@@ -651,7 +906,7 @@ sub update_request_queue {
$beneficiary = 'enroller';
$cid = $env{'request.course.id'};
$crstype = lc(&Apache::loncommon::course_type());
- $firsturl = &course_portal_url($cnum,$cdom);
+ $firsturl = &Apache::lonnet::course_portal_url($cnum,$cdom);
%requesthash = &Apache::lonnet::dump($namespace,$cdom,$cnum);
$access_start = $env{'course.'.$cid.'.internal.selfenroll_start_access'};
$access_end = $env{'course.'.$cid.'.internal.selfenroll_end_access'};
@@ -680,7 +935,7 @@ sub update_request_queue {
}
}
my $domconfiguser = &Apache::lonnet::get_domainconfiguser($cdom);
- $firsturl = &course_portal_url($domconfiguser,$cdom);
+ $firsturl = &Apache::lonnet::course_portal_url($domconfiguser,$cdom);
$approvedmsg = [{
mt => 'Your request for Authoring Space has been approved.',
},
@@ -705,7 +960,7 @@ sub update_request_queue {
}
}
my $domconfiguser = &Apache::lonnet::get_domainconfiguser($cdom);
- $firsturl = &course_portal_url($domconfiguser,$cdom);
+ $firsturl = &Apache::lonnet::course_portal_url($domconfiguser,$cdom);
$approvedmsg = [{
mt => 'Your request for a LON-CAPA account has been approved.',
},
@@ -717,6 +972,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);
+ } else {
+ %requesthash = &Apache::lonnet::dump($namespace,$cdom,$cnum);
+ }
+ $domdesc = &Apache::lonnet::domain($cdom);
+ $dbname = 'nohist_othdomqueued';
} else {
$domdesc = &Apache::lonnet::domain($cdom);
$namespace = 'courserequestqueue';
@@ -871,13 +1141,12 @@ 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);
-
+
if (ref($curr{$uname}) eq 'HASH') {
- my ($username,$logtoken,$serverid,$encpass,$courseid,$id,$firstname,
- $middlename,$lastname,$generation,$inststatus);
+ my ($logtoken,$serverid,$encpass,$courseid,$id,$firstname,
+ $middlename,$lastname,$generation,$inststatus,$email);
$curr{$uname}{'timestamp'} = $now;
$curr{$uname}{'adjudicator'} = $env{'user.name'}.':'.$env{'user.domain'};
$courseid = $curr{$uname}{'courseid'};
@@ -888,14 +1157,35 @@ sub update_request_queue {
$generation = $curr{$uname}{'generation'};
$inststatus = $curr{$uname}{'inststatus'};
- my ($key,$caller)=split(/&/,$curr{$uname}{'tmpinfo'});
- if ($caller eq 'createaccount') {
- my $upass = &Apache::loncommon::des_decrypt($key,$curr{$uname}{'upass'});
+ if ($curr{$uname}{'email'} ne '') {
+ $email = $curr{$uname}{'email'};
+ } elsif ($uname =~ /^[^\@]+\@[^\@]+$/) {
+ $email = $uname;
+ }
+
+ my $upass;
+ if ($curr{$uname}{'tmpinfo'}) {
+ my ($key,$caller)=split(/&/,$curr{$uname}{'tmpinfo'});
+ if ($caller eq 'createaccount') {
+ if ($curr{$uname}{'upass'} eq '') {
+ $upass = $curr{$uname}{'upass'};
+ } else {
+ $upass = &Apache::loncommon::des_decrypt($key,$curr{$uname}{'upass'});
+ }
+ } else {
+ push(@processing_errors,$uname);
+ }
+ } else {
+ $upass = $curr{$uname}{'upass'};
+ }
+ if ($upass eq '') {
+ push(@processing_errors,$uname);
+ } else {
undef($curr{$uname}{'upass'});
my $result =
&Apache::lonnet::modifyuser($cdom,$uname,$id,'internal',$upass,
$firstname,$middlename,$lastname,
- $generation,undef,undef,$uname);
+ $generation,undef,undef,$email);
if ($result eq 'ok') {
$curr{$uname}{'status'} = 'created';
push(@completed,$uname);
@@ -916,13 +1206,173 @@ sub update_request_queue {
} else {
push(@processing_errors,$uname);
}
- } else {
- push(@processing_errors,$uname);
}
} else {
push(@invalidusers,$uname);
}
push(@toremove,@invalidusers);
+ } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) {
+ if ($context eq 'othdombydc') {
+ my ($num,$extent,$role,$uname,$udom) = split(/:/,$item);
+ my ($logmsg,$result);
+ 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);
+ }
+ }
+ }
+ }
+ } 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);
+ }
+ }
+ }
+ }
+ }
+ } 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);
+ }
+ }
+ }
+ }
+ } 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);
+ }
+ }
+ }
+ }
+ } 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);
+ }
+ }
+ }
+ 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 = 'approved:'.$uname.':'.$extent.':'.$role;
+ $requesthash{$newkey} = $requesthash{$key};
+ delete($requesthash{$key});
+ push(@toremove,$key);
+ push(@completed,$item);
+ }
+ }
+ }
+ }
+ }
+ } 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);
if (ref($requesthash{$cnum.'_'.$queue}) eq 'HASH') {
@@ -957,7 +1407,9 @@ sub update_request_queue {
$ownerdom,$ownername);
if ((ref($history{'details'}) eq 'HASH') &&
($history{'disposition'} eq $queue)) {
- my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,$code,%customitems);
+ my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,
+ $keysmsg,$code,%customitems);
+ my $clonemsg = [];
my $fullname = '';
my $inprocess = &Apache::lonnet::auto_crsreq_update($cdom,$cnum,$crstype,'process',$ownername,
$ownerdom,$fullname,$coursedesc);
@@ -968,8 +1420,11 @@ sub update_request_queue {
}
}
}
- my ($result,$postprocess) = &course_creation($cdom,$cnum,$context,$history{'details'},\$logmsg,
- \$newusermsg,\$addresult,\$enrollcount,
+ if ($history{'details'}{'clonecrs'}) {
+ $customitems{'_LC_clonefrom'} = $history{'details'}{'clonedom'}.'_'.$history{'details'}{'clonecrs'};
+ }
+ my ($result,$postprocess) = &course_creation($cdom,$cnum,$context,$history{'details'},
+ \$logmsg,$clonemsg,\$newusermsg,\$addresult,\$enrollcount,
\$response,\$keysmsg,\%domdefs,$longroles,\$code,\%customitems);
if ($result eq 'created') {
if ($crstype eq 'community') {
@@ -977,11 +1432,14 @@ sub update_request_queue {
} else {
$approvedmsg = $approvalmsg{'course'};
}
- my $firsturl = &course_portal_url($cnum,$cdom);
+ my $firsturl = &Apache::lonnet::course_portal_url($cnum,$cdom);
if (ref($approvedmsg) eq 'ARRAY') {
if (ref($approvedmsg->[1]) eq 'HASH') {
$approvedmsg->[1]->{'args'} = [$firsturl];
}
+ if ((ref($clonemsg) eq 'ARRAY') && (@{$clonemsg})) {
+ push(@{$approvedmsg},@{$clonemsg});
+ }
if ($code) {
push(@{$approvedmsg},
{
@@ -1114,6 +1572,40 @@ sub update_request_queue {
if ($userresult ne 'ok') {
push(@warn_rejects,$uname);
}
+ } elsif (($context eq 'othdombydc') || ($context eq 'othdombyuser')) {
+ 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') {
+ $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);
+ }
+ }
+ }
+ }
} else {
my $cnum = $item;
if (ref($requesthash{$cnum.'_'.$queue}) eq 'HASH') {
@@ -1200,13 +1692,22 @@ sub update_request_queue {
}
}
}
- @toremove = map {$_.'_approval'} (@toremove);
+ unless ($context eq 'othdombydc') {
+ @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 (@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);
+ }
} else {
$delresult = &Apache::lonnet::del_dom($namespace,\@changes,$cdom);
}
@@ -1253,7 +1754,6 @@ sub update_request_queue {
my $userlink =
&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$cdom),$uname,$cdom);
$output .= '
'.$userlink.' ';
-
}
$output .= '';
}
@@ -1296,6 +1796,37 @@ sub update_request_queue {
$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) {
@@ -1311,7 +1842,7 @@ sub update_request_queue {
my $syllabuslink =
&Apache::loncommon::syllabuswrapper($showcourse,$cnum,$cdom);
if ($codes{$cnum}) {
- $syllabuslink .= &mt('Unique code: [_1]',$codes{$cnum});
+ $syllabuslink .= ' '.&mt('Unique code: [_1]',$codes{$cnum});
}
$output .= '
'.$syllabuslink.' ';
}
@@ -1338,7 +1869,7 @@ sub update_request_queue {
}
}
} else {
- if (($context eq 'requestauthor') || ($context eq 'requestusername')) {
+ if (($context eq 'requestauthor') || ($context eq 'requestusername') || ($context eq 'othdombydc')) {
push(@warn_dels,@changes);
}
}
@@ -1514,6 +2045,8 @@ sub update_request_queue {
$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) {
@@ -1543,7 +2076,12 @@ sub update_request_queue {
my ($escuname) = split(/_/,$item);
$output .= ''.&unescape($escuname).' ';
}
- $output .= ' ';
+ $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) {
@@ -1561,20 +2099,96 @@ sub update_request_queue {
return $output;
}
-sub course_portal_url {
- my ($cnum,$cdom) = @_;
- my $chome = &Apache::lonnet::homeserver($cnum,$cdom);
- my $hostname = &Apache::lonnet::hostname($chome);
- my $protocol = $Apache::lonnet::protocol{$chome};
- $protocol = 'http' if ($protocol ne 'https');
- my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);
- my $firsturl;
- if ($domdefaults{'portal_def'}) {
- $firsturl = $domdefaults{'portal_def'};
- } else {
- $firsturl = $protocol.'://'.$hostname;
+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 .= ' ';
+ unless ($action eq 'dequeue_error') {
+ push(@{$results->{$requestedby->{$item}}},join("\n",@text));
+ $for_requester->{$requestedby->{$item}} = 1;
+ }
+ }
+ return $output;
+}
+
+sub requester_roles {
+ my ($requname,$requdom,$activeroles) = @_;
+ if (ref($activeroles) eq 'HASH') {
+ my %roleshash = &Apache::lonnet::get_my_roles($requname,$requdom,'userroles');
+ $activeroles->{$requname.':'.$requdom} = \%roleshash;
}
- return $firsturl;
+ return;
+}
+
+sub requester_has_perm {
+ my ($crsdom,$crsnum,$mrole,$requesterroles) = @_;
+ return unless (ref($requesterroles) eq 'HASH');
+ my $has_perm;
+ foreach my $key (keys(%{$requesterroles})) {
+ if ($crsnum eq '') {
+ next unless ($key =~ /^\Q:$crsdom:\E/);
+ } else {
+ next unless (($key =~ /^\Q$crsnum:$crsdom:\E/) || ($key =~ /^\Q:$crsdom:\E/));
+ }
+ my ($keycrs,$keydom,$keyrole) = split(/:/,$key);
+ if (($keycrs ne '') && ($crsnum ne '')) {
+ if ($keycrs eq $crsnum) {
+ if ($Apache::lonnet::pr{$keyrole.':c'} =~ /(^|:)c\Q$mrole\E(&|:)/) {
+ $has_perm = 1;
+ last;
+ }
+ }
+ } else {
+ if ($Apache::lonnet::pr{$keyrole.':d'} =~ /(^|:)c\Q$mrole\E(&|:)/) {
+ $has_perm = 1;
+ last;
+ }
+ }
+ }
+ return $has_perm;
}
sub get_student_counts {
@@ -1596,11 +2210,12 @@ sub get_student_counts {
}
sub course_creation {
- my ($dom,$cnum,$context,$details,$logmsg,$newusermsg,$addresult,$enrollcount,$output,
- $keysmsg,$domdefs,$longroles,$coderef,$customhash) = @_;
+ my ($dom,$cnum,$context,$details,$logmsg,$clonemsg,$newusermsg,$addresult,
+ $enrollcount,$output,$keysmsg,$domdefs,$longroles,$coderef,$customhash,
+ $callercontext,$user_lh) = @_;
unless ((ref($details) eq 'HASH') && (ref($domdefs) eq 'HASH') &&
(ref($longroles) eq 'HASH')) {
- return 'error: Invalid request';
+ return ('error: Invalid request');
}
my ($result,$ownername,$ownerdom);
my $crstype = $details->{'crstype'};
@@ -1629,10 +2244,11 @@ sub course_creation {
$owneremail = $emails{$email};
last if ($owneremail ne '');
}
- my %reqdetails = &build_batchcreatehash($dom,$context,$details,$owneremail,$domdefs);
+ my %reqdetails = &build_batchcreatehash($dom,$cnum,$context,$details,$owneremail,$domdefs);
my $cid = &LONCAPA::batchcreatecourse::build_course($dom,$cnum,'requestcourses',
- \%reqdetails,$longroles,$logmsg,$newusermsg,$addresult,
- $enrollcount,$output,$keysmsg,$ownerdom,$ownername,$cnum,$crstype,$coderef);
+ \%reqdetails,$longroles,$logmsg,$clonemsg,$newusermsg,$addresult,
+ $enrollcount,$output,$keysmsg,$ownerdom,$ownername,$cnum,$crstype,
+ $coderef,$callercontext,$user_lh);
my $postprocess;
if ($cid eq "/$dom/$cnum") {
$result = 'created';
@@ -1650,15 +2266,30 @@ sub course_creation {
}
sub build_batchcreatehash {
- my ($dom,$context,$details,$owneremail,$domdefs) = @_;
+ my ($dom,$cnum,$context,$details,$owneremail,$domdefs) = @_;
my %batchhash;
- my @items = qw{owner domain coursehome clonecrs clonedom datemode dateshift enrollstart enrollend accessstart accessend sections crosslists users uniquecode};
+ my @items = qw{owner domain coursehome clonecrs clonedom datemode dateshift tinyurls enrollstart enrollend accessstart accessend sections users uniquecode};
if ((ref($details) eq 'HASH') && (ref($domdefs) eq 'HASH')) {
my $emailenc = &escape($owneremail);
my $owner = $details->{'owner'}.':'.$details->{'domain'};
foreach my $item (@items) {
$batchhash{$item} = $details->{$item};
}
+ if (ref($details->{'crosslists'}) eq 'HASH') {
+ foreach my $key (keys(%{$details->{'crosslists'}})) {
+ if (ref($details->{'crosslists'}->{$key}) eq 'HASH') {
+ my $instsec = $details->{crosslists}->{$key}->{instsec};
+ $batchhash{'crosslists'}{$key}{'inst'} = $details->{crosslists}->{$key}->{instcode};
+ my $crskey = $cnum.':'.$batchhash{'crosslists'}{$key}{'inst'};
+ my %formatted = &Apache::lonnet::auto_instsec_reformat($dom,'clutter',
+ {$crskey => [$instsec]});
+ if (ref($formatted{$crskey}) eq 'ARRAY') {
+ $batchhash{'crosslists'}{$key}{'inst'} .= $formatted{$crskey}->[0];
+ }
+ $batchhash{'crosslists'}{$key}{'loncapa'} = $details->{crosslists}->{$key}->{loncapa};
+ }
+ }
+ }
$batchhash{'title'} = $details->{'cdescr'};
$batchhash{'coursecode'} = $details->{'instcode'};
if ($domdefs->{'officialcredits'} || $domdefs->{'unofficialcredits'}) {
@@ -1671,12 +2302,16 @@ sub build_batchcreatehash {
$batchhash{'authparam'} = $domdefs->{'auth_arg_def'};
if ($details->{'crstype'} eq 'community') {
$batchhash{'crstype'} = 'Community';
+ } elsif ($details->{'crstype'} eq 'placement') {
+ $batchhash{'crstype'} = 'Placement';
} else {
if ($details->{'crstype'} eq 'textbook') {
if ($details->{'clonecrs'} && $details->{'clonedom'}) {
my %clonedfrom = &Apache::lonnet::coursedescription($details->{'clonedom'}.'_'.$details->{'clonecrs'});
$batchhash{'textbook'} = $clonedfrom{'description'};
}
+ } elsif ($details->{'crstype'} eq 'lti') {
+ $batchhash{'lti'} = 1;
}
$batchhash{'crstype'} = 'Course';
}
@@ -1716,12 +2351,13 @@ sub build_batchcreatehash {
$batchhash{'users'}{$owner}{lastname} = $owner_lastname;
$batchhash{'users'}{$owner}{emailenc} = $emailenc;
$batchhash{'users'}{$owner}{owneremail} = $owneremail;
+ $batchhash{'setcomment'} = 1;
}
return %batchhash;
}
sub can_clone_course {
- my ($uname,$udom,$clonecrs,$clonedom,$crstype) = @_;
+ my ($uname,$udom,$clonecrs,$clonedom,$crstype,$dom,$instcode) = @_;
my $canclone;
my $ccrole = 'cc';
if ($crstype eq 'community') {
@@ -1732,19 +2368,70 @@ sub can_clone_course {
if (exists($roleshash{$clonecrs.':'.$clonedom.':'.$ccrole})) {
$canclone = 1;
} else {
- my %courseenv = &Apache::lonnet::userenvironment($clonedom,$clonecrs,('cloners'));
+ my %courseenv = &Apache::lonnet::userenvironment($clonedom,$clonecrs,
+ ('cloners','internal.coursecode'));
my $cloners = $courseenv{'cloners'};
+ my $clonefromcode = $courseenv{'internal.coursecode'};
if ($cloners ne '') {
my @cloneable = split(',',$cloners);
if (grep(/^\*$/,@cloneable)) {
$canclone = 1;
- }
- if (grep(/^\*:\Q$udom\E$/,@cloneable)) {
+ } elsif (grep(/^\*:\Q$udom\E$/,@cloneable)) {
$canclone = 1;
- }
- if (grep(/^\Q$uname\E:\Q$udom\E$/,@cloneable)) {
+ } elsif (grep(/^\Q$uname\E:\Q$udom\E$/,@cloneable)) {
$canclone = 1;
}
+ unless ($canclone) {
+ if (($clonefromcode) && ($instcode) && ($clonedom eq $dom)) {
+ my (%gotdomdefaults,%gotcodedefaults);
+ foreach my $cloner (@cloneable) {
+ if (($cloner ne '*') && ($cloner !~ /^\*\:$match_domain$/) &&
+ ($cloner !~ /^$match_username\:$match_domain$/) && ($cloner ne '')) {
+ if ($cloner =~ /\=/) {
+ my (%codedefaults,@code_order);
+ if (ref($gotcodedefaults{$clonedom}) eq 'HASH') {
+ if (ref($gotcodedefaults{$clonedom}{'defaults'}) eq 'HASH') {
+ %codedefaults = %{$gotcodedefaults{$clonedom}{'defaults'}};
+ }
+ if (ref($gotcodedefaults{$clonedom}{'order'}) eq 'ARRAY') {
+ @code_order = @{$gotcodedefaults{$dom}{'order'}};
+ }
+ } else {
+ &Apache::lonnet::auto_instcode_defaults($clonedom,
+ \%codedefaults,
+ \@code_order);
+ $gotcodedefaults{$clonedom}{'defaults'} = \%codedefaults;
+ $gotcodedefaults{$clonedom}{'order'} = \@code_order;
+ }
+ if (@code_order > 0) {
+ if (&Apache::lonnet::check_instcode_cloning(\%codedefaults,\@code_order,
+ $cloner,$clonefromcode,$instcode)) {
+ $canclone = 1;
+ last;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ } else {
+ my %domdefs = &Apache::lonnet::get_domain_defaults($clonedom);
+ if ($domdefs{'canclone'}) {
+ unless ($domdefs{'canclone'} eq 'none') {
+ if ($domdefs{'canclone'} eq 'domain') {
+ if ($udom eq $clonedom) {
+ $canclone = 1;
+ }
+ } elsif (($clonefromcode) && ($instcode) &&
+ ($clonedom eq $dom)) {
+ if (&Apache::lonnet::default_instcode_cloning($clonedom,$domdefs{'canclone'},
+ $clonefromcode,$instcode)) {
+ $canclone = 1;
+ }
+ }
+ }
+ }
}
unless ($canclone) {
if (&Apache::lonnet::is_course_owner($clonedom,$clonecrs,$uname,$udom)) {
@@ -1951,9 +2638,10 @@ sub process_official_reqs {
$longroles{$role}=&Apache::lonnet::plaintext($role);
}
my %domdefs = &Apache::lonnet::get_domain_defaults($dom);
- my ($output,$linefeed);
+ my ($output,$linefeed,$user_lh);
if ($context eq 'auto') {
$linefeed = "\n";
+ $user_lh = &Apache::loncommon::user_lang($dcname,$dcdom);
} else {
$linefeed = ' '."\n";
}
@@ -2015,6 +2703,7 @@ sub process_official_reqs {
$reqstatus = $disposition;
if ($disposition eq 'process') {
my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,$code);
+ my $clonemsg = [];
my %customitems;
my $fullname = &Apache::loncommon::plainname($ownername,$ownerdom);
my $inprocess = &Apache::lonnet::auto_crsreq_update($dom,$cnum,$crstype,'process',$ownername,
@@ -2026,16 +2715,20 @@ sub process_official_reqs {
}
}
}
+ if ($history{'details'}{'clonecrs'}) {
+ $customitems{'_LC_clonefrom'} = $history{'details'}{'clonedom'}.'_'.$history{'details'}{'clonecrs'};
+ }
my ($result,$postprocess) =
- &course_creation($dom,$cnum,'domain',$history{'details'},\$logmsg,\$newusermsg,\$addresult,
- \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles,\$code,\%customitems);
+ &course_creation($dom,$cnum,'domain',$history{'details'},\$logmsg,$clonemsg,\$newusermsg,
+ \$addresult,\$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles,
+ \$code,\%customitems,$context,$user_lh);
if ($result eq 'created') {
$disposition = 'created';
$reqstatus = 'created';
my $cid = $dom.'_'.$cnum;
push(@{$newcids{$instcode}},$cid);
if ($dcname && $dcdom) {
- my $firsturl = &course_portal_url($cnum,$dom);
+ my $firsturl = &Apache::lonnet::course_portal_url($cnum,$dom);
my $beneficiary = 'pendingrequestor';
my $now = time;
my $owner = $ownername.':'.$ownerdom;
@@ -2043,14 +2736,20 @@ sub process_official_reqs {
[{
mt => 'Your requested course: [_1], (queued pending validation) has now been created.',
args => [$cdescr],
- },
+ }];
+ if ((ref($clonemsg) eq 'ARRAY') && (@{$clonemsg})) {
+ push(@{$approvedmsg},@{$clonemsg});
+ }
+ push(@{$approvedmsg},
{
mt => 'Visit [_1] to log-in and access the course.',
args => [$firsturl],
},
{
- mt => 'If currently logged-in to LON-CAPA, log-out and log-in again to select your new course role.'
- }];
+ mt => 'If currently logged-in to LON-CAPA, log-out and log-in again to select your new course role.',
+ args => [],
+ }
+ );
my $sender = $dcname.':'.$dcdom;
if (ref($postprocess) eq 'HASH') {
if (ref($postprocess->{'createdmsg'}) eq 'ARRAY') {