--- loncom/interface/loncreatecourse.pm 2002/12/23 18:04:54 1.16 +++ loncom/interface/loncreatecourse.pm 2003/12/05 21:59:31 1.42 @@ -1,7 +1,7 @@ # The LearningOnline Network # Create a course # -# $Id: loncreatecourse.pm,v 1.16 2002/12/23 18:04:54 www Exp $ +# $Id: loncreatecourse.pm,v 1.42 2003/12/05 21:59:31 albertel 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 @@ -65,7 +238,23 @@ sub print_course_creation_page { $course_home .= "\n\n"; 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(); + 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(< +$coursebrowserjs The LearningOnline Network with CAPA $bodytag +$helplink

Course Information

@@ -101,26 +293,53 @@ $bodytag

Course ID/Number (optional) +

+

Institutional Information

+

+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. +

+Course Code +
+(to interface with institutional data, e.g., fs03glg231 for Fall 2003 Geology 231) +

+Section Numbers and corresponding LON-CAPA section/group IDs +
+(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) +

+Crosslisted courses +
+(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)

Course Content

+ + + +
Completely new courseClone an existing course

Map: -Browse +Select Map

-Do NOT generate as standard course +Do NOT generate as standard course
(only check if you know what you are doing):

-First Resource (standard courses only): -Blank +First Resource
(standard courses only): +Blank   -Syllabus +Syllabus   Navigate

- +		 +Course ID: +
+Domain: +$cloneform
 
+Additional settings, if specified below, will override cloned settings. +

Assessment Parameters

Open all assessments: @@ -137,7 +356,14 @@ $bodytag

Communication

Disable student resource discussion: - +
+Disable student use of chatrooms: + +

+

Access Control

+

+Students need access key to enter course: +

Course Coordinator

@@ -148,8 +374,38 @@ $bodytag Immediately expire own role as Course Coordinator:

+

Automated enrollment settings

+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. +

+

+Automated adds +Yes No +

+Automated drops +Yes No +

+Duration of automated classlist updates +$date_table +

+Please select the authentication mechanism.
+Please choose the default authentication method to be used by new users added to this LON-CAPA domain by the automated enrollment process. +

+$krbform +
+$intform +
+$locform +

+Notification of enrollment changes
+Notification to course coordinator via LON-CAPA message when enrollment changes occur during the automated update?
+Yes No +

+Include retrieval of student photographs? Yes No +

- +

@@ -195,11 +451,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.'
'); # # Check if created correctly @@ -208,39 +469,128 @@ ENDENHEAD my $crsuhome=&Apache::lonnet::homeserver($crsunum,$crsudom); $r->print('Created on: '.$crsuhome.'
'); # -# 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( + '
Attempting to clone non-existing course '.$cloneid.''); + } else { + $r->print( + '
Cloning course from '.$clonehome.''); + 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(''. + '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'.'

'); + } + } 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'}) { + $cenv{'keyaccess'}='yes'; + } if ($ENV{'form.disresdis'}) { - $envflag=1; $cenv{'pch.roles.denied'}='st'; } - if ($envflag) { - $r->print('Setting environment: '. + if ($ENV{'form.disablechat'}) { + $cenv{'plc.roles.denied'}='st'; + } + + # Record we've not yet viewed the Course Initialization Helper for this + # course + $cenv{'course.helper.not.run'} = 1; + # + # Use new Randomseed + # + $cenv{'rndseed'}=&Apache::lonnet::latest_rnd_algorithm_id();; + # + # By default, use standard grading + $cenv{'grading'} = 'standard'; + + $r->print('
Setting environment: '. &Apache::lonnet::put('environment',\%cenv,$crsudom,$crsunum).'
'); - } # # 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).'
'); @@ -283,7 +633,11 @@ ENDENHEAD $ccuname.' at '.$ccdomain.': '. &Apache::lonnet::assignrole($ccdomain,$ccuname,$courseid,'cc').'

'); } - $r->print('Roles will be active at next login.'); + if ($ENV{'form.setkeys'}) { + $r->print( + '

Manage Access Keys

'); + } + $r->print('

Roles will be active at next login.

'); } # ===================================================================== Handler @@ -291,13 +645,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') {