--- loncom/interface/loncreatecourse.pm 2004/09/25 17:52:03 1.68 +++ loncom/interface/loncreatecourse.pm 2006/03/21 18:34:23 1.86 @@ -1,7 +1,7 @@ # The LearningOnline Network # Create a course # -# $Id: loncreatecourse.pm,v 1.68 2004/09/25 17:52:03 matthew Exp $ +# $Id: loncreatecourse.pm,v 1.86 2006/03/21 18:34:23 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,7 +38,6 @@ use Apache::londocs; use Apache::lonlocal; use Apache::londropadd; use lib '/home/httpd/lib/perl'; -use localenroll; # ================================================ Get course directory listing @@ -87,11 +86,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); } @@ -139,6 +137,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'}); } @@ -158,6 +159,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) { @@ -191,8 +200,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 @@ -204,18 +219,26 @@ 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|(grading|review)queue|CODEs)/) { ©db($origcrsid,$newcrsid,$_); + my $histfile=$_; + $histfile=~s/\.db$/\.hist/; + ©file($origcrsid,$newcrsid,$histfile); } } } @@ -234,7 +257,7 @@ sub copycoursefiles { sub print_course_creation_page { my $r=shift; - my $defdom=$ENV{'request.role.domain'}; + 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 $coursebrowserjs=&Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'}); my $starttime = time; my $endtime = time+(6*30*24*60*60); # 6 months from now, approx my $enroll_table = &Apache::londropadd::date_setting_table($starttime,$endtime,'create_enrolldates'); @@ -323,13 +345,13 @@ sub print_course_creation_page { '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?", 'rshm' => 'Resource Space Home', 'opco' => "Open Course" ); - $r->print(< - $coursebrowserjs - -The LearningOnline Network with CAPA - -$bodytag +END + + my $start_page = + &Apache::loncommon::start_page('Create a New Course',$js); + my $end_page = + &Apache::loncommon::end_page(); + + $r->print(<

$lt{'cinf'}

@@ -519,10 +546,18 @@ $locform $lt{'nech'}
$lt{'nccl'}
+
+$lt{'ndcl'}
+ +

$lt{'irsp'} @@ -543,19 +578,13 @@ $lt{'nccl'}
-

-

- - +$end_page ENDDOCUMENT } @@ -563,22 +592,77 @@ ENDDOCUMENT sub create_course { my $r=shift; - my $topurl='/res/'.&Apache::lonnet::declutter($ENV{'form.topmap'}); - my $this_server = $Apache::lonnet::perlvar{'lonHostID'}; - 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 $enrollstart = &Apache::lonhtmlcommon::get_date_from_form('startenroll'); + my $enrollend = &Apache::lonhtmlcommon::get_date_from_form('endenroll'); + my $startaccess = &Apache::lonhtmlcommon::get_date_from_form('startaccess'); + my $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 Course'); + $r->print($start_page); + + my $args = { + 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'}, + clonecourse => $env{'form.clonecourse'}, + clonedomain => $env{'form.clonedomain'}, + crsid => $env{'form.crsid'}, + curruser => $env{'user.name'}, + 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 # @@ -593,55 +677,82 @@ ENDENHEAD - '); + '.&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 +# + 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').'

'); + } +# Flush the course logs so reverse user roles immediately updated + &Apache::lonnet::flushcourselogs(); + $r->print('

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

