--- loncom/interface/loncreatecourse.pm 2004/02/24 23:22:27 1.51 +++ loncom/interface/loncreatecourse.pm 2006/07/20 22:10:22 1.93.2.4 @@ -1,7 +1,7 @@ # The LearningOnline Network # Create a course # -# $Id: loncreatecourse.pm,v 1.51 2004/02/24 23:22:27 albertel Exp $ +# $Id: loncreatecourse.pm,v 1.93.2.4 2006/07/20 22:10:22 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,22 +37,40 @@ use Apache::lonratedt; use Apache::londocs; use Apache::lonlocal; use Apache::londropadd; +use LONCAPA::batchcreatecourse; use lib '/home/httpd/lib/perl'; -use localenroll; +use LONCAPA; # ================================================ 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=(); + &propath($crsdata{'domain'},$crsdata{'num'})); 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; @@ -70,11 +88,10 @@ sub readfile { # ============================================================ Write a userfile sub writefile { - (my $courseid, my $which,$ENV{'form.output'})=@_; + (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); } @@ -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'}.'/' ))); } } @@ -120,6 +139,9 @@ sub copydb { 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'}); } @@ -139,6 +161,14 @@ sub copyresourcedb { 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) { @@ -172,8 +202,14 @@ sub copyresourcedb { my $thiskey=$_; $thiskey=~s/^$origcrsid/$newcrsid/; $newdata{$thiskey}=$data{$_}; - if ($data{$_.'.type'}=~/^date/) { - $newdata{$thiskey}=$newdata{$thiskey}+$delta; + 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 @@ -185,17 +221,22 @@ sub copyresourcedb { sub copyuserfiles { my ($origcrsid,$newcrsid)=@_; foreach (&crsdirlist($origcrsid,'userfiles')) { - ©file($origcrsid,$newcrsid,$_); + if ($_ !~m|^scantron_|) { + ©file($origcrsid,$newcrsid,$_); + } } } # ========================================================== Copy all userfiles sub copydbfiles { my ($origcrsid,$newcrsid)=@_; + + my ($origcrs_discussion) = ($origcrsid=~m|^/(.*)|); + $origcrs_discussion=~s|/|_|g; foreach (&crsdirlist($origcrsid)) { if ($_=~/\.db$/) { unless - ($_=~/^(nohist\_|discussiontimes|classlist|versionupdate|resourcedata)/) { + ($_=~/^(nohist\_|discussiontimes|classlist|versionupdate|resourcedata|\Q$origcrs_discussion\E|slots|slot_reservations|gradingqueue|reviewqueue|CODEs|groupmembership)/) { ©db($origcrsid,$newcrsid,$_); } } @@ -215,7 +256,12 @@ sub copycoursefiles { sub print_course_creation_page { my $r=shift; - my $defdom=$ENV{'request.role.domain'}; + my $crstype = 'Course'; +# my $crstype = 'Group'; +# if ($env{'form.phase'} eq 'courseone') { +# $crstype = 'Course'; +# } + my $defdom=$env{'request.role.domain'}; my %host_servers = &Apache::loncommon::get_library_servers($defdom); my $course_home = '\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',&mt('Help on Creating Courses')); my $cloneform=&Apache::loncommon::select_dom_form - ($ENV{'request.role.domain'},'clonedomain'). + ($env{'request.role.domain'},'clonedomain'). &Apache::loncommon::selectcourse_link - ('ccrs','clonecourse','clonedomain'); - 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 ($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); + ('ccrs','clonecourse','clonedomain',undef,undef,undef,$crstype); + my $coursebrowserjs=&Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'}); + my ($enroll_table,$access_table,$krbdef,$krbdefdom,$krbform,$intform,$locform, + $javascript_validations); + if ($crstype eq 'Course') { + my $starttime = time; + my $endtime = time+(6*30*24*60*60); # 6 months from now, approx + $enroll_table = &Apache::londropadd::date_setting_table($starttime, + $endtime,'create_enrolldates'); + $access_table = &Apache::londropadd::date_setting_table($starttime, + $endtime,'create_defaultdates'); + ($krbdef,$krbdefdom) = + &Apache::loncommon::get_kerberos_defaults($defdom); + $javascript_validations=&Apache::londropadd::javascript_validations( + 'createcourse',$krbdefdom); + my %param = ( formname => 'document.ccrs', + kerb_def_dom => $krbdefdom, + kerb_def_auth => $krbdef + ); + $krbform = &Apache::loncommon::authform_kerberos(%param); + $intform = &Apache::loncommon::authform_internal(%param); + $locform = &Apache::loncommon::authform_local(%param); + } else { + $javascript_validations = qq| +function validate(formname) { + if (formname.title == '') { + alert("A group title is required"); + return; + } + if (formname.ccuname == '') { + alert("The username of the group coordinator is required"); + } + formname.submit(); +} + |; + } my %lt=&Apache::lonlocal::texthash( 'cinf' => "Course Information", 'ctit' => "Course Title", @@ -257,10 +322,10 @@ sub print_course_creation_page { 'stat' => "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.", 'ccod' => "Course Code", 'toin' => "to interface with institutional data, e.g., fs03glg231 for Fall 2003 Geology 231", - '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", + 'snid' => "Section Numbers and corresponding LON-CAPA section IDs", + 'csli' => "a comma separated list of institutional section numbers, each separated by a colon from the (optional) corresponding section 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) sectionID 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,9 +351,10 @@ 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 (id@domain) if other than course', 'cc' => "Course Coordinator", 'user' => "Username", - 'ierc' => "Immediately expire own role as Course Coordinator", 'aens' => "Automated enrollment settings", 'aesc' => "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.", 'aadd' => "Automated adds", @@ -296,16 +362,42 @@ 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?", + 'ndcl' => "Notification to domain coordinator via LON-CAPA message when enrollment changes occur during the automated update?", 'irsp' => "Include retrieval of student photographs?", - 'opco' => "Open Course" + 'rshm' => 'Resource Space Home', + 'cgrs' => "Course Group Settings", + 'cgrq' => "Set a quota for the total disk space available for storage of course group portfolio files.", + 'opco' => "Open Course", + 'ginf' => "Group Information", + 'gtit' => "Group Title", + 'ghsr' => "Group Home Server", + 'gidn' => "Group ID/Number", + 'grco' => "Group Content", + 'cngr' => "Completely new group", + 'cegr' => "Clone an existing group", + 'sagr' => "Do NOT generate as standard group", + 'stgo' => "standard groups only", + 'sgpf' => "Set group policy feedback to Group Coordinator", + 'scfg' => "Set content feedback to Group Coordinator", + 'dmrd' => "Disable member resource discussion", + 'dmuc' => "Disable member use of chatrooms", + 'mnak' => "Members need access key to enter group", + 'kaug' => + 'Key authority (id@domain) if other than group', + 'gc' => "Group Coordinator", + 'gid' => "Group ID", + 'crgr' => "Create Group", + 'grts' => "Group Teams Settings", + 'grtq' => "Set a quota for the total disk space available for storage of group team portfolio files.", + ); - $r->print(< - $coursebrowserjs - -The LearningOnline Network with CAPA - -$bodytag -$helplink +END + + my %titles = &Apache::lonlocal::texthash( + courseone => 'Create a New Course', + groupone => 'Create a New Group', + ); + my $start_page = + &Apache::loncommon::start_page($titles{$env{'form.phase'}},$js); + my $end_page = + &Apache::loncommon::end_page(); + my $crumbs = + &Apache::lonhtmlcommon::breadcrumbs($crstype.' Information', + 'Create_Course',undef, + 'Create_Courses'); + $r->print($start_page.$crumbs); + if ($crstype eq 'Course') { + $r->print(<

