--- loncom/interface/lonmodifycourse.pm 2015/05/22 21:08:42 1.77 +++ loncom/interface/lonmodifycourse.pm 2017/01/22 19:22:04 1.91 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # handler for DC-only modifiable course settings # -# $Id: lonmodifycourse.pm,v 1.77 2015/05/22 21:08:42 raeburn Exp $ +# $Id: lonmodifycourse.pm,v 1.91 2017/01/22 19:22:04 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,7 +44,8 @@ sub get_dc_settable { if ($type eq 'Community') { return ('courseowner','selfenrollmgrdc','selfenrollmgrcc'); } else { - my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc','selfenrollmgrcc'); + my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc', + 'selfenrollmgrcc','mysqltables'); if (&showcredits($cdom)) { push(@items,'defaultcredits'); } @@ -55,7 +56,7 @@ sub get_dc_settable { sub autoenroll_keys { my $internals = ['coursecode','courseowner','authtype','autharg','defaultcredits', 'autoadds','autodrops','autostart','autoend','sectionnums', - 'crosslistings','co-owners']; + 'crosslistings','co-owners','autodropfailsafe']; my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date']; return ($internals,$accessdates); } @@ -71,6 +72,13 @@ sub catalog_settable { if ($confhash->{'categorizecomm'} ne 'comm') { push(@settable,'categorize'); } + } elsif ($type eq 'Placement') { + if ($confhash->{'togglecatsplace'} ne 'place') { + push(@settable,'togglecats'); + } + if ($confhash->{'categorizeplace'} ne 'place') { + push(@settable,'categorize'); + } } else { if ($confhash->{'togglecats'} ne 'crs') { push(@settable,'togglecats'); @@ -117,14 +125,13 @@ sub get_enrollment_settings { $enrollvar{$type} =~ s/,/, /g; } elsif ($type eq "authtype" || $type eq "autharg" || $type eq "coursecode" - || $type eq "crosslistings") { + || $type eq "crosslistings" || $type eq "selfenrollmgr" + || $type eq "autodropfailsafe") { $enrollvar{$type} = $settings{$item}; } elsif ($type eq 'defaultcredits') { if (&showcredits($cdom)) { $enrollvar{$type} = $settings{$item}; } - } elsif ($type eq 'selfenrollmgr') { - $enrollvar{$type} = $settings{$item}; } elsif ($type eq 'courseowner') { if ($settings{$item} =~ /^[^:]+:[^:]+$/) { $enrollvar{$type} = $settings{$item}; @@ -167,35 +174,198 @@ sub print_course_search_page { $r->print(&Apache::loncommon::js_changer()); if ($type eq 'Community') { $r->print('

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

'); + } elsif ($type eq 'Placement') { + $r->print('

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

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

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