'. + &Apache::loncommon::end_page()); +} + +sub construct_course { + my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname) = @_; + my $outcome; + # # Open course # my %cenv=(); - my $courseid=&Apache::lonnet::createcourse($ENV{'request.role.domain'}, - $cdescr,$curl, - $ENV{'form.course_home'}, - $ENV{'form.nonstandard'}, - $ENV{'form.crscode'}); + $$courseid=&Apache::lonnet::createcourse($args->{'course_domain'}, + $args->{'cdescr'}, + $args->{'curl'}, + $args->{'course_home'}, + $args->{'nonstandard'}, + $args->{'crscode'}, + $args->{'ccuname'}); # 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 .= 'New LON-CAPA Course ID: '.$$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 course').' '.$cloneid.''; } else { - $r->print( - '
'.&mt('Cloning course from').' '.$clonehome.''); - my %oldcenv=&Apache::lonnet::dump('environment',$crsudom,$crsunum); + $outcome .= + '
'.&mt('Cloning course from').' '.$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 @@ -661,34 +772,33 @@ ENDENHEAD # my @sections = (); my @xlists = (); - if ($ENV{'form.crsid'}) { - $cenv{'courseid'}=$ENV{'form.crsid'}; + if ($args->{'crsid'}) { + $cenv{'courseid'}=$args->{'crsid'}; } - if ($ENV{'form.crscode'}) { - $cenv{'internal.coursecode'}=$ENV{'form.crscode'}; + if ($args->{'crscode'}) { + $cenv{'internal.coursecode'}=$args->{'crscode'}; } - if ($ccuname) { - $cenv{'internal.courseowner'} = $ccuname; + if ($args->{'ccuname'}) { + $cenv{'internal.courseowner'} = $args->{'ccuname'}; } else { - $cenv{'internal.courseowner'} = $ENV{'user.name'}; + $cenv{'internal.courseowner'} = $args->{'curruser'}; } my @badclasses = (); # Used to accumulate sections/crosslistings that did not pass classlist access check for course owner. - if ($ENV{'form.crssections'}) { + if ($args->{'crssections'}) { $cenv{'internal.sectionnums'} = ''; - if ($ENV{'form.crssections'} =~ m/,/) { - @sections = split/,/,$ENV{'form.crssections'}; + if ($args->{'crssections'} =~ m/,/) { + @sections = split/,/,$args->{'crssections'}; } else { - $sections[0] = $ENV{'form.crssections'}; + $sections[0] = $args->{'crssections'}; } if (@sections > 0) { foreach my $item (@sections) { my ($sec,$gp) = split/:/,$item; - my $class = $ENV{'form.crscode'}.$sec; - my $addcheck = &Apache::lonnet::auto_new_course($crsunum,$crsudom,$class,$cenv{'internal.courseowner'}); - if ($addcheck eq 'ok') { - $cenv{'internal.sectionnums'} .= $item.','; - } else { + 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; } } @@ -697,116 +807,115 @@ ENDENHEAD } # do not hide course coordinator from staff listing, # even if privileged - $cenv{'nothideprivileged'}=$ccuname.':'.$ccdomain; - if ($ENV{'form.crsxlist'}) { + $cenv{'nothideprivileged'}=$args->{'ccuname'}.':'.$args->{'ccdomain'}; +# add crosslistings + if ($args->{'crsxlist'}) { $cenv{'internal.crosslistings'}=''; - if ($ENV{'form.crsxlist'} =~ m/,/) { - @xlists = split/,/,$ENV{'form.crsxlist'}; + if ($args->{'crsxlist'} =~ m/,/) { + @xlists = split/,/,$args->{'crsxlist'}; } else { - $xlists[0] = $ENV{'form.crsxlist'}; + $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'}); - if ($addcheck eq 'ok') { - $cenv{'internal.crosslistings'} .= $item.','; - } else { + 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 ($args->{'autoadds'}) { + $cenv{'internal.autoadds'}=$args->{'autoadds'}; + } + if ($args->{'autodrops'}) { + $cenv{'internal.autodrops'}=$args->{'autodrops'}; } - if ($ENV{'form.autodrops'}) { - $cenv{'internal.autodrops'}=$ENV{'form.autodrops'}; +# check for notification of enrollment changes + my @notified = (); + if ($args->{'notify_owner'}) { + if ($args->{'ccuname'} ne '') { + push(@notified,$args->{'ccuname'}.'@'.$args->{'ccdomain'}); + } } - if ($ENV{'form.notify'}) { - if ($ccuname) { - $cenv{'internal.notifylist'} = $ccuname.'@'.$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 have not been 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', + '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' ); - $r->print(''.$lt{'tclb'}.' ('.$cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}.' ('.$lt{'adby'}.').
    '."\n"); + $outcome .= ''.$lt{'tclb'}.' ('.$cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}.' ('.$lt{'adby'}.').
      '."\n"; foreach (@badclasses) { - $r->print("
    • $_
      • \n"); + $outcome .= "
    • $_
      • \n"; } - $r->print ("


    \n"); + $outcome .= "


\n"; } - my $enrollstart = &Apache::lonhtmlcommon::get_date_from_form('startenroll'); - my $enrollend = &Apache::lonhtmlcommon::get_date_from_form('endenroll'); - my $startaccess = &Apache::lonhtmlcommon::get_date_from_form('startaccess'); - my $endaccess = &Apache::lonhtmlcommon::get_date_from_form('endaccess'); - if ($ENV{'form.no_end_date'}) { - $endaccess = 0; + if ($args->{'no_end_date'}) { + $args->{'endaccess'} = 0; } - $cenv{'internal.autostart'}=$enrollstart; - $cenv{'internal.autoend'}=$enrollend; - $cenv{'default_enrollment_start_date'}=$startaccess; - $cenv{'default_enrollment_end_date'}=$endaccess; - 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'}; - } + $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.reshome'}) { - $cenv{'reshome'}=$ENV{'form.reshome'}.'/'; + if ($args->{'reshome'}) { + $cenv{'reshome'}=$args->{'reshome'}.'/'; $cenv{'reshome'}=~s/\/+$/\//; } # # course has keyed access # - if ($ENV{'form.setkeys'}) { + if ($args->{'setkeys'}) { $cenv{'keyaccess'}='yes'; } # if specified, key authority is not course, but user # only active if keyaccess is yes - if ($ENV{'form.keyauth'}) { - $ENV{'form.keyauth'}=~s/[^\w\@]//g; - if ($ENV{'form.keyauth'}) { - $cenv{'keyauth'}=$ENV{'form.keyauth'}; + if ($args->{'keyauth'}) { + $args->{'keyauth'}=~s/[^\w\@]//g; + if ($args->{'keyauth'}) { + $cenv{'keyauth'}=$args->{'keyauth'}; } } - if ($ENV{'form.disresdis'}) { + if ($args->{'disresdis'}) { $cenv{'pch.roles.denied'}='st'; } - if ($ENV{'form.disablechat'}) { + if ($args->{'disablechat'}) { $cenv{'plc.roles.denied'}='st'; } @@ -827,65 +936,42 @@ ENDENHEAD # By default, use standard grading 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; } # ===================================================================== Handler @@ -898,17 +984,17 @@ 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') { + if ($env{'form.phase'} eq 'two') { &create_course($r); } else { &print_course_creation_page($r); } } else { - $ENV{'user.error.msg'}= + $env{'user.error.msg'}= "/adm/createcourse:ccc:0:0:Cannot create courses"; return HTTP_NOT_ACCEPTABLE; }