--- loncom/interface/courseprefs.pm	2013/09/01 02:09:23	1.49.2.10
+++ loncom/interface/courseprefs.pm	2014/06/07 19:13:41	1.66
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.49.2.10 2013/09/01 02:09:23 raeburn Exp $
+# $Id: courseprefs.pm,v 1.66 2014/06/07 19:13:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -215,10 +215,14 @@ use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonconfigsettings;
+use Apache::lonrelrequtils;
 use Apache::lonparmset;
 use Apache::lonlocal;
 use LONCAPA qw(:DEFAULT :match);
 
+my $registered_cleanup;
+my $modified_courses;
+
 sub handler {
     my $r=shift;
     if ($r->header_only) {
@@ -228,7 +232,7 @@ sub handler {
     }
     my $context = 'course';
     my $cid = $env{'request.course.id'};
-    my ($cnum,$cdom) = &get_course($cid);
+    my ($cnum,$cdom,$chome) = &get_course($cid);
     my $crstype = &Apache::loncommon::course_type();
     my $parm_permission = &Apache::lonnet::allowed('opa',$cid);
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -257,6 +261,9 @@ sub handler {
         return HTTP_NOT_ACCEPTABLE;
     }
 
+    $registered_cleanup=0;
+    @{$modified_courses}=();
+
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['phase','actions','origin']);
     &Apache::lonhtmlcommon::clear_breadcrumbs();
@@ -272,6 +279,7 @@ sub handler {
                 edit => 'Edit Community Settings',
                 gens => 'General community settings',
                 idnu => 'Community ID or number',
+                unco => 'Unique code',
                 desc => 'Community Description',
                 ownr => 'Community Owner',
                 cown => 'Community Co-owners',
@@ -299,8 +307,9 @@ sub handler {
                 edit => 'Edit Course Settings',
                 gens => 'General course settings',
                 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',
@@ -342,7 +351,14 @@ sub handler {
     if ($phase eq 'releaseinfo') {
         my $loncaparev = $env{'course.'.$cid.'.internal.releaserequired'};
         if ($loncaparev) { 
-            &display_loncaparev_constraints($r,$navmap,$loncaparev,$crstype);
+            if (&display_loncaparev_constraints($r,$navmap,$loncaparev,$crstype)) {
+                push(@{$modified_courses},[$cdom,$cnum,$chome,$crstype]);
+                unless ($registered_cleanup) {
+                    my $handlers = $r->get_handlers('PerlCleanupHandler');
+                    $r->set_handlers('PerlCleanupHandler' => [\&update_releasereq,@{$handlers}]);
+                    $registered_cleanup=1;
+                }
+            }
             return OK;
         }
     }
@@ -357,13 +373,15 @@ sub handler {
                    { text => $lt{'gens'},
                      help => 'Course_Prefs_General',
                      ordered => ['owner','co-owners','loncaparev','description',
-                                 'courseid','categories','hidefromcat',
-                                 'externalsyllabus','cloners','url','rolenames'],
+                                 'clonedfrom','courseid','uniquecode','categories',
+                                 'hidefromcat','externalsyllabus','cloners','url',
+                                 'rolenames'],
                      itemtext => {
                                    'owner'            => $lt{'ownr'},
                                    'co-owners'        => $lt{'cown'},
                                    'description'      => $lt{'desc'},
                                    'courseid'         => $lt{'idnu'},
+                                   'uniquecode'       => $lt{'unco'},
                                    'categories'       => $lt{'catg'},
                                    'hidefromcat'      => $lt{'excc'},
                                    'cloners'          => $lt{'clon'}, 
@@ -371,6 +389,7 @@ sub handler {
                                    'url'              => 'Top Level Map',
                                    'rolenames'        => $lt{'rept'},
                                    'loncaparev'       => $lt{'lcrv'},
+                                   'clonedfrom'       => 'Cloned from',
                                  },
                     },
         'localization' =>
@@ -471,7 +490,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',
@@ -705,7 +724,8 @@ sub process_changes {
                         next if (($entry eq 'categories') &&
                                  (!$can_categorize));
                         next if (($entry eq 'loncaparev') || 
-                                ($entry eq 'owner'));
+                                ($entry eq 'owner') ||
+                                ($entry eq 'clonedfrom'));
                         push(@ordered,$entry);
                     }
                 } elsif ($action eq 'classlists') {
@@ -1027,14 +1047,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;
@@ -1042,7 +1062,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};
@@ -1051,7 +1071,7 @@ sub process_changes {
                             }
                             if ($fontchange) {
                                 $changes->{$entry} = 1;
-                            }
+                            } 
                         } elsif ($entry eq 'nothideprivileged') {
                             my @curr_nothide;
                             my @new_nothide;
@@ -1126,7 +1146,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'};
@@ -1142,7 +1162,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;
@@ -1657,7 +1677,8 @@ sub get_course {
     }
     my $cdom=$env{'course.'.$courseid.'.domain'};
     my $cnum=$env{'course.'.$courseid.'.num'};
-    return ($cnum,$cdom);
+    my $chome=$env{'course.'.$courseid.'.home'};
+    return ($cnum,$cdom,$chome);
 }
 
 sub get_jscript {
@@ -1707,7 +1728,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".
                $syllabus_js."\n".'//]]>'."\n".
@@ -1852,12 +1873,18 @@ sub print_courseinfo {
         'co-owners'    => {
                    text => '<b>'.&mt($itemtext->{'co-owners'}).'</b>',
                           },
+        'clonedfrom'   => {
+                   text => '<b>'.&mt($itemtext->{'clonedfrom'}).'</b>',
+                          },
         'courseid'     => { 
                    text => '<b>'.&mt($itemtext->{'courseid'}).'</b><br />'.'('.
                            &mt('internal, optional').')',
                    input => 'textbox',
                    size  => '25',
                           },
+        'uniquecode'   => {
+                   text => '<b>'.&mt($itemtext->{'uniquecode'}).'</b>',
+                          },
         'cloners'      => { 
                    text => '<b>'.&mt($itemtext->{'cloners'}).'</b><br />'.
                            &mt('Owner and Coordinators included automatically'),
@@ -1903,9 +1930,11 @@ sub print_courseinfo {
             next if (!$can_toggle_cat);
         } elsif ($item eq 'categories') {
             next if (!$can_categorize);
+        } elsif ($item eq 'uniquecode') {
+            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) {
@@ -2038,6 +2067,21 @@ sub print_courseinfo {
                 $owner = &mt('None specified');
             }
             $datatable .= $owner;
+        } elsif ($item eq 'clonedfrom') {
+            my $clonesrc = $env{'course.'.$env{'request.course.id'}.'.clonedfrom'};
+            my $clonedfrom = &mt('None');
+            if ($clonesrc =~ m{/$match_domain/$match_courseid}) {
+                my %clonesrcinfo = &Apache::lonnet::coursedescription($clonesrc);
+                if ($clonesrcinfo{'description'}) {
+                    $clonedfrom = $clonesrcinfo{'description'}.' '.($clonesrc); 
+                }
+            }
+            $datatable .= $clonedfrom;
+        } elsif ($item eq 'uniquecode') {
+            my $code = $env{'course.'.$env{'request.course.id'}.'.internal.uniquecode'}; 
+            if ($code) {
+                $datatable .= $code;
+            }
         } elsif ($item eq 'co-owners') {
             my $coowners = $env{'course.'.$env{'request.course.id'}.'.internal.co-owners'};
             my @currcoown;
@@ -2081,12 +2125,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;
@@ -2256,6 +2300,7 @@ ENDSCRIPT
 
 sub display_loncaparev_constraints {
     my ($r,$navmap,$loncaparev,$crstype) = @_;
+    my ($reqdmajor,$reqdminor); 
     my $cid = $env{'request.course.id'};
     my $cdom = $env{'course.'.$cid.'.domain'};
     my $cnum = $env{'course.'.$cid.'.num'};
@@ -2265,22 +2310,21 @@ sub display_loncaparev_constraints {
                                            'section/group' =>  'section/group',
                                            'user'          => 'user',
                                          );
-    my (%checkparms,%checkresponsetypes,%checkcrstypes,%anonsurvey,%randomizetry);
-    &Apache::loncommon::build_release_hashes(\%checkparms,\%checkresponsetypes,
-                                              \%checkcrstypes,\%anonsurvey,\%randomizetry);
-    if (defined($checkcrstypes{$crstype})) {
+    &Apache::lonrelrequtils::init_global_hashes();
+    if (defined($Apache::lonrelrequtils::checkcrstypes{$crstype})) {
+        ($reqdmajor,$reqdminor) = split(/\./,$Apache::lonrelrequtils::checkcrstypes{$crstype});
         $output .= '<h4>'.&mt('Course type: [_1] requires [_2] or newer',$crstype,
-                              $checkcrstypes{$crstype}).'</h4>';
+                              $Apache::lonrelrequtils::checkcrstypes{$crstype}).'</h4>';
     }
     my (%fromparam,%rowspan,%bymap,%byresource,@scopeorder,%toshow,%allmaps,
-        %byresponsetype,%bysubmission);
+        %byresponsetype,%bysubmission,%fromblocks);
     @scopeorder = ('all','section/group','user');
     my $resourcedata = &Apache::lonparmset::readdata($cnum,$cdom);
     if (ref($resourcedata) eq 'HASH') {
         foreach my $key (keys(%{$resourcedata})) {
-            foreach my $item (keys(%checkparms)) {
+            foreach my $item (keys(%Apache::lonrelrequtils::checkparms)) {
                 if ($key =~ /(\Q$item\E)$/) {
-                     if (ref($checkparms{$item}) eq 'ARRAY') {
+                     if (ref($Apache::lonrelrequtils::checkparms{$item}) eq 'ARRAY') {
                          my $value = $resourcedata->{$key};
                          if ($item eq 'examcode') {
                              if (&Apache::lonnet::validCODE($value)) {
@@ -2290,7 +2334,7 @@ sub display_loncaparev_constraints {
                              }
                          }
                          my ($middle,$scope,$which,$level,$map,$resource);
-                         if (grep(/^\Q$value\E$/,@{$checkparms{$item}})) {
+                         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);
@@ -2382,6 +2426,9 @@ sub display_loncaparev_constraints {
                        '<th>'.&mt('Extent').'</th><th>'.&mt('Setting').'</th>'.
                        &Apache::loncommon::end_data_table_header_row();
             foreach my $rev (keys(%fromparam)) {
+                my ($major,$minor) = split(/\./,$rev);
+                ($reqdmajor,$reqdminor) =
+                    &Apache::lonrelrequtils::update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor);
                 $output .=  &Apache::loncommon::start_data_table_row().
                             '<td rowspan="'.$rowspan{$rev}.'">'.$rev.'</td>';
                 my $newrow;
@@ -2412,6 +2459,75 @@ sub display_loncaparev_constraints {
         }
     }
 
+    my %comm_blocks =  &Apache::lonnet::dump('comm_block',$cdom,$cnum);
+    my $now = time;
+    if (keys(%comm_blocks) > 0) {
+        foreach my $block (keys(%comm_blocks)) {
+            if ($block =~ /^firstaccess____(.+)$/) {
+                my $rev = $Apache::lonnet::needsrelease{'course:commblock:timer'};
+                if (ref($comm_blocks{$block}) eq 'HASH') {
+                    push(@{$fromblocks{'timer'}{$rev}},&unescape($comm_blocks{$block}{'event'}).
+                         ' '.&mt('set by [_1]',
+                                 &Apache::loncommon::plainname(split(/:/,$comm_blocks{$block}{'setter'}))));
+                }
+                next;
+            } elsif ($block =~ /^(\d+)____(\d+)$/) {
+                my ($start,$end) = ($1,$2);
+                next if ($end < $now);
+            }
+            if (ref($comm_blocks{$block}) eq 'HASH') {
+                if (ref($comm_blocks{$block}{'blocks'}) eq 'HASH') {
+                    if (ref($comm_blocks{$block}{'blocks'}{'docs'}) eq 'HASH') {
+                        if (keys(%{$comm_blocks{$block}{'blocks'}{'docs'}}) > 0) {
+                            my $rev = $Apache::lonnet::needsrelease{'course:commblock:docs'};
+                            push(@{$fromblocks{'docs'}{$rev}},&unescape($comm_blocks{$block}{'event'}).
+                                 ' '.
+                                 &mt('set by [_1]',
+                                     &Apache::loncommon::plainname(split(/:/,$comm_blocks{$block}{'setter'}))));
+                        }
+                    } elsif ($comm_blocks{$block}{'blocks'}{'printout'} eq 'on') {
+                        my $rev = $Apache::lonnet::needsrelease{'course:commblock:printout'};
+                        push(@{$fromblocks{'printout'}{$rev}},&unescape($comm_blocks{$block}{'event'}).
+                             ' '.
+                             &mt('set by [_1]',
+                                 &Apache::loncommon::plainname(split(/:/,$comm_blocks{$block}{'setter'}))));
+
+                    }
+                }
+            }
+        }
+        if (keys(%fromblocks)) {
+            my %lt = (
+                       docs     => 'Content blocking',
+                       printout => 'Printout generation',
+                       timer    => 'Timed quiz trigger',
+                     );
+            $output .= '<h4>'.&mt('Requirements from exam blocking').'</h4>'.
+                       &Apache::loncommon::start_data_table().
+                       &Apache::loncommon::start_data_table_header_row().
+                       '<th>'.&mt('Release').'</th><th>'.&mt('Setting').'</th>'.
+                       '<th>'.&mt('Event(s)').'</th>'.
+                       &Apache::loncommon::end_data_table_header_row();
+            foreach my $type ('docs','printout','timer') {
+                if (ref($fromblocks{$type}) eq 'HASH') {
+                    foreach my $rev (keys(%{$fromblocks{$type}})) {
+                        my ($major,$minor) = split(/\./,$rev);
+                        ($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>';
+                        foreach my $event (sort(@{$fromblocks{$type}{$rev}})) {
+                            $output .= $event.'<br />';
+                        }
+                        $output =~ s{\Q<br />\E$}{};
+                        $output .= '</td>'.&Apache::loncommon::end_data_table_row();
+                    }
+                }
+            }
+            $output .= &Apache::loncommon::end_data_table().'<br />';
+        }
+    }
+
     if (defined($navmap)) {
         my %anonsubms=&Apache::lonnet::dump('nohist_anonsurveys',$cdom,$cnum);
         my $rev_anonsurv=$Apache::lonnet::needsrelease{'parameter:type:anonsurvey'};
@@ -2421,7 +2537,7 @@ sub display_loncaparev_constraints {
         my $stdname=&Apache::lonparmset::standard_parameter_names('type');
         my $valanon=&get_param_description($stdtype,'anonsurvey');
         my $valrandtry=&get_param_description($stdtype,'randomizetry');
-
+        my %checkedrev;
         foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_problem() },1,0)) {
             my @parts = @{$res->parts()};
             my $symb = $res->symb();
@@ -2438,6 +2554,13 @@ sub display_loncaparev_constraints {
                         push(@{$bysubmission{$symb}{$rev}},$what);
                     }
                     $allmaps{$enclosing_map} = 1;
+                    unless ($checkedrev{'anonsurvey'}) {
+                        my ($major,$minor) = split(/\./,$rev);
+                        ($reqdmajor,$reqdminor) =
+                            &Apache::lonrelrequtils::update_reqd_loncaparev($major,$minor,
+                                                                            $reqdmajor,$reqdminor);
+                        $checkedrev{'anonsurvey'} = 1;
+                    }
                 }
                 if (exists($randtrysubms{$symb."\0".$part})) {
                     my $rev = $rev_randtry;
@@ -2450,12 +2573,27 @@ sub display_loncaparev_constraints {
                         push(@{$bysubmission{$symb}{$rev}},$what);
                     }
                     $allmaps{$enclosing_map} = 1;
+                    unless ($checkedrev{'randomizetry'}) {
+                        my ($major,$minor) = split(/\./,$rev);
+                        ($reqdmajor,$reqdminor) =
+                            &Apache::lonrelrequtils::update_reqd_loncaparev($major,$minor,
+                                                                            $reqdmajor,$reqdminor);
+                        $checkedrev{'randomizetry'} = 1;
+                    }
                 }
             }
             my %responses = $res->responseTypes();
             foreach my $key (keys(%responses)) {
-                if (exists($checkresponsetypes{$key})) {
-                    push(@{$byresponsetype{$symb}{$checkresponsetypes{$key}}},$key);
+                if (exists($Apache::lonrelrequtils::checkresponsetypes{$key})) {
+                    my $rev = $Apache::lonrelrequtils::checkresponsetypes{$key};
+                    unless ($checkedrev{$key}) {
+                        my ($major,$minor) = split(/\./,$rev);
+                        ($reqdmajor,$reqdminor) =
+                            &Apache::lonrelrequtils::update_reqd_loncaparev($major,$minor,
+                                                                            $reqdmajor,$reqdminor);
+                        $checkedrev{$key} = 1;
+                    } 
+                    push(@{$byresponsetype{$symb}{$rev}},$key);
                     $allmaps{$enclosing_map} = 1;
                 }
             }
@@ -2516,6 +2654,10 @@ sub display_loncaparev_constraints {
                   '</p>'); 
     }
     $r->print(&Apache::loncommon::end_page());
+    my ($currmajor,$currminor) = split(/\./,$loncaparev);
+    if (($currmajor != $reqdmajor) || ($currminor != $reqdminor)) {
+        return 1;
+    }
     return;
 }
 
@@ -2657,6 +2799,7 @@ sub show_contents_view {
         }
         $r->print(&Apache::loncommon::end_data_table());
     }
+    return;
 }
 
 sub releases_by_map {
@@ -2710,6 +2853,24 @@ sub get_param_description {
     return $name;
 }
 
+sub update_releasereq {
+    my $readmap = 1;
+    my $getrelreq = 1;
+    if (ref($modified_courses) eq 'ARRAY') {
+        foreach my $item (@{$modified_courses}) {
+            if (ref($item) eq 'ARRAY') {
+                my ($cdom,$cnum,$chome,$crstype) = @{$item};
+                &Apache::lonrelrequtils::modify_course_relreq(undef,undef,$cnum,$cdom,
+                                                              $chome,$crstype,$cdom.'_'.$cnum,
+                                                              $readmap,$getrelreq);
+            }
+        }
+        $modified_courses = [];
+    }
+    undef($registered_cleanup);
+    return;
+}
+
 sub show_autocoowners {
     my (@currcoown) = @_;
     my $output = '<i><span class="LC_nobreak">'.&mt('Co-ownership is set automatically when a Course Coordinator role[_1] is assigned to official course personnel (from institutional data).','</span><br /><span class="LC_nobreak">').'</span></i>';
@@ -2858,7 +3019,7 @@ sub print_localization {
         $count ++;
         my $colspan;
         unless ($item eq 'languages') {
-            $colspan = 2;
+            $colspan = 2; 
         }
         $datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan);
         if ($item eq 'timezone') {
@@ -2978,8 +3139,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);
         } else {
             $datatable .= &Apache::lonhtmlcommon::textbox($item.'.text',
@@ -3168,15 +3329,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).
                           '</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);
         } elsif ($item eq 'pch.roles.denied') {
             $datatable .= '</td><td align="right">'.
@@ -3205,7 +3366,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).
                           &Apache::loncommon::end_data_table().'<br />';
@@ -3377,7 +3538,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',
@@ -3443,7 +3604,7 @@ sub print_classlists {
         'defaultcredits' => {
                    text => '<b>'.&mt($itemtext->{'defaultcredits'}).'</b>',
                  },
-
+              
         'nothideprivileged'   => {
                    text => '<b>'.&mt($itemtext->{'nothideprivileged'}).'</b>',
                    input => 'checkbox',
@@ -3510,11 +3671,12 @@ sub print_appearance {
                    text => '<b>'.&mt($itemtext->{'texengine'}).'</b>',
                    input => 'selectbox',
                    options => {
+                                MathJax  => 'MathJax',
                                 jsMath   => 'jsMath',
                                 mimetex => &mt('Convert to Images'),
                                 tth      => &mt('TeX to HTML'),
                               },
-                   order  => ['jsMath','mimetex','tth'],
+                   order  => ['MathJax','jsMath','mimetex','tth'],
                    nullval => $mathdef,
                  },
         'tthoptions' => {
@@ -3538,11 +3700,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>'.
@@ -3752,7 +3915,9 @@ sub get_other_items {
                     ($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/)
                     || ($parameter eq 'type') ||
                     ($parameter =~ m/^(cc|co|in|ta|ep|ad|st)\.plaintext$/)
-                    || ($parameter =~ m/^discussion_post_fonts/)) {
+                    || ($parameter =~ m/^discussion_post_fonts/) ||
+                    ($parameter =~ m{^(minimal|updated|uploaded|external)syllabus$}) ||
+                    ($parameter eq 'clonedfrom')) {
                 push(@ordered,$parameter);
             }
         }
@@ -3915,7 +4080,7 @@ sub nothidepriv_row {
             }
         }
         if ($settings->{'checkforpriv'}) {
-            @checkdoms = split(/,/,$settings->{'checkforpriv'});
+            @checkdoms = split(/,/,$settings->{'checkforpriv'}); 
         }
     }
     push(@checkdoms,$cdom);
@@ -3929,7 +4094,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);
@@ -3995,7 +4160,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">'.
@@ -4007,13 +4172,13 @@ sub checkforpriv_row {
                     &mt('Delete').'</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 />'.