--- loncom/interface/loncoursequeueadmin.pm 2024/07/02 13:55:53 1.52.2.6
+++ loncom/interface/loncoursequeueadmin.pm 2017/08/03 16:11:46 1.57
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Utilities to administer domain course requests and course self-enroll requests
#
-# $Id: loncoursequeueadmin.pm,v 1.52.2.6 2024/07/02 13:55:53 raeburn Exp $
+# $Id: loncoursequeueadmin.pm,v 1.57 2017/08/03 16:11:46 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -506,7 +506,7 @@ sub build_queue_display {
my %crstypes;
my $output = &Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row();
- unless (($context eq 'pending') || ($context eq 'displaypending') || ($context eq 'helpdesk')) {
+ unless (($context eq 'pending') || ($context eq 'displaypending') || ($context eq 'helpdesk')) {
$output .= '| '.&mt('Action').' | ';
}
$output .= ''.&mt('Requestor').' | ';
@@ -528,6 +528,7 @@ sub build_queue_display {
unofficial => 'Unofficial course',
community => 'Community',
textbook => 'Textbook course',
+ placement => 'Placement test',
);
$output .= ''.&mt('Type').' | '.
''.&mt('Date requested').' | '.
@@ -609,7 +610,7 @@ sub build_queue_display {
} elsif ($context eq 'requestusername') {
$row .= ''.$showtime.' | '."\n".
''.$detailslink.' | '."\n";
- } else {
+ } else {
if ($context eq 'pending' || $context eq 'displaypending' || $context eq 'stillpending') {
$row .= ''.$instcode.' | '."\n";
} else {
@@ -656,7 +657,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'};
@@ -685,7 +686,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.',
},
@@ -710,7 +711,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.',
},
@@ -879,10 +880,10 @@ sub update_request_queue {
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 ($logtoken,$serverid,$encpass,$courseid,$id,$firstname,
- $middlename,$lastname,$generation,$inststatus,$email);
+ my ($username,$logtoken,$serverid,$encpass,$courseid,$id,$firstname,
+ $middlename,$lastname,$generation,$inststatus);
$curr{$uname}{'timestamp'} = $now;
$curr{$uname}{'adjudicator'} = $env{'user.name'}.':'.$env{'user.domain'};
$courseid = $curr{$uname}{'courseid'};
@@ -893,35 +894,14 @@ sub update_request_queue {
$generation = $curr{$uname}{'generation'};
$inststatus = $curr{$uname}{'inststatus'};
- 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 {
+ my ($key,$caller)=split(/&/,$curr{$uname}{'tmpinfo'});
+ if ($caller eq 'createaccount') {
+ my $upass = &Apache::loncommon::des_decrypt($key,$curr{$uname}{'upass'});
undef($curr{$uname}{'upass'});
my $result =
&Apache::lonnet::modifyuser($cdom,$uname,$id,'internal',$upass,
$firstname,$middlename,$lastname,
- $generation,undef,undef,$email);
+ $generation,undef,undef,$uname);
if ($result eq 'ok') {
$curr{$uname}{'status'} = 'created';
push(@completed,$uname);
@@ -942,6 +922,8 @@ sub update_request_queue {
} else {
push(@processing_errors,$uname);
}
+ } else {
+ push(@processing_errors,$uname);
}
} else {
push(@invalidusers,$uname);
@@ -1004,7 +986,7 @@ 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];
@@ -1588,22 +1570,6 @@ 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;
- }
- return $firsturl;
-}
-
sub get_student_counts {
my ($cdom,$cnum) = @_;
my (%idx,%stucounts);
@@ -1629,12 +1595,12 @@ sub course_creation {
(ref($longroles) eq 'HASH')) {
return ('error: Invalid request');
}
- my ($result,$ownername,$ownerdom,$autocoowner);
+ my ($result,$ownername,$ownerdom);
my $crstype = $details->{'crstype'};
my $coursedesc = $details->{'cdescr'};
my $accessstart = $details->{'accessstart'};
my $accessend = $details->{'accessend'};
- my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses','autoenroll'],$dom);
+ my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$dom);
if (ref($domconfig{'requestcourses'}) eq 'HASH') {
if (ref($domconfig{'requestcourses'}{'uniquecode'}) eq 'HASH') {
if ($domconfig{'requestcourses'}{'uniquecode'}{$crstype}) {
@@ -1642,9 +1608,6 @@ sub course_creation {
}
}
}
- if (ref($domconfig{'autoenroll'}) eq 'HASH') {
- $autocoowner = $domconfig{'autoenroll'}{'co-owners'};
- }
if ($context eq 'domain') {
$ownername = $details->{'owner'};
$ownerdom = $details->{'domain'};
@@ -1659,7 +1622,7 @@ sub course_creation {
$owneremail = $emails{$email};
last if ($owneremail ne '');
}
- my %reqdetails = &build_batchcreatehash($dom,$cnum,$context,$details,$owneremail,$domdefs);
+ my %reqdetails = &build_batchcreatehash($dom,$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);
@@ -1673,66 +1636,6 @@ sub course_creation {
$postprocess = &Apache::lonnet::auto_crsreq_update($dom,$cnum,$crstype,$result,$ownername,
$ownerdom,$fullname,$coursedesc,$code,
$accessstart,$accessend,$customhash);
- if ($autocoowner) {
- my $instcode = $details->{'instcode'};
- if (($instcode ne '') && (ref($reqdetails{'users'}) eq 'HASH')) {
- my @posscoowners;
- my $now = time;
- foreach my $person (keys(%{$reqdetails{'users'}})) {
- my ($uname,$udom) = split(/:/,$person);
- next if (($udom ne $dom) || (($uname eq $ownername) && ($udom eq $ownerdom)));
- if ((&Apache::lonnet::homeserver($uname,$udom,1) ne 'no_host') &&
- (ref($reqdetails{'users'}{$person}) eq 'HASH')) {
- if ((grep(/^cc$/,keys(%{$reqdetails{'users'}{$person}}))) &&
- (ref($reqdetails{'users'}{$person}{'cc'}) eq 'HASH')) {
- my $start = $reqdetails{'users'}{$person}{'cc'}{'start'};
- my $end = $reqdetails{'users'}{$person}{'cc'}{'end'};
- if ((($start eq '') || ($start <= $now)) &&
- (($end eq '') || ($end >= $now))) {
- push(@posscoowners,$person);
- }
- }
- }
- }
- my @coowners;
- if (@posscoowners) {
- foreach my $user (@posscoowners) {
- my ($checkcc,$desc) =
- &Apache::lonnet::auto_validate_instcode($cnum,$dom,$instcode,$user);
- unless ($checkcc eq 'valid') {
- if (ref($reqdetails{'crosslists'}) eq 'HASH') {
- foreach my $key (keys(%{$reqdetails{'crosslists'}})) {
- if (ref($reqdetails{'crosslists'}{$key}) eq 'HASH') {
- my $inst_crosslist = $reqdetails{'crosslists'}{$key}{'inst'};
- if ($inst_crosslist ne '') {
- $checkcc =
- &Apache::lonnet::auto_validate_inst_crosslist($cnum,$dom,$instcode,
- $inst_crosslist,$user);
- last if ($checkcc eq 'valid');
- }
- }
- }
- }
- }
- if ($checkcc eq 'valid') {
- if (@coowners > 0) {
- unless (grep(/^\Q$user\E$/,@coowners)) {
- push(@coowners,$user);
- }
- } else {
- push(@coowners,$user);
- }
- }
- }
- }
- if (@coowners > 0) {
- my $chome = &Apache::lonnet::homeserver($cnum,$dom);
- unless ($chome eq 'no_host') {
- &Apache::lonnet::store_coowners($dom,$cnum,$chome,'',@coowners);
- }
- }
- }
- }
} else {
$result = 'error: '.$cid;
}
@@ -1740,30 +1643,15 @@ sub course_creation {
}
sub build_batchcreatehash {
- my ($dom,$cnum,$context,$details,$owneremail,$domdefs) = @_;
+ my ($dom,$context,$details,$owneremail,$domdefs) = @_;
my %batchhash;
- my @items = qw{owner domain coursehome clonecrs clonedom datemode dateshift enrollstart enrollend accessstart accessend sections users uniquecode};
+ my @items = qw{owner domain coursehome clonecrs clonedom datemode dateshift enrollstart enrollend accessstart accessend sections crosslists 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'}) {
@@ -1776,6 +1664,8 @@ 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'}) {
@@ -2195,7 +2085,7 @@ sub process_official_reqs {
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;
@@ -2316,7 +2206,7 @@ sub postprocess_crsenv {
my %needcrsidput = (
'internal.selfenroll_types' => 1,
'internal.selfenroll_start_date' => 1,
- 'internal.selfenroll_end_date' => 1,
+ 'internal. selfenroll_end_date' => 1,
);
my (@needupdate,%newcrsenv);
foreach my $key (keys(%{$postprocessenv})) {