--- loncom/interface/lonmodifycourse.pm 2021/06/20 17:27:03 1.79.2.9 +++ loncom/interface/lonmodifycourse.pm 2016/04/02 04:30:21 1.80 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # handler for DC-only modifiable course settings # -# $Id: lonmodifycourse.pm,v 1.79.2.9 2021/06/20 17:27:03 raeburn Exp $ +# $Id: lonmodifycourse.pm,v 1.80 2016/04/02 04:30:21 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,23 +39,15 @@ use Apache::lonpickcourse; use lib '/home/httpd/lib/perl'; use LONCAPA qw(:DEFAULT :match); -my $registered_cleanup; -my $modified_dom; - sub get_dc_settable { my ($type,$cdom) = @_; if ($type eq 'Community') { return ('courseowner','selfenrollmgrdc','selfenrollmgrcc'); } else { - my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc', - 'selfenrollmgrcc','mysqltables'); + my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc','selfenrollmgrcc'); if (&showcredits($cdom)) { push(@items,'defaultcredits'); } - my %passwdconf = &Apache::lonnet::get_passwdconf($cdom); - if (($passwdconf{'crsownerchg'}) && ($type ne 'Placement')) { - push(@items,'nopasswdchg'); - } return @items; } } @@ -63,7 +55,7 @@ sub get_dc_settable { sub autoenroll_keys { my $internals = ['coursecode','courseowner','authtype','autharg','defaultcredits', 'autoadds','autodrops','autostart','autoend','sectionnums', - 'crosslistings','co-owners','autodropfailsafe']; + 'crosslistings','co-owners']; my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date']; return ($internals,$accessdates); } @@ -101,7 +93,6 @@ sub get_enrollment_settings { @items = map { 'internal.'.$_; } (@{$internals}); push(@items,@{$accessdates}); } - push(@items,'internal.nopasswdchg'); my %settings = &Apache::lonnet::get('environment',\@items,$cdom,$cnum); my %enrollvar; $enrollvar{'autharg'} = ''; @@ -126,13 +117,14 @@ sub get_enrollment_settings { $enrollvar{$type} =~ s/,/, /g; } elsif ($type eq "authtype" || $type eq "autharg" || $type eq "coursecode" - || $type eq "crosslistings" || $type eq "selfenrollmgr" - || $type eq "autodropfailsafe" || $type eq 'nopasswdchg') { + || $type eq "crosslistings") { $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}; @@ -181,181 +173,29 @@ sub print_course_search_page { $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') { - $actiontext = &mt('Actions available after searching for a community:'); - } 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); - } 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'); - } 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); - } 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); - } 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,$permission) = @_; + my ($r,$dom,$domdesc) = @_; my $type = $env{'form.type'}; if (!defined($type)) { $type = 'Course'; } &print_header($r,$type); - 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"); - - - -END - } elsif ($permission->{'adhocrole'} eq 'coord') { - $r->print(<<"END"); - -END - } - -# Criteria for course search +# Criteria for course search my ($filterlist,$filter) = &get_filters(); my $action = '/adm/modifycourse'; my $dctitle = &Apache::lonnet::plaintext('dc'); @@ -368,7 +208,7 @@ END 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, - $dom,undef,%courses); + undef,undef,%courses); return; } @@ -389,9 +229,10 @@ sub get_filters { } sub print_modification_menu { - my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash,$permission) = @_; + my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash) = @_; &print_header($r,$type); - my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$cdom,$cnum); + my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$setparams_text,$cat_text, + $cdom,$cnum); if (ref($coursehash) eq 'HASH') { $cdom = $coursehash->{'domain'}; $cnum = $coursehash->{'num'}; @@ -403,72 +244,36 @@ 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') { - 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'; - } + $categorytitle = 'View/Modify Community Settings'; $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.'); + $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 { - 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 { - $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'; - } - } + $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'; + } else { + $setparams_text = 'View/Modify course owner, institutional code, default authentication, and self-enrollment'; + } + $cat_text = 'View/Modify catalog settings for course'; } 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,$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; - } - } + 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; + } } return 0; } @@ -481,59 +286,59 @@ sub print_modification_menu { ({ categorytitle => $categorytitle, items => [ { - linktext => $linktext{'setparms'}, + linktext => $setparams_text, url => &phaseurl('setparms'), - permission => $permission->{'setparms'}, + permission => 1, #help => '', icon => 'crsconf.png', linktitle => '' }, { - linktext => $linktext{'setquota'}, + linktext => 'View/Modify quotas for group portfolio files, and for uploaded content.', url => &phaseurl('setquota'), - permission => $permission->{'setquota'}, + permission => 1, #help => '', icon => 'groupportfolioquota.png', linktitle => '' }, { - linktext => $linktext{'setanon'}, + linktext => 'View/Modify responders threshold for anonymous survey submissions display', url => &phaseurl('setanon'), - permission => $permission->{'setanon'}, + permission => 1, #help => '', icon => 'anonsurveythreshold.png', linktitle => '' }, { - linktext => $linktext{'catsettings'}, + linktext => $cat_text, url => &phaseurl('catsettings'), - permission => (($permission->{'catsettings'}) && (@additional_params > 0)), + permission => (@additional_params > 0), #help => '', icon => 'ccatconf.png', linktitle => '' }, { - linktext => $linktext{'viewparms'}, + linktext => 'Display current settings for automated enrollment', url => &phaseurl('viewparms'), - permission => ($permission->{'viewparms'} && ($type ne 'Community')), + permission => ($type ne 'Community'), #help => '', icon => 'roles.png', linktitle => '' }, { - linktext => $linktext{'selfenroll'}, + linktext => 'View/Modify Self-Enrollment configuration', icon => 'self_enroll.png', #help => 'Course_Self_Enrollment', url => &phaseurl('selfenroll'), - permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash,$permission), + permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash), linktitle => 'Configure user self-enrollment.', }, { - linktext => $linktext{'setpostsubmit'}, + linktext => 'View/Modify submit button behavior, post-submission', icon => 'emblem-readonly.png', #help => '', url => &phaseurl('setpostsubmit'), - permission => $permission->{'setpostsubmit'}, + permission => 1, linktitle => '', }, ] @@ -562,28 +367,22 @@ sub print_modification_menu { } $menu_html .= '
  • '.&mt('Override defaults for who configures self-enrollment for this specific course.').'
    • '."\n"; } - $menu_html .= '
  • '.$mysqltables_text.'
    • '."\n". - '
  • '.$setquota_text.'
    • '."\n". + $menu_html .= '
  • '.$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).',$categories_link_start,$categories_link_end).'
    • '."\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).','','').'
    • '."\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).',$categories_link_start,$categories_link_end).'
    • '."\n"; + $menu_html .= '
  • '.&mt('Manual cataloging of a community (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).','','').'
    • '."\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).',$categories_link_start,$categories_link_end).'
    • '."\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).','','').'
    • '."\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).',$categories_link_start,$categories_link_end).'
    • '."\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).','','').'
    • '."\n"; } } } @@ -599,43 +398,18 @@ sub print_modification_menu { return; } -sub print_adhocrole_selected { - my ($r,$type,$permission) = @_; +sub print_ccrole_selected { + my ($r,$type) = @_; &print_header($r,$type); my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'}); - 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('
    - - + $r->print(' + +
    '); - } else { - $r->print('
    '. - '
    '); - } - return; } sub print_settings_display { - my ($r,$cdom,$cnum,$cdesc,$type,$permission) = @_; + my ($r,$cdom,$cnum,$cdesc,$type) = @_; my %enrollvar = &get_enrollment_settings($cdom,$cnum); my %longtype = &course_settings_descrip($type); my %lt = &Apache::lonlocal::texthash( @@ -664,34 +438,9 @@ sub print_settings_display { "$lt{'dcon'}\n". &Apache::loncommon::end_data_table_header_row()."\n"; foreach my $item (@items) { - my $shown = $enrollvar{$item}; - if ($item eq 'crosslistings') { - my (@xlists,@lcsecs); - foreach my $entry (split(/,/,$enrollvar{$item})) { - my ($xlist,$lc_sec) = split(/:/,$entry); - push(@xlists,$xlist); - push(@lcsecs,$lc_sec); - } - if (@xlists) { - my $crskey = $cnum.':'.$enrollvar{'coursecode'}; - my %reformatted = - &Apache::lonnet::auto_instsec_reformat($cdom,'declutter', - {$crskey => \@xlists}); - if (ref($reformatted{$crskey}) eq 'ARRAY') { - my @show; - my @xlcodes = @{$reformatted{$crskey}}; - for (my $i=0; $i<@xlcodes; $i++) { - push(@show,$xlcodes[$i].':'.$lcsecs[$i]); - } - if (@show) { - $shown = join(',',@show); - } - } - } - } $disp_table .= &Apache::loncommon::start_data_table_row()."\n". "$longtype{$item}\n". - "$shown\n"; + "$enrollvar{$item}\n"; if (grep(/^\Q$item\E$/,@modifiable_params)) { $disp_table .= ''.&mt('Yes').''."\n"; } else { @@ -701,39 +450,29 @@ sub print_settings_display { } $disp_table .= &Apache::loncommon::end_data_table()."\n"; &print_header($r,$type); - 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 = ''; - } + 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,$readonly) = @_; + my ($r,$cdom,$cnum,$cdesc,$type) = @_; my $lctype = lc($type); my $headline = &mt("Set disk space quotas for $lctype: [_1]", ''.$cdesc.''); @@ -766,25 +505,19 @@ 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'} @@ -794,7 +527,7 @@ ENDDOCUMENT } sub print_set_anonsurvey_threshold { - my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; + my ($r,$cdom,$cnum,$cdesc,$type) = @_; my %lt = &Apache::lonlocal::texthash( 'resp' => 'Responder threshold for anonymous survey submissions display:', 'sufa' => 'Anonymous survey submissions displayed when responders exceeds', @@ -817,19 +550,13 @@ 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'}:      -$submit +$helpitem $lt{'sufa'}:      +

    $hidden_elements $lt{'back'} @@ -839,7 +566,7 @@ ENDDOCUMENT } sub print_postsubmit_config { - my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; + my ($r,$cdom,$cnum,$cdesc,$type) = @_; my %lt = &Apache::lonlocal::texthash ( 'conf' => 'Configure submit button behavior after student makes a submission', 'disa' => 'Disable submit button/keypress following student submission', @@ -880,27 +607,21 @@ 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'} @@ -913,7 +634,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'; @@ -937,7 +658,7 @@ sub domain_postsubtimeout { } sub print_catsettings { - my ($r,$cdom,$cnum,$cdesc,$type,$readonly) = @_; + my ($r,$cdom,$cnum,$cdesc,$type) = @_; &print_header($r,$type); my %lt = &Apache::lonlocal::texthash( 'back' => 'Pick another action', @@ -958,10 +679,6 @@ 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)) { @@ -973,7 +690,7 @@ 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.")); } else { @@ -990,7 +707,7 @@ sub print_catsettings { if (ref($cathash) eq 'HASH') { $r->print($lt{'assi'}.'

    '. &Apache::loncommon::assign_categories_table($cathash, - $currsettings{'categories'},$type,$disabled)); + $currsettings{'categories'},$type)); } else { $r->print(&mt('No categories defined for this domain')); } @@ -1001,10 +718,8 @@ sub print_catsettings { $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 ($readonly) { - $r->print('

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

    '); } else { $r->print(''); if ($type eq 'Community') { @@ -1021,7 +736,7 @@ sub print_catsettings { } sub print_course_modification_page { - my ($r,$cdom,$cnum,$cdesc,$crstype,$readonly) = @_; + my ($r,$cdom,$cnum,$cdesc,$crstype) = @_; my %lt=&Apache::lonlocal::texthash( 'actv' => "Active", 'inac' => "Inactive", @@ -1035,28 +750,24 @@ sub print_course_modification_page { 'domd' => 'Domain default', 'whom' => 'Who configures', ); - my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname,$disabled); + my ($ownertable,$ccrole,$javascript_validations,$authenitems,$ccname); my %enrollvar = &get_enrollment_settings($cdom,$cnum); my %settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook', - 'internal.selfenrollmgrdc','internal.selfenrollmgrcc', - 'internal.mysqltables'],$cdom,$cnum); + 'internal.selfenrollmgrdc','internal.selfenrollmgrcc'], + $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'}); my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom); - my %passwdconf = &Apache::lonnet::get_passwdconf($cdom); my @default_managebydc = split(/,/,$domdefaults{$type.'selfenrolladmdc'}); if ($crstype 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,$readonly); + ($javascript_validations,$authenitems) = &gather_authenitems($cdom,\%enrollvar); } $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)) { @@ -1097,9 +808,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". @@ -1119,42 +830,28 @@ sub print_course_modification_page { if ($crstype eq 'Community') { $r->print(&Apache::lonhtmlcommon::row_title( &Apache::loncommon::help_open_topic('Modify_Community_Owner'). - ' '.&mt('Community Owner'))."\n". - $ownertable."\n".&Apache::lonhtmlcommon::row_closure()); + ' '.&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()); if (&showcredits($cdom)) { $r->print(&Apache::lonhtmlcommon::row_title( &Apache::loncommon::help_open_topic('Modify_Course_Credithours'). - ' '.&mt('Credits (students)'))."\n". - ''. + ' '.&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". - $ownertable."\n".&Apache::lonhtmlcommon::row_closure()); - if (($passwdconf{'crsownerchg'}) && ($type ne 'Placement')) { - my $checked; - if ($enrollvar{'nopasswdchg'}) { - $checked = ' checked="checked"'; - } - $r->print(&Apache::lonhtmlcommon::row_title( - &Apache::loncommon::help_open_topic('Modify_Course_Chgpasswd'). - ' '.&mt('Changing passwords (internal)'))."\n". - '