$lt{'cinf'}

-$lt{'ctit'}: - +

-$lt{'chsr'}:$course_home +

-$lt{'cidn'} ($lt{'opt'}) - +

$lt{'iinf'}

$lt{'stat'}

-$lt{'ccod'} -
+ +
($lt{'toin'})

-$lt{'snid'} -
+ +
($lt{'csli'})

-$lt{'crcs'} -
+ +
($lt{'cscs'})

$lt{'crco'}

@@ -363,77 +480,113 @@ $lt{'stat'} $lt{'cncr'}$lt{'cecr'}

-$lt{'map'}: - + $lt{'smap'}

-$lt{'sacr'}
+ +
($lt{'ocik'}): - -

-

+ +

$lt{'fres'}
($lt{'stco'}): -$lt{'blnk'} +   -$lt{'sllb'} +   -$lt{'navi'} +

-$lt{'cid'}: + +
+
-$lt{'dmn'}: -$cloneform
 
+ 
$lt{'asov'}.

$lt{'assp'}

-$lt{'oaas'}: - +

$lt{'mssg'}

-$lt{'scpf'}: - -

-$lt{'scfc'}: - + +
+

$lt{'cmmn'}

-$lt{'dsrd'}: -
-$lt{'dsuc'}: - + +
+

$lt{'acco'}

