--- loncom/interface/loncreatecourse.pm 2003/09/03 21:31:59 1.34
+++ loncom/interface/loncreatecourse.pm 2003/12/05 15:57:37 1.40
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Create a course
#
-# $Id: loncreatecourse.pm,v 1.34 2003/09/03 21:31:59 www Exp $
+# $Id: loncreatecourse.pm,v 1.40 2003/12/05 15:57:37 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -47,18 +47,7 @@ use Apache::lonnet;
use Apache::loncommon;
use Apache::lonratedt;
use Apache::londocs;
-
-# -------------------------------------------- Return path to profile directory
-
-sub propath {
- my ($udom,$uname)=@_;
- $udom=~s/\W//g;
- $uname=~s/\W//g;
- my $subdir=$uname.'__';
- $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
- my $proname="$Apache::lonnet::perlvar{'lonUsersDir'}/$udom/$subdir/$uname";
- return $proname;
-}
+use Apache::lonlocal;
# ================================================ Get course directory listing
@@ -68,7 +57,7 @@ sub crsdirlist {
my %crsdata=&Apache::lonnet::coursedescription($courseid);
my @listing=&Apache::lonnet::dirlist
($which,$crsdata{'domain'},$crsdata{'num'},
- &propath($crsdata{'domain'},$crsdata{'num'}));
+ &Apache::loncommon::propath($crsdata{'domain'},$crsdata{'num'}));
my @output=();
foreach (@listing) {
unless ($_=~/^\./) {
@@ -98,11 +87,37 @@ sub writefile {
'output',$which);
}
+# ===================================================================== Rewrite
+
+sub rewritefile {
+ my ($contents,%rewritehash)=@_;
+ foreach (keys %rewritehash) {
+ my $pattern=$_;
+ $pattern=~s/(\W)/\\$1/gs;
+ my $new=$rewritehash{$_};
+ $contents=~s/$pattern/$new/gs;
+ }
+ return $contents;
+}
+
# ============================================================= Copy a userfile
sub copyfile {
my ($origcrsid,$newcrsid,$which)=@_;
- return &writefile($newcrsid,$which,&readfile($origcrsid,$which));
+ unless ($which=~/\.sequence$/) {
+ return &writefile($newcrsid,$which,
+ &readfile($origcrsid,$which));
+ } else {
+ my %origcrsdata=&Apache::lonnet::coursedescription($origcrsid);
+ my %newcrsdata= &Apache::lonnet::coursedescription($newcrsid);
+ return &writefile($newcrsid,$which,
+ &rewritefile(
+ &readfile($origcrsid,$which),
+ (
+ '/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'
+ => '/uploaded/'. $newcrsdata{'domain'}.'/'. $newcrsdata{'num'}.'/'
+ )));
+ }
}
# =============================================================== Copy a dbfile
@@ -118,6 +133,62 @@ sub copydb {
($which,\%data,$newcrsdata{'domain'},$newcrsdata{'num'});
}
+# ========================================================== Copy resourcesdata
+
+sub copyresourcedb {
+ my ($origcrsid,$newcrsid)=@_;
+ my %origcrsdata=&Apache::lonnet::coursedescription($origcrsid);
+ my %newcrsdata= &Apache::lonnet::coursedescription($newcrsid);
+ my %data=&Apache::lonnet::dump
+ ('resourcedata',$origcrsdata{'domain'},$origcrsdata{'num'});
+ $origcrsid=~s/^\///;
+ $origcrsid=~s/\//\_/;
+ $newcrsid=~s/^\///;
+ $newcrsid=~s/\//\_/;
+ my %newdata=();
+ undef %newdata;
+ my $startdate=$data{$origcrsid.'.0.opendate'};
+ my $today=time;
+ my $delta=0;
+ if ($startdate) {
+ my $oneday=60*60*24;
+ $delta=$today-$startdate;
+ $delta=int($delta/$oneday)*$oneday;
+ }
+# ugly retro fix for broken version of types
+ foreach (keys %data) {
+ if ($_=~/\wtype$/) {
+ my $newkey=$_;
+ $newkey=~s/type$/\.type/;
+ $data{$newkey}=$data{$_};
+ delete $data{$_};
+ }
+ }
+# adjust symbs
+ my $pattern='uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/';
+ $pattern=~s/(\W)/\\$1/gs;
+ my $new= 'uploaded/'. $newcrsdata{'domain'}.'/'. $newcrsdata{'num'}.'/';
+ foreach (keys %data) {
+ if ($_=~/$pattern/) {
+ my $newkey=$_;
+ $newkey=~s/$pattern/$new/;
+ $data{$newkey}=$data{$_};
+ delete $data{$_};
+ }
+ }
+# adjust dates
+ foreach (keys %data) {
+ my $thiskey=$_;
+ $thiskey=~s/^$origcrsid/$newcrsid/;
+ $newdata{$thiskey}=$data{$_};
+ if ($data{$_.'.type'}=~/^date/) {
+ $newdata{$thiskey}=$newdata{$thiskey}+$delta;
+ }
+ }
+ return &Apache::lonnet::put
+ ('resourcedata',\%newdata,$newcrsdata{'domain'},$newcrsdata{'num'});
+}
+
# ========================================================== Copy all userfiles
sub copyuserfiles {
@@ -146,6 +217,7 @@ sub copycoursefiles {
my ($origcrsid,$newcrsid)=@_;
©userfiles($origcrsid,$newcrsid);
©dbfiles($origcrsid,$newcrsid);
+ ©resourcedb($origcrsid,$newcrsid);
}
# ===================================================== Phase one: fill-in form
@@ -171,6 +243,17 @@ sub print_course_creation_page {
&Apache::loncommon::selectcourse_link
('ccrs','clonecourse','clonedomain');
my $coursebrowserjs=&Apache::loncommon::coursebrowser_javascript();
+ my $date_table = &date_setting_table();
+ my ($krbdef,$krbdefdom) =
+ &Apache::loncommon::get_kerberos_defaults($defdom);
+ my $javascript_validations=&javascript_validations($krbdefdom);
+ my %param = ( formname => 'document.ccrs',
+ kerb_def_dom => $krbdefdom,
+ kerb_def_auth => $krbdef
+ );
+ my $krbform = &Apache::loncommon::authform_kerberos(%param);
+ my $intform = &Apache::loncommon::authform_internal(%param);
+ my $locform = &Apache::loncommon::authform_local(%param);
$r->print(<<ENDDOCUMENT);
<html>
<script language="JavaScript" type="text/javascript">
@@ -208,6 +291,23 @@ $helplink
</p><p>
<b>Course ID/Number (optional)</b>
<input type="text" size="30" name="crsid">
+</p><p>
+<h2>Institutional Information</h2>
+<p>
+The following entries will be used to identify the course according to the naming scheme adopted by your institution. Your choices will be used to map an internal LON-CAPA course ID to the corresponding course section ID(s) used by the office responsible for providing official class lists for courses at your institution. This mapping is required if you choose to employ automatic population of class lists.
+</p><p>
+<b>Course Code</b>
+<input type="text" size="30" name="crscode" /><br/>
+(to interface with institutional data, e.g., fs03glg231 for Fall 2003 Geology 231)
+</p><p>
+<b>Section Numbers and corresponding LON-CAPA section/group IDs</b>
+ <input type="text" size="30" name="crssections" /><br/>
+(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)
+</p><p>
+<b>Crosslisted courses</b>
+<input type="text" size="30" name="crsxlist" /><br/>
+(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)
</p>
<h2>Course Content</h2>
<table border="2">
@@ -272,6 +372,36 @@ Additional settings, if specified below,
<b>Immediately expire own role as Course Coordinator:</b>
<input type="checkbox" name="expireown" checked>
</p><p>
+<h2>Automated enrollment settings</h2>
+The following settings control automatic enrollment of students in this class based
+on information available for this specific course from your institution's official classlists.
+</p>
+<p>
+<b>Automated adds</b>
+<input type="radio" name="autoadds" value="1" checked="true" />Yes <input type="radio" name="autoadds" value="0" />No
+</p><p>
+<b>Automated drops</b>
+<input type="radio" name="autodrops" value="1" checked="true" />Yes <input type="radio" name="autodrops" value="0" />No
+</p><p>
+<b>Duration of automated classlist updates</b>
+$date_table
+</p><p>
+<b>Please select the authentication mechanism.</b><br />
+Please choose the default authentication method to be used by new users added to this LON-CAPA domain by the automated enrollment process.
+</p><p>
+$krbform
+<br />
+$intform
+<br />
+$locform
+</p><p>
+<b>Notification of enrollment changes</b><br />
+Notification to course coordinator via LON-CAPA message when enrollment changes occur during the automated update?<br/>
+<input type="radio" name="notify" value="1" />Yes <input type="radio" name="notify"
+value="0" />No
+</p><p>
+<b>Include retrieval of student photographs?</b> <input type="radio" name="showphotos" value="1" />Yes <input type="radio" name="showphotos" value="0" checked="true" />No
+</p><p>
<input type="hidden" name="phase" value="two" />
<input type="submit" value="Open Course">
</p>
@@ -281,6 +411,68 @@ Additional settings, if specified below,
ENDDOCUMENT
}
+sub javascript_validations {
+ my ($krbdefdom)=@_;
+ my %param = ( formname => 'ccrs',
+ kerb_def_dom => $krbdefdom );
+ my $authheader = &Apache::loncommon::authform_header(%param);
+ my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
+ return (<<ENDPICK);
+function verify_message (vf,foundpwd) {
+ var foundatype=0;
+ var message='';
+ // alert('current.radiovalue = '+current.radiovalue);
+ if (current.radiovalue == null || current.radiovalue == 'nochange') {
+ // They did not check any of the login radiobuttons.
+ alert('You must choose an authentication type');
+ return;
+ }
+ foundatype=1;
+ if (current.argfield == null || current.argfield == '') {
+ var alertmsg = '';
+ switch (current.value) {
+ case 'krb':
+ alertmsg = 'You need to specify the Kerberos domain';
+ break;
+ case 'loc':
+ case 'fsys':
+ alertmsg = 'You need to specify the initial password';
+ break;
+ case 'fsys':
+ alertmsg = '';
+ break;
+ default:
+ alertmsg = '';
+ }
+ if (alertmsg != '') {
+ alert(alertmsg);
+ return;
+ }
+ }
+ vf.submit();
+}
+$authheader
+ENDPICK
+}
+
+sub date_setting_table {
+ my $starttime = time;
+ my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
+ my $startform = &Apache::lonhtmlcommon::date_setter('ccrs','startdate',$starttime);
+ my $endform = &Apache::lonhtmlcommon::date_setter('ccrs','enddate',$endtime);
+ my $perpetual = '<nobr><input type="checkbox" name="no_end_date"/> no ending date</nobr>';
+ my $result = '';
+ $result .= "<table>\n";
+ $result .= '<tr><td align="right">Starting Date</td>'.
+ '<td>'.$startform.'</td>'.
+ '<td></td>'."</tr>\n";
+ $result .= '<tr><td align="right">Ending Date</td>'.
+ '<td>'.$endform.'</td>'.
+ '<td>'.$perpetual.'</td>'."</tr>\n";
+ $result .= "</table>\n";
+ return $result;
+}
+
# ====================================================== Phase two: make course
sub create_course {
@@ -350,10 +542,15 @@ ENDENHEAD
} else {
$r->print(
'<br /><font color="green">Cloning course from '.$clonehome.'</font>');
+ my %oldcenv=&Apache::lonnet::dump('environment',$crsudom,$crsunum);
# Copy all files
©coursefiles($cloneid,$courseid);
+# Restore URL
+ $cenv{'url'}=$oldcenv{'url'};
# Restore title
- $cenv{'description'}=$cdescr;
+ $cenv{'description'}=$oldcenv{'description'};
+# Mark as cloned
+ $cenv{'clonedfrom'}=$cloneid;
}
}
#
@@ -362,6 +559,60 @@ ENDENHEAD
if ($ENV{'form.crsid'}) {
$cenv{'courseid'}=$ENV{'form.crsid'};
}
+ if ($ENV{'form.crscode'}) {
+ $cenv{'internal.coursecode'}=$ENV{'form.crscode'};
+ }
+ if ($ENV{'form.crssections'}) {
+ $cenv{'internal.sectionnums'}=$ENV{'form.crssections'};
+ }
+ if ($ENV{'form.crsxlist'}) {
+ $cenv{'internal.crosslistings'}=$ENV{'form.crsxlist'};
+ }
+ if ($ENV{'form.autoadds'}) {
+ $cenv{'internal.autoadds'}=$ENV{'form.autoadds'};
+ }
+ if ($ENV{'form.autodrops'}) {
+ $cenv{'internal.autodrops'}=$ENV{'form.autodrops'};
+ }
+ if ($ENV{'form.notify'}) {
+ if ($ccuname) {
+ $cenv{'internal.notifylist'} = $ccuname;
+ }
+ }
+ if ($ccuname) {
+ $cenv{'internal.courseowner'} = $ccuname;
+ }
+ my $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate');
+ my $enddate = &Apache::lonhtmlcommon::get_date_from_form('enddate');
+ if ($ENV{'form.no_end_date'}) {
+ $enddate = 0;
+ }
+ $cenv{'internal.autostart'}=$startdate;
+ $cenv{'internal.autoend'}=$enddate;
+ if ($ENV{'form.showphotos'}) {
+ $cenv{'internal.showphotos'}=$ENV{'form.showphotos'};
+ }
+ if ($ENV{'form.login'} eq 'krb') {
+ $cenv{'internal.authtype'} = 'krb';
+ $cenv{'internal.authtype'} .=$ENV{'form.krbver'};
+ $cenv{'internal.autharg'} = $ENV{'form.krbarg'};
+ } elsif ($ENV{'form.login'} eq 'int') {
+ $cenv{'internal.authtype'} ='internal';
+ if ((defined($ENV{'form.intarg'})) && ($ENV{'form.intarg'})) {
+ $cenv{'internal.autharg'} = $ENV{'form.intarg'};
+ }
+ } elsif ($ENV{'form.login'} eq 'loc') {
+ $cenv{'internal.authtype'} = 'localauth';
+ if ((defined($ENV{'form.locarg'})) && ($ENV{'form.locarg'})) {
+ $cenv{'internal.autharg'} = $ENV{'form.locarg'};
+ }
+ }
+ if ( ($cenv{'internal.authtype'} =~ /^krb/) && ($cenv{'internal.autoadds'} == 1)) {
+ if (! defined($cenv{'internal.autharg'}) || $cenv{'internal.autharg'} eq '') {
+ $r->print('<font color="red" size="+1">'.
+ 'As you did not include the default Kerberos domain to be used for authentication in this class, the institutional data used by the automated enrollment process must include the Kerberos domain for each new student'.'</font></p>');
+ }
+ }
if (($ccdomain) && ($ccuname)) {
if ($ENV{'form.setpolicy'}) {
$cenv{'policy.email'}=$ccuname.':'.$ccdomain;
@@ -454,13 +705,13 @@ sub handler {
my $r = shift;
if ($r->header_only) {
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK;
}
if (&Apache::lonnet::allowed('ccc',$ENV{'request.role.domain'})) {
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
if ($ENV{'form.phase'} eq 'two') {