--- loncom/interface/lonmodifycourse.pm 2003/12/28 01:37:02 1.2 +++ loncom/interface/lonmodifycourse.pm 2007/10/03 19:57:29 1.33 @@ -1,110 +1,288 @@ +# The LearningOnline Network with CAPA +# handler for DC-only modifiable course settings +# +# $Id: lonmodifycourse.pm,v 1.33 2007/10/03 19:57:29 raeburn Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# package Apache::lonmodifycourse; use strict; use Apache::Constants qw(:common :http); use Apache::lonnet; use Apache::loncommon; +use Apache::lonhtmlcommon; use Apache::lonlocal; use Apache::londropadd; +use Apache::lonpickcourse; use LONCAPA::Enrollment; use lib '/home/httpd/lib/perl'; -use localenroll; +use LONCAPA; -sub print_course_selection_page { - my ($r,$tasklongref) = @_; - my $dom = $ENV{'user.domain'}; +sub get_dc_settable { + return ('courseowner','coursecode','authtype','autharg'); +} + +sub get_enrollment_settings { + my ($cdom,$cnum) = @_; + my %settings = &Apache::lonnet::dump('environment',$cdom,$cnum); + my %enrollvar; + $enrollvar{'autharg'} = ''; + $enrollvar{'authtype'} = ''; my %lt=&Apache::lonlocal::texthash( - 'csae' => "Course settings for automated enrollment", - 'unst' => "Unlike standard LON-CAPA course parameters, such as course description, feedback addresses, and top level map, which are displayed and/or modified using the 'Course Environment Parameters' screen, settings that control automated enrollment based on classlist data available from your institution's student information system are handled differently. Automated enrollment settings fall into two groups: (a) settings that can be modified by a Course Coordinator using the Automated Enrollment Manager and (b) settings that may only be modified by a Domain Coordinator via the 'View/Modify Course settings' menu accessed from this page.", - 'chcs' => "Choose the course for which you wish to view/modify automated enrollment settings from the select box below and click 'Go' to proceed.", - 'eaen' => "Each entry in the select box contains: course code -- course title ------- course owner, and entries are ordered alphabetically by course code.", - 'psac' => "Please select a course", - 'ccrs' => "Choose a course", - 'gobt' => "Go" + 'noen' => "No end date", ); - -# Determine the courses - my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1); - &print_header($r,$tasklongref); - $r->print(< -

$lt{'csae'}

-

$lt{'unst'} -

$lt{'chcs'} -
$lt{'eaen'} -

