--- loncom/interface/loncreatecourse.pm 2004/02/27 17:53:05 1.52
+++ loncom/interface/loncreatecourse.pm 2004/09/25 17:52:03 1.68
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Create a course
#
-# $Id: loncreatecourse.pm,v 1.52 2004/02/27 17:53:05 albertel Exp $
+# $Id: loncreatecourse.pm,v 1.68 2004/09/25 17:52:03 matthew 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 (<tt>id@domain</tt>) 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(<<ENDDOCUMENT);
@@ -334,28 +358,41 @@ $helplink
<form action="/adm/createcourse" method="post" name="ccrs">
<h2>$lt{'cinf'}</h2>
<p>
-<b>$lt{'ctit'}:</b>
-<input type="text" size="50" name="title">
+<label><b>$lt{'ctit'}:</b>
+<input type="text" size="50" name="title" /></label>
</p><p>
-<b>$lt{'chsr'}:</b>$course_home
-</p><p>
-<b>$lt{'cidn'} ($lt{'opt'})</b>
-<input type="text" size="30" name="crsid">
+<label>
+ <b>$lt{'chsr'}:</b>$course_home
+</label>
+</p><p>
+<label>
+ <b>$lt{'cidn'} ($lt{'opt'})</b>
+ <input type="text" size="30" name="crsid" />
+</label>
</p><p>
<h2>$lt{'iinf'}</h2>
<p>
$lt{'stat'}
</p><p>
-<b>$lt{'ccod'}</b>
-<input type="text" size="30" name="crscode" /><br/>
+<label>
+ <b>$lt{'ccod'}</b>
+ <input type="text" size="30" name="crscode" />
+</label>
+<br/>
($lt{'toin'})
</p><p>
-<b>$lt{'snid'}</b>
- <input type="text" size="30" name="crssections" /><br/>
+<label>
+ <b>$lt{'snid'}</b>
+ <input type="text" size="30" name="crssections" />
+</label>
+<br/>
($lt{'csli'})
</p><p>
-<b>$lt{'crcs'}</b>
-<input type="text" size="30" name="crsxlist" /><br/>
+<label>
+ <b>$lt{'crcs'}</b>
+ <input type="text" size="30" name="crsxlist" />
+</label>
+<br/>
($lt{'cscs'})
</p>
<h2>$lt{'crco'}</h2>
@@ -363,77 +400,113 @@ $lt{'stat'}
<tr><th>$lt{'cncr'}</th><th>$lt{'cecr'}</th></tr>
<tr><td>
<p>
-<b>$lt{'map'}:</b>
-<input type="text" size="50" name="topmap">
+<label>
+ <b>$lt{'map'}:</b>
+ <input type="text" size="50" name="topmap" />
+</label>
<a href="javascript:openbrowser('ccrs','topmap')">$lt{'smap'}</a>
</p><p>
-<b>$lt{'sacr'}</b><br />
+<label for="nonstd"><b>$lt{'sacr'}</b></label>
+<br />
($lt{'ocik'}):
-<input type="checkbox" name="nonstandard">
-</p>
-<p>
+<input id="nonstd" type="checkbox" name="nonstandard" />
+</p><p>
<b>$lt{'fres'}</b><br />($lt{'stco'}):
-<input type="radio" name="firstres" value="blank">$lt{'blnk'}
+<label>
+ <input type="radio" name="firstres" value="blank" />$lt{'blnk'}
+</label>
-<input type="radio" name="firstres" value="syl" checked>$lt{'sllb'}
+<label>
+ <input type="radio" name="firstres" value="syl" checked />$lt{'sllb'}
+</label>
-<input type="radio" name="firstres" value="nav">$lt{'navi'}
+<label>
+ <input type="radio" name="firstres" value="nav" />$lt{'navi'}
+</label>
</p>
</td><td>
-$lt{'cid'}: <input input type="text" size="25" name="clonecourse" value="" />
+<label>
+ $lt{'cid'}: <input type="text" size="25" name="clonecourse" value="" />
+</label>
+<br />
+<label>
+ $lt{'dmn'}: $cloneform
+</label>
<br />
-$lt{'dmn'}:
-$cloneform<br /> <br />
+ <br />
$lt{'asov'}.
</td></tr>
</table>
<h2>$lt{'assp'}</h2>
<p>
-<b>$lt{'oaas'}: </b>
-<input type="checkbox" name="openall" />
+<label>
+ <b>$lt{'oaas'}: </b>
+ <input type="checkbox" name="openall" />
+</label>
</p>
<h2>$lt{'mssg'}</h2>
<p>
-<b>$lt{'scpf'}: </b>
-<input type="checkbox" name="setpolicy" checked>
-</p><p>
-<b>$lt{'scfc'}: </b>
-<input type="checkbox" name="setcontent" checked>
+<label>
+ <b>$lt{'scpf'}: </b>
+ <input type="checkbox" name="setpolicy" checked />
+</label>
+<br />
+<label>
+ <b>$lt{'scfc'}: </b>
+ <input type="checkbox" name="setcontent" checked />
+</label>
</p>
<h2>$lt{'cmmn'}</h2>
<p>
-<b>$lt{'dsrd'}: </b>
-<input type="checkbox" name="disresdis" /> <br />
-<b>$lt{'dsuc'}: </b>
-<input type="checkbox" name="disablechat" />
+<label>
+ <b>$lt{'dsrd'}: </b>
+ <input type="checkbox" name="disresdis" />
+</label>
+<br />
+<label>
+ <b>$lt{'dsuc'}: </b>
+ <input type="checkbox" name="disablechat" />
+</label>
</p>
<h2>$lt{'acco'}</h2>
<p>
-<b>$lt{'snak'}: </b>
-<input type="checkbox" name="setkeys" />
+<label>
+ <b>$lt{'snak'}: </b>
+ <input type="checkbox" name="setkeys" />
+</label>
+<br />
+<label>
+ <b>$lt{'kaut'}: </b>
+ <input type="text" size="30" name="keyauth" />
+</label>
+</p>
+<h2>$lt{'rshm'}</h2>
+<p>
+<label>
+ <b>$lt{'rshm'}: </b>
+ <input type="text" name="reshome" size="30" value="/res/$defdom/" />
+</label>
</p>
-<h2>$lt{'cc'}</h2>
<p>
-<b>$lt{'user'}:</b> <input type="text" size="15" name="ccuname" />
-</p><p>
-<b>$lt{'dmn'}:</b> $domform
-</p><p>
-<b>$lt{'ierc'}:</b>
-<input type="checkbox" name="expireown" checked>
-</p><p>
<h2>$lt{'aens'}</h2>
$lt{'aesc'}
</p>
<p>
<b>$lt{'aadd'}</b>
-<input type="radio" name="autoadds" value="1" />$lt{'yes'} <input type="radio" name="autoadds" value="0" checked="true" />$lt{'no'}
+<label><input type="radio" name="autoadds" value="1" />$lt{'yes'}</label>
+<label><input type="radio" name="autoadds" value="0" checked="true" />$lt{'no'}
+</label>
</p><p>
<b>$lt{'audr'}</b>
-<input type="radio" name="autodrops" value="1" />$lt{'yes'} <input type="radio" name="autodrops" value="0" checked="true" />$lt{'no'}
+<label><input type="radio" name="autodrops" value="1" />$lt{'yes'}</label>
+<label><input type="radio" name="autodrops" value="0" checked="true" />$lt{'no'}</label>
</p><p>
<b>$lt{'dacu'}</b>
-$date_table
+$enroll_table
</p><p>
+<b>$lt{'dacc'}</b>
+$access_table
+<p></p>
<b>$lt{'psam'}.</b><br />
$lt{'pcda'}.
</p><p>
@@ -445,13 +518,40 @@ $locform
</p><p>
<b>$lt{'nech'}</b><br />
$lt{'nccl'}<br/>
-<input type="radio" name="notify" value="1" />$lt{'yes'} <input type="radio" name="notify"
-value="0" checked="true" />$lt{'no'}
-</p><p>
-<b>$lt{'irsp'}</b> <input type="radio" name="showphotos" value="1" />$lt{'yes'} <input type="radio" name="showphotos" value="0" checked="true" />$lt{'no'}
-</p><p>
+<label>
+ <input type="radio" name="notify" value="1" />$lt{'yes'}
+</label>
+<label>
+ <input type="radio" name="notify" value="0" checked="true" />$lt{'no'}
+</label>
+</p><p>
+<b>$lt{'irsp'}</b>
+<label>
+ <input type="radio" name="showphotos" value="1" />$lt{'yes'}
+</label>
+<label>
+ <input type="radio" name="showphotos" value="0" checked="true" />$lt{'no'}
+</label>
+</p>
+<hr />
+<h2>$lt{'cc'}</h2>
+<p>
+<label>
+ <b>$lt{'user'}:</b> <input type="text" size="15" name="ccuname" />
+</label>
+</p><p>
+<label>
+ <b>$lt{'dmn'}:</b> $domform
+</label>
+</p><p>
+<label>
+ <b>$lt{'ierc'}:</b>
+ <input type="checkbox" name="expireown" checked />
+</label>
+</p>
+<p>
<input type="hidden" name="phase" value="two" />
-<input type="button" onClick="verify_message(this.form)" value="$lt{'opco'}">
+<input type="button" onClick="verify_message(this.form)" value="$lt{'opco'}" />
</p>
</form>
</body>
@@ -464,6 +564,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 +611,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 +646,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 +726,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('<font color="red">'.
- "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).<br/><ul>\n");
- foreach (@badclasses) {
- $r->print("<li>$_</li>\n");
- }
- $r->print ("</ul><br/><br/></font>\n");
+ if (@badclasses > 0) {
+ my %lt=&Apache::lonlocal::texthash(
+ 'tclb' => 'The courses listed below have not been 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',
+ 'dnhr' => 'does not have rights to access enrollment in these classes',
+ 'adby' => 'as determined by the policies of your institution on access to official classlists'
+ );
+ $r->print('<font color="red">'.$lt{'tclb'}.' ('.$cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}.' ('.$lt{'adby'}.').<br /><ul>'."\n");
+ foreach (@badclasses) {
+ $r->print("<li>$_</li>\n");
}
+ $r->print ("</ul><br /><br /></font>\n");
}
- my $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate');
- my $enddate = &Apache::lonhtmlcommon::get_date_from_form('enddate');
+ my $enrollstart = &Apache::lonhtmlcommon::get_date_from_form('startenroll');
+ my $enrollend = &Apache::lonhtmlcommon::get_date_from_form('endenroll');
+ my $startaccess = &Apache::lonhtmlcommon::get_date_from_form('startaccess');
+ my $endaccess = &Apache::lonhtmlcommon::get_date_from_form('endaccess');
if ($ENV{'form.no_end_date'}) {
- $enddate = 0;
+ $endaccess = 0;
}
- $cenv{'internal.autostart'}=$startdate;
- $cenv{'internal.autoend'}=$enddate;
+ $cenv{'internal.autostart'}=$enrollstart;
+ $cenv{'internal.autoend'}=$enrollend;
+ $cenv{'default_enrollment_start_date'}=$startaccess;
+ $cenv{'default_enrollment_end_date'}=$endaccess;
if ($ENV{'form.showphotos'}) {
$cenv{'internal.showphotos'}=$ENV{'form.showphotos'};
}
@@ -663,9 +784,25 @@ ENDENHEAD
$cenv{'question.email'}=$ccuname.':'.$ccdomain;
}
}
+ if ($ENV{'form.reshome'}) {
+ $cenv{'reshome'}=$ENV{'form.reshome'}.'/';
+ $cenv{'reshome'}=~s/\/+$/\//;
+ }
+#
+# course has keyed access
+#
if ($ENV{'form.setkeys'}) {
$cenv{'keyaccess'}='yes';
}
+# if specified, key authority is not course, but user
+# only active if keyaccess is yes
+ if ($ENV{'form.keyauth'}) {
+ $ENV{'form.keyauth'}=~s/[^\w\@]//g;
+ if ($ENV{'form.keyauth'}) {
+ $cenv{'keyauth'}=$ENV{'form.keyauth'};
+ }
+ }
+
if ($ENV{'form.disresdis'}) {
$cenv{'pch.roles.denied'}='st';
}
@@ -682,8 +819,13 @@ ENDENHEAD
$cenv{'rndseed'}=&Apache::lonnet::latest_rnd_algorithm_id();;
$cenv{'receiptalg'}=&Apache::lonnet::latest_receipt_algorithm_id();;
#
+ # The encryption code and receipt prefix for this course
+ #
+ $cenv{'internal.encseed'}=$Apache::lonnet::perlvar{'lonReceipt'}.$$.time.int(rand(9999));
+ $cenv{'internal.encpref'}=100+int(9*rand(99));
+ #
# By default, use standard grading
- $cenv{'grading'} = 'standard';
+ if (!defined($cenv{'grading'})) { $cenv{'grading'} = 'standard'; }
$r->print('<br />'.&mt('Setting environment').': '.
&Apache::lonnet::put('environment',\%cenv,$crsudom,$crsunum).'<br>');