--- loncom/interface/loncoursequeueadmin.pm 2010/01/18 15:54:23 1.12.2.7 +++ loncom/interface/loncoursequeueadmin.pm 2010/02/26 23:39:01 1.12.2.8 @@ -1,7 +1,7 @@ # The LearningOnline Network # Utilities to administer domain course requests and course self-enroll requests # -# $Id: loncoursequeueadmin.pm,v 1.12.2.7 2010/01/18 15:54:23 raeburn Exp $ +# $Id: loncoursequeueadmin.pm,v 1.12.2.8 2010/02/26 23:39:01 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -976,8 +976,8 @@ sub course_creation { } 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); + \%reqdetails,$longroles,$logmsg,$newusermsg,$addresult, + $enrollcount,$output,$keysmsg,$ownerdom,$ownername,$cnum,$crstype); if ($cid eq "/$dom/$cnum") { $result = 'created'; } else { @@ -989,12 +989,12 @@ sub course_creation { sub build_batchcreatehash { my ($dom,$context,$details,$owneremail,$domdefs) = @_; my %batchhash; - my @items = qw{owner domain coursehome clonecrs clonedom datemode dateshift enrollstart enrollend accessstart accessend sections crosslists users}; + my @items = qw{owner domain coursehome clonecrs clonedom cloneroster datemode dateshift enrollstart enrollend accessstart accessend sections crosslists users}; if ($dom eq 'gcitest') { push(@items,'firstres'); } if ((ref($details) eq 'HASH') && (ref($domdefs) eq 'HASH')) { - my $emailenc = &Apache::lonnet::escape($owneremail); + my $emailenc = &escape($owneremail); my $owner = $details->{'owner'}.':'.$details->{'domain'}; foreach my $item (@items) { $batchhash{$item} = $details->{$item}; @@ -1077,6 +1077,11 @@ sub can_clone_course { $canclone = 1; } } + unless ($canclone) { + if (&Apache::lonnet::is_course_owner($clonedom,$clonecrs,$uname,$udom)) { + $canclone = 1; + } + } } return $canclone; }