--- loncom/interface/courseprefs.pm	2021/12/15 00:48:41	1.49.2.27
+++ loncom/interface/courseprefs.pm	2016/10/11 22:58:55	1.80
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.49.2.27 2021/12/15 00:48:41 raeburn Exp $
+# $Id: courseprefs.pm,v 1.80 2016/10/11 22:58:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -310,7 +310,7 @@ sub handler {
                 idnu => 'Course ID or number',
                 unco => 'Unique code',
                 desc => 'Course Description',
-                cred => 'Student credits',
+                cred => 'Student credits', 
                 ownr => 'Course Owner',
                 cown => 'Course Co-owners',
                 catg => 'Categorize course',
@@ -375,18 +375,18 @@ sub handler {
                      help => 'Course_Prefs_General',
                      ordered => ['owner','co-owners','loncaparev','description',
                                  'clonedfrom','courseid','uniquecode','categories',
-                                 'hidefromcat','syllabus','cloners','url',
+                                 'hidefromcat','externalsyllabus','cloners','url',
                                  'rolenames'],
                      itemtext => {
                                    'owner'            => $lt{'ownr'},
                                    'co-owners'        => $lt{'cown'},
                                    'description'      => $lt{'desc'},
                                    'courseid'         => $lt{'idnu'},
-                                   'uniquecode'       => $lt{'unco'}, 
+                                   'uniquecode'       => $lt{'unco'},
                                    'categories'       => $lt{'catg'},
                                    'hidefromcat'      => $lt{'excc'},
                                    'cloners'          => $lt{'clon'}, 
-                                   'syllabus'         => 'Syllabus status',
+                                   'externalsyllabus' => 'Syllabus status',
                                    'url'              => 'Top Level Map',
                                    'rolenames'        => $lt{'rept'},
                                    'loncaparev'       => $lt{'lcrv'},
@@ -419,6 +419,7 @@ sub handler {
                     { text => 'Discussion and Chat',
                       help => 'Course_Prefs_Discussions',
                       ordered => ['pch.roles.denied','pch.users.denied',
+                                  'pac.roles.denied','pac.users.denied',
                                   'plc.roles.denied','plc.users.denied',
                                   'allow_limited_html_in_feedback',
                                   'allow_discussion_post_editing',
@@ -428,9 +429,11 @@ sub handler {
                          'pch.users.denied'             => 'No Resource Discussion',
                          'plc.roles.denied'             => 'No Chat room use',
                          'plc.users.denied'             => 'No Chat room use',
+                         'pac.roles.denied'             => 'No Anonymous Resource Discussion',
+                         'pac.users.denied'             => 'No Anonymous Resource Discussion',  
                          allow_limited_html_in_feedback => 'Allow limited HTML in discussion',
                          allow_discussion_post_editing  => 'Users can edit/delete own discussion posts',
-                         discussion_post_fonts       => 'Discussion post fonts based on likes/unlikes',
+                         discussion_post_fonts          => 'Discussion post fonts based on likes/unlikes',
                                   },
                     },
         'classlists' =>
@@ -493,7 +496,7 @@ sub handler {
                     help => 'Course_Prefs_Printouts',
                     ordered => ['problem_stream_switch','suppress_tries',
                                 'default_paper_size','print_header_format',
-                                'disableexampointprint'],
+                                'disableexampointprint','canuse_pdfforms'],
                     itemtext => {
                         problem_stream_switch => 'Allow problems to be split over pages',
                         suppress_tries        => 'Suppress number of tries in printing',
@@ -763,8 +766,7 @@ sub process_changes {
                                  (!$can_categorize));
                         next if (($entry eq 'loncaparev') || 
                                 ($entry eq 'owner') ||
-                                ($entry eq 'clonedfrom') ||
-                                ($entry eq 'syllabus'));
+                                ($entry eq 'clonedfrom'));
                         push(@ordered,$entry);
                     }
                 } elsif ($action eq 'classlists') {
@@ -967,19 +969,19 @@ sub process_changes {
                                 my $udom = $env{'user.domain'};
                                 my $pendingcoowners = $values->{'internal.pendingco-owners'};
                                 my @pendingcoown = split(',',$pendingcoowners);
-                                if ($env{'form.pending_coowner'}) {
+                                if ($env{'form.pending_coowoner'}) {
                                     foreach my $item (@pendingcoown) {
                                         unless ($item eq $uname.':'.$udom) {
                                             push(@newpending,$item);
                                         }
                                     }
                                     @newcoown = @currcoown;
-                                    if ($env{'form.pending_coowner'} eq 'accept') {
+                                    if ($env{'form.pending_coowoner'} eq 'accept') {
                                         unless (grep(/^\Q$uname\E:\Q$udom\E$/,@currcoown)) {
                                             push(@newcoown,$uname.':'.$udom);
                                         }
                                     }
-                                } elsif ($env{'form.remove_coowner'}) {
+                                } elsif ($env{'form.remove_coowoner'}) {
                                     foreach my $item (@currcoown) {
                                         unless ($item eq $uname.':'.$udom) {
                                             push(@newcoown,$item);
@@ -1057,7 +1059,8 @@ sub process_changes {
                                     }
                                 }
                             }
-                        } elsif (($entry eq 'plc.roles.denied') || ($entry eq 'pch.roles.denied')) {
+                        } elsif (($entry eq 'plc.roles.denied') || ($entry eq 'pch.roles.denied') ||
+                                 ($entry eq 'pac.roles.denied')) {
                             my @denied = &Apache::loncommon::get_env_multiple('form.'.$entry);
                             @denied = sort(@denied);
                             my $deniedstr = '';
@@ -1065,7 +1068,8 @@ sub process_changes {
                                 $deniedstr = join(',',@denied);  
                             }
                             $newvalues{$entry} = $deniedstr;
-                        } elsif (($entry eq 'plc.users.denied') || ($entry eq 'pch.users.denied')) {
+                        } elsif (($entry eq 'plc.users.denied') || ($entry eq 'pch.users.denied') ||
+                                 ($entry eq 'pac.users.denied')) {
                             my $total = $env{'form.'.$entry.'_total'};
                             my $userstr = '';
                             my @denied;  
@@ -1117,14 +1121,14 @@ sub process_changes {
                             my ($classorder,$classtitles) = &discussion_vote_classes();
                             my $fontchange = 0;
                             foreach my $class (@{$classorder}) {
-                                my $ext_entry = $entry.'_'.$class;
+                                my $ext_entry = $entry.'_'.$class; 
                                 my $size = $env{'form.'.$ext_entry.'_size'};
                                 my $unit = $env{'form.'.$ext_entry.'_unit'};
                                 my $weight = $env{'form.'.$ext_entry.'_weight'};
                                 my $style = $env{'form.'.$ext_entry.'_style'};
                                 my $other = $env{'form.'.$ext_entry.'_other'};
                                 $size =~ s/,//g;
-                                $unit =~ s/,//g;
+                                $unit =~ s/,//g; 
                                 $weight =~ s/,//g;
                                 $style =~ s/,//g;
                                 $other =~ s/[^\w;:\s\-\%.]//g;
@@ -1132,7 +1136,7 @@ sub process_changes {
                                 $newvalues{$ext_entry} = join(',',($size.$unit,$weight,$style,$other));
                                 my $current = $values->{$ext_entry};
                                 if ($values->{$ext_entry} eq '') {
-                                    $current = ',,,';
+                                    $current = ',,,'; 
                                 }
                                 if ($newvalues{$ext_entry} ne $current) {
                                     $changes->{$ext_entry} = $newvalues{$ext_entry};
@@ -1141,7 +1145,7 @@ sub process_changes {
                             }
                             if ($fontchange) {
                                 $changes->{$entry} = 1;
-                            }
+                            } 
                         } elsif ($entry eq 'nothideprivileged') {
                             my @curr_nothide;
                             my @new_nothide;
@@ -1216,7 +1220,7 @@ sub process_changes {
                             my $newtext = $maxnum-1;
                             $newhdr[$env{'form.printfmthdr_pos_'.$newtext}] = $env{'form.printfmthdr_text_'.$newtext};
                             $newvalues{$entry} = join('',@newhdr);
-                        } elsif (($entry eq 'languages') ||
+                        } elsif (($entry eq 'languages') || 
                                  ($entry eq 'checkforpriv')) {
                             my $settings;
                             my $total = $env{'form.'.$entry.'_total'};
@@ -1232,7 +1236,7 @@ sub process_changes {
                             }
                             if ($env{'form.'.$entry.'_'.$total} ne '') {
                                 my $new = $env{'form.'.$entry.'_'.$total};
-                                if ($entry eq 'languages') {
+                                if ($entry eq 'languages') { 
                                     my %langchoices = &get_lang_choices();
                                     if ($langchoices{$new}) {
                                         $settings .= $new;
@@ -1507,12 +1511,12 @@ sub store_changes {
                                                 }
                                             }
                                             unless (&Apache::lonnet::is_course_owner($cdom,$cnum)) {
-                                                if ($env{'form.pending_coowner'} eq 'accept') {
+                                                if ($env{'form.pending_coowoner'} eq 'accept') {
                                                         $displayval = &mt('on');
-                                                } elsif ($env{'form.pending_coowner'} eq 'decline') {
+                                                } elsif ($env{'form.pending_coowoner'} eq 'decline') {
                                                         $displayval = '';
                                                         $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('Invitation to be co-owner declined')).'</li>';
-                                                } elsif ($env{'form.remove_coowner'}) {
+                                                } elsif ($env{'form.remove_coowoner'}) {
                                                     $displayval = &mt('off');
                                                 }
                                                 if ($displayval) {
@@ -1777,7 +1781,7 @@ sub get_jscript {
                                     $local_to_standard{$code_order[$i]} = $standardnames[$i];
                                 }
                                 foreach my $cloner (@cloners) {
-                                    if (($cloner !~ /^\Q*:\E$match_domain$/) &&
+                                    if (($cloner !~ /^\Q*:\E$match_domain$/) && 
                                         ($cloner !~ /^$match_username\:$match_domain$/)) {
                                         foreach my $item (split(/\&/,$cloner)) {
                                             my ($key,$val) = split(/\=/,$item);
@@ -1879,7 +1883,7 @@ function syllabusinfo() {
 }
 ENDSCRIPT
     $jscript = '<script type="text/javascript" language="Javascript">'."\n".
-               '// <![CDATA['."\n".
+               '// <![CDATA['."\n".  
                $browse_js."\n".$categorize_js."\n".$loncaparev_js."\n".
                $cloners_js."\n".$instcode_js.
                $syllabus_js."\n".'//]]>'."\n".
@@ -1974,10 +1978,7 @@ sub print_courseinfo {
     unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
         return;
     }
-    my ($cathash,$categoriesform,$autocoowner,$clonedefaults,$disabled);
-    if ($noedit) {
-        $disabled = ' disabled="disabled"';
-    }
+    my ($cathash,$categoriesform,$autocoowner,$clonedefaults);
     my %domconf = 
         &Apache::lonnet::get_dom('configuration',
                                  ['coursecategories','autoenroll','coursedefaults'],$cdom);
@@ -1986,7 +1987,7 @@ sub print_courseinfo {
         if (ref($cathash) eq 'HASH') {
             $categoriesform = 
                 &Apache::loncommon::assign_categories_table($cathash,
-                                                $settings->{'categories'},$crstype,$disabled)."\n";
+                                                $settings->{'categories'},$crstype)."\n";
         }
     }
     if (ref($domconf{'autoenroll'}) eq 'HASH') {
@@ -2053,20 +2054,14 @@ sub print_courseinfo {
     } else {
         $replace = &mt('To replace the standard title for a course role, enter a title, otherwise leave blank');
     }
-    my ($editmap,$editsyllabus);
-    unless ($noedit) {
-        $editmap = ('&nbsp;'x2).
-                   '<a href="javascript:openbrowser'.
-                   "('display','url','sequence')\">".
-                   &mt('Select Map').'</a><br /><span class="LC_warning"> '.
-                   &mt('Modification may make assessment data inaccessible!').
-                   '</span>';
-        $editsyllabus = &mt('[_1]Edit[_2]','<a href="/public/'.$cdom.'/'.$cnum.'/syllabus?forceedit=1">',
-                            '</a>');
-    }
     my %items = (
         'url' => {
-                   text => '<b>'.&mt($itemtext->{'url'}).'</b>'.$editmap,
+                   text => '<b>'.&mt($itemtext->{'url'}).'</b>'.('&nbsp;'x2).
+                           '<a href="javascript:openbrowser'.
+                           "('display','url','sequence')\">".
+                           &mt('Select Map').'</a><br /><span class="LC_warning"> '.
+                           &mt('Modification may make assessment data inaccessible!').
+                           '</span>',
                    input => 'textbox',
                    size  => '55',
                    advanced => 1
@@ -2108,10 +2103,11 @@ sub print_courseinfo {
                    size  => '20',
                    advanced => 1
                         },
-        'syllabus' => {
-                   text => '<b>'.&mt($itemtext->{'syllabus'}).'</b><br />'.
+        'externalsyllabus' => {
+                   text => '<b>'.&mt($itemtext->{'externalsyllabus'}).'</b><br />'.
                            &mt('(Syllabus type in use)').('&nbsp;' x2).
-                           $editsyllabus,
+                           &mt('[_1]Edit[_2]','<a href="/public/'.$cdom.'/'.$cnum.'/syllabus?forceedit=1">',
+                               '</a>'),
                         },
         'hidefromcat' => {
                    text => '<b>'.&mt($itemtext->{'hidefromcat'}).'</b><br />'.
@@ -2133,6 +2129,10 @@ sub print_courseinfo {
     );
     my $datatable;
     my $count = 0;
+    my $disabled;
+    if ($noedit) {
+        $disabled = ' disabled="disabled"';
+    }
     foreach my $item (@{$ordered}) {
         my $colspan;
         if ($item eq 'hidefromcat') {
@@ -2143,7 +2143,7 @@ sub print_courseinfo {
             next if (!$env{'course.'.$env{'request.course.id'}.'.internal.uniquecode'});
         }
         unless (($item eq 'cloners') || ($item eq 'rolenames')) {
-            $colspan = 2;
+            $colspan = 2; 
         }
         $count ++;
         if (exists $items{$item}{advanced} && $items{$item}{advanced} == 1) {
@@ -2187,7 +2187,7 @@ sub print_courseinfo {
                         $default = '0';
                     }
                     $datatable .= &new_cloners_dom_row($cdom,'0',$default);
-                } 
+                }
             } elsif ($settings->{$item} ne '*') {
                 my @entries = split(/,/,$settings->{$item});
                 if (@entries > 0) {
@@ -2326,12 +2326,12 @@ sub print_courseinfo {
             if ($clonesrc =~ m{/$match_domain/$match_courseid}) {
                 my %clonesrcinfo = &Apache::lonnet::coursedescription($clonesrc);
                 if ($clonesrcinfo{'description'}) {
-                    $clonedfrom = $clonesrcinfo{'description'}.' '.($clonesrc);
+                    $clonedfrom = $clonesrcinfo{'description'}.' '.($clonesrc); 
                 }
             }
             $datatable .= $clonedfrom;
         } elsif ($item eq 'uniquecode') {
-            my $code = $env{'course.'.$env{'request.course.id'}.'.internal.uniquecode'};
+            my $code = $env{'course.'.$env{'request.course.id'}.'.internal.uniquecode'}; 
             if ($code) {
                 $datatable .= $code;
             }
@@ -2354,7 +2354,7 @@ sub print_courseinfo {
                     $datatable .= &manage_coownership($cnum,$cdom,\@currcoown,$noedit);
                 }
             }
-        } elsif ($item eq 'syllabus') {
+        } elsif ($item eq 'externalsyllabus') {
             my $external = $env{'course.'.$env{'request.course.id'}.'.externalsyllabus'};
             my $uploaded = $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'};
             my $minimal =  $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'};
@@ -2378,12 +2378,12 @@ sub print_courseinfo {
             } elsif ($uploaded) {
                 $datatable .= &mt('Uploaded file');
             } else {
-                $datatable .= &mt('Standard template');
+                $datatable .= &mt('Standard template'); 
             }
             $datatable .= ('&nbsp;' x 2).
                           &mt('[_1]View[_2]',
                               '<a href="javascript:syllabusinfo();">',
-                              '</a>');
+                              '</a>'); 
         } elsif ($item eq 'loncaparev') {
             my $loncaparev = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
             my $showreqd;
@@ -2408,7 +2408,7 @@ sub new_cloners_dom_row {
     my ($output,$checkedon,$checkedoff);
     if ($newdom ne '') {
         if ($num eq $default) {
-           $checkedon = 'checked="checked" ';
+           $checkedon = 'checked="checked" '; 
         } else {
            $checkedoff = 'checked="checked" ';
         }
@@ -2559,7 +2559,7 @@ ENDSCRIPT
 
 sub display_loncaparev_constraints {
     my ($r,$navmap,$loncaparev,$crstype) = @_;
-    my ($reqdmajor,$reqdminor);
+    my ($reqdmajor,$reqdminor); 
     my $cid = $env{'request.course.id'};
     my $cdom = $env{'course.'.$cid.'.domain'};
     my $cnum = $env{'course.'.$cid.'.num'};
@@ -2582,110 +2582,154 @@ sub display_loncaparev_constraints {
     my $resourcedata = &Apache::lonparmset::readdata($cnum,$cdom);
     if (ref($resourcedata) eq 'HASH') {
         foreach my $key (keys(%{$resourcedata})) {
+            my %found;
             foreach my $item (keys(%Apache::lonrelrequtils::checkparms)) {
                 if ($key =~ /(\Q$item\E)$/) {
-                     if (ref($Apache::lonrelrequtils::checkparms{$item}) eq 'ARRAY') {
-                         my $value = $resourcedata->{$key};
-                         if ($item eq 'examcode') {
-                             if (&Apache::lonnet::validCODE($value)) {
-                                 $value = 'valid';
-                             } else {
-                                 $value = '';
-                             }
-                         } elsif ($item eq 'printstartdate') {
-                             if ($value =~ /^\d+$/) {
-                                 if ($value > $now) {
-                                     $value = 'future';
-                                 }
-                             }
-                         } elsif ($item eq 'printenddate') {
-                             if ($value =~ /^\d+$/) {
-                                 if ($value < $now) {
-                                     $value = 'past';
-                                 }
-                             }
-
-                         }
-                         my ($middle,$scope,$which,$level,$map,$resource);
-                         if (grep(/^\Q$value\E$/,@{$Apache::lonrelrequtils::checkparms{$item}})) {
-                             my $stdtype = &Apache::lonparmset::standard_parameter_types($item);
-                             my $stdname = &Apache::lonparmset::standard_parameter_names($item);
-                             my $valname = &get_param_description($stdtype,$value);
-                             my $rev = $Apache::lonnet::needsrelease{'parameter:'.$item.':'.$value};
-                             my $start = $cid.'.';
-                             if ($key =~ /^\Q$start\E(\[useropt\:($match_username\:$match_domain)\]\.)/) {
-                                 $middle = $1;
-                                 $which = $2;
-                                 $scope = 'user'; 
-                             } elsif ($key =~ /^\Q$start\E(\[(\w+)\]\.)/) {
-                                 $middle = $1;
-                                 $which = $2;
-                                 $scope = 'section/group';
-                             } else {
-                                 $scope = 'all';
-                             }
-                             my $what="$stdname=$valname";
-                             if ($key =~ /^\Q$start$middle\E\w+\.\Q$item\E$/) {
-                                 $level = 'general';
-                                 if ($scope eq 'all') {
-                                     if (ref($fromparam{$rev}{$scope}) eq 'ARRAY') {
-                                         unless(grep(/^\Q$what\E$/,@{$fromparam{$rev}{$scope}})) {
-                                             push(@{$fromparam{$rev}{$scope}},$what);
-                                         }
-                                     } else {
-                                         push(@{$fromparam{$rev}{$scope}},$what);
-                                     }
-                                 } else {
-                                     if (ref($fromparam{$rev}{$scope}{$which}) eq 'ARRAY') {
-                                         unless (grep(/^\Q$what\E$/,@{$fromparam{$rev}{$scope}{$which}})) {
-                                             push(@{$fromparam{$rev}{$scope}{$which}},$what);
-                                         }
-                                     } else {
-                                         push(@{$fromparam{$rev}{$scope}{$which}},$what);
-                                     }
-                                 }
-                                 $rowspan{$rev} ++;
-                             } elsif ($key =~ /^\Q$start$middle\E(.+)___\(all\).\w+\.\Q$item\E$/) {
-                                 $level = 'folder';
-                                 $map = $1;
-                                 if ($scope eq 'all') {
-                                     if (ref($bymap{$map}{$rev}{$scope}) eq 'ARRAY') {
-                                         unless(grep(/^\Q$what\E$/,@{$bymap{$map}{$rev}{$scope}})) {
-                                             push(@{$bymap{$map}{$rev}{$scope}},$what);
-                                         }
-                                     } else {
-                                         push(@{$bymap{$map}{$rev}{$scope}},$what);
-                                     }
-                                 } else {
-                                     if (ref($bymap{$map}{$rev}{$scope}{$which}) eq 'ARRAY') {
-                                         unless(grep(/^\Q$what\E$/,@{$bymap{$map}{$rev}{$scope}{$which}})) {
-                                             push(@{$bymap{$map}{$rev}{$scope}{$which}},$what);
-                                         }
-                                     } else {
-                                         push(@{$bymap{$map}{$rev}{$scope}{$which}},$what);
-                                     }
-                                 }
-                             } elsif ($key =~ /^\Q$start$middle\E(.+)\.\w+\.\Q$item\E$/) {
-                                 $level = 'resource';
-                                 $resource = $1;
-                                 if ($scope eq 'all') {
-                                     if (ref($byresource{$resource}{$rev}{$scope}) eq 'ARRAY') {
-                                         unless(grep(/^\Q$what\E$/,@{$byresource{$resource}{$rev}{$scope}})) {
-                                             push(@{$byresource{$resource}{$rev}{$scope}},$what);
-                                         }
-                                     } else {
-                                         push(@{$byresource{$resource}{$rev}{$scope}},$what);
-                                     }
-                                 } else {
-                                     if (ref($byresource{$resource}{$rev}{$scope}{$which}) eq 'ARRAY') {
-                                         unless (grep(/^\Q$what\E$/,@{$byresource{$resource}{$rev}{$scope}{$which}})) {
-                                             push(@{$byresource{$resource}{$rev}{$scope}{$which}},$what);
-                                         }
-                                     } else {
-                                         push(@{$byresource{$resource}{$rev}{$scope}{$which}},$what);
-                                     }
-                                 }
-                             }
+                    if (ref($Apache::lonrelrequtils::checkparms{$item}) eq 'ARRAY') {
+                        my $value = $resourcedata->{$key};
+                        if ($item eq 'examcode') {
+                            if (&Apache::lonnet::validCODE($value)) {
+                                $value = 'valid';
+                            } else {
+                                $value = '';
+                            }
+                        } elsif ($item eq 'printstartdate') {
+                            if ($value =~ /^\d+$/) {
+                                if ($value > $now) {
+                                    $value = 'future';
+                                }
+                            }
+                        } elsif ($item eq 'printenddate') {
+                            if ($value =~ /^\d+$/) {
+                                if ($value < $now) {
+                                    $value = 'past';
+                                }
+                            }
+                        }
+                        if (grep(/^\Q$value\E$/,@{$Apache::lonrelrequtils::checkparms{$item}})) {
+                            my $stdtype = &Apache::lonparmset::standard_parameter_types($item);
+                            $found{$item}{'valname'} = &get_param_description($stdtype,$value);
+                            $found{$item}{'rev'} = $Apache::lonnet::needsrelease{'parameter:'.$item.':'.$value.'::'};
+                        }
+                    }
+                }
+            }
+            foreach my $item (keys(%Apache::lonrelrequtils::checkparmvalsmatch)) {
+                if (ref($Apache::lonrelrequtils::checkparmvalsmatch{$item}) eq 'ARRAY') {
+                    my $value = $resourcedata->{$key};
+                    foreach my $valuematch (@{$Apache::lonrelrequtils::checkparmvalsmatch{$item}}) {
+                        if ($value =~ /$valuematch/) {
+                            my $stdtype = &Apache::lonparmset::standard_parameter_types($item);
+                            $found{$item}{'valname'} = &get_param_description($stdtype,$value,1);
+                            $found{$item}{'rev'} = 
+                                $Apache::lonnet::needsrelease{'parameter:'.$item.'::'.$valuematch.':'};
+                            last;
+                        }
+                    }
+                }
+            }
+            foreach my $item (keys(%Apache::lonrelrequtils::checkparmnamesmatch)) {
+                my $regexp;
+                if ($item eq 'maplevelrecurse') {
+                    $regexp = '\.(?:sequence|page)___\(rec\)\.';
+                }
+                if ($regexp ne '') {
+                    if ($key =~ /$regexp.*\.(\w+)$/) {
+                        my $name = $1;
+                        my $value = $resourcedata->{$key};
+                        if ($name eq 'type') { 
+                            last unless (($value eq 'problem') || ($value eq 'practice') || ($value eq 'exam') ||
+                                         ($value eq 'survey') || ($value eq 'surveycred') || ($value eq 'anonsurvey') || 
+                                         ($value eq 'anonsurveycred') || ($value eq 'randomizetry') || ($value eq 'library'));
+                        }
+                        my $stdtype = &Apache::lonparmset::standard_parameter_types($name);
+                        $found{$name}{'valname'} = &get_param_description($stdtype,$value);
+                        $found{$name}{'extra'} = &mt('Recursive into sub-folders');
+                        $found{$name}{'rev'} =
+                            $Apache::lonnet::needsrelease{'parameter::::'.$item};
+                    }
+                }
+            }
+            foreach my $item (keys(%found)) {
+                my $stdname = &Apache::lonparmset::standard_parameter_names($item);
+                my $rev = $found{$item}{'rev'};
+                my $valname = $found{$item}{'valname'};
+                my $extra = $found{$item}{'extra'};
+                my ($middle,$scope,$which,$level,$map,$resource);  
+                my $start = $cid.'.';
+                if ($key =~ /^\Q$start\E(\[useropt\:($match_username\:$match_domain)\]\.)/) {
+                    $middle = $1;
+                    $which = $2;
+                    $scope = 'user'; 
+                } elsif ($key =~ /^\Q$start\E(\[(\w+)\]\.)/) {
+                    $middle = $1;
+                    $which = $2;
+                    $scope = 'section/group';
+                } else {
+                    $scope = 'all';
+                }
+                my $what="$stdname=$valname";
+                if ($extra) {
+                    $what .= "<br/>$extra<br />";
+                }
+                if ($key =~ /^\Q$start$middle\E\w+\.\Q$item\E$/) {
+                    $level = 'general';
+                    if ($scope eq 'all') {
+                        if (ref($fromparam{$rev}{$scope}) eq 'ARRAY') {
+                            unless(grep(/^\Q$what\E$/,@{$fromparam{$rev}{$scope}})) {
+                                push(@{$fromparam{$rev}{$scope}},$what);
+                            }
+                        } else {
+                            push(@{$fromparam{$rev}{$scope}},$what);
+                        }
+                    } else {
+                        if (ref($fromparam{$rev}{$scope}{$which}) eq 'ARRAY') {
+                            unless (grep(/^\Q$what\E$/,@{$fromparam{$rev}{$scope}{$which}})) {
+                                push(@{$fromparam{$rev}{$scope}{$which}},$what);
+                            }
+                        } else {
+                            push(@{$fromparam{$rev}{$scope}{$which}},$what);
+                        }
+                    }
+                    $rowspan{$rev} ++;
+                } elsif ($key =~ /^\Q$start$middle\E(.+)___\((all|rec)\).\w+\.\Q$item\E$/) {
+                    $level = 'folder';
+                    $map = $1;
+                    if ($scope eq 'all') {
+                        if (ref($bymap{$map}{$rev}{$scope}) eq 'ARRAY') {
+                            unless(grep(/^\Q$what\E$/,@{$bymap{$map}{$rev}{$scope}})) {
+                                push(@{$bymap{$map}{$rev}{$scope}},$what);
+                            }
+                        } else {
+                            push(@{$bymap{$map}{$rev}{$scope}},$what);
+                        }
+                    } else {
+                        if (ref($bymap{$map}{$rev}{$scope}{$which}) eq 'ARRAY') {
+                            unless(grep(/^\Q$what\E$/,@{$bymap{$map}{$rev}{$scope}{$which}})) {
+                                push(@{$bymap{$map}{$rev}{$scope}{$which}},$what);
+                            }
+                        } else {
+                            push(@{$bymap{$map}{$rev}{$scope}{$which}},$what);
+                        }
+                    }
+                } elsif ($key =~ /^\Q$start$middle\E(.+)\.\w+\.\Q$item\E$/) {
+                    $level = 'resource';
+                    $resource = $1;
+                    if ($scope eq 'all') {
+                        if (ref($byresource{$resource}{$rev}{$scope}) eq 'ARRAY') {
+                            unless(grep(/^\Q$what\E$/,@{$byresource{$resource}{$rev}{$scope}})) {
+                                push(@{$byresource{$resource}{$rev}{$scope}},$what);
+                            }
+                        } else {
+                            push(@{$byresource{$resource}{$rev}{$scope}},$what);
+                        }
+                    } else {
+                        if (ref($byresource{$resource}{$rev}{$scope}{$which}) eq 'ARRAY') {
+                            unless (grep(/^\Q$what\E$/,@{$byresource{$resource}{$rev}{$scope}{$which}})) {
+                                push(@{$byresource{$resource}{$rev}{$scope}{$which}},$what);
+                            }
+                        } else {
+                            push(@{$byresource{$resource}{$rev}{$scope}{$which}},$what);
                         }
                     }
                 }
@@ -2785,7 +2829,7 @@ sub display_loncaparev_constraints {
                 if (ref($fromblocks{$type}) eq 'HASH') {
                     foreach my $rev (keys(%{$fromblocks{$type}})) {
                         my ($major,$minor) = split(/\./,$rev);
-                        ($reqdmajor,$reqdminor) =
+                        ($reqdmajor,$reqdminor) = 
                             &Apache::lonrelrequtils::update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor);
                         $output .= &Apache::loncommon::start_data_table_row().
                                    '<td>'.$rev.'</td><td>'.$lt{$type}.'</td><td>';
@@ -2803,9 +2847,9 @@ sub display_loncaparev_constraints {
 
     if (defined($navmap)) {
         my %anonsubms=&Apache::lonnet::dump('nohist_anonsurveys',$cdom,$cnum);
-        my $rev_anonsurv=$Apache::lonnet::needsrelease{'parameter:type:anonsurvey'};
+        my $rev_anonsurv=$Apache::lonnet::needsrelease{'parameter:type:anonsurvey::'};
         my %randtrysubms=&Apache::lonnet::dump('nohist_randomizetry',$cdom,$cnum);
-        my $rev_randtry=$Apache::lonnet::needsrelease{'parameter:type:randomizetry'};
+        my $rev_randtry=$Apache::lonnet::needsrelease{'parameter:type:randomizetry::'};
         my $stdtype=&Apache::lonparmset::standard_parameter_types('type');
         my $stdname=&Apache::lonparmset::standard_parameter_names('type');
         my $valanon=&get_param_description($stdtype,'anonsurvey');
@@ -2865,7 +2909,7 @@ sub display_loncaparev_constraints {
                             &Apache::lonrelrequtils::update_reqd_loncaparev($major,$minor,
                                                                             $reqdmajor,$reqdminor);
                         $checkedrev{$key} = 1;
-                    }
+                    } 
                     push(@{$byresponsetype{$symb}{$rev}},$key);
                     $allmaps{$enclosing_map} = 1;
                 }
@@ -3078,7 +3122,7 @@ sub show_contents_view {
 sub releases_by_map {
     my ($r,$bymap,$url,$scopeorder,$lt) = @_;
     return unless ((ref($bymap) eq 'HASH') && (ref($scopeorder) eq 'ARRAY'));
-    my $newrow = 0;
+    my $newrow = 0; 
     if (ref($bymap->{$url}) eq 'HASH') {
         foreach my $rev (sort(keys(%{$bymap->{$url}}))) {
             if ($newrow) {
@@ -3115,18 +3159,67 @@ sub releases_by_map {
 }
 
 sub get_param_description {
-    my ($stdtype,$value) = @_;
-    my $name = $value;
-    my $paramstrings = &Apache::lonparmset::standard_string_options($stdtype);
-    unless (ref($paramstrings) eq 'ARRAY') {
-        return $name;
+    my ($stdtype,$value,$regexp) = @_;
+    my ($name,$parammatches,$paramstrings,@possibles);
+    if ($stdtype =~ /^string/) {
+        $paramstrings = &Apache::lonparmset::standard_string_options($stdtype);
+    } elsif ($stdtype eq 'date_interval') {
+        $paramstrings = &Apache::lonparmset::standard_interval_options($stdtype);
+    }
+    if ($regexp) {
+        if ($stdtype =~ /^string/) {
+            $parammatches = &Apache::lonparmset::standard_string_matches($stdtype);
+        } elsif ($stdtype eq 'date_interval') {
+            $parammatches = &Apache::lonparmset::standard_interval_matches($stdtype);
+        }
+        if (ref($parammatches) eq 'ARRAY') {
+            @possibles = @{$parammatches};
+        } else {
+            undef($regexp);
+            $name = $value;
+        }
     }
-    foreach my $possibilities (@{$paramstrings}) {
+    unless ($regexp) {
+        $name = $value;
+        if (ref($paramstrings) eq 'ARRAY') {
+            @possibles = @{$paramstrings};
+        } else {
+            if (($stdtype eq 'date_start') || ($stdtype eq 'date_end')) {
+                if ($name == 0) {
+                    $name = &mt('Never');
+                } elsif (($name ne '') && ($name !~ /\D/)) {
+                    $name = &Apache::lonlocal::locallocaltime($name);
+                }
+            }
+            return $name;
+        }
+    }
+    foreach my $possibilities (@possibles) {
         next unless (ref($possibilities) eq 'ARRAY');
-        my ($thing, $description) = @{ $possibilities };
-        if ($thing eq $value) {
-            $name = $description;
-            last;
+        my $gotregexmatch = '';
+        if ($regexp) {
+            last if ($gotregexmatch);
+            my ($item,$pattern) = @{ $possibilities };
+            if ($value =~ /$pattern/) {
+                if (ref($paramstrings) eq 'ARRAY') {
+                    foreach my $possibles (@{$paramstrings}) {
+                        next unless (ref($possibles) eq 'ARRAY');
+                        my ($thing,$description) = @{$possibles};
+                        if ($thing eq $item) {
+                            $name = $description;
+                            $gotregexmatch = 1;
+                            last;
+                        }
+                    }
+                    last if ($gotregexmatch);
+                }
+            }
+        } else {
+            my ($thing,$description) = @{ $possibilities };
+            if ($thing eq $value) {
+                $name = $description;
+                last;
+            }
         }
     }
     return $name;
@@ -3270,10 +3363,10 @@ sub manage_coownership  {
         }
         $output .= '<span class="LC_nobreak">';
         if ($is_coowner) {
-            $output .= &mt('You are currently a co-owner:').'&nbsp;<label><input type="checkbox" name="remove_coowner" value="'.$uname.':'.$udom.'" />'.&mt('Discontinue?').'</label>';
+            $output .= &mt('You are currently a co-owner:').'&nbsp;<label><input type="checkbox" name="remove_coowoner" value="'.$uname.':'.$udom.'" />'.&mt('Discontinue?').'</label>';
         } else {
-            $output .= &mt('The course owner has invited you to become a co-owner:').'&nbsp;<label><input type="radio" name="pending_coowner" value="accept"'.$disabled.' />'.&mt('Accept?').'</label>'.('&nbsp;'x2).
-                       '<label><input type="radio" name=pending_coowner" value="decline"'.$disabled.' />'.&mt('Decline?').'</label>';
+            $output .= &mt('The course owner has invited you to become a co-owner:').'&nbsp;<label><input type="radio" name="pending_coowoner" value="accept"'.$disabled.' />'.&mt('Accept?').'</label>'.('&nbsp;'x2).
+                       '<label><input type="radio" name=pending_coowoner" value="decline"'.$disabled.' />'.&mt('Decline?').'</label>';
         }
         $output .= '</span>';
         if (@currcoown) {
@@ -3336,7 +3429,7 @@ sub print_localization {
                                                       undef,$includeempty,$disabled);
         } else {
             if ($settings->{$item} eq '') {
-                unless ($noedit) {
+                unless ($noedit) { 
                     $datatable .= '</td><td align="right">'.
                         &Apache::loncommon::select_language('languages_0','',1);
                 }
@@ -3366,15 +3459,15 @@ sub print_localization {
                     }
                 }
                 unless ($noedit) {
-                    $datatable .= 
+                    $datatable .=
                               &Apache::loncommon::start_data_table_row().
                               '<td align="left"><span class="LC_nobreak">'.
                               &mt('Additional language:'). '</span><br />'.
                               &Apache::loncommon::select_language('languages_'.$num,'',1).
                               '<input type="hidden" name="languages_total" value="'.$num.'" />'.
                               '</td>'.&Apache::loncommon::end_data_table_row();
-                }
-                $datatable .= &Apache::loncommon::end_data_table().'<br />';
+                 }
+                 $datatable .= &Apache::loncommon::end_data_table().'<br />';
             }
         }
         $datatable .= &item_table_row_end();
@@ -3443,8 +3536,8 @@ sub print_feedback {
         }
         if ($position eq 'top') {
             my $includeempty = 0;
-            $datatable .= '</td><td align="right">'.
-                          &user_table($cdom,$item,\@sections,
+            $datatable .=  '</td><td align="right">'.
+                           &user_table($cdom,$item,\@sections,
                                       $settings->{$item},\%lt,$noedit);
         } else {
             $datatable .= &Apache::lonhtmlcommon::textbox($item.'.text',
@@ -3462,7 +3555,7 @@ sub user_table {
     if ($currvalue eq '') {
         unless ($noedit) {
             $output .= &select_recipient($item,'0',$cdom,$sections);
-        }  
+        }
     } else {
         my $num = 0;
         my @curr = split(/,/,$currvalue);
@@ -3531,7 +3624,7 @@ sub select_recipient {
     my $domform = &Apache::loncommon::select_dom_form($cdom,$item.'_udom_'.$num,$includeempty);
     my $selectlink =
         &Apache::loncommon::selectstudent_link('display',$item.'_uname_'.$num,
-                                               $item.'_udom_'.$num,'only');
+                                               $item.'_udom_'.$num,1);
     my $output = 
         '<table><tr><td align="center">'.&mt('Username').'<br />'.
         '<input type="text" name="'.$item.'_uname_'.$num.'" value="" /></td>'.
@@ -3614,6 +3707,20 @@ sub print_discussion {
                            &mt('(specific user(s))'),
                    input => 'checkbox',
                  },
+
+        'pac.roles.denied' => {
+                   text => '<span class="LC_nobreak"><b>'.&mt($itemtext->{'pac.roles.denied'}).'</b>'.
+                           &Apache::loncommon::help_open_topic("Course_Disable_Anonymous_Discussion").'</span><br />'.
+                           &mt('(role-based)'),
+                   input => 'checkbox',
+                 },
+
+        'pac.users.denied'   => {
+                   text => '<span class="LC_nobreak"><b>'.&mt($itemtext->{'pac.users.denied'}).'</b><br />'.
+                           &mt('(specific user(s))'),
+                   input => 'checkbox',
+                 },
+
         'allow_limited_html_in_feedback' => {
                    text => '<b>'.&mt($itemtext->{'allow_limited_html_in_feedback'}).'</b>',
                    input => 'radio',
@@ -3646,15 +3753,15 @@ sub print_discussion {
         my $colspan;
         if ($item eq 'allow_limited_html_in_feedback') {
             $colspan = 2;
-        }
+        } 
         $datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan);
         if ($item eq 'plc.roles.denied') {
             $datatable .= '</td><td align="right">'.
                           '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings,undef,undef,$noedit).
                           '</table>';
         } elsif ($item eq 'plc.users.denied') {
-            $datatable .= '</td><td align="right">'.
-                          &user_table($cdom,$item,undef,
+            $datatable .=  '</td><td align="right">'.
+                           &user_table($cdom,$item,undef,
                                       $settings->{$item},\%lt,$noedit);
         } elsif ($item eq 'pch.roles.denied') {
             $datatable .= '</td><td align="right">'.
@@ -3664,6 +3771,14 @@ sub print_discussion {
             $datatable .= '</td><td align="right">'.
                           &user_table($cdom,$item,undef,
                                       $settings->{$item},\%lt,$noedit);
+        } elsif ($item eq 'pac.roles.denied') {
+            $datatable .= '</td><td align="right">'.
+                          '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings,undef,undef,$noedit).
+                          '</table>';
+        } elsif ($item eq 'pac.users.denied') {
+            $datatable .=  '</td><td align="right">'.
+                           &user_table($cdom,$item,undef,
+                                      $settings->{$item},\%lt,$noedit);
         } elsif ($item eq 'allow_limited_html_in_feedback') {
             $datatable .= &yesno_radio($item,$settings,undef,undef,undef,$noedit);
         } elsif ($item eq 'allow_discussion_post_editing') {
@@ -3683,7 +3798,7 @@ sub print_discussion {
                           '<th align="center">'.&mt('font-size').'</th>'.
                           '<th align="center">'.&mt('font-weight').'</th>'.
                           '<th align="center">'.&mt('font-style').'</th>'.
-                          '<th align="center">'.&mt('Other css').'</th>'.
+                          '<th align="center">'.&mt('Other css').'</th>'. 
                           &Apache::loncommon::end_data_table_row().
                           &set_discussion_fonts($cdom,$cnum,$item,$settings,$noedit).
                           &Apache::loncommon::end_data_table().'<br />';
@@ -3735,7 +3850,7 @@ sub role_checkboxes {
     my $count = 0;
     my $disabled;
     if ($noedit) {
-        $disabled = ' disabled="disabled"';
+        $disabled = ' disabled="disabled"';  
     }
     foreach my $role (@roles) {
         my $checked = '';
@@ -3838,7 +3953,7 @@ sub set_discussion_fonts {
                             ($currsize,$currunit) = ($1,$2);
                             $curr{'size'} = $currunit;
                         }
-                        $output .= '<input type="textbox" name="discussion_post_fonts_'.$cat.'_'.$item.'" value="'.$currsize.'" size="5"'.$disabled.' />'.
+                        $output .= '<input type="textbox" name="discussion_post_fonts_'.$cat.'_'.$item.'" value="'.$currsize.'" size="5"'.$disabled.'>'.
                                    '&nbsp;';
                         $selitem = 'unit';
                     }
@@ -3863,7 +3978,7 @@ sub set_discussion_fonts {
 
 sub discussion_vote_classes {
     my $classorder = ['twoplus','oneplus','zero','oneminus','twominus'];
-    my %classtitles = &Apache::lonlocal::texthash(
+    my %classtitles = &Apache::lonlocal::texthash( 
                         'twoplus'  => 'Two sigma above mean',
                         'oneplus'  => 'One sigma above mean',
                         'zero'     => 'Within one sigma of mean',
@@ -3929,7 +4044,7 @@ sub print_classlists {
         'defaultcredits' => {
                    text => '<b>'.&mt($itemtext->{'defaultcredits'}).'</b>',
                  },
-
+              
         'nothideprivileged'   => {
                    text => '<b>'.&mt($itemtext->{'nothideprivileged'}).'</b>',
                    input => 'checkbox',
@@ -4032,11 +4147,12 @@ sub print_grading {
                    input => 'selectbox',
                    options => {
                                 standard => &mt('Standard: shows points'),
+                                categories => &mt('Categories: shows points according to categories'),
                                 external => &mt('External: shows number of completed parts and totals'),
                                 externalnototals => &mt('External: shows only number of completed parts'),
                                 spreadsheet => &mt('Spreadsheet: (with link to detailed scores)'), 
                               },
-                   order => ['standard','external','externalnototals','spreadsheet'],
+                   order => ['standard','categories','external','externalnototals','spreadsheet'],
                  },
         'rndseed' => {
                    text => '<b>'.&mt($itemtext->{'rndseed'}).'</b>'.
@@ -4228,7 +4344,7 @@ sub print_other {
                             input => 'textbox',
                             size  => '30',
                            };
-    return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'other',$noedit);
+    my $output = &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'other',$noedit);
 }
 
 sub get_other_items {
@@ -4448,7 +4564,7 @@ sub nothidepriv_row {
             }
         }
         if ($settings->{'checkforpriv'}) {
-            @checkdoms = split(/,/,$settings->{'checkforpriv'});
+            @checkdoms = split(/,/,$settings->{'checkforpriv'}); 
         }
     }
     push(@checkdoms,$cdom);
@@ -4462,7 +4578,7 @@ sub nothidepriv_row {
         if ($end == -1 || $start == -1) {
             next;
         }
-        foreach my $dom (@checkdoms) {
+        foreach my $dom (@checkdoms) { 
             if (&Apache::lonnet::privileged($uname,$udom,\@checkdoms,['dc','su'])) {
                 unless (grep(/^\Q$user\E$/,@privusers)) {
                     push(@privusers,$user);
@@ -4538,7 +4654,7 @@ sub checkforpriv_row {
                 my $domdesc = &Apache::lonnet::domain($currdom,'description');
                 if ($domdesc eq '') {
                     $domdesc = $currdom;
-                }
+                } 
                 $datatable .=
                     &Apache::loncommon::start_data_table_row().
                     '<td align="left"><span class="LC_nobreak">'.
@@ -4546,17 +4662,17 @@ sub checkforpriv_row {
                     '</b><input type="hidden" name="checkforpriv_'.$num.
                     '" value="'.$currdom.'" /></span><br />'.
                     '<span class="LC_nobreak"><label><input type="checkbox" '.
-                    'name="checkforpriv_delete" value="'.$num.'"'.$disabled.' />'.
-                    &mt('Delete').'</label></span></td>'.
+                    'name="checkforpriv_delete" value="'.$num.'" />'.
+                    &mt('Delete').$disabled.'</label></span></td>'.
                     &Apache::loncommon::end_data_table_row();
                 $num ++;
-                unless (grep(/^\Q$currdom\E$/,@excdoms)) {
+                unless (grep(/^\Q$currdom\E$/,@excdoms)) { 
                     push(@excdoms,$currdom);
                 }
             }
         }
         if ((scalar(keys(%domains)) - scalar(@excdoms)) > 0) {
-            $datatable .=
+            $datatable .= 
                 &Apache::loncommon::start_data_table_row().
                 '<td align="left"><span class="LC_nobreak">'.
                 &mt('Additional domain:'). '</span><br />'.
@@ -4669,8 +4785,8 @@ ENDJS
             $output .= '</tr>';
         }
     }
-    my $pos = $currnum+1; 
-    unless ($noedit) {
+    my $pos = $currnum+1;
+    unless ($noedit) { 
         $output .= 
                '<tr>'.
                '<td align="left"><span class="LC_nobreak">'.
@@ -4679,8 +4795,8 @@ ENDJS
                &substitution_selector($currnum).'</td>'.
                '</tr>'; 
         $pos ++;
-        $currnum ++;
-        $output .= 
+       $currnum ++;
+       $output .= 
                '<tr>'.
                '<td align="left"><span class="LC_nobreak">'.
                &position_selector($pos,$currnum,$maxnum).
@@ -4741,7 +4857,7 @@ sub substitution_selector {
     }
     $output .= '</select></td><td align="left">'.&mt('Size limit').'<br />'.
                '<input type="textbox" name="printfmthdr_limit_'.$num.
-               '" value="'.$limit.'" size="5"'.$disabled.' /></span>';
+               '" value="'.$limit.'" size="5" /></span>';
     return $output;
 }