--- loncom/interface/loncoursequeueadmin.pm 2010/01/15 03:29:54 1.14 +++ loncom/interface/loncoursequeueadmin.pm 2010/02/21 02:38:23 1.18 @@ -1,7 +1,7 @@ # The LearningOnline Network # Utilities to administer domain course requests and course self-enroll requests # -# $Id: loncoursequeueadmin.pm,v 1.14 2010/01/15 03:29:54 raeburn Exp $ +# $Id: loncoursequeueadmin.pm,v 1.18 2010/02/21 02:38:23 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,7 +69,6 @@ described at http://www.lon-capa.org. package Apache::loncoursequeueadmin; use strict; -use Apache::Constants qw(:common :http); use Apache::lonnet; use Apache::loncommon; use Apache::lonmsg; @@ -957,7 +956,7 @@ sub build_batchcreatehash { my %batchhash; my @items = qw{owner domain coursehome clonecrs clonedom datemode dateshift enrollstart enrollend accessstart accessend sections crosslists users}; 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}; @@ -1040,6 +1039,11 @@ sub can_clone_course { $canclone = 1; } } + unless ($canclone) { + if (&Apache::lonnet::is_course_owner($clonedom,$clonecrs,$uname,$udom)) { + $can_clone = 1; + } + } } return $canclone; } @@ -1150,7 +1154,6 @@ sub queued_selfenrollment { } } if (keys(%reqs_by_date)) { - my $rolename = &Apache::lonnet::plaintext('st'); unless ($notitle) { $output .= ''.&mt('Enrollment requests pending Course Coordinator approval').'
'; } @@ -1165,6 +1168,7 @@ sub queued_selfenrollment { foreach my $crs (@{$reqs_by_date{$item}}) { my %courseinfo = &Apache::lonnet::coursedescription($crs); my $usec = $selfenrollrequests{$crs}{'section'}; + my $rolename = &Apache::lonnet::plaintext('st',$courseinfo{'type'},$crs); if ($usec eq '') { $usec = &mt('No section'); }