--- loncom/interface/loncreatecourse.pm 2004/03/30 20:46:24 1.53
+++ loncom/interface/loncreatecourse.pm 2004/09/09 19:24:01 1.67
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Create a course
#
-# $Id: loncreatecourse.pm,v 1.53 2004/03/30 20:46:24 www Exp $
+# $Id: loncreatecourse.pm,v 1.67 2004/09/09 19:24:01 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,17 +42,34 @@ use localenroll;
# ================================================ Get course directory listing
+my @output=();
+
sub crsdirlist {
my ($courseid,$which)=@_;
- unless ($which) { $which=''; }
+ @output=();
+ return &innercrsdirlist($courseid,$which);
+}
+
+sub innercrsdirlist {
+ my ($courseid,$which,$path)=@_;
+ my $dirptr=16384;
+ unless ($which) { $which=''; } else { $which.='/'; }
+ unless ($path) { $path=''; } else { $path.='/'; }
my %crsdata=&Apache::lonnet::coursedescription($courseid);
my @listing=&Apache::lonnet::dirlist
($which,$crsdata{'domain'},$crsdata{'num'},
&Apache::loncommon::propath($crsdata{'domain'},$crsdata{'num'}));
- my @output=();
foreach (@listing) {
unless ($_=~/^\./) {
- push (@output,(split(/\&/,$_))[0]);
+ my @unpackline = split (/\&/,$_);
+ if ($unpackline[3]&$dirptr) {
+# is a directory, recurse
+ &innercrsdirlist($courseid,$which.$unpackline[0],
+ $path.$unpackline[0]);
+ } else {
+# is a file, put into output
+ push (@output,$path.$unpackline[0]);
+ }
}
}
return @output;
@@ -106,7 +123,9 @@ sub copyfile {
&readfile($origcrsid,$which),
(
'/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'
- => '/uploaded/'. $newcrsdata{'domain'}.'/'. $newcrsdata{'num'}.'/'
+ => '/uploaded/'. $newcrsdata{'domain'}.'/'. $newcrsdata{'num'}.'/',
+ '/public/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'
+ => '/public/'. $newcrsdata{'domain'}.'/'. $newcrsdata{'num'}.'/'
)));
}
}
@@ -236,7 +255,8 @@ sub print_course_creation_page {
my $coursebrowserjs=&Apache::loncommon::coursebrowser_javascript();
my $starttime = time;
my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
- my $date_table = &Apache::londropadd::date_setting_table($starttime,$endtime,'createcourse');
+ my $enroll_table = &Apache::londropadd::date_setting_table($starttime,$endtime,'create_enrolldates');
+ my $access_table = &Apache::londropadd::date_setting_table($starttime,$endtime,'create_defaultdates');
my ($krbdef,$krbdefdom) =
&Apache::loncommon::get_kerberos_defaults($defdom);
my $javascript_validations=&Apache::londropadd::javascript_validations('createcourse',$krbdefdom);
@@ -260,7 +280,7 @@ sub print_course_creation_page {
'snid' => "Section Numbers and corresponding LON-CAPA section/group IDs",
'csli' => "a comma separated list of institutional section numbers, each separated by a colon from the (optional) corresponding section/group ID to be used in LON-CAPA e.g., 001:1,002:2",
'crcs' => "Crosslisted courses",
- 'cscs' => "a comma separated list of course sections crosslisted with the current course, with each entry including the institutional course section name followed by a colon and then the (optional) groupID to be used in LON-CAPA, e.g., fs03ent231001:ent1,fs03bot231001:bot1,fs03zol231002:bot2",
+ 'cscs' => "a comma separated list of course sections crosslisted with the current course, with each entry including the institutional course section name followed by a colon and then the (optional) groupID to be used in LON-CAPA, e.g., fs03ent231001:ent1,fs03bot231001:bot1,fs03zol231002:zol2",
'crco' => "Course Content",
'cncr' => "Completely new course",
'cecr' => "Clone an existing course",
@@ -286,6 +306,8 @@ sub print_course_creation_page {
'dsuc' => "Disable student use of chatrooms",
'acco' => "Access Control",
'snak' => "Students need access key to enter course",
+ 'kaut' =>
+ 'Key authority (id@domain) if other than course',
'cc' => "Course Coordinator",
'user' => "Username",
'ierc' => "Immediately expire own role as Course Coordinator",
@@ -296,11 +318,13 @@ sub print_course_creation_page {
'no' => "No",
'audr' => "Automated drops",
'dacu' => "Duration of automated classlist updates",
+ 'dacc' => "Default start and end dates for student access",
'psam' => "Please select the authentication mechanism",
'pcda' => "Please choose the default authentication method to be used by new users added to this LON-CAPA domain by the automated enrollment process",
'nech' => "Notification of enrollment changes",
'nccl' => "Notification to course coordinator via LON-CAPA message when enrollment changes occur during the automated update?",
'irsp' => "Include retrieval of student photographs?",
+ 'rshm' => 'Resource Space Home',
'opco' => "Open Course"
);
$r->print(<
+
$lt{'scfc'}:
$lt{'snak'}:
-
+
+$lt{'kaut'}:
+
+
+$lt{'rshm'}: +
--$lt{'user'}: -
-$lt{'dmn'}: $domform -
-$lt{'ierc'}: - -
$lt{'dacu'} -$date_table +$enroll_table
+$lt{'dacc'} +$access_table +
$lt{'psam'}.
@@ -449,7 +475,18 @@ $lt{'nccl'}
value="0" checked="true" />$lt{'no'}
$lt{'irsp'} $lt{'yes'} $lt{'no'} +
++$lt{'user'}: +
+$lt{'dmn'}: $domform
+$lt{'ierc'}: + +
+@@ -464,6 +501,7 @@ ENDDOCUMENT sub create_course { my $r=shift; my $topurl='/res/'.&Apache::lonnet::declutter($ENV{'form.topmap'}); + my $this_server = $Apache::lonnet::perlvar{'lonHostID'}; my $ccuname=$ENV{'form.ccuname'}; my $ccdomain=$ENV{'form.ccdomain'}; $ccuname=~s/\W//g; @@ -510,7 +548,8 @@ ENDENHEAD my $courseid=&Apache::lonnet::createcourse($ENV{'request.role.domain'}, $cdescr,$curl, $ENV{'form.course_home'}, - $ENV{'form.nonstandard'}); + $ENV{'form.nonstandard'}, + $ENV{'form.crscode'}); # Note: The testing routines depend on this being output; see # Utils::Course. This needs to at least be output as a comment @@ -544,51 +583,76 @@ ENDENHEAD $cenv{'url'}=$oldcenv{'url'}; # Restore title $cenv{'description'}=$oldcenv{'description'}; +# restore grading mode + if (defined($oldcenv{'grading'})) { + $cenv{'grading'}=$oldcenv{'grading'}; + } # Mark as cloned $cenv{'clonedfrom'}=$cloneid; + delete($cenv{'default_enrollment_start_date'}); + delete($cenv{'default_enrollment_end_date'}); } } # # Set environment (will override cloned, if existing) # - my @affiliates = (); # Used to accumulate sections and crosslistings + my @sections = (); + my @xlists = (); if ($ENV{'form.crsid'}) { $cenv{'courseid'}=$ENV{'form.crsid'}; } if ($ENV{'form.crscode'}) { $cenv{'internal.coursecode'}=$ENV{'form.crscode'}; } + if ($ccuname) { + $cenv{'internal.courseowner'} = $ccuname; + } else { + $cenv{'internal.courseowner'} = $ENV{'user.name'}; + } + + my @badclasses = (); # Used to accumulate sections/crosslistings that did not pass classlist access check for course owner. if ($ENV{'form.crssections'}) { - $cenv{'internal.sectionnums'}=$ENV{'form.crssections'}; - my @sections = (); - if ($cenv{'internal.sectionnums'} =~ m/,/) { - @sections = split/,/,$cenv{'internal.sectionnums'}; + $cenv{'internal.sectionnums'} = ''; + if ($ENV{'form.crssections'} =~ m/,/) { + @sections = split/,/,$ENV{'form.crssections'}; } else { - $sections[0] = $cenv{'internal.sectionnums'}; + $sections[0] = $ENV{'form.crssections'}; } if (@sections > 0) { - foreach (@sections) { - my ($sec,$gp) = split/:/,$_; - push @affiliates,$ENV{'form.crscode'}.$sec; + foreach my $item (@sections) { + my ($sec,$gp) = split/:/,$item; + my $class = $ENV{'form.crscode'}.$sec; + my $addcheck = &Apache::lonnet::auto_new_course($crsunum,$crsudom,$class,$cenv{'internal.courseowner'}); + if ($addcheck eq 'ok') { + $cenv{'internal.sectionnums'} .= $item.','; + } else { + push @badclasses, $class; + } } + $cenv{'internal.sectionnums'} =~ s/,$//; } } # do not hide course coordinator from staff listing, # even if privileged $cenv{'nothideprivileged'}=$ccuname.':'.$ccdomain; if ($ENV{'form.crsxlist'}) { - $cenv{'internal.crosslistings'}=$ENV{'form.crsxlist'}; - my @xlists = (); - if ($cenv{'internal.crosslistings'} =~ m/,/) { - @xlists = split/,/,$cenv{'internal.crosslistings'}; + $cenv{'internal.crosslistings'}=''; + if ($ENV{'form.crsxlist'} =~ m/,/) { + @xlists = split/,/,$ENV{'form.crsxlist'}; } else { - $xlists[0] = $cenv{'internal.crosslistings'}; + $xlists[0] = $ENV{'form.crsxlist'}; } if (@xlists > 0) { - foreach (@xlists) { - my ($xl,$gp) = split/:/,$_; - push @affiliates,$xl; + foreach my $item (@xlists) { + my ($xl,$gp) = split/:/,$item; + my $addcheck = &Apache::lonnet::auto_new_course($crsunum,$crsudom,$xl,$cenv{'internal.courseowner'}); + if ($addcheck eq 'ok') { + $cenv{'internal.crosslistings'} .= $item.','; + } else { + push @badclasses, $xl; + } } + $cenv{'internal.crosslistings'} =~ s/,$//; } } if ($ENV{'form.autoadds'}) { @@ -599,38 +663,32 @@ ENDENHEAD } if ($ENV{'form.notify'}) { if ($ccuname) { - $cenv{'internal.notifylist'} = $ccuname; + $cenv{'internal.notifylist'} = $ccuname.'@'.$ccdomain; } } - if ($ccuname) { - $cenv{'internal.courseowner'} = $ccuname; - } else { - $cenv{'internal.courseowner'} = $ENV{'user.name'}; - } - if (@affiliates > 0) { - my @badclasses = (); - foreach my $class (@affiliates) { - my $addcheck = &localenroll::new_course($class,$cenv{'internal.courseowner'}); - unless ($addcheck eq 'ok') { - push @badclasses, $class; - } - } - if (@badclasses > 0) { - $r->print(''. - "The courses listed below were included as sections or crosslistings affiliated with your new LON-CAPA course. If automated course roster updates are enabled for this class, these particular sections/crosslistings will not contribute towards enrollment, because the user identified as the course owner for this LON-CAPA course ($cenv{'internal.courseowner'}) - does not have rights to access enrollment in these classes (as determined by your instititution's policies on access to official classlists).