--- loncom/interface/lonmodifycourse.pm 2009/02/19 22:03:13 1.42 +++ loncom/interface/lonmodifycourse.pm 2010/07/08 23:19:19 1.56 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # handler for DC-only modifiable course settings # -# $Id: lonmodifycourse.pm,v 1.42 2009/02/19 22:03:13 schafran Exp $ +# $Id: lonmodifycourse.pm,v 1.56 2010/07/08 23:19:19 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,23 +35,44 @@ use Apache::lonhtmlcommon; use Apache::lonlocal; use Apache::lonuserutils; use Apache::lonpickcourse; -use LONCAPA::Enrollment; use lib '/home/httpd/lib/perl'; use LONCAPA; sub get_dc_settable { - return ('courseowner','coursecode','authtype','autharg'); + my ($type) = @_; + if ($type eq 'Community') { + return ('courseowner'); + } else { + return ('courseowner','coursecode','authtype','autharg'); + } +} + +sub autoenroll_keys { + my $internals = ['coursecode','courseowner','authtype','autharg','autoadds','autodrops', + 'autostart','autoend','sectionnums','crosslistings', + 'co-owners']; + my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date']; + return ($internals,$accessdates); } sub catalog_settable { - my ($confhash) = @_; + my ($confhash,$type) = @_; my @settable; if (ref($confhash) eq 'HASH') { - if ($confhash->{'togglecats'} ne 'crs') { - push(@settable,'togglecats'); - } - if ($confhash->{'categorize'} ne 'crs') { - push(@settable,'categorize'); + if ($type eq 'Community') { + if ($confhash->{'togglecatscomm'} ne 'comm') { + push(@settable,'togglecats'); + } + if ($confhash->{'categorizecomm'} ne 'comm') { + push(@settable,'categorize'); + } + } else { + if ($confhash->{'togglecats'} ne 'crs') { + push(@settable,'togglecats'); + } + if ($confhash->{'categorize'} ne 'crs') { + push(@settable,'categorize'); + } } } else { push(@settable,('togglecats','categorize')); @@ -61,14 +82,17 @@ sub catalog_settable { sub get_enrollment_settings { my ($cdom,$cnum) = @_; - my %settings = &Apache::lonnet::dump('environment',$cdom,$cnum); + my ($internals,$accessdates) = &autoenroll_keys(); + my @items; + if ((ref($internals) eq 'ARRAY') && (ref($accessdates) eq 'ARRAY')) { + @items = map { 'internal.'.$_; } (@{$internals}); + push(@items,@{$accessdates}); + } + my %settings = &Apache::lonnet::get('environment',\@items,$cdom,$cnum); my %enrollvar; $enrollvar{'autharg'} = ''; $enrollvar{'authtype'} = ''; - my %lt=&Apache::lonlocal::texthash( - 'noen' => "No end date", - ); - foreach my $item (keys %settings) { + foreach my $item (keys(%settings)) { if ($item =~ m/^internal\.(.+)$/) { my $type = $1; if ( ($type eq "autoadds") || ($type eq "autodrops") ) { @@ -79,11 +103,11 @@ sub get_enrollment_settings { } } elsif ( ($type eq "autostart") || ($type eq "autoend") ) { if ( ($type eq "autoend") && ($settings{$item} == 0) ) { - $enrollvar{$type} = $lt{'noen'}; + $enrollvar{$type} = &mt('No end date'); } else { - $enrollvar{$type} = localtime($settings{$item}); + $enrollvar{$type} = &Apache::lonlocal::locallocaltime($settings{$item}); } - } elsif ($type eq "sectionnums") { + } elsif (($type eq 'sectionnums') || ($type eq 'co-owners')) { $enrollvar{$type} = $settings{$item}; $enrollvar{$type} =~ s/,/, /g; } elsif ($type eq "authtype" @@ -102,11 +126,11 @@ sub get_enrollment_settings { } elsif ($item =~ m/^default_enrollment_(start|end)_date$/) { my $type = $1; if ( ($type eq 'end') && ($settings{$item} == 0) ) { - $enrollvar{$item} = $lt{'noen'}; + $enrollvar{$item} = &mt('No end date'); } elsif ( ($type eq 'start') && ($settings{$item} eq '') ) { $enrollvar{$item} = 'When enrolled'; } else { - $enrollvar{$item} = localtime($settings{$item}); + $enrollvar{$item} = &Apache::lonlocal::locallocaltime($settings{$item}); } } } @@ -115,114 +139,190 @@ sub get_enrollment_settings { sub print_course_search_page { my ($r,$dom,$domdesc) = @_; - &print_header($r); + my $action = '/adm/modifycourse'; + my $type = $env{'form.type'}; + if (!defined($env{'form.type'})) { + $type = 'Course'; + } + &print_header($r,$type); my $filterlist = ['descriptfilter', 'instcodefilter','ownerfilter', - 'ownerdomfilter','coursefilter']; + 'coursefilter']; my $filter = {}; - my $type = 'Course'; - my $action = '/adm/modifycourse'; - my $cctitle = &Apache::lonnet::plaintext('cc',$type); - my $dctitle = &Apache::lonnet::plaintext('dc'); - $r->print( - '