-$lt{'ccrs'}: - -  - - + &print_header($r,$cdesc); + my $hidden_elements = &hidden_form_elements(); + $r->print(< +

$lt{'cquo'}.

+

+$lt{'each'}
+$subdiv +

+$lt{'gpqu'}: Mb      +

-"); - &print_footer($r); +$hidden_elements +$lt{'back'} + +ENDDOCUMENT return; } sub print_course_modification_page { - my ($r,$tasklongref,$typeref) = @_; - my %enrollvar = (); - my @bgcolors=("#eeeeee","#cccccc"); - my $course = $ENV{'form.course'}; - my $dom = $ENV{'user.domain'}; + my ($r,$cdom,$cnum,$cdesc,$domdesc) = @_; + my %longtype = &course_settings_descrip(); + my %enrollvar = &get_enrollment_settings($cdom,$cnum); my $ownertable; my %lt=&Apache::lonlocal::texthash( 'actv' => "Active", @@ -113,21 +291,20 @@ sub print_course_modification_page { 'noen' => "No end date", 'ownr' => "Owner", 'name' => "Name", - 'unme' => "Username", + 'unme' => "Username:Domain", 'stus' => "Status", - 'aecs' => "Automated Enrollment Course Settings", + 'cquo' => "Disk space for storage of group portfolio files", + 'gpqu' => "Course portfolio files disk space", + 'each' => "Each course group can be assigned a quota for portfolio files uploaded to the group.", 'cose' => "Course settings for LON-CAPA courses that control automated student enrollment based on classlist data available from your institution's student information system fall into two groups: (a) settings that can be modified by a Course Coordinator using the ", 'aenm' => "Automated Enrollment Manager", 'andb' => " and (b) settings that may only be modified by a Domain Coordinator via this page.", 'caes' => 'Current automated enrollment settings', 'cour' => "Course settings that control automated enrollment in this LON-CAPA course are currently:", - 'cset' => "Course setting", - 'valu' => "Current value", 'nocc' => "There is currently no course owner set for this course. In addition, no active course coordinators from this LON-CAPA domain were found, so you will not be able assign a course owner. If you wish to assign a course owner, it is recommended that you use the 'User Roles' screen to add a course coordinator with a LON-CAPA account in this domain to the course.", 'ccus' => "A course coordinator can use the 'Automated Enrollment Manager' to change all settings except course code, course owner, and default authentication method for students added to your course (who are also new to the LON-CAPA system at this domain).", - 'mkch' => "Make changes to course settings set by Domain Coordinator", 'ccod' => "Course Code", 'ccus' => "The course code is used during automated enrollment to map the internal LON-CAPA course ID for this course to the corresponding course section ID(s) used by the office responsible for providing official class lists for courses at your institution.", 'cown' => "Course Owner", @@ -136,65 +313,50 @@ all settings except course code, course 'usrd' => 'Use the radio buttons to select a different course owner.', 'deam' => "Default Authentication method", 'deus' => "The default authentication method, and default authentication parameter (domain, initial password or argument) are used when automatic enrollment of students in a course requires addition of new user accounts in your domain, and the class list file contains empty entries for the <authtype> and <autharg> properties for the new student. If you choose 'internally authenticated', and leave the initial password field empty, the automated enrollment process will create a randomized password for each new student account that it adds to your LON-CAPA domain.", - 'gobt' => "Modify settings", + 'gobt' => "Save", ); + my @bgcolors = ('#eeeeee','#cccccc'); - my %settings = &Apache::lonnet::dump('environment',$dom,$course); - $enrollvar{'autharg'} = ''; - $enrollvar{'authtype'} = ''; - foreach my $item (keys %settings) { - if ($item =~ m/^internal\.(.+)$/) { - if ( ($1 eq "autoadds") || ($1 eq "autodrops") ) { - if ($settings{$item} == 1) { - $enrollvar{$1} = "ON"; - } else { - $enrollvar{$1} = "OFF"; - } - } elsif ( ($1 eq "autostart") || ($1 eq "autoend") ) { - if ( ($1 eq "autoend") && ($settings{$item} == 0) ) { - $enrollvar{$1} = $lt{'noen'}; - } else { - $enrollvar{$1} = localtime($settings{$item}); - } - } else { - $enrollvar{$1} = $settings{$item}; - } - } - } - - my @coursepersonnel = &Apache::lonnet::getkeys('nohist_userroles',$dom,$course); + my @coursepersonnel = &Apache::lonnet::getkeys('nohist_userroles',$cdom,$cnum); my @local_ccs = (); my %cc_status = (); my %pname = (); my $active_cc; - foreach (@coursepersonnel) { - my @roleinfo = split/:/,$_; - if ( ($roleinfo[0] eq 'cc') && ($roleinfo[2] eq $dom) ) { - unless (grep/^$roleinfo[1]$/,@local_ccs) { - $active_cc = &LONCAPA::Enrollment::check_user_status($roleinfo[2],$roleinfo[1],$dom,$course,'cc'); - if ($active_cc eq 'ok') { - push @local_ccs, $roleinfo[1]; - $pname{$roleinfo[1]} = &Apache::loncommon::plainname($roleinfo[1],$roleinfo[2]); - $cc_status{$roleinfo[1]} = $lt{'actv'}; + foreach my $person (@coursepersonnel) { + my ($role,$user) = split(/:/,$person,2); + $user =~ s/:$//; + if (($role eq 'cc') && ($user ne '')) { + if (!grep(/^\Q$user\E$/,@local_ccs)) { + my ($ccname,$ccdom) = split(/:/,$user); + $active_cc = + &Apache::loncommon::check_user_status($ccdom,$ccname,$cdom, + $cnum,'cc'); + if ($active_cc eq 'active') { + push(@local_ccs,$user); + $pname{$user} = &Apache::loncommon::plainname($ccname,$ccdom); + $cc_status{$user} = $lt{'actv'}; } } } } - unless ( (grep/^$enrollvar{'courseowner'}$/,@local_ccs) || ($enrollvar{'courseowner'} eq '') ) { - push @local_ccs, $enrollvar{'coursecode'}; - $pname{$enrollvar{'courseowner'}} = &Apache::loncommon::plainname($enrollvar{'courseowner'},$dom); - $active_cc = &LONCAPA::Enrollment::check_user_status($dom,$enrollvar{'coursecode'},$dom,$course,'cc'); - if ($active_cc eq 'ok') { + if ( (!grep(/^$enrollvar{'courseowner'}$/,@local_ccs)) && + ($enrollvar{'courseowner'} ne '') ) { + my ($owneruname,$ownerdom) = split(/:/,$enrollvar{'courseowner'}); + push(@local_ccs,$enrollvar{'courseowner'}); + $pname{$enrollvar{'courseowner'}} = + &Apache::loncommon::plainname($owneruname,$ownerdom); + $active_cc = &Apache::loncommon::check_user_status($ownerdom,$owneruname, + $cdom,$cnum,'cc'); + if ($active_cc eq 'active') { $cc_status{$enrollvar{'courseowner'}} = $lt{'actv'}; } else { $cc_status{$enrollvar{'courseowner'}} = $lt{'inac'}; } } my $numlocalcc = @local_ccs; - my $bodytag=&Apache::loncommon::bodytag(&mt("Modify Course Settings")); + my $helplink=&Apache::loncommon::help_open_topic('Modify_Course',&mt("Help on Modifying Courses")); - my $defdom=$ENV{'request.role.domain'}; - my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($defdom); + my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($cdom); my $curr_authtype = ''; my $curr_authfield = ''; if ($enrollvar{'authtype'} =~ /^krb/) { @@ -206,7 +368,7 @@ all settings except course code, course } unless ($curr_authtype eq '') { $curr_authfield = $curr_authtype.'arg'; - } + } my $javascript_validations=&Apache::londropadd::javascript_validations('modifycourse',$krbdefdom,$curr_authtype,$curr_authfield); my %param = ( formname => 'document.cmod', kerb_def_dom => $krbdefdom, @@ -215,39 +377,15 @@ all settings except course code, course curr_authtype => $curr_authtype, curr_autharg => $enrollvar{'autharg'} ); - my $krbform = &Apache::loncommon::authform_kerberos(%param); - my $intform = &Apache::loncommon::authform_internal(%param); - my $locform = &Apache::loncommon::authform_local(%param); - - my $disp_table = qq| - - - -
- - - - -
- - - - - - |; - my $iter = 0; - foreach my $key (sort keys %enrollvar) { - my $colflag = $iter%2; - $disp_table .= " - - - "; - $iter ++; - } - $disp_table .= "
$lt{'cset'}$lt{'valu'}
$$typeref{$key}$enrollvar{$key}
-
-
"; - + my (%authform,$authenitems); + $authform{'krb'} = &Apache::loncommon::authform_kerberos(%param); + $authform{'int'} = &Apache::loncommon::authform_internal(%param); + $authform{'loc'} = &Apache::loncommon::authform_local(%param); + foreach my $item ('krb','int','loc') { + if ($authform{$item} ne '') { + $authenitems .= $authform{$item}.'
'; + } + } if ($numlocalcc == 0) { $ownertable = $lt{'nocc'}; } @@ -258,81 +396,53 @@ all settings except course code, course - - '."\n". + ''."\n". + ''."\n". + &Apache::loncommon::end_data_table_row()."\n"; + } + $ownertable .= &Apache::loncommon::end_data_table()."
$lt{'tabl'} ($dom). $lt{'usrd'} + $lt{'tabl'} - $cdom ($domdesc). $lt{'usrd'}
 
- - - - -
- - - - -
- - - - - - - - ); - for (my $i=0; $i<@local_ccs; $i++) { - my $colflag = $i%2; - $ownertable .= ""; - if ($local_ccs[$i] eq $enrollvar{'courseowner'}) { - $ownertable .= ""; + \n". + "\n". + "\n". + "\n". + &Apache::loncommon::end_data_table_header_row()."\n"; + foreach my $cc (@local_ccs) { + $ownertable .= &Apache::loncommon::start_data_table_row()."\n"; + if ($cc eq $enrollvar{'courseowner'}) { + $ownertable .= ''."\n"; } else { - $ownertable .= ""; + $ownertable .= ''."\n"; } - $ownertable .= " - - - "; - } - $ownertable .= "
$lt{'ownr'}$lt{'name'}$lt{'unme'}$lt{'stus'}
). + &Apache::loncommon::start_data_table()."\n". + &Apache::loncommon::start_data_table_header_row()."\n". + "$lt{'ownr'}$lt{'name'}$lt{'unme'}$lt{'stus'}$pname{$local_ccs[$i]}$local_ccs[$i]$cc_status{$local_ccs[$i]} $lt{'ccor'}
-
-
+ $ownertable .= + '		'.$pname{$cc}.''.$cc.''.$cc_status{$cc}.' '.$lt{'ccor'}.'
"; } - &print_header($r,$tasklongref,$settings{'description'},\$javascript_validations); + &print_header($r,$cdesc,$javascript_validations); + my $type = $env{'form.type'}; + if ($type eq '') { + $type = 'Course'; + } + my $dctitle = &Apache::lonnet::plaintext('dc'); + my $cctitle = &Apache::lonnet::plaintext('cc',$type); + my $mainheader = &mt('Course settings modifiable by [_1] only.',$dctitle); + my $hidden_elements = &hidden_form_elements(); $r->print(< -

$lt{'aecs'}

-$lt{'cose'}$lt{'aenm'}$lt{'andb'} -

- - - - - -
 

$lt{'caes'}

-

-$lt{'cour'} -

-$disp_table -
-

- - - - - - -
  -

$lt{'mkch'}

-
+

$mainheader

- +
Use the appropriate text boxes and radio buttons below to change some or all of the four automated enrollment settings that may only be changed by a Domain Coordinator. Click the "$lt{'gobt'}" button to save your changes.Use the appropriate text boxes and radio buttons below to change some or all of the four automated enrollment settings that may only be changed by a Domain Coordinator.
@@ -350,25 +460,18 @@ $disp_table
$lt{'deam'}:

- $krbform -
- $intform -
- $locform -
+ $authenitems
$lt{'deus'}. 		 
-

-
- - - + + $hidden_elements +
@@ -376,14 +479,13 @@ $disp_table

ENDDOCUMENT - &print_footer($r); + return; } sub modify_course { - my ($r,$tasklongref,$typeref) = @_; - my $dom = $ENV{'user.domain'}; - my $crs = $ENV{'form.course'}; - my %settings = &Apache::lonnet::get('environment',['internal.courseowner','internal.coursecode','internal.authtype','internal.autharg','internal.sectionnums','internal.crosslistings','description'],$dom,$crs); + my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_; + my %longtype = &course_settings_descrip(); + my %settings = &Apache::lonnet::get('environment',['internal.courseowner','internal.coursecode','internal.authtype','internal.autharg','internal.sectionnums','internal.crosslistings','description'],$cdom,$cnum); my %currattr = (); my %newattr = (); my %cenv = (); @@ -398,7 +500,7 @@ sub modify_course { my @xlists = (); my $changecode = 0; my $changeowner = 0; - unless ($settings{'internal.sectionnums'} eq'') { + unless ($settings{'internal.sectionnums'} eq '') { if ($settings{'internal.sectionnums'} =~ m/,/) { @sections = split/,/,$settings{'internal.sectionnums'}; } else { @@ -413,29 +515,28 @@ sub modify_course { } } - my @params = ('courseowner','coursecode','authtype','autharg'); - foreach (@params) { - my $attr = 'internal.'.$_; - $currattr{$_} = $settings{$attr}; + my @modifiable_params = &get_dc_settable(); + foreach my $param (@modifiable_params) { + my $attr = 'internal.'.$param; + $currattr{$param} = $settings{$attr}; } my $description = $settings{'description'}; my %cenv = (); - if ($ENV{'form.login'} eq 'krb') { - $newattr{'authtype'} = $ENV{'form.login'}; - $newattr{'authtype'} .= $ENV{'form.krbver'}; - $newattr{'autharg'} = $ENV{'form.krbarg'}; - $newattr{'autharg'} =~ tr/a-z/A-Z/; - } elsif ($ENV{'form.login'} eq 'int') { + if ($env{'form.login'} eq 'krb') { + $newattr{'authtype'} = $env{'form.login'}; + $newattr{'authtype'} .= $env{'form.krbver'}; + $newattr{'autharg'} = $env{'form.krbarg'}; + } elsif ($env{'form.login'} eq 'int') { $newattr{'authtype'} ='internal'; - if ((defined($ENV{'form.intarg'})) && ($ENV{'form.intarg'})) { - $newattr{'autharg'} = $ENV{'form.intarg'}; + if ((defined($env{'form.intarg'})) && ($env{'form.intarg'})) { + $newattr{'autharg'} = $env{'form.intarg'}; } - } elsif ($ENV{'form.login'} eq 'loc') { + } elsif ($env{'form.login'} eq 'loc') { $newattr{'authtype'} = 'localauth'; - if ((defined($ENV{'form.locarg'})) && ($ENV{'form.locarg'})) { - $newattr{'autharg'} = $ENV{'form.locarg'}; + if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) { + $newattr{'autharg'} = $env{'form.locarg'}; } } if ( $newattr{'authtype'}=~ /^krb/) { @@ -445,49 +546,57 @@ sub modify_course { } } - if ( exists($ENV{'form.courseowner'}) ) { - my $ownerparam = 'username_'.$ENV{'form.courseowner'}; - if ( exists($ENV{"form.$ownerparam"}) ) { - $newattr{'courseowner'}=$ENV{"form.$ownerparam"}; - unless ( $newattr{'courseowner'} eq $currattr{'courseowner'} ) { - $changeowner = 1; - } + if ( exists($env{'form.courseowner'}) ) { + $newattr{'courseowner'}=$env{'form.courseowner'}; + unless ( $newattr{'courseowner'} eq $currattr{'courseowner'} ) { + $changeowner = 1; } } - if ( exists($ENV{'form.coursecode'}) ) { - $newattr{'coursecode'}=$ENV{'form.coursecode'}; + if ( exists($env{'form.coursecode'}) ) { + $newattr{'coursecode'}=$env{'form.coursecode'}; unless ( $newattr{'coursecode'} eq $currattr{'coursecode'} ) { $changecode = 1; } } - - foreach (@params) { - if ($currattr{$_} eq $newattr{$_}) { - push @nochanges, $_; + if ($changeowner == 1 || $changecode == 1) { + my $courseid_entry = &escape($cdom.'_'.$cnum).'='.&escape($description).':'.&escape($env{'form.coursecode'}).':'.&escape($env{'form.courseowner'}).':'.&escape($type); + my %courseid_entry = ( + $cdom.'_'.$cnum => { + description => &escape($description), + inst_code => &escape($env{'form.coursecode'}), + owner => &escape($env{'form.courseowner'}), + type => &escape($type), + }, + ); + &Apache::lonnet::courseidput($cdom,\%courseid_entry, + &Apache::lonnet::homeserver($cnum,$cdom)); + } + foreach my $param (@modifiable_params) { + if ($currattr{$param} eq $newattr{$param}) { + push(@nochanges,$param); } else { - my $attr = 'internal.'.$_; - $cenv{$attr} = $newattr{$_}; - push @changes, $_; + my $attr = 'internal.'.$param; + $cenv{$attr} = $newattr{$param}; + push(@changes,$param); } } - if (@changes > 0) { $chgresponse = &mt("The following automated enrollment parameters have been changed: