--- loncom/interface/loncreatecourse.pm 2003/07/17 15:16:45 1.25 +++ loncom/interface/loncreatecourse.pm 2003/12/05 21:34:48 1.41 @@ -1,7 +1,7 @@ # The LearningOnline Network # Create a course # -# $Id: loncreatecourse.pm,v 1.25 2003/07/17 15:16:45 matthew Exp $ +# $Id: loncreatecourse.pm,v 1.41 2003/12/05 21:34:48 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -47,6 +47,179 @@ use Apache::lonnet; use Apache::loncommon; use Apache::lonratedt; use Apache::londocs; +use Apache::lonlocal; +use Apache::londropadd; + +# ================================================ Get course directory listing + +sub crsdirlist { + my ($courseid,$which)=@_; + unless ($which) { $which=''; } + 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]); + } + } + return @output; +} + +# ============================================================= Read a userfile + +sub readfile { + my ($courseid,$which)=@_; + my %crsdata=&Apache::lonnet::coursedescription($courseid); + return &Apache::lonnet::getfile('/uploaded/'.$crsdata{'domain'}.'/'. + $crsdata{'num'}.'/'.$which); +} + +# ============================================================ Write a userfile + +sub writefile { + (my $courseid, my $which,$ENV{'form.output'})=@_; + my %crsdata=&Apache::lonnet::coursedescription($courseid); + return &Apache::lonnet::finishuserfileupload( + $crsdata{'num'},$crsdata{'domain'}, + $crsdata{'home'}, + '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)=@_; + 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 + +sub copydb { + my ($origcrsid,$newcrsid,$which)=@_; + $which=~s/\.db$//; + my %origcrsdata=&Apache::lonnet::coursedescription($origcrsid); + my %newcrsdata= &Apache::lonnet::coursedescription($newcrsid); + my %data=&Apache::lonnet::dump + ($which,$origcrsdata{'domain'},$origcrsdata{'num'}); + return &Apache::lonnet::put + ($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 { + my ($origcrsid,$newcrsid)=@_; + foreach (&crsdirlist($origcrsid,'userfiles')) { + ©file($origcrsid,$newcrsid,$_); + } +} +# ========================================================== Copy all userfiles + +sub copydbfiles { + my ($origcrsid,$newcrsid)=@_; + foreach (&crsdirlist($origcrsid)) { + if ($_=~/\.db$/) { + unless + ($_=~/^(nohist\_|discussiontimes|classlist|versionupdate|resourcedata)/) { + ©db($origcrsid,$newcrsid,$_); + } + } + } +} + +# ======================================================= Copy all course files + +sub copycoursefiles { + my ($origcrsid,$newcrsid)=@_; + ©userfiles($origcrsid,$newcrsid); + ©dbfiles($origcrsid,$newcrsid); + ©resourcedb($origcrsid,$newcrsid); +} # ===================================================== Phase one: fill-in form @@ -66,6 +239,23 @@ sub print_course_creation_page { my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain'); my $bodytag=&Apache::loncommon::bodytag('Create a New Course'); my $helplink=&Apache::loncommon::help_open_topic('Create_Course','Help on Creating Courses'); + my $cloneform=&Apache::loncommon::select_dom_form + ($ENV{'request.role.domain'},'clonedomain'). + &Apache::loncommon::selectcourse_link + ('ccrs','clonecourse','clonedomain'); + my $coursebrowserjs=&Apache::loncommon::coursebrowser_javascript(); + print STDERR "Course browser js is $coursebrowserjs\n"; + my $date_table = &Apache::londropadd::date_setting_table('','','createcourse'); + my ($krbdef,$krbdefdom) = + &Apache::loncommon::get_kerberos_defaults($defdom); + my $javascript_validations=&Apache::londropadd::javascript_validations('createcourse',$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"> @@ -86,7 +276,9 @@ function openbrowser(formname,elementnam editbrowser = open(url,title,options,'1'); editbrowser.focus(); } +$javascript_validations </script> +$coursebrowserjs <head> <title>The LearningOnline Network with CAPA</title> </head> @@ -102,26 +294,53 @@ $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"> +<tr><th>Completely new course</th><th>Clone an existing course</th></tr> +<tr><td> <p> <b>Map:</b> <input type="text" size="50" name="topmap"> <a href="javascript:openbrowser('ccrs','topmap')">Select Map</a> </p><p> -<b>Do NOT generate as standard course</b> +<b>Do NOT generate as standard course</b><br /> (only check if you know what you are doing): <input type="checkbox" name="nonstandard"> </p> <p> -<b>First Resource</b> (standard courses only): +<b>First Resource</b><br />(standard courses only): <input type="radio" name="firstres" value="blank">Blank <input type="radio" name="firstres" value="syl" checked>Syllabus <input type="radio" name="firstres" value="nav">Navigate </p> - +</td><td> +Course ID: <input input type="text" size="25" name="clonecourse" value="" /> +<br /> +Domain: +$cloneform<br /> <br /> +Additional settings, if specified below, will override cloned settings. +</td></tr> +</table> <h2>Assessment Parameters</h2> <p> <b>Open all assessments: </b> @@ -138,7 +357,9 @@ $helplink <h2>Communication</h2> <p> <b>Disable student resource discussion: </b> -<input type="checkbox" name="disresdis" /> +<input type="checkbox" name="disresdis" /> <br /> +<b>Disable student use of chatrooms: </b> +<input type="checkbox" name="disablechat" /> </p> <h2>Access Control</h2> <p> @@ -154,8 +375,38 @@ $helplink <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"> +<input type="button" onClick="verify_message(this.form)" value="Open Course"> </p> </form> </body> @@ -201,11 +452,16 @@ ENDENHEAD # # Open course # + my %cenv=(); my $courseid=&Apache::lonnet::createcourse($ENV{'request.role.domain'}, $cdescr,$curl, $ENV{'form.course_home'}, $ENV{'form.nonstandard'}); + # Note: The testing routines depend on this being output; see + # Utils::Course. This needs to at least be output as a comment + # if anyone ever decides to not show this, and Utils::Course::new + # will need to be suitably modified. $r->print('New LON-CAPA Course ID: '.$courseid.'<br>'); # # Check if created correctly @@ -214,55 +470,128 @@ ENDENHEAD my $crsuhome=&Apache::lonnet::homeserver($crsunum,$crsudom); $r->print('Created on: '.$crsuhome.'<br>'); # -# Set environment +# Are we cloning? +# + my $cloneid=''; + if (($ENV{'form.clonecourse'}) && ($ENV{'form.clonedomain'})) { + $cloneid='/'.$ENV{'form.clonedomain'}.'/'.$ENV{'form.clonecourse'}; + my ($clonecrsudom,$clonecrsunum)=($cloneid=~/^\/(\w+)\/(\w+)$/); + my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom); + if ($clonehome eq 'no_host') { + $r->print( + '<br /><font color="red">Attempting to clone non-existing course '.$cloneid.'</font>'); + } 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'}=$oldcenv{'description'}; +# Mark as cloned + $cenv{'clonedfrom'}=$cloneid; + } + } +# +# Set environment (will override cloned, if existing) # - my %cenv=(); - my $envflag=0; if ($ENV{'form.crsid'}) { - $envflag=1; $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'}) { - $envflag=1; $cenv{'policy.email'}=$ccuname.':'.$ccdomain; } if ($ENV{'form.setcontent'}) { - $envflag=1; $cenv{'question.email'}=$ccuname.':'.$ccdomain; } } if ($ENV{'form.setkeys'}) { - $envflag=1; $cenv{'keyaccess'}='yes'; } if ($ENV{'form.disresdis'}) { - $envflag=1; $cenv{'pch.roles.denied'}='st'; } + if ($ENV{'form.disablechat'}) { + $cenv{'plc.roles.denied'}='st'; + } - # Record we've not yet viewed the Course Initialization Helper for this course + # Record we've not yet viewed the Course Initialization Helper for this + # course $cenv{'course.helper.not.run'} = 1; # # Use new Randomseed # - $envflag=1; $cenv{'rndseed'}=&Apache::lonnet::latest_rnd_algorithm_id();; # # By default, use standard grading $cenv{'grading'} = 'standard'; - if ($envflag) { - $r->print('Setting environment: '. + $r->print('<br />Setting environment: '. &Apache::lonnet::put('environment',\%cenv,$crsudom,$crsunum).'<br>'); - } # # Open all assignments # if ($ENV{'form.openall'}) { my $storeunder=$crsudom.'_'.$crsunum.'.0.opendate'; - my %storecontent = ($storeunder => time, - $storeunder.'type' => 'date_start'); + my %storecontent = ($storeunder => time, + $storeunder.'.type' => 'date_start'); $r->print('Opening all assignments: '.&Apache::lonnet::cput ('resourcedata',\%storecontent,$crsudom,$crsunum).'<br>'); @@ -317,13 +646,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') {