'.&mt('Search for a course in the [_1] domain',$domdesc).'

'. - &mt('Actions available after searching for a course:').''); + my ($numtitles,$cctitle,$dctitle,@codetitles); + my $ccrole = 'cc'; + if ($type eq 'Community') { + $ccrole = 'co'; + } + $cctitle = &Apache::lonnet::plaintext($ccrole,$type); + $dctitle = &Apache::lonnet::plaintext('dc'); + $r->print(&Apache::lonpickcourse::js_changer()); + if ($type eq 'Community') { + $r->print('

'.&mt('Search for a community in the [_1] domain',$domdesc).'

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

'.&mt('Search for a course in the [_1] domain',$domdesc).'

'); + } $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type, - undef,undef,$filter,$action,'modifycourse')); + undef,undef,$filter,$action,\$numtitles,'modifycourse', + undef,undef,undef,\@codetitles)); + if ($type eq 'Community') { + $r->print(&mt('Actions available after searching for a community:').''); + } else { + $r->print(&mt('Actions available after searching for a course:').''); + } } sub print_course_selection_page { my ($r,$dom,$domdesc) = @_; - &print_header($r); + my $type = $env{'form.type'}; + if (!defined($type)) { + $type = 'Course'; + } + &print_header($r,$type); # Criteria for course search my $filterlist = ['descriptfilter', 'instcodefilter','ownerfilter', 'ownerdomfilter','coursefilter']; my %filter; - my $type = $env{'form.type'}; - if ($type eq '') { - $type = 'Course'; - } my $action = '/adm/modifycourse'; my $dctitle = &Apache::lonnet::plaintext('dc'); - $r->print(&mt('Revise your search criteria for this domain').' ('.$domdesc.').

'); + my ($numtitles,@codetitles); + $r->print(&Apache::lonpickcourse::js_changer()); + $r->print(&mt('Revise your search criteria for this domain').' ('.$domdesc.').
'); $r->print(&Apache::lonpickcourse::build_filters($filterlist,$type, - undef,undef,\%filter,$action)); + undef,undef,\%filter,$action,\$numtitles, + undef,undef,undef,undef,\@codetitles)); $filter{'domainfilter'} = $dom; my %courses = &Apache::lonpickcourse::search_courses($r,$type,0, - \%filter); - &Apache::lonpickcourse::display_matched_courses($r,$type,0,$action, + \%filter,$numtitles,undef, + undef,undef,\@codetitles); + &Apache::lonpickcourse::display_matched_courses($r,$type,0,$action,undef,undef,undef, %courses); return; } sub print_modification_menu { - my ($r,$cdesc,$domdesc,$dom) = @_; - &print_header($r,$cdesc); - my $type = 'Course'; - my $action = '/adm/modifycourse'; - my $cctitle = &Apache::lonnet::plaintext('cc',$type); - my $dctitle = &Apache::lonnet::plaintext('dc'); - my %lt=&Apache::lonlocal::texthash( - 'some' => "Certain settings which control auto-enrollment of students from your institution's student information system.", - 'crqo' => 'The total disk space allocated for storage of portfolio files in all groups in a course.', - ); + my ($r,$cdesc,$domdesc,$dom,$type) = @_; + &print_header($r,$type); + my ($ccrole,$categorytitle,$setquota_text,$setparams_text,$cat_text); + if ($type eq 'Community') { + $ccrole = 'co'; + } else { + $ccrole = 'cc'; + } + if ($type eq 'Community') { + $categorytitle = 'View/Modify Community Settings'; + $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a community.'); + $setparams_text = 'View/Modify community owner'; + $cat_text = 'View/Modify catalog settings for community'; + } else { + $categorytitle = 'View/Modify Course Settings'; + $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a course.'); + $setparams_text = 'View/Modify course owner, institutional code, and default authentication'; + $cat_text = 'View/Modify catalog settings for course'; + } + + my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom); + my @additional_params = &catalog_settable($domconf{'coursecategories'},$type); + + sub phaseurl { + my $phase = shift; + return "javascript:changePage(document.menu,'$phase')" + } my @menu = - ( - { text => 'Modify quota for group portfolio files', - phase => 'setquota', + ({ categorytitle => $categorytitle, + items => [ + { + linktext => $setparams_text, + url => &phaseurl('setparms'), + permission => 1, + #help => '', + icon => 'crsconf.png', + linktitle => '' }, - { text => 'Display current settings for automated enrollment', - phase => 'viewparms', + { + linktext => 'View/Modify quota for group portfolio files', + url => &phaseurl('setquota'), + permission => 1, + #help => '', + icon => 'groupportfolioquota.png', + linktitle => '' }, - { text => 'Modify institutional code, course owner and/or default authentication', - phase => 'setparms', - }, - ); - my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom); - my @additional_params = &catalog_settable($domconf{'coursecategories'}); - if (@additional_params > 0) { - push (@menu, { text => 'Modify course catalog settings for course', - phase => 'catsettings', - }); - } - my $menu_html = '