'); } $r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action, \$numtitles,'modifycourse',undef,undef,undef, \@codetitles,$dom)); + + my ($actiontext,$roleoption,$settingsoption); 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:').''); + $actiontext = &mt('Actions available after searching for a community:'); + } elsif ($type eq 'Placement') { + $actiontext = &mt('Actions available after searching for a placement test:') + } else { + $actiontext = &mt('Actions available after searching for a course:'); + } + if (&Apache::lonnet::allowed('ccc',$dom)) { + if ($type eq 'Community') { + $roleoption = &mt('Enter the community with the role of [_1]',$cctitle); + $settingsoption = &mt('View or modify community settings which only a [_1] may modify.',$dctitle); + } elsif ($type eq 'Placement') { + $roleoption = &mt('Enter the placement test with the role of [_1]',$cctitle); + $settingsoption = &mt('View or modify placement test settings which only a [_1] may modify.',$dctitle); + } else { + $roleoption = &mt('Enter the course with the role of [_1]',$cctitle); + $settingsoption = &mt('View or modify course settings which only a [_1] may modify.',$dctitle); + } + } elsif (&Apache::lonnet::allowed('rar',$dom)) { + my ($roles_by_num,$description,$accessref,$accessinfo) = &Apache::lonnet::get_all_adhocroles($dom); + if ((ref($roles_by_num) eq 'ARRAY') && (ref($description) eq 'HASH')) { + if (@{$roles_by_num} > 1) { + if ($type eq 'Community') { + $roleoption = &mt('Enter the community with one of the available ad hoc roles'); + } elsif ($type eq 'Placement') { + $roleoption = &mt('Enter the placement test with one of the available ad hoc roles.'); + } else { + $roleoption = &mt('Enter the course with one of the available ad hoc roles.'); + } + } else { + my $rolename = $description->{$roles_by_num->[0]}; + if ($type eq 'Community') { + $roleoption = &mt('Enter the community with the ad hoc role of: [_1]',$rolename); + } elsif ($type eq 'Placement') { + $roleoption = &mt('Enter the placement test with the ad hoc role of: [_1]',$rolename); + } else { + $roleoption = &mt('Enter the course with the ad hoc role of: [_1]',$rolename); + } + } + } + if ($type eq 'Community') { + $settingsoption = &mt('View community settings which only a [_1] may modify.',$dctitle); + } elsif ($type eq 'Placement') { + $settingsoption = &mt('View placement test settings which only a [_1] may modify.',$dctitle); + } else { + $settingsoption = &mt('View course settings which only a [_1] may modify.',$dctitle); + } } + $r->print($actiontext.''); return; } sub print_course_selection_page { - my ($r,$dom,$domdesc) = @_; + my ($r,$dom,$domdesc,$permission) = @_; my $type = $env{'form.type'}; if (!defined($type)) { $type = 'Course'; } &print_header($r,$type); -# Criteria for course search + if ($permission->{'adhocrole'} eq 'custom') { + my %lt = &Apache::lonlocal::texthash( + title => 'Ad hoc role selection', + preamble => 'Please choose an ad hoc role in the course.', + cancel => 'Click "OK" to enter the course, or "Cancel" to choose a different course.', + ); + my %jslt = &Apache::lonlocal::texthash ( + none => 'You are not eligible to use an ad hoc role for the selected course', + ok => 'OK', + exit => 'Cancel', + ); + &js_escape(\%jslt); + $r->print(<<"END"); + + +
+

$lt{'preamble'}

+
+
+
+ + +
+

$lt{'cancel'}

+
+END + } elsif ($permission->{'adhocrole'} eq 'coord') { + $r->print(<<"END"); + +END + } + +# Criteria for course search my ($filterlist,$filter) = &get_filters(); my $action = '/adm/modifycourse'; my $dctitle = &Apache::lonnet::plaintext('dc'); @@ -208,7 +378,7 @@ sub print_course_selection_page { my %courses = &Apache::loncommon::search_courses($dom,$type,$filter,$numtitles, undef,undef,undef,\@codetitles); &Apache::lonpickcourse::display_matched_courses($r,$type,0,$action,undef,undef,undef, - undef,undef,%courses); + $dom,undef,%courses); return; } @@ -229,10 +399,9 @@ sub get_filters { } sub print_modification_menu { - my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash) = @_; + my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash,$permission) = @_; &print_header($r,$type); - my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$setparams_text,$cat_text, - $cdom,$cnum); + my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$cdom,$cnum); if (ref($coursehash) eq 'HASH') { $cdom = $coursehash->{'domain'}; $cnum = $coursehash->{'num'}; @@ -244,36 +413,72 @@ sub print_modification_menu { } else { $ccrole = 'cc'; } + my %linktext; + if ($permission->{'setparms'} eq 'edit') { + %linktext = ( + 'setquota' => 'View/Modify quotas for group portfolio files, and for uploaded content', + 'setanon' => 'View/Modify responders threshold for anonymous survey submissions display', + 'selfenroll' => 'View/Modify Self-Enrollment configuration', + 'setpostsubmit' => 'View/Modify submit button behavior, post-submission', + ); + } else { + %linktext = ( + 'setquota' => 'View quotas for group portfolio files, and for uploaded content', + 'setanon' => 'View responders threshold for anonymous survey submissions display', + 'selfenroll' => 'View Self-Enrollment configuration', + 'setpostsubmit' => 'View submit button behavior, post-submission', + ); + } if ($type eq 'Community') { - $categorytitle = 'View/Modify Community Settings'; + if ($permission->{'setparms'} eq 'edit') { + $categorytitle = 'View/Modify Community Settings'; + $linktext{'setparms'} = 'View/Modify community owner'; + $linktext{'catsettings'} = 'View/Modify catalog settings for community'; + } else { + $categorytitle = 'View Community Settings'; + $linktext{'setparms'} = 'View community owner'; + $linktext{'catsettings'} = 'View catalog settings for community'; + } $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a community.'); $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a community via Content Editor.'); - $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.'); - $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a course via Content Editor.'); - if (&showcredits($dom)) { - $setparams_text = 'View/Modify course owner, institutional code, default authentication, credits, and self-enrollment'; + if ($permission->{'setparms'} eq 'edit') { + $categorytitle = 'View/Modify Course Settings'; + $linktext{'catsettings'} = 'View/Modify catalog settings for course'; + if (($type ne 'Placement') && (&showcredits($dom))) { + $linktext{'setparms'} = 'View/Modify course owner, institutional code, default authentication, credits, self-enrollment and table lifetime'; + } else { + $linktext{'setparms'} = 'View/Modify course owner, institutional code, default authentication, self-enrollment and table lifetime'; + } } else { - $setparams_text = 'View/Modify course owner, institutional code, default authentication, and self-enrollment'; + $categorytitle = 'View Course Settings'; + $linktext{'catsettings'} = 'View catalog settings for course'; + if (($type ne 'Placement') && (&showcredits($dom))) { + $linktext{'setparms'} = 'View course owner, institutional code, default authentication, credits, self-enrollment and table lifetime'; + } else { + $linktext{'setparms'} = 'View course owner, institutional code, default authentication, self-enrollment and table lifetime'; + } } - $cat_text = 'View/Modify catalog settings for course'; + $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a course.'); + $setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a course via Content Editor.'); } my $anon_text = &mt('Responder threshold required to display anonymous survey submissions.'); my $postsubmit_text = &mt('Override defaults for submit button behavior post-submission for this specific course.'); + my $mysqltables_text = &mt('Override default for lifetime of "temporary" MySQL tables containing student performance data.'); + $linktext{'viewparms'} = 'Display current settings for automated enrollment'; my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom); my @additional_params = &catalog_settable($domconf{'coursecategories'},$type); sub manage_selfenrollment { - my ($cdom,$cnum,$type,$coursehash) = @_; - my ($managed_by_cc,$managed_by_dc) = &Apache::lonuserutils::selfenrollment_administration($cdom,$cnum,$type,$coursehash); - if (ref($managed_by_dc) eq 'ARRAY') { - if (@{$managed_by_dc}) { - return 1; - } + my ($cdom,$cnum,$type,$coursehash,$permission) = @_; + if ($permission->{'selfenroll'}) { + my ($managed_by_cc,$managed_by_dc) = &Apache::lonuserutils::selfenrollment_administration($cdom,$cnum,$type,$coursehash); + if (ref($managed_by_dc) eq 'ARRAY') { + if (@{$managed_by_dc}) { + return 1; + } + } } return 0; } @@ -286,59 +491,59 @@ sub print_modification_menu { ({ categorytitle => $categorytitle, items => [ { - linktext => $setparams_text, + linktext => $linktext{'setparms'}, url => &phaseurl('setparms'), - permission => 1, + permission => $permission->{'setparms'}, #help => '', icon => 'crsconf.png', linktitle => '' }, { - linktext => 'View/Modify quotas for group portfolio files, and for uploaded content.', + linktext => $linktext{'setquota'}, url => &phaseurl('setquota'), - permission => 1, + permission => $permission->{'setquota'}, #help => '', icon => 'groupportfolioquota.png', linktitle => '' }, { - linktext => 'View/Modify responders threshold for anonymous survey submissions display', + linktext => $linktext{'setanon'}, url => &phaseurl('setanon'), - permission => 1, + permission => $permission->{'setanon'}, #help => '', icon => 'anonsurveythreshold.png', linktitle => '' }, { - linktext => $cat_text, + linktext => $linktext{'catsettings'}, url => &phaseurl('catsettings'), - permission => (@additional_params > 0), + permission => (($permission->{'catsettings'}) && (@additional_params > 0)), #help => '', icon => 'ccatconf.png', linktitle => '' }, { - linktext => 'Display current settings for automated enrollment', + linktext => $linktext{'viewparms'}, url => &phaseurl('viewparms'), - permission => ($type ne 'Community'), + permission => ($permission->{'viewparms'} && ($type ne 'Community') && ($type ne 'Placement')), #help => '', icon => 'roles.png', linktitle => '' }, { - linktext => 'View/Modify Self-Enrollment configuration', + linktext => $linktext{'selfenroll'}, icon => 'self_enroll.png', #help => 'Course_Self_Enrollment', url => &phaseurl('selfenroll'), - permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash), + permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash,$permission), linktitle => 'Configure user self-enrollment.', }, { - linktext => 'View/Modify submit button behavior, post-submission', + linktext => $linktext{'setpostsubmit'}, icon => 'emblem-readonly.png', #help => '', url => &phaseurl('setpostsubmit'), - permission => 1, + permission => $permission->{'setpostsubmit'}, linktitle => '', }, ] @@ -362,27 +567,33 @@ sub print_modification_menu { } else { $menu_html .= '
  • '.&mt('Course owner (permitted to assign Course Coordinator roles in the course).').'
    • '."\n". '
  • '.&mt("Institutional code and default authentication (both required for auto-enrollment of students from institutional datafeeds).").'
    • '."\n"; - if (&showcredits($dom)) { + if (($type ne 'Placement') && &showcredits($dom)) { $menu_html .= '
  • '.&mt('Default credits earned by student on course completion.').'
    • '."\n"; } $menu_html .= '
  • '.&mt('Override defaults for who configures self-enrollment for this specific course.').'
    • '."\n"; } - $menu_html .= '
  • '.$setquota_text.'
    • '."\n". + $menu_html .= '
  • '.$mysqltables_text.'
    • '."\n". + '
  • '.$setquota_text.'
    • '."\n". '
  • '.$setuploadquota_text.'
    • '."\n". '
  • '.$anon_text.'
    • '."\n". '
  • '.$postsubmit_text.'
    • '."\n"; + my ($categories_link_start,$categories_link_end); + if ($permission->{'catsettings'} eq 'edit') { + $categories_link_start = ''; + $categories_link_end = ''; + } foreach my $item (@additional_params) { if ($type eq 'Community') { if ($item eq 'togglecats') { - $menu_html .= '
  • '.&mt('Hiding/unhiding a community from the catalog (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).','','').'
    • '."\n"; + $menu_html .= '
  • '.&mt('Hiding/unhiding a community from the catalog (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).',$categories_link_start,$categories_link_end).'
    • '."\n"; } elsif ($item eq 'categorize') { - $menu_html .= '
  • '.&mt('Manual cataloging of a community (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).','','').'
    • '."\n"; + $menu_html .= '
  • '.&mt('Manual cataloging of a community (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).',$categories_link_start,$categories_link_end).'
    • '."\n"; } } else { if ($item eq 'togglecats') { - $menu_html .= '
  • '.&mt('Hiding/unhiding a course from the course catalog (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).','','').'
    • '."\n"; + $menu_html .= '
  • '.&mt('Hiding/unhiding a course from the course catalog (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).',$categories_link_start,$categories_link_end).'
    • '."\n"; } elsif ($item eq 'categorize') { - $menu_html .= '
  • '.&mt('Manual cataloging of a course (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).','','').'
    • '."\n"; + $menu_html .= '
  • '.&mt('Manual cataloging of a course (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).',$categories_link_start,$categories_link_end).'
    • '."\n"; } } } @@ -398,18 +609,43 @@ sub print_modification_menu { return; } -sub print_ccrole_selected { - my ($r,$type) = @_; +sub print_adhocrole_selected { + my ($r,$type,$permission) = @_; &print_header($r,$type); my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'}); - $r->print('
    - - + my ($newrole,$selectrole); + if ($permission->{'adhocrole'} eq 'coord') { + if ($type eq 'Community') { + $newrole = "co./$cdom/$cnum"; + } else { + $newrole = "cc./$cdom/$cnum"; + } + $selectrole = 1; + } elsif ($permission->{'adhocrole'} eq 'custom') { + my ($okroles,$description) = &Apache::lonnet::get_my_adhocroles($env{'form.pickedcourse'},1); + if (ref($okroles) eq 'ARRAY') { + my $possrole = $env{'form.adhocrole'}; + if (($possrole ne '') && (grep(/^\Q$possrole\E$/,@{$okroles}))) { + my $confname = &Apache::lonnet::get_domainconfiguser($cdom); + $newrole = "cr/$cdom/$confname/$possrole./$cdom/$cnum"; + $selectrole = 1; + } + } + } + if ($selectrole) { + $r->print(' + +
    '); + } else { + $r->print('
    '. + '
    '); + } + return; } sub print_settings_display { - my ($r,$cdom,$cnum,$cdesc,$type) = @_; + my ($r,$cdom,$cnum,$cdesc,$type,$permission) = @_; my %enrollvar = &get_enrollment_settings($cdom,$cnum); my %longtype = &course_settings_descrip($type); my %lt = &Apache::lonlocal::texthash( @@ -450,29 +686,39 @@ sub print_settings_display { } $disp_table .= &Apache::loncommon::end_data_table()."\n"; &print_header($r,$type); - my $newrole = $ccrole.'./'.$cdom.'/'.$cnum; - my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole. - '=1&destinationurl=/adm/populate','&<>"'); + my ($enroll_link_start,$enroll_link_end,$setparms_link_start,$setparms_link_end); + if (&Apache::lonnet::allowed('ccc',$cdom)) { + my $newrole = $ccrole.'./'.$cdom.'/'.$cnum; + my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole. + '=1&destinationurl=/adm/populate','&<>"'); + $enroll_link_start = ''; + $enroll_link_end = ''; + } + if ($permission->{'setparms'}) { + $setparms_link_start = ''; + $setparms_link_end = ''; + } $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 ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; my $lctype = lc($type); my $headline = &mt("Set disk space quotas for $lctype: [_1]", ''.$cdesc.''); @@ -505,19 +751,25 @@ sub print_setquota { my $hidden_elements = &hidden_form_elements(); my $porthelpitem = &Apache::loncommon::help_open_topic('Modify_Course_Quota'); my $uploadhelpitem = &Apache::loncommon::help_open_topic('Modify_Course_Upload_Quota'); + my ($disabled,$submit); + if ($readonly) { + $disabled = ' disabled="disabled"'; + } else { + $submit = ''; + } $r->print(<

    $headline

    -$porthelpitem $lt{'gpqu'}: MB +$porthelpitem $lt{'gpqu'}: MB
    -$uploadhelpitem $lt{'upqu'}: MB +$uploadhelpitem $lt{'upqu'}: MB

    - +$submit

    $hidden_elements $lt{'back'} @@ -527,7 +779,7 @@ ENDDOCUMENT } sub print_set_anonsurvey_threshold { - my ($r,$cdom,$cnum,$cdesc,$type) = @_; + my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; my %lt = &Apache::lonlocal::texthash( 'resp' => 'Responder threshold for anonymous survey submissions display:', 'sufa' => 'Anonymous survey submissions displayed when responders exceeds', @@ -550,13 +802,19 @@ sub print_set_anonsurvey_threshold { } &print_header($r,$type); my $hidden_elements = &hidden_form_elements(); + my ($disabled,$submit); + if ($readonly) { + $disabled = ' disabled="disabled"'; + } else { + $submit = ''; + } my $helpitem = &Apache::loncommon::help_open_topic('Modify_Anonsurvey_Threshold'); $r->print(<

    $lt{'resp'} $cdesc

    -$helpitem $lt{'sufa'}:      - +$helpitem $lt{'sufa'}:      +$submit

    $hidden_elements $lt{'back'} @@ -566,7 +824,7 @@ ENDDOCUMENT } sub print_postsubmit_config { - my ($r,$cdom,$cnum,$cdesc,$type) = @_; + my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; my %lt = &Apache::lonlocal::texthash ( 'conf' => 'Configure submit button behavior after student makes a submission', 'disa' => 'Disable submit button/keypress following student submission', @@ -607,21 +865,27 @@ sub print_postsubmit_config { } &print_header($r,$type); my $hidden_elements = &hidden_form_elements(); + my ($disabled,$submit); + if ($readonly) { + $disabled = ' disabled="disabled"'; + } else { + $submit = ''; + } my $helpitem = &Apache::loncommon::help_open_topic('Modify_Postsubmit_Config'); $r->print(<

    $lt{'conf'} ($cdesc)

    $helpitem $lt{'disa'}: -

    -$lt{'nums'}
    +$lt{'nums'}
    $zero

    - +$submit

    $hidden_elements $lt{'back'} @@ -634,7 +898,7 @@ sub domain_postsubtimeout { my ($cdom,$type,$settings) = @_; return unless (ref($settings) eq 'HASH'); my $lctype = lc($type); - unless ($type eq 'Community') { + unless (($type eq 'Community') || ($type eq 'Placement')) { $lctype = 'unofficial'; if ($settings->{'internal.coursecode'}) { $lctype = 'official'; @@ -658,7 +922,7 @@ sub domain_postsubtimeout { } sub print_catsettings { - my ($r,$cdom,$cnum,$cdesc,$type) = @_; + my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; &print_header($r,$type); my %lt = &Apache::lonlocal::texthash( 'back' => 'Pick another action', @@ -679,6 +943,10 @@ sub print_catsettings { my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom); my @cat_params = &catalog_settable($domconf{'coursecategories'},$type); if (@cat_params > 0) { + my $disabled; + if ($readonly) { + $disabled = ' disabled="disabled"'; + } my %currsettings = &Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum); if (grep(/^togglecats$/,@cat_params)) { @@ -690,9 +958,11 @@ sub print_catsettings { } $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.")); + } elsif ($type eq 'Placement') { + $r->print(&mt("If a placement test has been categorized using at least one of the categories defined for placement tests 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").':

      '. '
    • '.&mt('Auto-cataloging is enabled and the course is assigned an institutional code.').'
      • '. @@ -707,19 +977,21 @@ sub print_catsettings { if (ref($cathash) eq 'HASH') { $r->print($lt{'assi'}.'

      '. &Apache::loncommon::assign_categories_table($cathash, - $currsettings{'categories'},$type)); + $currsettings{'categories'},$type,$disabled)); } else { $r->print(&mt('No categories defined for this domain')); } } else { $r->print(&mt('No categories defined for this domain')); } - unless ($type eq 'Community') { + unless (($type eq 'Community') || ($type eq 'Placement')) { $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('

      '); + unless ($readonly) { + $r->print('

      '); + } } else { $r->print(''); if ($type eq 'Community') { @@ -736,7 +1008,7 @@ sub print_catsettings { } sub print_course_modification_page { - my ($r,$cdom,$cnum,$cdesc,$crstype) = @_; + my ($r,$cdom,$cnum,$cdesc,$crstype,$readonly) = @_; my %lt=&Apache::lonlocal::texthash( 'actv' => "Active", 'inac' => "Inactive", @@ -750,11 +1022,11 @@ sub print_course_modification_page { 'domd' => 'Domain default', 'whom' => 'Who configures', ); - my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname); + my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname,$disabled); my %enrollvar = &get_enrollment_settings($cdom,$cnum); my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook', - 'internal.selfenrollmgrdc','internal.selfenrollmgrcc'], - $cdom,$cnum); + 'internal.selfenrollmgrdc','internal.selfenrollmgrcc', + 'internal.mysqltables'],$cdom,$cnum); my $type = &Apache::lonuserutils::get_extended_type($cdom,$cnum,$crstype,\%settings); my @specific_managebydc = split(/,/,$settings{'internal.selfenrollmgrdc'}); my @specific_managebycc = split(/,/,$settings{'internal.selfenrollmgrcc'}); @@ -765,9 +1037,12 @@ sub print_course_modification_page { $lt{'nocc'} = &mt('There is currently no owner set for this community.'); } else { $ccrole ='cc'; - ($javascript_validations,$authenitems) = &gather_authenitems($cdom,\%enrollvar); + ($javascript_validations,$authenitems) = &gather_authenitems($cdom,\%enrollvar,$readonly); } $ccname = &Apache::lonnet::plaintext($ccrole,$crstype); + if ($readonly) { + $disabled = ' disabled="disabled"'; + } my %roleshash = &Apache::lonnet::get_my_roles($cnum,$cdom,'','',[$ccrole]); my (@local_ccs,%cc_status,%pname); foreach my $item (keys(%roleshash)) { @@ -808,9 +1083,9 @@ sub print_course_modification_page { foreach my $cc (@local_ccs) { $ownertable .= &Apache::loncommon::start_data_table_row()."\n"; if ($cc eq $enrollvar{'courseowner'}) { - $ownertable .= ''."\n"; + $ownertable .= ''."\n"; } else { - $ownertable .= ''."\n"; + $ownertable .= ''."\n"; } $ownertable .= ''.$pname{$cc}.''."\n". @@ -835,23 +1110,23 @@ sub print_course_modification_page { $r->print(&Apache::lonhtmlcommon::row_title( &Apache::loncommon::help_open_topic('Modify_Course_Instcode'). ' '.&mt('Course Code'))."\n". - ''. + ''. &Apache::lonhtmlcommon::row_closure()); - if (&showcredits($cdom)) { + if (($crstype eq 'Course') && (&showcredits($cdom))) { $r->print(&Apache::lonhtmlcommon::row_title( &Apache::loncommon::help_open_topic('Modify_Course_Credithours'). ' '.&mt('Credits (students)'))."\n". - ''. + ''. &Apache::lonhtmlcommon::row_closure()); - } - $r->print(&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(&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"); } my ($cctitle,$rolename,$currmanages,$ccchecked,$dcchecked,$defaultchecked); my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles(); @@ -895,27 +1170,35 @@ sub print_course_modification_page { foreach my $option ('','0','1') { $r->print('
      '); } $r->print(''."\n". &Apache::loncommon::end_data_table_row()."\n"); } $r->print(&Apache::loncommon::end_data_table()."\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);"'); + '
      '.&Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_title( + &Apache::loncommon::help_open_topic('Modify_Course_Table_Lifetime'). + ' '.&mt('"Temporary" Tables Lifetime (s)'))."\n". + ''. + &Apache::lonhtmlcommon::row_closure(1). + &Apache::lonhtmlcommon::end_pick_box().'

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

      '); + $r->print('

      '); return; } sub print_selfenrollconfig { - my ($r,$type,$cdesc,$coursehash) = @_; + my ($r,$type,$cdesc,$coursehash,$readonly) = @_; return unless(ref($coursehash) eq 'HASH'); my $cnum = $coursehash->{'num'}; my $cdom = $coursehash->{'domain'}; @@ -925,7 +1208,7 @@ sub print_selfenrollconfig { ''.$cdesc.'').''."\n"); &Apache::loncreateuser::print_selfenroll_menu($r,'domain',$env{'form.pickedcourse'}, $cdom,$cnum,\%currsettings, - &hidden_form_elements()); + &hidden_form_elements(),$readonly); return; } @@ -981,7 +1264,7 @@ sub modifiable_only_title { } sub gather_authenitems { - my ($cdom,$enrollvar) = @_; + my ($cdom,$enrollvar,$readonly) = @_; my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($cdom); my $curr_authtype = ''; my $curr_authfield = ''; @@ -1005,7 +1288,8 @@ sub gather_authenitems { kerb_def_auth => $krbdef, mode => 'modifycourse', curr_authtype => $curr_authtype, - curr_autharg => $enrollvar->{'autharg'} + curr_autharg => $enrollvar->{'autharg'}, + readonly => $readonly, ); my (%authform,$authenitems); $authform{'krb'} = &Apache::loncommon::authform_kerberos(%param); @@ -1024,9 +1308,9 @@ sub modify_course { my %longtype = &course_settings_descrip($type); my @items = ('internal.courseowner','description','internal.co-owners', 'internal.pendingco-owners','internal.selfenrollmgrdc', - 'internal.selfenrollmgrcc'); + 'internal.selfenrollmgrcc','internal.mysqltables'); my ($selfenrollrows,$selfenrolltitles) = &Apache::lonuserutils::get_selfenroll_titles(); - unless ($type eq 'Community') { + unless (($type eq 'Community') || ($type eq 'Placement')) { push(@items,('internal.coursecode','internal.authtype','internal.autharg', 'internal.sectionnums','internal.crosslistings')); if (&showcredits($cdom)) { @@ -1095,10 +1379,13 @@ sub modify_course { $changed{'code'} = 1; } } - - if (&showcredits($cdom) && exists($env{'form.defaultcredits'})) { - $newattr{'defaultcredits'} =~ s/[^\d\.]//g; + if ( exists($env{'form.mysqltables'}) ) { + $newattr{'mysqltables'} = $env{'form.mysqltables'}; + $newattr{'mysqltables'} =~ s/\D+//g; + } + if (($type ne 'Placement') && (&showcredits($cdom) && exists($env{'form.defaultcredits'}))) { $newattr{'defaultcredits'}=$env{'form.defaultcredits'}; + $newattr{'defaultcredits'} =~ s/[^\d\.]//g; } } @@ -1190,6 +1477,8 @@ sub modify_course { $shown = &selfenroll_config_status(\@newmgrcc,$selfenrolltitles); } elsif (($attr eq 'defaultcredits') && ($shown eq '')) { $shown = &mt('None'); + } elsif (($attr eq 'mysqltables') && ($shown eq '')) { + $shown = &mt('domain default'); } $chgresponse .= '
    • '.&mt('[_1] now set to: [_2]',$longtype{$attr},$shown).'
      • '; } else { @@ -1200,11 +1489,13 @@ sub modify_course { $shown = &selfenroll_config_status(\@currmgrcc,$selfenrolltitles); } elsif (($attr eq 'defaultcredits') && ($shown eq '')) { $shown = &mt('None'); + } elsif (($attr eq 'mysqltables') && ($shown eq '')) { + $shown = &mt('domain default'); } $nochgresponse .= '
    • '.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'
      • '; } } - if (($type ne 'Community') && ($changed{'code'} || $changed{'owner'})) { + if (($type ne 'Community') && ($type ne 'Placement') && ($changed{'code'} || $changed{'owner'})) { if ( $newattr{'courseowner'} eq '') { push(@warnings,&mt('There is no owner associated with this LON-CAPA course.'). '
      '.&mt('If automated enrollment at your institution requires validation of course owners, automated enrollment will fail.')); @@ -1271,6 +1562,8 @@ sub modify_course { $shown = &selfenroll_config_status(\@currmgrcc,$selfenrolltitles); } elsif (($attr eq 'defaultcredits') && ($shown eq '')) { $shown = &mt('None'); + } elsif (($attr eq 'mysqltables') && ($shown eq '')) { + $shown = &mt('domain default'); } $nochgresponse .= '
    • '.&mt('[_1] still set to: [_2]',$longtype{$attr},$shown).'
      • '; } @@ -1883,13 +2176,7 @@ function changePage(formname,newphase) { if ($phase eq 'setparms') { $js .= $javascript_validations; } elsif ($phase eq 'courselist') { - $js .= qq| - -function gochoose(cname,cdom,cdesc) { - document.courselist.pickedcourse.value = cdom+'_'+cname; - document.courselist.submit(); -} - + $js .= <<"ENDJS"; function hide_searching() { if (document.getElementById('searching')) { document.getElementById('searching').style.display = 'none'; @@ -1897,10 +2184,12 @@ function hide_searching() { return; } -|; +ENDJS } elsif ($phase eq 'setquota') { my $invalid = &mt('The quota you entered contained invalid characters.'); my $alert = &mt('You must enter a number'); + &js_escape(\$invalid); + &js_escape(\$alert); my $regexp = '/^\s*(\d+\.?\d*|\.\d+)\s*$/'; $js .= <<"ENDSCRIPT"; @@ -1920,6 +2209,8 @@ ENDSCRIPT } elsif ($phase eq 'setanon') { my $invalid = &mt('The responder threshold you entered is invalid.'); my $alert = &mt('You must enter a positive integer.'); + &js_escape(\$invalid); + &js_escape(\$alert); my $regexp = ' /^\s*\d+\s*$/'; $js .= <<"ENDSCRIPT"; @@ -1945,6 +2236,9 @@ ENDSCRIPT my $invalid = &mt('The choice entered for disabling the submit button is invalid.'); my $invalidtimeout = &mt('The timeout you entered for disabling the submit button is invalid.'); my $alert = &mt('Enter one of: a positive integer, 0 (for no timeout), or leave blank to use domain default'); + &js_escape(\$invalid); + &js_escape(\$invalidtimeout); + &js_escape(\$alert); my $regexp = ' /^\s*\d+\s*$/'; $js .= <<"ENDSCRIPT"; @@ -2019,9 +2313,9 @@ ENDSCRIPT } my $starthash; - if ($env{'form.phase'} eq 'ccrole') { + if ($env{'form.phase'} eq 'adhocrole') { $starthash = { - add_entries => {'onload' => "javascript:document.ccrole.submit();"}, + add_entries => {'onload' => "javascript:document.adhocrole.submit();"}, }; } elsif ($phase eq 'courselist') { $starthash = { @@ -2034,6 +2328,8 @@ ENDSCRIPT my $bread_text = "View/Modify Courses/Communities"; if ($type eq 'Community') { $bread_text = 'Community Settings'; + } elsif ($type eq 'Placement') { + $bread_text = 'Placement Test Settings'; } else { $bread_text = 'Course Settings'; } @@ -2088,6 +2384,7 @@ sub course_settings_descrip { 'co-owners' => "Username:domain of each co-owner", 'selfenrollmgrdc' => "Community-specific self-enrollment configuration by Domain Coordinator", 'selfenrollmgrcc' => "Community-specific self-enrollment configuration by Community personnel", + 'mysqltables' => '"Temporary" student performance tables lifetime (seconds)', ); } else { %longtype = &Apache::lonlocal::texthash( @@ -2106,9 +2403,10 @@ sub course_settings_descrip { 'sectionnums' => 'Course section number:LON-CAPA section', 'crosslistings' => 'Crosslisted class:LON-CAPA section', 'defaultcredits' => 'Credits', + 'autodropfailsafe' => "Failsafe section enrollment count", 'selfenrollmgrdc' => "Course-specific self-enrollment configuration by Domain Coordinator", 'selfenrollmgrcc' => "Course-specific self-enrollment configuration by Course personnel", - + 'mysqltables' => '"Temporary" student performance tables lifetime (seconds)', ); } return %longtype; @@ -2121,7 +2419,7 @@ sub hidden_form_elements { 'locarg','krbarg','krbver','counter','hidefromcat','usecategory', 'threshold','postsubmit','postsubtimeout','defaultcredits','uploadquota', 'selfenrollmgrdc','selfenrollmgrcc','action','state','currsec_st', - 'sections','newsec'],['^selfenrollmgr_'])."\n". + 'sections','newsec','mysqltables'],['^selfenrollmgr_','^selfenroll_'])."\n". ''; return $hidden_elements; } @@ -2129,11 +2427,47 @@ sub hidden_form_elements { sub showcredits { my ($dom) = @_; my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); - if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbokcredits'}) { + if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'} || $domdefaults{'textbookcredits'}) { return 1; } } +sub get_permission { + my ($dom) = @_; + my ($allowed,%permission); + if (&Apache::lonnet::allowed('ccc',$dom)) { + $allowed = 1; + %permission = ( + setquota => 'edit', + processquota => 'edit', + setanon => 'edit', + processthreshold => 'edit', + setpostsubmit => 'edit', + processpostsubmit => 'edit', + viewparms => 'view', + setparms => 'edit', + processparms => 'edit', + catsettings => 'edit', + processcat => 'edit', + selfenroll => 'edit', + adhocrole => 'coord', + ); + } elsif (&Apache::lonnet::allowed('rar',$dom)) { + $allowed = 1; + %permission = ( + setquota => 'view', + viewparms => 'view', + setanon => 'view', + setpostsubmit => 'view', + setparms => 'view', + catsettings => 'view', + selfenroll => 'view', + adhocrole => 'custom', + ); + } + return ($allowed,\%permission); +} + sub handler { my $r = shift; if ($r->header_only) { @@ -2144,8 +2478,8 @@ sub handler { my $dom = $env{'request.role.domain'}; my $domdesc = &Apache::lonnet::domain($dom,'description'); - - if (&Apache::lonnet::allowed('ccc',$dom)) { + my ($allowed,$permission) = &get_permission($dom); + if ($allowed) { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -2172,6 +2506,8 @@ sub handler { } if ($type eq 'Community') { $choose_text = "Choose a community"; + } elsif ($type eq 'Placement') { + $choose_text = "Choose a placement test"; } else { $choose_text = "Choose a course"; } @@ -2181,13 +2517,15 @@ sub handler { {href=>"javascript:changePage(document.$phase,'courselist')", text=>$choose_text}); if ($phase eq 'courselist') { - &print_course_selection_page($r,$dom,$domdesc); + &print_course_selection_page($r,$dom,$domdesc,$permission); } else { my ($checked,$cdesc,$coursehash) = &check_course($dom,$domdesc); if ($checked eq 'ok') { my $enter_text; if ($type eq 'Community') { $enter_text = 'Enter community'; + } elsif ($type eq 'Placement') { + $enter_text = 'Enter placement test'; } else { $enter_text = 'Enter course'; } @@ -2196,23 +2534,33 @@ sub handler { ({href=>"javascript:changePage(document.$phase,'menu')", text=>"Pick action"}); &print_modification_menu($r,$cdesc,$domdesc,$dom,$type, - $env{'form.pickedcourse'},$coursehash); - } elsif ($phase eq 'ccrole') { + $env{'form.pickedcourse'},$coursehash, + $permission); + } elsif ($phase eq 'adhocrole') { &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:changePage(document.$phase,'ccrole')", + ({href=>"javascript:changePage(document.$phase,'adhocrole')", text=>$enter_text}); - &print_ccrole_selected($r,$type); + &print_adhocrole_selected($r,$type,$permission); } else { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'menu')", text=>"Pick action"}); my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'}); - if ($phase eq 'setquota') { + my ($readonly,$linktext); + if ($permission->{$phase} eq 'view') { + $readonly = 1; + } + if (($phase eq 'setquota') && ($permission->{'setquota'})) { + if ($permission->{'setquota'} eq 'view') { + $linktext = 'Set quota'; + } else { + $linktext = 'Display quota'; + } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", - text=>"Set quota"}); - &print_setquota($r,$cdom,$cnum,$cdesc,$type); - } elsif ($phase eq 'processquota') { + text=>$linktext}); + &print_setquota($r,$cdom,$cnum,$cdesc,$type,$readonly); + } elsif (($phase eq 'processquota') && ($permission->{'processquota'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'setquota')", text=>"Set quota"}); @@ -2220,12 +2568,12 @@ sub handler { ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Result"}); &modify_quota($r,$cdom,$cnum,$cdesc,$domdesc,$type); - } elsif ($phase eq 'setanon') { + } elsif (($phase eq 'setanon') && ($permission->{'setanon'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Threshold for anonymous submissions display"}); - &print_set_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$type); - } elsif ($phase eq 'processthreshold') { + &print_set_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$type,$readonly); + } elsif (($phase eq 'processthreshold') && ($permission->{'processthreshold'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'setanon')", text=>"Threshold for anonymous submissions display"}); @@ -2233,27 +2581,37 @@ sub handler { ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Result"}); &modify_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$domdesc,$type); - } elsif ($phase eq 'setpostsubmit') { + } elsif (($phase eq 'setpostsubmit') && ($permission->{'setpostsubmit'})) { + if ($permission->{'setpostsubmit'} eq 'view') { + $linktext = 'Submit button behavior post-submission'; + } else { + $linktext = 'Configure submit button behavior post-submission'; + } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", - text=>"Configure submit button behavior post-submission"}); - &print_postsubmit_config($r,$cdom,$cnum,$cdesc,$type); - } elsif ($phase eq 'processpostsubmit') { + text=>$linktext}); + &print_postsubmit_config($r,$cdom,$cnum,$cdesc,$type,$readonly); + } elsif (($phase eq 'processpostsubmit') && ($permission->{'processpostsubmit'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Result"}); &modify_postsubmit_config($r,$cdom,$cnum,$cdesc,$domdesc,$type); - } elsif ($phase eq 'viewparms') { + } elsif (($phase eq 'viewparms') && ($permission->{'viewparms'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'viewparms')", text=>"Display settings"}); - &print_settings_display($r,$cdom,$cnum,$cdesc,$type); - } elsif ($phase eq 'setparms') { + &print_settings_display($r,$cdom,$cnum,$cdesc,$type,$permission); + } elsif (($phase eq 'setparms') && ($permission->{'setparms'})) { + if ($permission->{'setparms'} eq 'view') { + $linktext = 'Display settings'; + } else { + $linktext = 'Change settings'; + } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", - text=>"Change settings"}); - &print_course_modification_page($r,$cdom,$cnum,$cdesc,$type); - } elsif ($phase eq 'processparms') { + text=>$linktext}); + &print_course_modification_page($r,$cdom,$cnum,$cdesc,$type,$readonly); + } elsif (($phase eq 'processparms') && ($permission->{'processparms'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'setparms')", text=>"Change settings"}); @@ -2261,12 +2619,12 @@ sub handler { ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Result"}); &modify_course($r,$cdom,$cnum,$cdesc,$domdesc,$type); - } elsif ($phase eq 'catsettings') { + } elsif (($phase eq 'catsettings') && ($permission->{'catsettings'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Catalog settings"}); - &print_catsettings($r,$cdom,$cnum,$cdesc,$type); - } elsif ($phase eq 'processcat') { + &print_catsettings($r,$cdom,$cnum,$cdesc,$type,$readonly); + } elsif (($phase eq 'processcat') && ($permission->{'processcat'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'catsettings')", text=>"Catalog settings"}); @@ -2274,12 +2632,12 @@ sub handler { ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Result"}); &modify_catsettings($r,$cdom,$cnum,$cdesc,$domdesc,$type); - } elsif ($phase eq 'selfenroll') { + } elsif (($phase eq 'selfenroll') && ($permission->{'selfenroll'})) { &Apache::lonhtmlcommon::add_breadcrumb ({href => "javascript:changePage(document.$phase,'$phase')", text => "Self-enrollment settings"}); if (!exists($env{'form.state'})) { - &print_selfenrollconfig($r,$type,$cdesc,$coursehash); + &print_selfenrollconfig($r,$type,$cdesc,$coursehash,$readonly); } elsif ($env{'form.state'} eq 'done') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'$phase')", @@ -2292,6 +2650,8 @@ sub handler { $r->print(''); if ($type eq 'Community') { $r->print(&mt('The community you selected is not a valid community in this domain')); + } elsif ($type eq 'Placement') { + $r->print(&mt('The course you selected is not a valid placement test in this domain')); } else { $r->print(&mt('The course you selected is not a valid course in this domain')); }