-$lt{'snak'}: - + +
+ +

+

$lt{'rshm'}

+

+

-

$lt{'cc'}

-$lt{'user'}: -

-$lt{'dmn'}: $domform -

-$lt{'ierc'}: - -

$lt{'aens'}

$lt{'aesc'}

$lt{'aadd'} -$lt{'yes'} $lt{'no'} + +

$lt{'audr'} -$lt{'yes'} $lt{'no'} + +

$lt{'dacu'} -$date_table +$enroll_table

+$lt{'dacc'} +$access_table +

$lt{'psam'}.
$lt{'pcda'}.

@@ -445,222 +598,535 @@ $locform

$lt{'nech'}
$lt{'nccl'}
-$lt{'yes'} $lt{'no'} + + +
+$lt{'ndcl'}
+ + +

+$lt{'irsp'} + + +

+

+

$lt{'cgrs'}

+$lt{'cgrq'} +Mb +

+
+

$lt{'cc'}

+

+

-$lt{'irsp'} $lt{'yes'} $lt{'no'} + +

+

+ + + +

+ +ENDDOCUMENT + } elsif ($crstype eq 'Group') { + $r->print(< +

$lt{'ginf'}

+

+ +

+ +

+ +

+

$lt{'grco'}

+ + + +
$lt{'cngr'}$lt{'cegr'}
+

+ +$lt{'smap'} +

+ +
+($lt{'ocik'}): + +

+$lt{'fres'}
($lt{'stgo'}): + +  + +  + +

+		 + +
+ +
+ 
+$lt{'asov'}. +
+

+

+

$lt{'mssg'}

+

+ +
+ +

+

$lt{'cmmn'}

+

+ +
+ +

+

$lt{'acco'}

+

+ +
+ +

+

$lt{'rshm'}

+

+ +

+

+

$lt{'grts'}

+$lt{'grtq'} +Mb +

+
+

$lt{'gc'}

+

+

- - + +

+

+ + +

- - ENDDOCUMENT + } + $r->print($end_page); } # ====================================================== Phase two: make course sub create_course { my $r=shift; - my $topurl='/res/'.&Apache::lonnet::declutter($ENV{'form.topmap'}); - my $ccuname=$ENV{'form.ccuname'}; - my $ccdomain=$ENV{'form.ccdomain'}; + my $ccuname=$env{'form.ccuname'}; + my $ccdomain=$env{'form.ccdomain'}; $ccuname=~s/\W//g; $ccdomain=~s/\W//g; - my $cdescr=$ENV{'form.title'}; - my $curl=$ENV{'form.topmap'}; - my $bodytag=&Apache::loncommon::bodytag('Create a New Course'); - $r->print(< - -The LearningOnline Network with CAPA - -$bodytag -ENDENHEAD + my $crstype = 'Group'; + 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'); + + my $autharg; + my $authtype; + + if ($env{'form.login'} eq 'krb') { + $authtype = 'krb'; + $authtype .=$env{'form.krbver'}; + $autharg = $env{'form.krbarg'}; + } elsif ($env{'form.login'} eq 'int') { + $authtype ='internal'; + if ((defined($env{'form.intarg'})) && ($env{'form.intarg'})) { + $autharg = $env{'form.intarg'}; + } + } elsif ($env{'form.login'} eq 'loc') { + $authtype = 'localauth'; + if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) { + $autharg = $env{'form.locarg'}; + } + } + my $logmsg; + my $start_page=&Apache::loncommon::start_page('Create a New '.$crstype); + my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Creation Outcome','Create_Course',undef,'Create_Courses'); + + $r->print($start_page.$crumbs); + + my $args = { + crstype => $crstype, + ccuname => $ccuname, + ccdomain => $ccdomain, + cdescr => $env{'form.title'}, + curl => $env{'form.topmap'}, + course_domain => $env{'request.role.domain'}, + course_home => $env{'form.course_home'}, + nonstandard => $env{'form.nonstandard'}, + crscode => $env{'form.crscode'}, + crsquota => $env{'form.crsquota'}, + clonecourse => $env{'form.clonecourse'}, + clonedomain => $env{'form.clonedomain'}, + crsid => $env{'form.crsid'}, + curruser => $env{'user.name'}.':'.$env{'user.domain'}, + crssections => $env{'form.crssections'}, + crsxlist => $env{'form.crsxlist'}, + autoadds => $env{'form.autoadds'}, + autodrops => $env{'form.autodrops'}, + notify_owner => $env{'form.notify_owner'}, + notify_dc => $env{'form.notify_dc'}, + no_end_date => $env{'form.no_end_date'}, + showphotos => $env{'form.showphotos'}, + authtype => $authtype, + autharg => $autharg, + enrollstart => $enrollstart, + enrollend => $enrollend, + startaccess => $startaccess, + endaccess => $endaccess, + setpolicy => $env{'form.setpolicy'}, + setcontent => $env{'form.setcontent'}, + reshome => $env{'form.reshome'}, + setkeys => $env{'form.setkeys'}, + keyauth => $env{'form.keyauth'}, + disresdis => $env{'form.disresdis'}, + disablechat => $env{'form.disablechat'}, + openall => $env{'form.openall'}, + firstres => $env{'form.firstres'} + }; + # # Verify data # # Check the veracity of the course coordinator if (&Apache::lonnet::homeserver($ccuname,$ccdomain) eq 'no_host') { - $r->print(&mt('No such user').' '.$ccuname.' '.&mt('at').' '.$ccdomain.''); + $r->print('
'); + $r->print(&mt('No such user').' '.$ccuname.' '.&mt('at').' '.$ccdomain.'.
'); + $r->print(&mt("Please click Back on your browser and select another user, or ")); + $r->print(' + + + + +
'.&Apache::loncommon::end_page()); return; } # Check the proposed home server for the course my %host_servers = &Apache::loncommon::get_library_servers - ($ENV{'request.role.domain'}); - if (! exists($host_servers{$ENV{'form.course_home'}})) { + ($env{'request.role.domain'}); + if (! exists($host_servers{$env{'form.course_home'}})) { $r->print(&mt('Invalid home server for course').': '. - $ENV{'form.course_home'}.''); + $env{'form.course_home'}.&Apache::loncommon::end_page()); return; } + my ($courseid,$crsudom,$crsunum); + $r->print(&construct_course($args,\$logmsg,\$courseid,\$crsudom,\$crsunum,$env{'user.domain'},$env{'user.name'})); + +# +# Make the requested user a course coordinator or group coordinator +# + if (($ccdomain) && ($ccuname)) { + $r->print(&mt('Assigning role of [_1] Coordinator to [_2] at [_3]:', + $crstype,$ccuname,$ccdomain). + &Apache::lonnet::assignrole($ccdomain,$ccuname,$courseid, + 'cc').'

'); + } + if ($env{'form.setkeys'}) { + $r->print( + '

'.&mt('Manage Access Keys').'

'); + } +# 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=(); - my $courseid=&Apache::lonnet::createcourse($ENV{'request.role.domain'}, - $cdescr,$curl, - $ENV{'form.course_home'}, - $ENV{'form.nonstandard'}); + $$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. - $r->print('New LON-CAPA Course ID: '.$courseid.'
'); + $outcome .= &mt('New LON-CAPA [_1] ID: [_2]
',$crstype,$$courseid); # # Check if created correctly # - my ($crsudom,$crsunum)=($courseid=~/^\/(\w+)\/(\w+)$/); - my $crsuhome=&Apache::lonnet::homeserver($crsunum,$crsudom); - $r->print(&mt('Created on').': '.$crsuhome.'
'); + ($$crsudom,$$crsunum)=($$courseid=~/^\/(\w+)\/(\w+)$/); + my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom); + $outcome .= &mt('Created on').': '.$crsuhome.'
'; # # Are we cloning? # my $cloneid=''; - if (($ENV{'form.clonecourse'}) && ($ENV{'form.clonedomain'})) { - $cloneid='/'.$ENV{'form.clonedomain'}.'/'.$ENV{'form.clonecourse'}; + if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) { + $cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'}; my ($clonecrsudom,$clonecrsunum)=($cloneid=~/^\/(\w+)\/(\w+)$/); my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom); if ($clonehome eq 'no_host') { - $r->print( - '
'.&mt('Attempting to clone non-existing course').' '.$cloneid.''); + $outcome .= + '
'.&mt('Attempting to clone non-existing [_1]',$crstype).' '.$cloneid.''; } else { - $r->print( - '
'.&mt('Cloning course from').' '.$clonehome.''); - my %oldcenv=&Apache::lonnet::dump('environment',$crsudom,$crsunum); + $outcome .= + '
'.&mt('Cloning [_1] from [_2]',$crstype,$clonehome).''; + my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum); # Copy all files - ©coursefiles($cloneid,$courseid); + ©coursefiles($cloneid,$$courseid); # Restore URL $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 - 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'}; - my @sections = (); - if ($cenv{'internal.sectionnums'} =~ m/,/) { - @sections = split/,/,$cenv{'internal.sectionnums'}; + 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] = $cenv{'internal.sectionnums'}; + $sections[0] = $args->{'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 = $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'}=$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{'nothideprivileged'}=$args->{'ccuname'}.':'.$args->{'ccdomain'}; +# add crosslistings + if ($args->{'crsxlist'}) { + $cenv{'internal.crosslistings'}=''; + if ($args->{'crsxlist'} =~ m/,/) { + @xlists = split/,/,$args->{'crsxlist'}; } else { - $xlists[0] = $cenv{'internal.crosslistings'}; + $xlists[0] = $args->{'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'}); + $cenv{'internal.crosslistings'} .= $item.','; + unless ($addcheck eq 'ok') { + push @badclasses, $xl; + } } + $cenv{'internal.crosslistings'} =~ s/,$//; } } - if ($ENV{'form.autoadds'}) { - $cenv{'internal.autoadds'}=$ENV{'form.autoadds'}; - } - if ($ENV{'form.autodrops'}) { - $cenv{'internal.autodrops'}=$ENV{'form.autodrops'}; + if ($args->{'autoadds'}) { + $cenv{'internal.autoadds'}=$args->{'autoadds'}; } - if ($ENV{'form.notify'}) { - if ($ccuname) { - $cenv{'internal.notifylist'} = $ccuname; - } + if ($args->{'autodrops'}) { + $cenv{'internal.autodrops'}=$args->{'autodrops'}; } - if ($ccuname) { - $cenv{'internal.courseowner'} = $ccuname; - } else { - $cenv{'internal.courseowner'} = $ENV{'user.name'}; +# check for notification of enrollment changes + my @notified = (); + if ($args->{'notify_owner'}) { + if ($args->{'ccuname'} ne '') { + push(@notified,$args->{'ccuname'}.':'.$args->{'ccdomain'}); + } } - 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 ($args->{'notify_dc'}) { + if ($uname ne '') { + push(@notified,$uname.'@'.$udom); } - if (@badclasses > 0) { - $r->print(''. - "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).
    \n"); - foreach (@badclasses) { - $r->print("
  • $_
    • \n"); - } - $r->print ("


\n"); + } + if (@notified > 0) { + my $notifylist; + if (@notified > 1) { + $notifylist = join(',',@notified); + } else { + $notifylist = $notified[0]; } + $cenv{'internal.notifylist'} = $notifylist; } - 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 (@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"; } + $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 '') { - $r->print(''. - &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').'

'); + $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').'

'; } } - if (($ccdomain) && ($ccuname)) { - if ($ENV{'form.setpolicy'}) { - $cenv{'policy.email'}=$ccuname.':'.$ccdomain; + if (($args->{'ccdomain'}) && ($args->{'ccuname'})) { + if ($args->{'setpolicy'}) { + $cenv{'policy.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'}; } - if ($ENV{'form.setcontent'}) { - $cenv{'question.email'}=$ccuname.':'.$ccdomain; + if ($args->{'setcontent'}) { + $cenv{'question.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'}; } } - if ($ENV{'form.setkeys'}) { + if ($args->{'reshome'}) { + $cenv{'reshome'}=$args->{'reshome'}.'/'; + $cenv{'reshome'}=~s/\/+$/\//; + } +# +# course has keyed access +# + if ($args->{'setkeys'}) { $cenv{'keyaccess'}='yes'; } - if ($ENV{'form.disresdis'}) { +# if specified, key authority is not course, but user +# only active if keyaccess is yes + if ($args->{'keyauth'}) { + $args->{'keyauth'}=~s/[^\w\@]//g; + if ($args->{'keyauth'}) { + $cenv{'keyauth'}=$args->{'keyauth'}; + } + } + + if ($args->{'disresdis'}) { $cenv{'pch.roles.denied'}='st'; } - if ($ENV{'form.disablechat'}) { + if ($args->{'disablechat'}) { $cenv{'plc.roles.denied'}='st'; } @@ -673,68 +1139,151 @@ 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('
'.&mt('Setting environment').': '. - &Apache::lonnet::put('environment',\%cenv,$crsudom,$crsunum).'
'); + $outcome .= ('
'.&mt('Setting environment').': '. + &Apache::lonnet::put('environment',\%cenv,$$crsudom,$$crsunum).'
'); # # Open all assignments # - if ($ENV{'form.openall'}) { - my $storeunder=$crsudom.'_'.$crsunum.'.0.opendate'; + if ($args->{'openall'}) { + my $storeunder=$$crsudom.'_'.$$crsunum.'.0.opendate'; my %storecontent = ($storeunder => time, $storeunder.'.type' => 'date_start'); - $r->print(&mt('Opening all assignments').': '.&Apache::lonnet::cput - ('resourcedata',\%storecontent,$crsudom,$crsunum).'
'); + $outcome .= &mt('Opening all assignments').': '.&Apache::lonnet::cput + ('resourcedata',\%storecontent,$$crsudom,$$crsunum).'
'; } # # Set first page # - unless (($ENV{'form.nonstandard'}) || ($ENV{'form.firstres'} eq 'blank') + unless (($args->{'nonstandard'}) || ($args->{'firstres'} eq 'blank') || ($cloneid)) { - $r->print(&mt('Setting first resource').': '); + $outcome .= &mt('Setting first resource').': '; my ($errtext,$fatal)= - &Apache::londocs::mapread($crsunum,$crsudom,'default.sequence'); - $r->print(($fatal?$errtext:'read ok').' - '); + &Apache::londocs::mapread($$crsunum,$$crsudom,'default.sequence'); + $outcome .= ($fatal?$errtext:'read ok').' - '; my $title; my $url; - if ($ENV{'form.firstres'} eq 'syl') { + if ($args->{'firstres'} eq 'syl') { $title='Syllabus'; - $url='/public/'.$crsudom.'/'.$crsunum.'/syllabus'; + $url='/public/'.$$crsudom.'/'.$$crsunum.'/syllabus'; } else { $title='Navigate Contents'; $url='/adm/navmaps'; } $Apache::lonratedt::resources[1]=$title.':'.$url.':false:start:res'; ($errtext,$fatal)= - &Apache::londocs::storemap($crsunum,$crsudom,'default.sequence'); - $r->print(($fatal?$errtext:'write ok').'
'); - } -# -# Make current user course adminstrator -# - my $end=undef; - my $addition=''; - if ($ENV{'form.expireown'}) { $end=time+5; $addition='expired'; } - $r->print(&mt('Assigning').' '.$addition.' '.&mt('role of course coordinator to self').': '. - &Apache::lonnet::assignrole( - $ENV{'user.domain'},$ENV{'user.name'},$courseid,'cc',$end).'
'); -# -# Make additional user course administrator -# - if (($ccdomain) && ($ccuname)) { - $r->print(&mt('Assigning role of course coordinator to').' '. - $ccuname.' at '.$ccdomain.': '. - &Apache::lonnet::assignrole($ccdomain,$ccuname,$courseid,'cc').'

'); - } - if ($ENV{'form.setkeys'}) { - $r->print( - '

'.&mt('Manage Access Keys').'

'); + &Apache::londocs::storemap($$crsunum,$$crsudom,'default.sequence'); + $outcome .= ($fatal?$errtext:'write ok').'
'; } -# Flush the course logs so reverse user roles immediately updated - &Apache::lonnet::flushcourselogs(); - $r->print('

'.&mt('Roles will be active at next login').'.

'); + return $outcome; +} + +sub print_intro_page { + my $r = shift; + my $start_page = + &Apache::loncommon::start_page('Create a New Course'); + 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 $options; + foreach my $choice (@choices) { + $options .='

'. + $choice->{'name'}."

\n"; + $options .= ' '.(' 'x8).$choice->{'short_description'}. + "\n"; + } + + $r->print(<print($start_page.$crumbs); + $r->print('

'.&mt('Upload a courses attributes file').'

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

'. + '
'); + $r->print($end_page); + return; +} + +sub process_batchfile { + my $r = shift; + my $start_page = + &Apache::loncommon::start_page('Create a New Course or Group Space'); + my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('Creation Outcome','Create_Course',undef,'Create_Courses'); + my $end_page = + &Apache::loncommon::end_page(); + my $defdom=$env{'request.role.domain'}; + my $batchfilepath=&Apache::lonnet::userfileupload('coursecreatorxml',undef, + 'batchupload',undef,undef, + undef,undef,$defdom); + my ($batchdir,$filename) = ($batchfilepath =~ m-^(.+)/pending/([^/]+)$-); + my ($result,$logmsg); + if (-e "$batchfilepath") { + open(FILE,"<$batchfilepath"); + my @buffer = ; + close(FILE); + if ((defined($filename)) && (defined($batchdir))) { + my @requests = ($filename); + my %courseids = (); + ($result,$logmsg) = &LONCAPA::batchcreatecourse::create_courses( + \@requests,\%courseids,'web',$defdom, + $env{'user.name'},$env{'user.domain'}); + if ($result) { + if (!-e "$batchdir/processed") { + mkdir("$batchdir/processed", 0755); + open(FILE,">$batchdir/processed/$filename"); + print FILE @buffer; + close(FILE); + if (-e "$batchdir/processed/$filename") { + unlink("$batchdir/pending/$filename"); + } + } + } + } + } + $r->print($start_page.$crumbs.$result.$end_page); + } # ===================================================================== Handler @@ -747,22 +1296,61 @@ sub handler { return OK; } - if (&Apache::lonnet::allowed('ccc',$ENV{'request.role.domain'})) { + if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - if ($ENV{'form.phase'} eq 'two') { + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['phase']); + &Apache::lonhtmlcommon::clear_breadcrumbs(); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/createcourse", + text=>"Creation Options", + faq=>79,bug=>'Dom Coord Interface',}); + if (($env{'form.phase'} eq 'coursetwo') || + ($env{'form.phase'} eq 'grouptwo')) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/createcourse?phase=$env{'form.prevphase'}", + text=>&mt('[_1] Creation Settings',), + faq=>9,bug=>'Dom Coord Interface',}); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/createcourse?phase=$env{'form.phase'}", + text=>"Creation Outcome", + faq=>9,bug=>'Dom Coord Interface',}); &create_course($r); - } else { + } elsif (($env{'form.phase'} eq 'courseone') || + ($env{'form.phase'} eq 'groupone')) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/createcourse?phase=$env{'form.phase'}", + text=>&mt('[_1] Creation Settings',), + faq=>9,bug=>'Dom Coord Interface',}); &print_course_creation_page($r); + } elsif ($env{'form.phase'} eq 'batchone') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/createcourse?phase=$env{'form.phase'}", + text=>"Upload Description File", + faq=>9,bug=>'Dom Coord Interface',}); + &upload_batchfile($r); + } elsif ($env{'form.phase'} eq 'batchtwo') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/createcourse?phase=$env{'form.prevphase'}", + text=>"Upload Description File", + faq=>9,bug=>'Dom Coord Interface',}); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/createcourse?phase=$env{'form.phase'}", + text=>"Creation Outcome", + faq=>9,bug=>'Dom Coord Interface',}); + &process_batchfile($r); + } else { + &print_intro_page($r); } } else { - $ENV{'user.error.msg'}= - "/adm/createcourse:ccc:0:0:Cannot create courses"; + $env{'user.error.msg'}= + "/adm/createcourse:ccc:0:0:Cannot create courses or groups"; return HTTP_NOT_ACCEPTABLE; } return OK; -} +} 1; __END__