--- loncom/interface/loncreatecourse.pm 2006/07/20 22:09:36 1.95 +++ loncom/interface/loncreatecourse.pm 2010/04/13 21:19:15 1.137 @@ -1,7 +1,7 @@ # The LearningOnline Network # Create a course # -# $Id: loncreatecourse.pm,v 1.95 2006/07/20 22:09:36 albertel Exp $ +# $Id: loncreatecourse.pm,v 1.137 2010/04/13 21:19:15 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,241 +27,73 @@ # ### -package Apache::loncreatecourse; +=head1 NAME -use strict; -use Apache::Constants qw(:common :http); -use Apache::lonnet; -use Apache::loncommon; -use Apache::lonratedt; -use Apache::londocs; -use Apache::lonlocal; -use Apache::londropadd; -use LONCAPA::batchcreatecourse; -use lib '/home/httpd/lib/perl'; -use LONCAPA; +Apache::loncreatecourse.pm -# ================================================ Get course directory listing +=head1 SYNOPSIS -my @output=(); +Allows domain coordinators to create new +courses and assign course coordinators. -sub crsdirlist { - my ($courseid,$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'}, - &propath($crsdata{'domain'},$crsdata{'num'})); - foreach (@listing) { - unless ($_=~/^\./) { - 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; -} +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. -# ============================================================= Read a userfile +=head1 SUBROUTINES -sub readfile { - my ($courseid,$which)=@_; - my %crsdata=&Apache::lonnet::coursedescription($courseid); - return &Apache::lonnet::getfile('/uploaded/'.$crsdata{'domain'}.'/'. - $crsdata{'num'}.'/'.$which); -} +=over -# ============================================================ Write a userfile +=item handler() -sub writefile { - (my $courseid, my $which,$env{'form.output'})=@_; - my %crsdata=&Apache::lonnet::coursedescription($courseid); - return &Apache::lonnet::finishuserfileupload( - $crsdata{'num'},$crsdata{'domain'}, - 'output',$which); -} +=item print_course_creation_page() -# ===================================================================== Rewrite +=item create_course() -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; -} +=item print_intro_page() -# ============================================================= Copy a userfile +=item upload_batchfile() -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'}.'/', - '/public/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/' - => '/public/'. $newcrsdata{'domain'}.'/'. $newcrsdata{'num'}.'/' - ))); - } -} +=item process_batchfile() -# =============================================================== Copy a dbfile +=item courserequestbrowser_javascript() -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'}); - foreach my $key (keys(%data)) { - if ($key=~/^internal./) { delete($data{$key}); } - } - return &Apache::lonnet::put - ($which,\%data,$newcrsdata{'domain'},$newcrsdata{'num'}); -} +=item print_creation_logs() -# ========================================================== Copy resourcesdata +=item creation_display_filter() -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'}; - if (!$startdate) { - # now global start date for assements try the enrollment start - my %start=&Apache::lonnet::get('environment', - ['default_enrollment_start_date'], - $origcrsdata{'domain'},$origcrsdata{'num'}); - - $startdate = $start{'default_enrollment_start_date'}; - } - 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_(start|end)$/) { - if ($delta > 0) { - $newdata{$thiskey}=$newdata{$thiskey}+$delta; - } else { - # no delta, it's unlikely we want the old dates and times - delete($newdata{$thiskey}); - delete($newdata{$thiskey.'.type'}); - } - } - } - return &Apache::lonnet::put - ('resourcedata',\%newdata,$newcrsdata{'domain'},$newcrsdata{'num'}); -} +=item context_names() -# ========================================================== Copy all userfiles +=item instcode_srchstr() -sub copyuserfiles { - my ($origcrsid,$newcrsid)=@_; - foreach (&crsdirlist($origcrsid,'userfiles')) { - if ($_ !~m|^scantron_|) { - ©file($origcrsid,$newcrsid,$_); - } - } -} -# ========================================================== Copy all userfiles +=item syllabuslink_javascript() -sub copydbfiles { - my ($origcrsid,$newcrsid)=@_; +=back - my ($origcrs_discussion) = ($origcrsid=~m|^/(.*)|); - $origcrs_discussion=~s|/|_|g; - foreach (&crsdirlist($origcrsid)) { - if ($_=~/\.db$/) { - unless - ($_=~/^(nohist\_|discussiontimes|classlist|versionupdate|resourcedata|\Q$origcrs_discussion\E|slots|slot_reservations|gradingqueue|reviewqueue|CODEs|groupmembership)/) { - ©db($origcrsid,$newcrsid,$_); - } - } - } -} +=cut -# ======================================================= Copy all course files +package Apache::loncreatecourse; -sub copycoursefiles { - my ($origcrsid,$newcrsid)=@_; - ©userfiles($origcrsid,$newcrsid); - ©dbfiles($origcrsid,$newcrsid); - ©resourcedb($origcrsid,$newcrsid); -} +use strict; +use Apache::Constants qw(:common :http); +use Apache::lonnet; +use Apache::loncommon; +use Apache::londocs; +use Apache::lonlocal; +use Apache::lonuserutils; +use Apache::lonclonecourse; +use LONCAPA::batchcreatecourse; +use LONCAPA; # ===================================================== Phase one: fill-in form sub print_course_creation_page { my $r=shift; - my $crstype = 'Group'; + my $crstype = 'Community'; if ($env{'form.phase'} eq 'courseone') { $crstype = 'Course'; } my $defdom=$env{'request.role.domain'}; - my %host_servers = &Apache::loncommon::get_library_servers($defdom); + my %host_servers = &Apache::lonnet::get_servers($defdom,'library'); my $course_home = '
--
-
-
-
-
-
-
-
-
-
-
-
-
- -
--
- -
- -
+' + ); + } elsif ($crstype eq 'Community') { + $r->print('- -
- -ENDDOCUMENT + +' + ); } - $r->print($end_page); + $r->print(''. + $end_page); } # ====================================================== Phase two: make course sub create_course { my $r=shift; - my $ccuname=$env{'form.ccuname'}; - my $ccdomain=$env{'form.ccdomain'}; - $ccuname=~s/\W//g; - $ccdomain=~s/\W//g; - my $crstype = 'Group'; + my $ccuname =&LONCAPA::clean_username($env{'form.ccuname'}); + my $ccdomain=&LONCAPA::clean_domain($env{'form.ccdomain'}); + my $crstype = 'Community'; my ($enrollstart,$enrollend,$startaccess,$endaccess); if ($env{'form.phase'} eq 'coursetwo') { $crstype='Course'; $enrollstart=&Apache::lonhtmlcommon::get_date_from_form('startenroll'); $enrollend=&Apache::lonhtmlcommon::get_date_from_form('endenroll'); - } $startaccess = &Apache::lonhtmlcommon::get_date_from_form('startaccess'); $endaccess = &Apache::lonhtmlcommon::get_date_from_form('endaccess'); @@ -831,6 +600,8 @@ sub create_course { crsquota => $env{'form.crsquota'}, clonecourse => $env{'form.clonecourse'}, clonedomain => $env{'form.clonedomain'}, + datemode => $env{'form.datemode'}, + dateshift => $env{'form.dateshift'}, crsid => $env{'form.crsid'}, curruser => $env{'user.name'}.':'.$env{'user.domain'}, crssections => $env{'form.crssections'}, @@ -864,360 +635,120 @@ sub create_course { # Check the veracity of the course coordinator if (&Apache::lonnet::homeserver($ccuname,$ccdomain) eq 'no_host') { $r->print(''.&Apache::loncommon::end_page()); + $r->print(''); - } - if ($env{'form.setkeys'}) { - $r->print( - '
'); - } -# Flush the course logs so reverse user roles immediately updated - &Apache::lonnet::flushcourselogs(); - $r->print(''.&mt('Roles will be active at next login').'.
'. - ''. - &mt('Create Another [_1]',$crstype).'
'. - &Apache::loncommon::end_page()); -} - -sub construct_course { - my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname) = @_; - my $outcome; - -# -# Open course -# - my $crstype = lc($args->{'crstype'}); - my %cenv=(); - $$courseid=&Apache::lonnet::createcourse($args->{'course_domain'}, - $args->{'cdescr'}, - $args->{'curl'}, - $args->{'course_home'}, - $args->{'nonstandard'}, - $args->{'crscode'}, - $args->{'ccuname'}.':'. - $args->{'ccdomain'}, - $args->{'crstype'}); - - # 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. - $outcome .= &mt('New LON-CAPA [_1] ID: [_2]');
}
- }
-#
-# Set environment (will override cloned, if existing)
-#
- my @sections = ();
- my @xlists = ();
- if ($args->{'crstype'}) {
- $cenv{'type'}=$args->{'crstype'};
- }
- if ($args->{'crsid'}) {
- $cenv{'courseid'}=$args->{'crsid'};
- }
- if ($args->{'crscode'}) {
- $cenv{'internal.coursecode'}=$args->{'crscode'};
- }
- if ($args->{'crsquota'} ne '') {
- $cenv{'internal.coursequota'}=$args->{'crsquota'};
- } else {
- $cenv{'internal.coursequota'}=$args->{'crsquota'} = 20;
- }
- if ($args->{'ccuname'}) {
- $cenv{'internal.courseowner'} = $args->{'ccuname'}.
- ':'.$args->{'ccdomain'};
- } else {
- $cenv{'internal.courseowner'} = $args->{'curruser'};
- }
-
- my @badclasses = (); # Used to accumulate sections/crosslistings that did not pass classlist access check for course owner.
- if ($args->{'crssections'}) {
- $cenv{'internal.sectionnums'} = '';
- if ($args->{'crssections'} =~ m/,/) {
- @sections = split/,/,$args->{'crssections'};
- } else {
- $sections[0] = $args->{'crssections'};
- }
- if (@sections > 0) {
- foreach my $item (@sections) {
- my ($sec,$gp) = split/:/,$item;
- my $class = $args->{'crscode'}.$sec;
- my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$class,$cenv{'internal.courseowner'});
- $cenv{'internal.sectionnums'} .= $item.',';
- unless ($addcheck eq 'ok') {
- push @badclasses, $class;
- }
- }
- $cenv{'internal.sectionnums'} =~ s/,$//;
- }
- }
-# do not hide course coordinator from staff listing,
-# even if privileged
- $cenv{'nothideprivileged'}=$args->{'ccuname'}.':'.$args->{'ccdomain'};
-# add crosslistings
- if ($args->{'crsxlist'}) {
- $cenv{'internal.crosslistings'}='';
- if ($args->{'crsxlist'} =~ m/,/) {
- @xlists = split/,/,$args->{'crsxlist'};
- } else {
- $xlists[0] = $args->{'crsxlist'};
- }
- if (@xlists > 0) {
- foreach my $item (@xlists) {
- my ($xl,$gp) = split/:/,$item;
- my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$xl,$cenv{'internal.courseowner'});
- $cenv{'internal.crosslistings'} .= $item.',';
- unless ($addcheck eq 'ok') {
- push @badclasses, $xl;
- }
- }
- $cenv{'internal.crosslistings'} =~ s/,$//;
- }
- }
- if ($args->{'autoadds'}) {
- $cenv{'internal.autoadds'}=$args->{'autoadds'};
- }
- if ($args->{'autodrops'}) {
- $cenv{'internal.autodrops'}=$args->{'autodrops'};
- }
-# check for notification of enrollment changes
- my @notified = ();
- if ($args->{'notify_owner'}) {
- if ($args->{'ccuname'} ne '') {
- push(@notified,$args->{'ccuname'}.':'.$args->{'ccdomain'});
- }
- }
- if ($args->{'notify_dc'}) {
- if ($uname ne '') {
- push(@notified,$uname.'@'.$udom);
- }
- }
- if (@notified > 0) {
- my $notifylist;
- if (@notified > 1) {
- $notifylist = join(',',@notified);
- } else {
- $notifylist = $notified[0];
- }
- $cenv{'internal.notifylist'} = $notifylist;
- }
- if (@badclasses > 0) {
- my %lt=&Apache::lonlocal::texthash(
- 'tclb' => 'The courses listed below were included as sections or crosslistings affiliated with your new LON-CAPA course. However, 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'
- );
- $outcome .= ''.$lt{'tclb'}.' ('.$cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}.' ('.$lt{'adby'}.').'."\n";
- foreach (@badclasses) {
- $outcome .= "
\n";
- }
- if ($args->{'no_end_date'}) {
- $args->{'endaccess'} = 0;
- }
- $cenv{'internal.autostart'}=$args->{'enrollstart'};
- $cenv{'internal.autoend'}=$args->{'enrollend'};
- $cenv{'default_enrollment_start_date'}=$args->{'startaccess'};
- $cenv{'default_enrollment_end_date'}=$args->{'endaccess'};
- if ($args->{'showphotos'}) {
- $cenv{'internal.showphotos'}=$args->{'showphotos'};
- }
- $cenv{'internal.authtype'} = $args->{'authtype'};
- $cenv{'internal.autharg'} = $args->{'autharg'};
- if ( ($cenv{'internal.authtype'} =~ /^krb/) && ($cenv{'internal.autoadds'} == 1)) {
- if (! defined($cenv{'internal.autharg'}) || $cenv{'internal.autharg'} eq '') {
- $outcome .= ''.
- &mt('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').'
'.&mt('Roles will be active at next login').'.
'); } - - if ($args->{'disresdis'}) { - $cenv{'pch.roles.denied'}='st'; - } - if ($args->{'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();; - $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 - if (!defined($cenv{'grading'})) { $cenv{'grading'} = 'standard'; } - - $outcome .= (''. + &mt("Create Another $crstype").'
'. + &Apache::loncommon::end_page()); } sub print_intro_page { - my $r = shift; + my ($r,$show_all_choices) = @_; my $start_page = - &Apache::loncommon::start_page('Create a New Course or Group Space'); + &Apache::loncommon::start_page('Create a New Course or Community'); my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Creation Options','Create_Course',undef,'Create_Courses'); my $end_page = &Apache::loncommon::end_page(); - my $helplink=&Apache::loncommon::help_open_topic('Create_Course_GroupSpace',&mt('Help on Creating Courses and Groups')); - - my @choices = ({ internal_name => 'courseone', - name => &mt('Create a single course'), - short_description => - &mt('Create a new course by completing an online form.'), - }, - { internal_name => 'groupone', - name => &mt('Create a single collaborative group space '), - short_description => - &mt('Create a new group space for non-course use by completing an online form .'), - }, - { internal_name => 'batchone', - name => &mt('Create courses/groups by uploading an attributes file'), - short_description => - &mt('Upload an attributes file containing specifications for one or more courses or groups in XML format'), - }, - ); + my $helplink=&Apache::loncommon::help_open_topic('Create_Course_Community',&mt('Help on Creating Courses and Communities')); + my @choices = ({ internal_name => 'courseone', + name => &mt('Create a single course'), + short_description => &mt('Create a new course by completing an online form.'), + }); + if ($show_all_choices) { + push(@choices,{ internal_name => 'groupone', + name => &mt('Create a single community'), + short_description => + &mt('Create a new collaborative community by completing an online form.'), + }, + { internal_name => 'batchone', + name => &mt('Create courses/communities by uploading an attributes file'), + short_description => + &mt('Upload an attributes file containing specifications for one or more courses or communities in XML format.'), + help => 'Batch_Creation', + }, + { internal_name => 'requestdisplay', + name => &mt('Approve or reject requests'), + short_description => + &mt('Display course and community creation requests submitted by authorized users, held pending approval by a Domain Coordinator.'), + }, + { internal_name => 'pendingdisplay', + name => &mt('Display official course requests'), + short_description => + &mt('Display official course requests submitted by authorized users, held pending validation of instructor status.'), + }, + { internal_name => 'creationlog', + name => &mt('View creation log'), + short_description => + &mt('Display information about when, how and by whom courses and communities were created in this domain.'), + }); + } else { + push(@choices,{ internal_name => 'batchone', + name => &mt('Create courses by uploading an attributes file'), + short_description => + &mt('Upload an attributes file containing specifications for one or more courses in XML format.'), + help => 'Batch_Creation', + }); + } my $options; foreach my $choice (@choices) { $options .='