'.&mt('View/Modify settings for: ').$cdesc.'

'."\n". - &mt('Although almost all course settings can be modified by a [_1], a number of settings exist which only a [_2] may change:',$cctitle,$dctitle).' -' + .'' + ."\n" + .&hidden_form_elements(); $r->print($menu_html); + $r->print(&Apache::lonhtmlcommon::generate_menu(@menu)); + $r->print(''); return; } sub print_ccrole_selected { - my ($r,$cdesc,$domdesc) = @_; - &print_header($r); + my ($r,$type) = @_; + &print_header($r,$type); my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'}); $r->print('
@@ -233,84 +333,86 @@ sub print_ccrole_selected { sub print_settings_display { my ($r,$cdom,$cnum,$cdesc,$type) = @_; my %enrollvar = &get_enrollment_settings($cdom,$cnum); - my %longtype = &course_settings_descrip(); + my %longtype = &course_settings_descrip($type); my %lt = &Apache::lonlocal::texthash( - 'cset' => "Course setting", - 'valu' => "Current value", - 'caes' => 'Current automated enrollment settings for ', - 'cour' => "Course settings that control automated enrollment in this LON-CAPA course are currently:", - 'cose' => "Course settings for LON-CAPA courses that control auto-enrollment based on classlist data available from your institution's student information system fall into two groups:", - 'dcon' => "Modifiable by DC only", - 'back' => "Back to options page", + 'valu' => 'Current value', + 'cour' => 'Current settings are:', + 'cose' => "Settings which control auto-enrollment using classlists from your institution's student information system fall into two groups:", + 'dcon' => 'Modifiable only by Domain Coordinator', + 'back' => 'Pick another action', ); - - my @bgcolors = ('#eeeeee','#cccccc'); - my $cctitle = &Apache::lonnet::plaintext('cc',$type); + my $ccrole = 'cc'; + if ($type eq 'Community') { + $ccrole = 'co'; + } + my $cctitle = &Apache::lonnet::plaintext($ccrole,$type); my $dctitle = &Apache::lonnet::plaintext('dc'); - my @modifiable_params = &get_dc_settable(); - + my @modifiable_params = &get_dc_settable($type); + my ($internals,$accessdates) = &autoenroll_keys(); + my @items; + if ((ref($internals) eq 'ARRAY') && (ref($accessdates) eq 'ARRAY')) { + @items = (@{$internals},@{$accessdates}); + } my $disp_table = &Apache::loncommon::start_data_table()."\n". &Apache::loncommon::start_data_table_header_row()."\n". - "$lt{'cset'}\n". + " \n". "$lt{'valu'}\n". "$lt{'dcon'}\n". &Apache::loncommon::end_data_table_header_row()."\n"; - foreach my $key (sort(keys(%enrollvar))) { + foreach my $item (@items) { $disp_table .= &Apache::loncommon::start_data_table_row()."\n". - "$longtype{$key}\n". - "$enrollvar{$key}\n"; - if (grep(/^\Q$key\E$/,@modifiable_params)) { - $disp_table .= ''.&mt('Yes').''."\n"; + "$longtype{$item}\n". + "$enrollvar{$item}\n"; + if (grep(/^\Q$item\E$/,@modifiable_params)) { + $disp_table .= ''.&mt('Yes').''."\n"; } else { - $disp_table .= ''.&mt('No').''."\n"; + $disp_table .= ''.&mt('No').''."\n"; } $disp_table .= &Apache::loncommon::end_data_table_row()."\n"; } $disp_table .= &Apache::loncommon::end_data_table()."\n"; - &print_header($r,$cdesc); - $r->print(' -

'.$lt{'caes'}.$cdesc.'

-

- -'.$lt{'cose'}.'

-

-'.$lt{'cour'}.' -

-'.$disp_table.' -

-'.$lt{'back'}.'     -'.&mt('Modify [_1]-only settings',$dctitle).''."\n". -&hidden_form_elements(). -'

'); + &print_header($r,$type); + my $newrole = $ccrole.'./'.$cdom.'/'.$cnum; + my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole. + '=1&destinationurl=/adm/populate','&<>"'); + $r->print('

'.&mt('Current automated enrollment settings for:'). + ' '.$cdesc.'

'. + '
'."\n". + '

'.$lt{'cose'}.'

'. + '

'.$lt{'cour'}.'

'.$disp_table.'

'. + ''.$lt{'back'}.''."\n". + &hidden_form_elements(). + '

' + ); } sub print_setquota { my ($r,$cdom,$cnum,$cdesc,$type) = @_; - my $dctitle = &Apache::lonnet::plaintext('dc'); - my $cctitle = &Apache::lonnet::plaintext('cc',$type); - my $subdiv = &mt('Although a [_1] will assign the disk quota for each individual group, the size of the quota is constrained by the total disk space allocated by the [_2] for portfolio files in a course.',$cctitle,$dctitle); my %lt = &Apache::lonlocal::texthash( - 'cquo' => 'Disk space for storage of group portfolio files', + 'cquo' => 'Disk space for storage of group portfolio files for:', 'gpqu' => 'Course portfolio files disk space', - 'each' => 'Each course group can be assigned a quota for portfolio files uploaded to the group.', 'modi' => 'Save', - 'back' => "Back to options page", + 'back' => 'Pick another action', ); + if ($type eq 'Community') { + $lt{'gpqu'} = &mt('Community portfolio files disk space'); + } my %settings = &Apache::lonnet::get('environment',['internal.coursequota'],$cdom,$cnum); my $coursequota = $settings{'internal.coursequota'}; if ($coursequota eq '') { $coursequota = 20; } - &print_header($r,$cdesc); + &print_header($r,$type); my $hidden_elements = &hidden_form_elements(); + my $helpitem = &Apache::loncommon::help_open_topic('Modify_Course_Quota'); $r->print(< -

$lt{'cquo'}.

+

$lt{'cquo'} $cdesc

-$lt{'each'}
-$subdiv -

-$lt{'gpqu'}: Mb      +$helpitem $lt{'gpqu'}: Mb     

$hidden_elements @@ -321,15 +423,26 @@ ENDDOCUMENT } sub print_catsettings { - my ($r,$cdom,$cnum,$cdesc) = @_; - &print_header($r,$cdesc); + my ($r,$cdom,$cnum,$cdesc,$type) = @_; + &print_header($r,$type); my %lt = &Apache::lonlocal::texthash( - 'back' => 'Back to options page', + 'back' => 'Pick another action', + 'catset' => 'Catalog Settings for Course', + 'visi' => 'Visibility in Course/Community Catalog', + 'exclude' => 'Exclude from course catalog:', + 'categ' => 'Categorize Course', + 'assi' => 'Assign one or more categories and/or subcategories to this course.' ); + if ($type eq 'Community') { + $lt{'catset'} = &mt('Catalog Settings for Community'); + $lt{'exclude'} = &mt('Exclude from course catalog'); + $lt{'categ'} = &mt('Categorize Community'); + $lt{'assi'} = &mt('Assign one or more subcategories to this community.'); + } $r->print('
'. - '

'.&mt('Catalog Settings for Course').'

'); + '

'.$lt{'catset'}.' '.$cdesc.'

'); my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom); - my @cat_params = &catalog_settable($domconf{'coursecategories'}); + my @cat_params = &catalog_settable($domconf{'coursecategories'},$type); if (@cat_params > 0) { my %currsettings = &Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum); @@ -340,32 +453,46 @@ sub print_catsettings { $excludeon = $excludeoff; $excludeoff = ''; } - $r->print('

'.&mt('Visibility in Course Catalog').'

'. - &mt("Unless excluded, a course is listed in this domain's publicly accessible course catalog, if at least one of the following applies").':'. - &mt('Exclude from course catalog').'    
'); + $r->print('

'.$lt{'visi'}.'

'. + $lt{'exclude'}. + '    

'); + if ($type eq 'Community') { + $r->print(&mt("If a community has been categorized using at least one of the categories defined for communities in the domain, it will be listed in the domain's publicly accessible Course/Community Catalog, unless excluded.")); + } else { + $r->print(&mt("Unless excluded, a course will be listed in the domain's publicly accessible Course/Community Catalog, if at least one of the following applies").':

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

'); } if (grep(/^categorize$/,@cat_params)) { - $r->print('

'.&mt('Categorize Course').'

'); + $r->print('

'.$lt{'categ'}.'

'); if (ref($domconf{'coursecategories'}) eq 'HASH') { my $cathash = $domconf{'coursecategories'}{'cats'}; if (ref($cathash) eq 'HASH') { - $r->print(&mt('Assign one or more categories to this course.').'

'. + $r->print($lt{'assi'}.'

'. &Apache::loncommon::assign_categories_table($cathash, - $currsettings{'categories'})); + $currsettings{'categories'},$type)); } else { $r->print(&mt('No categories defined for this domain')); } } else { $r->print(&mt('No categories defined for this domain')); } - $r->print('

'.&mt('If auto-cataloging based on institutional code is enabled in the domain, a course will continue to be listed in the catalog of official courses, in addition to receiving a listing under any manually assigned categor(ies).').'

'); + unless ($type eq 'Community') { + $r->print('

'.&mt('If auto-cataloging based on institutional code is enabled in the domain, a course will continue to be listed in the catalog of official courses, in addition to receiving a listing under any manually assigned categor(ies).').'

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

'); } else { - $r->print(''.&mt('Catalog settings in this domain are set in course context via "Set Course Environment".').'

'."\n". + $r->print(''); + if ($type eq 'Community') { + $r->print(&mt('Catalog settings in this domain are set in community context via "Community Configuration".')); + } else { + $r->print(&mt('Catalog settings in this domain are set in course context via "Course Configuration".')); + } + $r->print('

'."\n". ''. $lt{'back'}.''); } @@ -374,103 +501,154 @@ sub print_catsettings { } sub print_course_modification_page { - my ($r,$cdom,$cnum,$cdesc,$domdesc) = @_; - my %longtype = &course_settings_descrip(); - my %enrollvar = &get_enrollment_settings($cdom,$cnum); - my $ownertable; + my ($r,$cdom,$cnum,$cdesc,$type) = @_; my %lt=&Apache::lonlocal::texthash( 'actv' => "Active", 'inac' => "Inactive", - 'ccor' => "Course Coordinator", - 'noen' => "No end date", 'ownr' => "Owner", 'name' => "Name", 'unme' => "Username:Domain", 'stus' => "Status", - '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:", - '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).", - '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", - 'cous' => "The course owner is used in the retrieval of class lists from your institution's student information system when access to class lists data incorporates validation of instructor status.", - 'tabl' => 'The table below contains a list of active course coordinators in this course, who are from this domain', - '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.", + 'nocc' => 'There is currently no owner set for this course.', 'gobt' => "Save", ); - my @bgcolors = ('#eeeeee','#cccccc'); - - my @coursepersonnel = &Apache::lonnet::getkeys('nohist_userroles',$cdom,$cnum); - my @local_ccs = (); - my %cc_status = (); - my %pname = (); - my $active_cc; - 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'}; - } - } + my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname); + my %enrollvar = &get_enrollment_settings($cdom,$cnum); + if ($type eq 'Community') { + $ccrole = 'co'; + $lt{'nocc'} = &mt('There is currently no owner set for this community.'); + } else { + $ccrole ='cc'; + ($javascript_validations,$authenitems) = &gather_authenitems($cdom,\%enrollvar); + } + $ccname = &Apache::lonnet::plaintext($ccrole,$type); + my %roleshash = &Apache::lonnet::get_my_roles($cnum,$cdom,'','',[$ccrole]); + my (@local_ccs,%cc_status,%pname); + foreach my $item (keys(%roleshash)) { + my ($uname,$udom) = split(/:/,$item); + if (!grep(/^\Q$uname\E:\Q$udom\E$/,@local_ccs)) { + push(@local_ccs,$uname.':'.$udom); + $pname{$uname.':'.$udom} = &Apache::loncommon::plainname($uname,$udom); + $cc_status{$uname.':'.$udom} = $lt{'actv'}; } } - if ( (!grep(/^$enrollvar{'courseowner'}$/,@local_ccs)) && - ($enrollvar{'courseowner'} ne '') ) { - my ($owneruname,$ownerdom) = split(/:/,$enrollvar{'courseowner'}); + if (($enrollvar{'courseowner'} ne '') && + (!grep(/^$enrollvar{'courseowner'}$/,@local_ccs))) { push(@local_ccs,$enrollvar{'courseowner'}); + my ($owneruname,$ownerdom) = split(/:/,$enrollvar{'courseowner'}); $pname{$enrollvar{'courseowner'}} = &Apache::loncommon::plainname($owneruname,$ownerdom); - $active_cc = &Apache::loncommon::check_user_status($ownerdom,$owneruname, - $cdom,$cnum,'cc'); + my $active_cc = &Apache::loncommon::check_user_status($ownerdom,$owneruname, + $cdom,$cnum,$ccrole); if ($active_cc eq 'active') { $cc_status{$enrollvar{'courseowner'}} = $lt{'actv'}; } else { $cc_status{$enrollvar{'courseowner'}} = $lt{'inac'}; } } - my $numlocalcc = @local_ccs; + @local_ccs = sort(@local_ccs); + if (@local_ccs == 0) { + $ownertable = $lt{'nocc'}; + } else { + my $numlocalcc = scalar(@local_ccs); + $ownertable = ''. + &Apache::loncommon::start_data_table()."\n". + &Apache::loncommon::start_data_table_header_row()."\n". + ''.$lt{'ownr'}.''. + ''.$lt{'name'}.''. + ''.$lt{'unme'}.''. + ''.$lt{'stus'}.''. + &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 .= ''."\n"; + } + $ownertable .= + ''.$pname{$cc}.''."\n". + ''.$cc.''."\n". + ''.$cc_status{$cc}.' '.$ccname.''."\n". + &Apache::loncommon::end_data_table_row()."\n"; + } + $ownertable .= &Apache::loncommon::end_data_table(); + } + &print_header($r,$type,$javascript_validations); + my $dctitle = &Apache::lonnet::plaintext('dc'); + my $mainheader = &modifiable_only_title($type); + my $hidden_elements = &hidden_form_elements(); + $r->print(''."\n". + '

'.$mainheader.' '.$cdesc.'

'. + &Apache::lonhtmlcommon::start_pick_box()); + if ($type eq 'Community') { + $r->print(&Apache::lonhtmlcommon::row_title( + &Apache::loncommon::help_open_topic('Modify_Community_Owner'). + ' '.&mt('Community Owner'))."\n"); + } else { + $r->print(&Apache::lonhtmlcommon::row_title( + &Apache::loncommon::help_open_topic('Modify_Course_Instcode'). + ' '.&mt('Course Code'))."\n". + ''. + &Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_title( + &Apache::loncommon::help_open_topic('Modify_Course_Defaultauth'). + ' '.&mt('Default Authentication method'))."\n". + $authenitems."\n". + &Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_title( + &Apache::loncommon::help_open_topic('Modify_Course_Owner'). + ' '.&mt('Course Owner'))."\n"); + } + $r->print($ownertable."\n".&Apache::lonhtmlcommon::row_closure(1). + &Apache::lonhtmlcommon::end_pick_box().'

'.$hidden_elements. + 'print('this.form.submit();"'); + } else { + $r->print('javascript:verify_message(this.form);"'); + } + $r->print('value="'.$lt{'gobt'}.'" />

'); + return; +} - my $helplink=&Apache::loncommon::help_open_topic('Modify_Course',&mt("Help on Modifying Courses")); +sub modifiable_only_title { + my ($type) = @_; + my $dctitle = &Apache::lonnet::plaintext('dc'); + if ($type eq 'Community') { + return &mt('Community settings modifiable only by [_1] for:',$dctitle); + } else { + return &mt('Course settings modifiable only by [_1] for:',$dctitle); + } +} + +sub gather_authenitems { + my ($cdom,$enrollvar) = @_; my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($cdom); my $curr_authtype = ''; my $curr_authfield = ''; - if ($enrollvar{'authtype'} =~ /^krb/) { - $curr_authtype = 'krb'; - } elsif ($enrollvar{'authtype'} eq 'internal' ) { - $curr_authtype = 'int'; - } elsif ($enrollvar{'authtype'} eq 'localauth' ) { - $curr_authtype = 'loc'; + if (ref($enrollvar) eq 'HASH') { + if ($enrollvar->{'authtype'} =~ /^krb/) { + $curr_authtype = 'krb'; + } elsif ($enrollvar->{'authtype'} eq 'internal' ) { + $curr_authtype = 'int'; + } elsif ($enrollvar->{'authtype'} eq 'localauth' ) { + $curr_authtype = 'loc'; + } } unless ($curr_authtype eq '') { $curr_authfield = $curr_authtype.'arg'; } - my $javascript_validations=&Apache::lonuserutils::javascript_validations('modifycourse',$krbdefdom,$curr_authtype,$curr_authfield); + my $javascript_validations = + &Apache::lonuserutils::javascript_validations('modifycourse',$krbdefdom, + $curr_authtype,$curr_authfield); my %param = ( formname => 'document.'.$env{'form.phase'}, - kerb_def_dom => $krbdefdom, - kerb_def_auth => $krbdef, + kerb_def_dom => $krbdefdom, + kerb_def_auth => $krbdef, mode => 'modifycourse', curr_authtype => $curr_authtype, - curr_autharg => $enrollvar{'autharg'} - ); + curr_autharg => $enrollvar->{'autharg'} + ); my (%authform,$authenitems); $authform{'krb'} = &Apache::loncommon::authform_kerberos(%param); $authform{'int'} = &Apache::loncommon::authform_internal(%param); @@ -479,164 +657,80 @@ all settings except course code, course if ($authform{$item} ne '') { $authenitems .= $authform{$item}.'
'; } - } - if ($numlocalcc == 0) { - $ownertable = $lt{'nocc'}; - } - - if ($numlocalcc > 0) { - @local_ccs = sort @local_ccs; - $ownertable = qq( - - - - - - - - \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 .= ''."\n"; - } - $ownertable .= - ''."\n". - ''."\n". - ''."\n". - &Apache::loncommon::end_data_table_row()."\n"; - } - $ownertable .= &Apache::loncommon::end_data_table()." - - -
$lt{'tabl'} - $cdom ($domdesc). $lt{'usrd'} -
 
). - &Apache::loncommon::start_data_table()."\n". - &Apache::loncommon::start_data_table_header_row()."\n". - "$lt{'ownr'}$lt{'name'}$lt{'unme'}$lt{'stus'}'.$pname{$cc}.''.$cc.''.$cc_status{$cc}.' '.$lt{'ccor'}.'
"; - } - &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(< -

$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. -
- $lt{'ccod'}:   -

- $lt{'ccus'} - 		- $lt{'cown'}:

- $ownertable -

- $lt{'cous'} -
- $lt{'deam'}:

- $authenitems -
- $lt{'deus'}. - 		 
- - - - -
- $hidden_elements - -
- -
-
-ENDDOCUMENT - return; + return($javascript_validations,$authenitems); } sub modify_course { 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 = (); - my $response; - my $chgresponse; - my $nochgresponse; - my $warning; - my $reply; - my @changes = (); - my @nochanges = (); - my @sections = (); - my @xlists = (); - my %changed = ( code => 0, - owner => 0, - ); - unless ($settings{'internal.sectionnums'} eq '') { - if ($settings{'internal.sectionnums'} =~ m/,/) { - @sections = split/,/,$settings{'internal.sectionnums'}; - } else { - $sections[0] = $settings{'internal.sectionnums'}; - } + my %longtype = &course_settings_descrip($type); + my @items = ('internal.courseowner','description','internal.co-owners', + 'internal.pendingco-owners'); + unless ($type eq 'Community') { + push(@items,('internal.coursecode','internal.authtype','internal.autharg', + 'internal.sectionnums','internal.crosslistings')); } - unless ($settings{'internal.crosslistings'} eq'') { - if ($settings{'internal.crosslistings'} =~ m/,/) { - @xlists = split/,/,$settings{'internal.crosslistings'}; - } else { - $xlists[0] = $settings{'internal.crosslistings'}; - } - } - - my @modifiable_params = &get_dc_settable(); + my %settings = &Apache::lonnet::get('environment',\@items,$cdom,$cnum); + my $description = $settings{'description'}; + my ($ccrole,$response,$chgresponse,$nochgresponse,$reply,%currattr,%newattr,%cenv,%changed, + @changes,@nochanges,@sections,@xlists,@warnings); + my @modifiable_params = &get_dc_settable($type); foreach my $param (@modifiable_params) { - my $attr = 'internal.'.$param; - $currattr{$param} = $settings{$attr}; + $currattr{$param} = $settings{'internal.'.$param}; } + if ($type eq 'Community') { + %changed = ( owner => 0 ); + $ccrole = 'co'; + } else { + %changed = ( code => 0, + owner => 0, + ); + $ccrole = 'cc'; + unless ($settings{'internal.sectionnums'} eq '') { + if ($settings{'internal.sectionnums'} =~ m/,/) { + @sections = split/,/,$settings{'internal.sectionnums'}; + } else { + $sections[0] = $settings{'internal.sectionnums'}; + } + } + unless ($settings{'internal.crosslistings'} eq'') { + if ($settings{'internal.crosslistings'} =~ m/,/) { + @xlists = split/,/,$settings{'internal.crosslistings'}; + } else { + $xlists[0] = $settings{'internal.crosslistings'}; + } + } + 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'}; + } + } elsif ($env{'form.login'} eq 'loc') { + $newattr{'authtype'} = 'localauth'; + if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) { + $newattr{'autharg'} = $env{'form.locarg'}; + } + } + if ( $newattr{'authtype'}=~ /^krb/) { + if ($newattr{'autharg'} eq '') { + push(@warnings, + &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.')); + } + } - my $description = $settings{'description'}; - - 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'}; - } - } elsif ($env{'form.login'} eq 'loc') { - $newattr{'authtype'} = 'localauth'; - if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) { - $newattr{'autharg'} = $env{'form.locarg'}; - } - } - if ( $newattr{'authtype'}=~ /^krb/) { - if ($newattr{'autharg'} eq '') { - $warning = qq(). - &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").qq(

); + if ( exists($env{'form.coursecode'}) ) { + $newattr{'coursecode'}=$env{'form.coursecode'}; + unless ( $newattr{'coursecode'} eq $currattr{'coursecode'} ) { + $changed{'code'} = 1; + } } } @@ -646,94 +740,106 @@ sub modify_course { $changed{'owner'} = 1; } } - - if ( exists($env{'form.coursecode'}) ) { - $newattr{'coursecode'}=$env{'form.coursecode'}; - unless ( $newattr{'coursecode'} eq $currattr{'coursecode'} ) { - $changed{'code'} = 1; - } - } - if ($changed{'owner'} || $changed{'code'}) { + + if ($changed{'owner'} || $changed{'code'}) { my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum, undef,undef,'.'); if (ref($crsinfo{$env{'form.pickedcourse'}}) eq 'HASH') { - $crsinfo{$env{'form.pickedcourse'}}{'inst_code'} = $env{'form.coursecode'}; - $crsinfo{$env{'form.pickedcourse'}}{'owner'} = $env{'form.courseowner'}; + if ($changed{'code'}) { + $crsinfo{$env{'form.pickedcourse'}}{'inst_code'} = $env{'form.coursecode'}; + } + if ($changed{'owner'}) { + $crsinfo{$env{'form.pickedcourse'}}{'owner'} = $env{'form.courseowner'}; + } my $chome = &Apache::lonnet::homeserver($cnum,$cdom); my $putres = &Apache::lonnet::courseidput($cdom,\%crsinfo,$chome,'notime'); + if ($putres eq 'ok') { + &update_coowners($cdom,$cnum,$chome,\%settings,\%newattr); + } } } foreach my $param (@modifiable_params) { if ($currattr{$param} eq $newattr{$param}) { push(@nochanges,$param); } else { - my $attr = 'internal.'.$param; - $cenv{$attr} = $newattr{$param}; + $cenv{'internal.'.$param} = $newattr{$param}; push(@changes,$param); } } if (@changes > 0) { - $chgresponse = &mt("The following automated enrollment parameters have been changed: