--- loncom/interface/courseprefs.pm	2012/02/01 19:54:35	1.28.2.11
+++ loncom/interface/courseprefs.pm	2023/12/29 19:44:06	1.49.2.28.2.19
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.28.2.11 2012/02/01 19:54:35 raeburn Exp $
+# $Id: courseprefs.pm,v 1.49.2.28.2.19 2023/12/29 19:44:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,12 +52,16 @@ This module is used for configuration of
 
 =item process_changes()
 
+=item process_linkprot()
+
 =item get_sec_str()
 
 =item check_clone()
 
 =item store_changes()
 
+=item store_linkprot()
+
 =item update_env()
 
 =item display_disallowed()
@@ -112,7 +116,7 @@ This module is used for configuration of
 
 =item item_table_row_end()
 
-=item yes_no_radio()
+=item yesno_radio()
 
 =item select_from_options()
 
@@ -137,7 +141,7 @@ whether Domain coordinators who are curr
 advanced course user .db file for a course are to be hidden (e.g.,
 in syllabus, or from course user lists).
 
-Inputs: $cdom,$item,$settings,$crstype
+Inputs: $cdom,$item,$settings,$crstype,$noedit
 where $cdom is course domain, item is nothideprivileged, $settings is
 HASH ref of the current values for nothideprivileged, $crstype is 
 course type (Course or Community). 
@@ -215,8 +219,16 @@ use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonconfigsettings;
+use Apache::lonrelrequtils;
+use Apache::lonparmset;
+use Apache::courseclassifier;
 use Apache::lonlocal;
 use LONCAPA qw(:DEFAULT :match);
+use Crypt::CBC;
+use Time::HiRes qw( sleep );
+
+my $registered_cleanup;
+my $modified_courses;
 
 sub handler {
     my $r=shift;
@@ -227,11 +239,11 @@ 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 ($parm_permission,$allowed) = &get_permission($cid);
     my $navmap = Apache::lonnavmaps::navmap->new();
-    if ($parm_permission && $navmap) {
+    if ($allowed && $navmap) {
         &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
     } else {
@@ -256,6 +268,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();
@@ -267,10 +282,11 @@ sub handler {
     my %lt;
     if ($crstype eq 'Community') {
         %lt = (
-                conf => 'Community Configuration',
-                edit => 'Edit Community Configuration',
+                conf => 'Community Settings',
+                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',
@@ -278,7 +294,7 @@ sub handler {
                 excc => 'Exclude from community catalog',
                 clon => 'Users allowed to clone community',
                 rept => 'Replacement titles for standard community roles',
-                time => 'Timezone where the community is located',
+                time => 'Time Zone where the community is located',
                 date => 'Locale used for community calendar',
                 coco => 'Community Content',
                 copo => 'Community Policy',
@@ -286,26 +302,28 @@ sub handler {
                 defd => 'Default dates for member access',
                 stuv => 'Member-viewable membership list options',
                 stul => 'Member agreement needed to be listed',
-                clas => 'Membership and Facilitator Listing',
-                priv => 'Privileged users (Domain Coordinators) in facilitator listing',
+                clas => 'Membership and facilitator listing',
+                prus => 'Privileged users (Domain Coordinators) in facilitator listing',
                 defc => 'Default Community Spreadsheet',
                 defs => 'Default User Spreadsheet',
                 seme => 'Send message to member when clicking Done on Tasks'
               );
     } else {
         %lt = (
-                conf => 'Course Configuration',
-                edit => 'Edit Course Configuration',
+                conf => 'Course Settings',
+                edit => 'Edit Course Settings',
                 gens => 'General course settings',
                 idnu => 'Course ID or number',
+                unco => 'Unique code',
                 desc => 'Course Description',
+                cred => 'Student credits',
                 ownr => 'Course Owner',
                 cown => 'Course Co-owners',
                 catg => 'Categorize course',
                 excc => 'Exclude from course catalog',
                 clon => 'Users allowed to clone course',
                 rept => 'Replacement titles for standard course roles',
-                time => 'Timezone in which the course takes place',
+                time => 'Time Zone in which the course takes place',
                 date => 'Locale used for course calendar',
                 coco => 'Course Content',
                 copo => 'Course Policy',
@@ -313,8 +331,9 @@ sub handler {
                 defd => 'Default dates for student access',
                 stuv => 'Student-viewable classlist options',
                 stul => 'Student agreement needed to be listed',
-                clas => 'Classlists and Staff Listing',
-                priv => 'Privileged users (Domain Coordinators) in staff listing',
+                clas => 'Classlists and staff listing',
+                prus => 'Privileged users (Domain Coordinators) in staff listing',
+                prdo => "Domains to check for privileged users (besides course's domain)",
                 defc => 'Default Course Spreadsheet',
                 defs => 'Default Student Spreadsheet',
                 seme => 'Send message to student when clicking Done on Tasks',
@@ -331,52 +350,96 @@ sub handler {
         $phase = $env{'form.phase'};
     }
 
-    if ($phase eq 'categorizecourse') {
+    if (($phase eq 'categorizecourse') && ($parm_permission->{'categorizecourse'})) {
         &assign_course_categories($r,$crstype);
         return OK;
     }
 
-    if ($phase eq 'releaseinfo') {
+    if (($phase eq 'releaseinfo') && ($parm_permission->{'releaseinfo'})) {
         my $loncaparev = $env{'course.'.$cid.'.internal.releaserequired'};
-        if ($loncaparev) {
-            &display_loncaparev_constraints($r,$navmap,$loncaparev,$crstype);
+        if ($loncaparev) { 
+            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;
         }
     }
 
     my %values=&Apache::lonnet::dump('environment',$cdom,$cnum);
+    my %linkprot=&Apache::lonnet::dump('lti',$cdom,$cnum,undef,undef,undef,1);
+    my %ltienc = &Apache::lonnet::dump('nohist_ltienc',$cdom,$cnum,undef,undef,undef,1);
+    my %ltitools = &Apache::lonnet::dump('ltitools',$cdom,$cnum,undef,undef,undef,1);
+    my %ltitoolsenc = &Apache::lonnet::dump('nohist_toolsenc',$cdom,$cnum,undef,undef,undef,1);
+    foreach my $id (keys(%linkprot)) {
+        if (ref($linkprot{$id}) eq 'HASH') {
+            if (ref($ltienc{$id}) eq 'HASH') {
+                $values{'linkprot'}{$id} = { %{$linkprot{$id}}, %{$ltienc{$id}} };
+            } else {
+                $values{'linkprot'}{$id} = $linkprot{$id};
+            }
+        }
+        unless ($phase eq 'process') {
+            if (ref($values{'linkprot'}{$id}) eq 'HASH') {
+                delete($values{'linkprot'}{$id}{'secret'});
+            }
+        }
+    }
+    if ($linkprot{'lock'}) {
+        delete($linkprot{'lock'});
+    }
+    foreach my $id (keys(%ltitools)) {
+        if (ref($ltitools{$id}) eq 'HASH') {
+            if (ref($ltitoolsenc{$id}) eq 'HASH') {
+                $values{'ltitools'}{$id} = { %{$ltitools{$id}}, %{$ltitoolsenc{$id}} };
+            } else {
+                $values{'ltitools'}{$id} = $ltitools{$id};
+            }
+        }
+        unless ($phase eq 'process') {
+            if (ref($values{'ltitools'}{$id}) eq 'HASH') {
+                delete($values{'ltitools'}{$id}{'secret'});
+            }
+        }
+    }
+    if ($ltitools{'lock'}) {
+        delete($ltitools{'lock'});
+    }
     my @prefs_order = ('courseinfo','localization','feedback','discussion',
                        'classlists','appearance','grading','printouts',
-                       'spreadsheet','bridgetasks','other');
-
+                       'menuitems','ltitools','linkprot','spreadsheet',
+                       'bridgetasks','other');
     my %prefs = (
         'courseinfo' =>
                    { text => $lt{'gens'},
-                     help => 'Course_Environment',
-                     header => [{col1 => 'Setting',
-                                 col2 => 'Value'}],
+                     help => 'Course_Prefs_General',
                      ordered => ['owner','co-owners','loncaparev','description',
-                                 'courseid','categories','hidefromcat',
-                                 'externalsyllabus','cloners','url','rolenames'],
+                                 'clonedfrom','courseid','uniquecode','categories',
+                                 'hidefromcat','syllabus','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'}, 
-                                   'externalsyllabus' => 'URL of Syllabus',
+                                   'syllabus'         => 'Syllabus status',
                                    'url'              => 'Top Level Map',
                                    'rolenames'        => $lt{'rept'},
                                    'loncaparev'       => $lt{'lcrv'},
+                                   'clonedfrom'       => 'Cloned from',
                                  },
                     },
         'localization' =>
-                    { text => 'Language and Time Localization',
-                      help => 'Course_Environment',
-                      header => [{col1 => 'Setting',
-                                  col2 => 'Value',}],
+                    { text => 'Language and time localization',
+                      help => 'Course_Prefs_Language',
                       ordered => ['languages','timezone','datelocale'],
                       itemtext => {
                                     languages  => 'Languages used',
@@ -386,11 +449,9 @@ sub handler {
                     },
         'feedback' =>
                     { text => 'Feedback messages',
-                      help => 'Course_Environment',
+                      help => 'Course_Prefs_Feedback',
                       header => [{col1 => 'Questions about:',
-                                  col2 => 'Recipients'},
-                                 {col1 => 'Questions about:',
-                                  col2 => 'Custom Text'}],
+                                  col2 => 'Recipients'}],
                       ordered => ['question.email','comment.email','policy.email'],
                       itemtext => {
                                      'question.email' => 'Resource Content',
@@ -400,11 +461,12 @@ sub handler {
                     },
         'discussion' =>
                     { text => 'Discussion and Chat',
-                      help => 'Course_Environment',
+                      help => 'Course_Prefs_Discussions',
                       ordered => ['pch.roles.denied','pch.users.denied',
                                   'plc.roles.denied','plc.users.denied',
                                   'allow_limited_html_in_feedback',
-                                  'allow_discussion_post_editing'],
+                                  'allow_discussion_post_editing',
+                                  'discussion_post_fonts'],
                       itemtext => {
                          'pch.roles.denied'             => 'No Resource Discussion',
                          'pch.users.denied'             => 'No Resource Discussion',
@@ -412,11 +474,12 @@ sub handler {
                          'plc.users.denied'             => 'No Chat room use',
                          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',
                                   },
                     },
         'classlists' =>
                    { text => $lt{'clas'},
-                     help => 'Course_Environment',
+                     help => 'Course_Prefs_Classlists',
                      header => [{col1 => 'Type',
                                  col2 => $lt{'defd'}},
                                 {col1 => 'Setting',
@@ -425,38 +488,43 @@ sub handler {
                                  col2 => $lt{'stuv'}}],
                      ordered => ['default_enrollment_start_date',
                                  'default_enrollment_end_date',
-                                 'nothideprivileged','student_classlist_view',
+                                 'defaultcredits',
+                                 'nothideprivileged','checkforpriv',
+                                 'student_classlist_view',
                                  'student_classlist_opt_in','student_classlist_portfiles'],
                      itemtext => {
                          default_enrollment_start_date => 'Start date',
                          default_enrollment_end_date   => 'End date',
-                         nothideprivileged             => $lt{'priv'},
+                         nothideprivileged             => $lt{'prus'},
+                         checkforpriv                  => $lt{'prdo'},
                          student_classlist_view        => $lt{'stuv'},
                          student_classlist_opt_in      => $lt{'stul'},
                          student_classlist_portfiles   => 'Include link to accessible portfolio files',
+                         defaultcredits                => $lt{'cred'},
                                   },
                    },
         'appearance' =>
                    { text => 'Display of resources ',
-                     help => 'Course_Environment',
-                     header => [{col1 => 'Setting',
-                                 col2 => 'Value',}],
+                     help => 'Course_Prefs_Display',
                      ordered => ['default_xml_style','pageseparators',
                                  'disable_receipt_display','texengine',
-                                 'tthoptions'],
+                                 'tthoptions','uselcmath','usejsme',
+                                 'inline_chem','extresource'],
                       itemtext => {
                           default_xml_style       => 'Default XML style file',
                           pageseparators          => 'Visibly Separate Items on Pages',
                           disable_receipt_display => 'Disable display of problem receipts',
                           texengine               => 'Force use of a specific math rendering engine',
                           tthoptions              => 'Default set of options to pass to tth/m when converting TeX',
+                          uselcmath               => 'Student formula entry uses inline preview, not DragMath pop-up',
+                          usejsme                 => 'Molecule editor uses JSME (HTML5) in place of JME (Java)',
+                          inline_chem             => 'Chemical reaction response uses inline preview, not pop-up',
+                          extresource             => 'Display of external resources',
                                   },
                   },
         'grading' =>
                   { text => 'Grading',
-                    help => 'Course_Environment',
-                    header => [{col1 => 'Setting',
-                                col2 => 'Value',}],
+                    help => 'Course_Prefs_Grading',
                     ordered => ['grading','rndseed',
                                 'receiptalg','disablesigfigs'],
                     itemtext => {
@@ -469,9 +537,7 @@ sub handler {
                   },
         'printouts' =>
                   { text => 'Printout generation',
-                    help => 'Course_Environment',
-                    header => [{col1 => 'Setting',
-                                col2 => 'Value',}],
+                    help => 'Course_Prefs_Printouts',
                     ordered => ['problem_stream_switch','suppress_tries',
                                 'default_paper_size','print_header_format',
                                 'disableexampointprint'],
@@ -480,15 +546,13 @@ sub handler {
                         suppress_tries        => 'Suppress number of tries in printing',
                         default_paper_size    => 'Default paper type',
                         print_header_format   => 'Print header format',
-                        disableexampointprint => 'Disable automatically printing point values on exams',
+                        disableexampointprint => 'Disable automatically printing point values on bubblesheet exams',
                         canuse_pdfforms    => 'Users can print problems as PDF forms and upload later for grading',
                                 },
                   },
         'spreadsheet' =>
                   { text => 'Spreadsheets',
-                    help => 'Course_Environment',
-                    header => [{col1 => 'Setting',
-                                col2 => 'Value'}],
+                    help => 'Course_Prefs_Spreadsheet',
                     ordered => ['spreadsheet_default_classcalc',
                                 'spreadsheet_default_studentcalc',
                                 'spreadsheet_default_assesscalc','hideemptyrows'],
@@ -501,9 +565,7 @@ sub handler {
                   },
         'bridgetasks' =>
                   { text => 'Bridge tasks',
-                    help => 'Course_Environment',
-                    header => [{col1 => 'Setting',
-                                col2 => 'Value'}],
+                    help => 'Course_Prefs_Bridgetasks',
                     ordered => ['task_messages','task_grading',
                                 'suppress_embed_prompt'],
                     itemtext => {
@@ -512,31 +574,101 @@ sub handler {
                         suppress_embed_prompt => 'Hide upload references prompt if uploading file to portfolio',
                                 },
                   },
+        'menuitems' =>
+                   {
+                     text => 'Menu display',
+                     help => 'Course_Prefs_Menus',
+                     header => [{col1 => 'Default Menu',
+                                 col2 => 'Value',},
+                                {col1 => 'Menu collections',
+                                 col2 => 'Settings',
+                                }],
+                     ordered => ['menudefault','menucollections'],
+                     itemtext => {
+                         menudefault     => 'Choose default collection of menu items for course',
+                         menucollections => 'Menu collections',
+                                 },
+                   },
+        'linkprot' =>
+                   {
+                     text => 'Link protection',
+                     help => 'Course_Prefs_Linkprotection',
+                     header => [{col1 => 'Item',
+                                 col2 => 'Settings',
+                                }],
+                   },
+        'ltitools' =>
+                   {
+                     text => 'External tools',
+                     help => 'Course_Prefs_ExternalTools',
+                     header => [{col1 => 'Item',
+                                 col2 => 'Settings',
+                                }],
+                   },
         'other' =>
                   { text => 'Other settings',
-                    help => 'Course_Environment',
+                    help => 'Course_Prefs_Other',
                     header => [ {col1 => 'Item',
                                  col2 => 'Value',
                               }],
                   },
     );
-    if ($phase eq 'process') {
+    if (($phase eq 'process') && ($parm_permission->{'process'})) {
         my @allitems = &get_allitems(%prefs);
-        &Apache::lonconfigsettings::make_changes($r,$cdom,$phase,$context,
-                                                 \@prefs_order,\%prefs,\%values,
-                                                  $cnum,undef,\@allitems);
-    } elsif ($phase eq 'display') {
-        my $jscript = &get_jscript($cid,$cdom,$phase,$crstype);
+        my $result = &Apache::lonconfigsettings::make_changes($r,$cdom,$phase,$context,
+                                                              \@prefs_order,\%prefs,\%values,
+                                                              $cnum,undef,\@allitems,
+                                                              'coursepref',$parm_permission);
+        if ((ref($result) eq 'HASH') && (keys(%{$result}))) {
+            $r->rflush();
+            &devalidate_remote_courseprefs($cdom,$cnum,$result);
+        }
+    } elsif (($phase eq 'display') && ($parm_permission->{'display'})) {
+        my $noedit;
+        if (ref($parm_permission) eq 'HASH') {
+            unless ($parm_permission->{'process'}) {
+                $noedit = 1;
+            }
+        }
+        my $jscript = &get_jscript($cid,$cdom,$phase,$crstype,\%values,$noedit);
         my @allitems = &get_allitems(%prefs);
         &Apache::lonconfigsettings::display_settings($r,$cdom,$phase,$context,
-            \@prefs_order,\%prefs,\%values,undef,$jscript,\@allitems,$crstype);
+            \@prefs_order,\%prefs,\%values,$cnum,$jscript,\@allitems,$crstype,
+            'coursepref',$parm_permission);
     } else {
         &Apache::lonconfigsettings::display_choices($r,$phase,$context,
-                                                    \@prefs_order,\%prefs);
+                                                    \@prefs_order,\%prefs,
+                                                    'coursepref',$parm_permission);
     }
     return OK;
 }
 
+sub get_permission {
+    my ($cid) = @_;
+    my %permission;
+    my $allowed = 0;
+    return (\%permission,$allowed) unless ($cid);
+    if (&Apache::lonnet::allowed('opa',$cid)) {
+        %permission= (
+                       'pickactions'      => 1,
+                       'categorizecourse' => 1,
+                       'releaseinfo'      => 1,
+                       'process'          => 1,
+                       'display'          => 1,
+         );
+    } elsif (&Apache::lonnet::allowed('vpa',$env{'request.course.id'})) {
+        %permission = (
+                       'pickactions'      => 1,
+                       'releaseinfo'      => 1,
+                       'display'          => 1,
+                      );
+    }
+    foreach my $perm (values(%permission)) {
+        if ($perm) { $allowed=1; last; }
+    }
+    return (\%permission,$allowed);
+}
+
 sub get_allitems {
     my (%prefs) = @_;
     my @allitems;
@@ -547,6 +679,8 @@ sub get_allitems {
                 if ($item eq 'feedback') {
                     push(@allitems,(map { $_.'.text'; } @{$prefs{$item}{'ordered'}}));
                 }
+            } elsif (($item eq 'linkprot') || ($item eq 'ltitools')) {
+                push(@allitems,$item);
             }
         }
     }
@@ -554,50 +688,75 @@ sub get_allitems {
 }
 
 sub print_config_box {
-    my ($r,$cdom,$phase,$action,$item,$settings,$allitems,$crstype) = @_;
+    my ($r,$cdom,$cnum,$phase,$action,$item,$settings,$allitems,$crstype,$parm_permission) = @_;
     my $ordered = $item->{'ordered'};
     my $itemtext = $item->{'itemtext'};
+    my $noedit;
+    if (ref($parm_permission) eq 'HASH') {
+        unless ($parm_permission->{'process'}) {
+            $noedit = 1;
+        }
+    }
     my $rowtotal = 0;
     my $output =
          '<table class="LC_nested_outer">
           <tr>
            <th align="left" valign="middle"><span class="LC_nobreak" style="font-size: larger;" >'.
-           &mt($item->{text}).'&nbsp;'.
-           &Apache::loncommon::help_open_topic($item->{'help'}).'</span></th>'."\n".
-          '</tr>';
-    if (($action eq 'feedback') || ($action eq 'classlists')) {
+           &mt($item->{text});
+    if ($item->{'help'}) {
+        $output .= '&nbsp;'.
+                   &Apache::loncommon::help_open_topic($item->{'help'});
+    }
+    $output .= '</span></th>'."\n".
+               '</tr>';
+    if (($action eq 'feedback') || ($action eq 'classlists') || ($action eq 'menuitems')) {
         $output .= '
           <tr>
            <td>
-            <table class="LC_nested">';
+            <table class="LC_nested">';   
         if (exists $item->{'header'}->[0]->{'col1'} || 
             exists $item->{'header'}->[0]->{'col2'}) {
 			$output .= '          
           	<tr class="LC_info_row">
-              <td class="LC_left_item">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>
-              <td class="LC_right_item">'.&mt($item->{'header'}->[0]->{'col2'}).'</td>
+              <td class="LC_left_item">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';
+            if ($action eq 'feedback') {
+                $output .= '
+                  <td class="LC_right_item" colspan="2">';
+            } else {
+                $output .= '
+                  <td class="LC_right_item">';
+            }
+            $output .= &mt($item->{'header'}->[0]->{'col2'}).'</td>
             </tr>';
         }
         $rowtotal ++;
         if ($action eq 'feedback') {
-            $output .= &print_feedback('top',$cdom,$settings,$ordered,$itemtext,\$rowtotal);
+            $output .= &print_feedback('top',$cdom,$settings,$ordered,$itemtext,\$rowtotal,$noedit);
         } elsif ($action eq 'classlists') {
-            $output .= &print_classlists('top',$cdom,$settings,$itemtext,\$rowtotal,$crstype);
+            $output .= &print_classlists('top',$cdom,$settings,$itemtext,\$rowtotal,$crstype,$noedit);
+        } elsif ($action eq 'menuitems') {
+            $output .= &print_menuitems('top',$cdom,$settings,$itemtext,\$rowtotal,$crstype,$noedit);
         }
         $output .= '
            </table>
           </td>
          </tr>
          <tr>
-           <td>
+          <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
               <td class="LC_left_item">'.&mt($item->{'header'}->[1]->{'col1'}).'</td>';
-        $output .= '
-              <td class="LC_right_item">'.&mt($item->{'header'}->[1]->{'col2'}).'</td>
+        if ($action eq 'classlists') {
+            $output .= '
+              <td class="LC_right_item" colspan="2">';
+        } else {
+            $output .= '
+              <td class="LC_right_item">';
+        }
+        $output .= &mt($item->{'header'}->[1]->{'col2'}).'</td>
              </tr>';
         if ($action eq 'classlists') {
-            $output .= &print_classlists('middle',$cdom,$settings,$itemtext,\$rowtotal,$crstype).
+            $output .= &print_classlists('middle',$cdom,$settings,$itemtext,\$rowtotal,$crstype,$noedit).
                        '
             </table>
            </td>
@@ -605,14 +764,14 @@ sub print_config_box {
           <tr>
            <td>
             <table class="LC_nested">';
-            if (exists $item->{'header'}->[0]->{'col1'} || 
-            	exists $item->{'header'}->[0]->{'col2'}) {
+            if (exists $item->{'header'}->[2]->{'col1'} || 
+            	exists $item->{'header'}->[2]->{'col2'}) {
 				$output .= '          
 				<tr class="LC_info_row">
-				  <td class="LC_left_item">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>
-				  <td class="LC_right_item">'.&mt($item->{'header'}->[0]->{'col2'}).'</td>
+				  <td class="LC_left_item">'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
+				  <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>
 				</tr>';
-            }
+        	}
         }
     } else {
         $output .= '
@@ -623,34 +782,50 @@ sub print_config_box {
             exists $item->{'header'}->[0]->{'col2'}) {
 			$output .= '          
           	<tr class="LC_info_row">
-              <td class="LC_left_item" valign="top">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>
-              <td class="LC_right_item" valign="top">'.&mt($item->{'header'}->[0]->{'col2'}).'</td>
+              <td class="LC_left_item" valign="top">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';
+            if (($action eq 'courseinfo') || ($action eq 'localization') ||
+                ($action eq 'print_discussion')) {
+                $output .= '<td class="LC_right_item" valign="top" colspan="2">';
+            } else {
+                $output .= '<td class="LC_right_item" valign="top">';
+            }
+            $output .= &mt($item->{'header'}->[0]->{'col2'}).'</td>
             </tr>';
         }
     }
     $rowtotal ++;
     if ($action eq 'courseinfo') {
-        $output .= &print_courseinfo($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
+        $output .= &print_courseinfo($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
     } elsif ($action eq 'localization') {
-        $output .= &print_localization($cdom,$settings,$ordered,$itemtext,\$rowtotal);
+        $output .= &print_localization($cdom,$settings,$ordered,$itemtext,\$rowtotal,$noedit);
     } elsif ($action eq 'feedback') {
-        $output .= &print_feedback('bottom',$cdom,$settings,$ordered,$itemtext,\$rowtotal);
+        $output .= &print_feedback('bottom',$cdom,$settings,$ordered,$itemtext,\$rowtotal,$noedit);
     } elsif ($action eq 'discussion') {
-        $output .= &print_discussion($cdom,$settings,$ordered,$itemtext,\$rowtotal);
-    } elsif ($action eq 'classlists') {
-        $output .= &print_classlists('bottom',$cdom,$settings,$itemtext,\$rowtotal,$crstype);
+        $output .= &print_discussion($cdom,$settings,$ordered,$itemtext,\$rowtotal,$noedit);
+    } elsif (($action eq 'classlists') || ($action eq 'viewableroster')) {
+        $output .= &print_classlists('bottom',$cdom,$settings,$itemtext,\$rowtotal,$crstype,$noedit);
     } elsif ($action eq 'appearance') {
-        $output .= &print_appearance($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
+        $output .= &print_appearance($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
     } elsif ($action eq 'grading') {
-        $output .= &print_grading($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
+        $output .= &print_grading($cdom,$cnum,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
     } elsif ($action eq 'printouts') {
-        $output .= &print_printouts($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
+        $output .= &print_printouts($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
     } elsif ($action eq 'spreadsheet') {
-        $output .= &print_spreadsheet($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
+        $output .= &print_spreadsheet($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
     } elsif ($action eq 'bridgetasks') {
-        $output .= &print_bridgetasks($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
+        $output .= &print_bridgetasks($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
+    } elsif ($action eq 'ltitools') {
+        my $currtools = {};
+        if ((ref($settings) eq 'HASH') && (ref($settings->{'ltitools'}))) {
+            $currtools = $settings->{'ltitools'};
+        }
+        $output .= &print_ltitools($cdom,$cnum,$currtools,\$rowtotal,$crstype,$noedit,'course');
+    } elsif ($action eq 'menuitems') {
+        $output .= &print_menuitems('bottom',$cdom,$settings,$itemtext,\$rowtotal,$crstype,$noedit);
+    } elsif ($action eq 'linkprot') {
+        $output .= &print_linkprotection($cdom,$cnum,$settings,\$rowtotal,$crstype,$noedit,'course');
     } elsif ($action eq 'other') {
-        $output .= &print_other($cdom,$settings,$allitems,\$rowtotal,$crstype);
+        $output .= &print_other($cdom,$settings,$allitems,\$rowtotal,$crstype,$noedit);
     }
     $output .= '
    </table>
@@ -661,8 +836,8 @@ sub print_config_box {
 }
 
 sub process_changes {
-    my ($cdom,$action,$values,$item,$changes,$allitems,$disallowed,$crstype) = @_;
-    my %newvalues;
+    my ($cdom,$cnum,$action,$values,$item,$changes,$allitems,$disallowed,$crstype,$lastactref) = @_;
+    my (%newvalues,$errors);
     if (ref($item) eq 'HASH') {
         if (ref($changes) eq 'HASH') {
             my @ordered;
@@ -679,8 +854,41 @@ sub process_changes {
                         }
                     }
                 }
+            } elsif (($action eq 'linkprot') || ($action eq 'ltitools')) {
+                if (ref($values->{$action}) eq 'HASH') {
+                    foreach my $id (keys(%{$values->{$action}})) {
+                        if ($id =~ /^\d+$/) {
+                            push(@ordered,$id);
+                        }
+                    }
+                }
+                @ordered = sort { $a <=> $b } @ordered;
+                if (($env{'form.'.$action.'_add'}) && ($env{'form.'.$action.'_maxnum'} =~ /^\d+$/)) {
+                    push(@ordered,$env{'form.'.$action.'_maxnum'});
+                }
             } elsif (ref($item->{'ordered'}) eq 'ARRAY') {
-                @ordered = @{$item->{'ordered'}};
+                if ($action eq 'courseinfo') {
+                    my ($can_toggle_cat,$can_categorize) =
+                        &can_modify_catsettings($cdom,$crstype);
+                    foreach my $entry (@{$item->{'ordered'}}) {
+                        next if (($entry eq 'hidefromcat') &&
+                                 (!$can_toggle_cat));
+                        next if (($entry eq 'categories') &&
+                                 (!$can_categorize));
+                        next if (($entry eq 'loncaparev') || 
+                                ($entry eq 'owner') ||
+                                ($entry eq 'clonedfrom') ||
+                                ($entry eq 'syllabus'));
+                        push(@ordered,$entry);
+                    }
+                } elsif ($action eq 'classlists') {
+                    foreach my $entry (@{$item->{'ordered'}}) {
+                        next if ($entry eq 'defaultcredits');
+                        push(@ordered,$entry);
+                    }
+                } else {
+                    @ordered = @{$item->{'ordered'}};
+                }
             }
             if (@ordered > 0) {
                 if ($action eq 'feedback') {
@@ -720,9 +928,93 @@ sub process_changes {
                             $changes->{$ext_entry} = $newvalues{$ext_entry};
                         }
                     }
+                } elsif ($action eq 'menuitems') {
+                    my (%current,@colls);
+                    my $next = 1;
+                    if ($values->{'menucollections'}) {
+                        foreach my $item (split(/;/,$values->{'menucollections'})) {
+                            my ($num,$value) = split(/\%/,$item);
+                            if ($num =~ /^\d+$/) {
+                                unless (grep(/^$num$/,@colls)) {
+                                    push(@colls,$num);
+                                }
+                                my @entries = split(/\&/,$value);
+                                foreach my $entry (@entries) {
+                                    my ($name,$fields) = split(/=/,$entry);
+                                    $current{$num}{$name} = $fields;
+                                }
+                            }
+                        }
+                    }
+                    if (@colls) {
+                        @colls = sort { $a <=> $b } @colls;
+                        $next += $colls[-1];
+                    }
+                    if ($env{'form.menucollections_add'} eq $next) {
+                        push(@colls,$next);
+                    }
+                    my $currdef = $values->{'menudefault'};
+                    my $possdef = $env{'form.menudefault'};
+                    if (($possdef =~ /^\d+$/) && (grep(/^$possdef$/,@colls))) {
+                        if ($currdef ne $possdef) {
+                            $changes->{'menudefault'} = $possdef;
+                        }
+                    } elsif ($currdef) {
+                        $changes->{'menudefault'} = '';
+                    }
+                    my $menucoll;
+                    if (@colls) {
+                        my ($ordered,$cats) = &menuitems_categories();
+                        my %shortcats = &menuitems_abbreviations();
+                        foreach my $num (@colls) {
+                            my ($entry,%include);
+                            map { $include{$_}= 1; } &Apache::loncommon::get_env_multiple('form.menucollections_'.$num);
+                            foreach my $item (@{$ordered}) {
+                                if ($item eq 'shown') {
+                                    foreach my $type (@{$cats->{$item}}) {
+                                        $entry .= $type.'=';
+                                        if ($include{$type}) {
+                                            $entry .= 'y';
+                                        } else {
+                                            $entry .= 'n';
+                                        }
+                                        $entry .= '&';
+                                    }
+                                } else {
+                                    $entry .= $shortcats{$item}.'=';
+                                    foreach my $type (@{$cats->{$item}}) {
+                                        if ($include{$type}) {
+                                            $entry .= $type.',';
+                                        }
+                                    }
+                                    $entry =~ s/,$//;
+                                    $entry .= '&';
+                                }
+                            }
+                            $entry =~ s/\&$//;
+                            if ($menucoll) {
+                                $menucoll .= ';';
+                            }
+                            $menucoll .= $num.'%'.$entry;
+                        }
+                        if ($menucoll ne $values->{'menucollections'}) {
+                            $changes->{'menucollections'} = $menucoll;
+                        }
+                    } elsif ($values->{'menucollections'}) {
+                        $changes->{'menucollections'} = '';
+                    }
+                } elsif ($action eq 'linkprot') {
+                    if (ref($values) eq 'HASH') {
+                        $errors = &process_linkprot($cdom,$cnum,$values->{$action},$changes,'course',$lastactref);
+                    }
+                } elsif ($action eq 'ltitools') {
+                    if (ref($values) eq 'HASH') {
+                        my $switchserver = &check_switchserver($cdom,$cnum,'course','/adm/courseprefs');
+                        $errors = &process_ltitools('',$cdom,$cnum,$values->{$action},$changes,'course',$lastactref,
+                                                    'ok','','ok');
+                    }
                 } else {
                     foreach my $entry (@ordered) {
-                        next if (($entry eq 'loncaparev') || ($entry eq 'owner'));
                         if ($entry eq 'cloners') {
                             if ($env{'form.cloners_all'}) {
                                 $newvalues{$entry} = '*';
@@ -730,7 +1022,7 @@ sub process_changes {
                                 my @clonedoms;
                                 if (exists($env{'form.cloners_activate'})) {
                                     my $actnum = $env{'form.cloners_activate'};
-                                    if ($actnum ne '') {
+                                    if ($actnum ne '-1') {
                                         if ($env{'form.cloners_dom_'.$actnum} ne '') {
                                             my $clonedom = $env{'form.cloners_dom_'.$actnum};
                                             if (&check_clone($clonedom,$disallowed) eq 'ok') {
@@ -748,7 +1040,7 @@ sub process_changes {
                                             my $clonedom = $env{'form.cloners_dom_'.$i};
                                             if (&check_clone($clonedom,$disallowed) eq 'ok') {
                                                 if (!grep(/^\*:\Q$clonedom\E$/,@clonedoms)) {
-                                                    push (@clonedoms,'*:'.$clonedom);
+                                                    push(@clonedoms,'*:'.$clonedom);
                                                 }
                                             }
                                         }
@@ -761,7 +1053,7 @@ sub process_changes {
                                     my $clonedom = $env{'form.cloners_newdom'};
                                     if (&check_clone($clonedom,$disallowed) eq 'ok') {
                                         my $newdom = '*:'.$env{'form.cloners_newdom'};
-                                        if (@clonedoms) { 
+                                        if (@clonedoms) {
                                             if (!grep(/^\Q$newdom\E$/,@clonedoms)) {
                                                 $newvalues{$entry} .= ','.$newdom;
                                             }
@@ -794,6 +1086,37 @@ sub process_changes {
                                         }
                                     }
                                 }
+                                if (ref($values) eq 'HASH') {
+                                    my (@code_order,%codedefaults);
+                                    &Apache::lonnet::auto_instcode_defaults($cdom,\%codedefaults,
+                                                                            \@code_order);
+                                    my $clonebycode;
+                                    if ($env{'form.cloners_instcode'}) {
+                                        if (@code_order > 0) {
+                                            my @standardnames = &Apache::loncommon::get_standard_codeitems();
+                                            my %local_to_standard;
+                                            for (my $i=0; $i<@code_order; $i++) {
+                                                $local_to_standard{$code_order[$i]} = $standardnames[$i];
+                                            }
+                                            foreach my $item (@code_order) {
+                                                my $key = $local_to_standard{$item};
+                                                if ($key ne '') {
+                                                    if ($env{'form.'.$key}) {
+                                                        $clonebycode .= $key.'='.&escape($env{'form.'.$key}).'&';
+                                                    }
+                                                }
+                                            }
+                                            $clonebycode =~ s/\&$//;
+                                        }
+                                    }
+                                    if ($clonebycode) {
+                                        if ($newvalues{$entry}) {
+                                            $newvalues{$entry} .= ','.$clonebycode;
+                                        } else {
+                                            $newvalues{$entry} = $clonebycode;
+                                        }
+                                    }
+                                }
                             }
                             if (ref($disallowed) eq 'HASH') {
                                 if (ref($disallowed->{'cloners'}) eq 'HASH') {
@@ -819,7 +1142,9 @@ sub process_changes {
                                         $autocoowner = $domconf{'autoenroll'}{'co-owners'};
                                     }
                                 }
-                                unless ($autocoowner) {
+                                if ($autocoowner) {
+                                    $newvalues{'co-owners'} = $values->{'internal.co-owners'}; 
+                                } else {
                                     my @keepcoowners = &Apache::loncommon::get_env_multiple('form.coowners');
                                     my @pendingcoowners = &Apache::loncommon::get_env_multiple('form.pendingcoowners');
                                     my @invitecoowners =  &Apache::loncommon::get_env_multiple('form.invitecoowners');
@@ -843,19 +1168,19 @@ sub process_changes {
                                 my $udom = $env{'user.domain'};
                                 my $pendingcoowners = $values->{'internal.pendingco-owners'};
                                 my @pendingcoown = split(',',$pendingcoowners);
-                                if ($env{'form.pending_coowoner'}) {
+                                if ($env{'form.pending_coowner'}) {
                                     foreach my $item (@pendingcoown) {
                                         unless ($item eq $uname.':'.$udom) {
                                             push(@newpending,$item);
                                         }
                                     }
                                     @newcoown = @currcoown;
-                                    if ($env{'form.pending_coowoner'} eq 'accept') {
+                                    if ($env{'form.pending_coowner'} eq 'accept') {
                                         unless (grep(/^\Q$uname\E:\Q$udom\E$/,@currcoown)) {
                                             push(@newcoown,$uname.':'.$udom);
                                         }
                                     }
-                                } elsif ($env{'form.remove_coowoner'}) {
+                                } elsif ($env{'form.remove_coowner'}) {
                                     foreach my $item (@currcoown) {
                                         unless ($item eq $uname.':'.$udom) {
                                             push(@newcoown,$item);
@@ -864,6 +1189,8 @@ sub process_changes {
                                     if ($pendingcoowners ne '') {
                                         @newpending = @pendingcoown;
                                     }
+                                } else {
+                                    @newcoown = @currcoown;
                                 }
                                 $newvalues{'pendingco-owners'} = join(',',sort(@newpending));
                                 $newvalues{'co-owners'} = join(',',sort(@newcoown));
@@ -989,6 +1316,35 @@ sub process_changes {
                                 }
                             }
                             $newvalues{$entry} =~ s/,$//;
+                        } elsif ($entry eq 'discussion_post_fonts') {
+                            my ($classorder,$classtitles) = &discussion_vote_classes();
+                            my $fontchange = 0;
+                            foreach my $class (@{$classorder}) {
+                                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;
+                                $weight =~ s/,//g;
+                                $style =~ s/,//g;
+                                $other =~ s/[^\w;:\s\-\%.]//g;
+                                $other =~ s/(^\s+|\s+$)//g;
+                                $newvalues{$ext_entry} = join(',',($size.$unit,$weight,$style,$other));
+                                my $current = $values->{$ext_entry};
+                                if ($values->{$ext_entry} eq '') {
+                                    $current = ',,,';
+                                }
+                                if ($newvalues{$ext_entry} ne $current) {
+                                    $changes->{$ext_entry} = $newvalues{$ext_entry};
+                                    $fontchange ++;
+                                }
+                            }
+                            if ($fontchange) {
+                                $changes->{$entry} = 1;
+                            }
                         } elsif ($entry eq 'nothideprivileged') {
                             my @curr_nothide;
                             my @new_nothide;
@@ -1063,36 +1419,118 @@ 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') {
-                            my $langstr;
+                        } elsif (($entry eq 'languages') ||
+                                 ($entry eq 'checkforpriv')) {
+                            my $settings;
                             my $total = $env{'form.'.$entry.'_total'};
                             if ($total) {
                                 my @deletes = &Apache::loncommon::get_env_multiple('form.'.$entry.'_delete');
                                 for (my $i=0; $i<$total; $i++) {
                                     unless (grep(/^$i$/,@deletes)) {
-                                       $langstr .= $env{'form.'.$entry.'_'.$i}.',';
+                                        $settings .= $env{'form.'.$entry.'_'.$i}.',';
                                     }
                                 }
                             } else {
                                 $total = 0;
                             }
                             if ($env{'form.'.$entry.'_'.$total} ne '') {
-                                my $newlang = $env{'form.'.$entry.'_'.$total};
-                                my %langchoices = &get_lang_choices();
-                                if ($langchoices{$newlang}) {
-                                    $langstr .= $newlang;
+                                my $new = $env{'form.'.$entry.'_'.$total};
+                                if ($entry eq 'languages') {
+                                    my %langchoices = &get_lang_choices();
+                                    if ($langchoices{$new}) {
+                                        $settings .= $new;
+                                    } else {
+                                        $settings =~ s/,$//;
+                                        $disallowed->{'localization'}{$entry} = $new;
+                                    }
                                 } else {
-                                    $langstr =~ s/,$//;
-                                    $disallowed->{'localization'}{$entry} = $newlang;
+                                    my %domains=map { $_ => 1; } &Apache::lonnet::all_domains();
+                                    if ($domains{$new}) {
+                                        $settings .= $new;
+                                    } else {
+                                        $settings =~ s/,$//;
+                                        $disallowed->{'classlists'}{$entry} = $new;
+                                    }
                                 }
                             } else {
-                                $langstr =~ s/,$//;
+                                $settings =~ s/,$//;
                             }
-                            $newvalues{$entry} = $langstr;
+                            $newvalues{$entry} = $settings;
+                        } elsif ($entry eq 'extresource') {
+                            if ($env{'form.'.$entry} =~ /^iframe|tab|window$/) {
+                                $newvalues{$entry} = $env{'form.'.$entry};
+                                if ($env{'form.'.$entry} ne 'iframe') {
+                                    if ($env{'form.extwintabreuse'}) {
+                                        $newvalues{$entry} .= ':1';
+                                    } else {
+                                        $newvalues{$entry} .= ':0';
+                                    }
+                                    if ($env{'form.'.$entry} eq 'window') {
+                                        foreach my $dim ('width','height') {
+                                            $env{'form.extreswin'.$dim} =~ s/^\s+|\s+$//g;
+                                            if ($env{'form.extreswin'.$dim} =~ /^\d+$/) {
+                                                $newvalues{$entry} .= ':'.$env{'form.extreswin'.$dim};
+                                            } else {
+                                                $newvalues{$entry} .= ':';
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                            unless (($newvalues{$entry} eq 'iframe') && ($values->{$entry} eq '')) {
+                                if ($newvalues{$entry} ne $values->{$entry}) {
+                                    $changes->{$entry} = $newvalues{$entry};
+                                }
+                            }
+                        } elsif ($entry eq 'timezone') {
+                            if ($env{'form.'.$entry}) {
+                                $newvalues{$entry} = $env{'form.'.$entry};
+                                if ($newvalues{$entry} ne $values->{$entry}) {
+                                    $changes->{$entry} = $newvalues{$entry};
+                                }
+                                if ($env{'form.tzover'}) {
+                                    $newvalues{'tzover'} = $env{'form.tzover'};
+                                    if ($newvalues{'tzover'} ne $values->{'tzover'}) {
+                                        $changes->{'tzover'} = $newvalues{'tzover'};
+                                    }
+                                } elsif ($values->{'tzover'}) {
+                                    $changes->{'tzover'} = '';
+                                }
+                            } elsif ($values->{$entry}) {
+                                $changes->{$entry} = '';
+                            }
+                        } elsif ($entry eq 'grading') {
+                            if ($env{'form.'.$entry} eq 'standard') {
+                                if ($env{'form.hidetotals'}) {
+                                    my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
+                                    if (keys(%sections)) {
+                                        my @secs = &Apache::loncommon::get_env_multiple('form.hidetotals_sections');
+                                        if (grep(/^all$/,@secs)) {
+                                            $newvalues{'hidetotals'} = 'all';
+                                        } elsif (@secs) {
+                                            $newvalues{'hidetotals'} = '';
+                                            foreach my $sec (sort {$a <=> $b} @secs) {
+                                                if (exists($sections{$sec})) {
+                                                    $newvalues{'hidetotals'} .= $sec.','
+                                                }
+                                            }
+                                            $newvalues{'hidetotals'} =~ s/,$//;
+                                        }
+                                    } else {
+                                        $newvalues{'hidetotals'} = 'all';
+                                    }
+                                }
+                            }
+                            if ($newvalues{'hidetotals'} ne $values->{'hidetotals'}) {
+                                $changes->{'hidetotals'} = $newvalues{'hidetotals'};
+                                $changes->{'grading'} = $env{'form.'.$entry};
+                            }
+                            $newvalues{$entry} = $env{'form.'.$entry};
                         } else {
                             $newvalues{$entry} = $env{'form.'.$entry};
                         }
-                        unless ($entry eq 'co-owners') {
+                        unless (($entry eq 'co-owners') || ($entry eq 'discussion_post_fonts') ||
+                                ($entry eq 'extresource') || ($entry eq 'timezone')) {
                             if ($newvalues{$entry} ne $values->{$entry}) {
                                 $changes->{$entry} = $newvalues{$entry};
                             }
@@ -1102,7 +1540,887 @@ sub process_changes {
             }
         }
     }
-    return;
+    return $errors;
+}
+
+sub process_linkprot {
+    my ($cdom,$cnum,$values,$changes,$context,$lastactref) = @_;
+    my ($dest,$ltiauth,$privnum,$cipher,$errors,%linkprot);
+    if (ref($values) eq 'HASH') {
+        foreach my $id (keys(%{$values})) {
+            if ($id =~ /^\d+$/) {
+                unless (ref($values->{$id}) eq 'HASH') {
+                    $linkprot{$id} = '';
+                }
+            }
+        }
+    }
+    ($cipher,$privnum) = &get_credentials($cdom,$cnum,'lti',$context);
+    if ($context eq 'domain') {
+        $dest = '/adm/domainprefs';
+        $ltiauth = 1;
+    } else {
+        $dest = '/adm/courseprefs';
+        if (exists($env{'course.'.$env{'request.course.id'}.'.internal.ltiauth'})) {
+            $ltiauth = $env{'course.'.$env{'request.course.id'}.'.internal.ltiauth'};
+        } else {
+            my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+            $ltiauth = $domdefs{'crsltiauth'};
+        }
+    }
+    my $switchserver = &check_switchserver($cdom,$cnum,$context,$dest);
+    my (@items,%deletions,%itemids,%haschanges);
+    if ($env{'form.linkprot_add'}) {
+        my $name = $env{'form.linkprot_name_add'};
+        $name =~ s/(`)/'/g;
+        my ($newid,$error) = &get_linkprot_id($cdom,$cnum,$name,$context);
+        if ($newid) {
+            $itemids{'add'} = $newid;
+            push(@items,'add');
+            $haschanges{$newid} = 1;
+        } else {
+            $errors .= '<span class="LC_error">'.
+                       &mt('Failed to acquire unique ID for link protection').
+                       '</span>';
+        }
+    }
+    if (ref($values) eq 'HASH') {
+        my @todelete = &Apache::loncommon::get_env_multiple('form.linkprot_del');
+        my $maxnum = $env{'form.linkprot_maxnum'};
+        for (my $i=0; $i<$maxnum; $i++) {
+            my $itemid = $env{'form.linkprot_id_'.$i};
+            $itemid =~ s/\D+//g;
+            if ($itemid) {
+                if (ref($values->{$itemid}) eq 'HASH') {
+                    push(@items,$i);
+                    $itemids{$i} = $itemid;
+                    if ((@todelete > 0) && (grep(/^$i$/,@todelete))) {
+                        $deletions{$itemid} = $values->{$itemid}->{'name'};
+                    }
+                }
+            }
+        }
+    }
+    foreach my $idx (@items) {
+        my $itemid = $itemids{$idx};
+        next unless ($itemid);
+        if (exists($deletions{$itemid})) {
+            $linkprot{$itemid} = $deletions{$itemid};
+            $haschanges{$itemid} = 1;
+            next;
+        }
+        my %current;
+        if (ref($values) eq 'HASH') {
+            if (ref($values->{$itemid}) eq 'HASH') {
+                foreach my $key (keys(%{$values->{$itemid}})) {
+                    $current{$key} = $values->{$itemid}->{$key};
+                }
+            }
+        }
+        foreach my $inner ('name','lifetime','version') {
+            my $formitem = 'form.linkprot_'.$inner.'_'.$idx;
+            $env{$formitem} =~ s/(`)/'/g;
+            if ($inner eq 'lifetime') {
+                $env{$formitem} =~ s/[^\d.]//g;
+            }
+            unless ($idx eq 'add') {
+                if ($current{$inner} ne $env{$formitem}) {
+                    $haschanges{$itemid} = 1;
+                }
+            }
+            if ($env{$formitem} ne '') {
+                $linkprot{$itemid}{$inner} = $env{$formitem};
+            }
+        }
+        my $urlitem = 'form.linkprot_returnurl_'.$idx;
+        my $urlparamname = 'form.linkprot_urlparam_'.$idx;
+        if ($env{$urlitem} == 1) {
+            $env{$urlparamname} =~ s/(`)/'/g;
+        } elsif (exists($env{$urlparamname})) {
+            $env{$urlparamname} = '';
+        }
+        my $passback = 'form.linkprot_passback_'.$idx;
+        my $passbackparamname = 'form.linkprot_passbackformat_'.$idx;
+        if ($env{$passback} == 1) {
+            unless ($env{$passbackparamname} =~ /^1\.(0|1)$/) {
+                $env{$passbackparamname} = '';
+            }
+        } elsif (exists($env{$passbackparamname})) {
+            $env{$passbackparamname} = '';
+        }
+        unless ($idx eq 'add') {
+            if ((!$current{'returnurl'} && ($env{$urlparamname} ne '')) ||
+                ($current{'returnurl'} && ($env{$urlparamname} eq ''))) {
+                $haschanges{$itemid} = 1;
+            }
+            if ((!$current{'passback'} && ($env{$passbackparamname} ne '')) ||
+                ($current{'passback'} && ($env{$passbackparamname} eq ''))) {
+                $haschanges{$itemid} = 1;
+            }
+        }
+        if ($env{$urlparamname} ne '') {
+            $linkprot{$itemid}{'returnurl'} = $env{$urlparamname};
+        }
+        if ($env{$passbackparamname} ne '') {
+            $linkprot{$itemid}{'passback'} = 1;
+            $linkprot{$itemid}{'passbackformat'} = $env{$passbackparamname};
+        }
+        if ($ltiauth) {
+            my $reqitem = 'form.linkprot_requser_'.$idx;
+            $env{$reqitem} =~ s/(`)/'/g;
+            unless ($idx eq 'add') {
+                if ((!$current{'requser'} && $env{$reqitem}) ||
+                    ($current{'requser'} && !$env{$reqitem})) {
+                    $haschanges{$itemid} = 1;
+                }
+            }
+            if ($env{$reqitem} == 1) {
+                $linkprot{$itemid}{'requser'} = $env{$reqitem};
+                foreach my $inner ('mapuser','notstudent') {
+                    my $formitem = 'form.linkprot_'.$inner.'_'.$idx;
+                    $env{$formitem} =~ s/(`)/'/g;
+                    if ($inner eq 'mapuser') {
+                        if ($env{$formitem} eq 'other') {
+                            my $mapuser = $env{'form.linkprot_customuser_'.$idx};
+                            $mapuser =~ s/(`)/'/g;
+                            $mapuser =~ s/^\s+|\s+$//g;
+                            if ($mapuser ne '') {
+                                $linkprot{$itemid}{$inner} = $mapuser;
+                            } else {
+                                delete($linkprot{$itemid}{'requser'});
+                                last;
+                            }
+                        } elsif ($env{$formitem} eq 'sourcedid') {
+                            $linkprot{$itemid}{$inner} = 'lis_person_sourcedid';
+                        } elsif ($env{$formitem} eq 'email') {
+                            $linkprot{$itemid}{$inner} = 'lis_person_contact_email_primary';
+                        }
+                    } else {
+                        $linkprot{$itemid}{$inner} = $env{$formitem};
+                    }
+                    unless ($idx eq 'add') {
+                        if ($current{$inner} ne $linkprot{$itemid}{$inner}) {
+                            $haschanges{$itemid} = 1;
+                        }
+                    }
+                }
+            }
+        }
+        unless ($switchserver) {
+            my $keyitem = 'form.linkprot_key_'.$idx;
+            $env{$keyitem} =~ s/(`)/'/g;
+            unless ($idx eq 'add') {
+                if ($current{'key'} ne $env{$keyitem}) {
+                    $haschanges{$itemid} = 1;
+                }
+            }
+            if ($env{$keyitem} ne '') {
+                $linkprot{$itemid}{'key'} = $env{$keyitem};
+            }
+            my $secretitem = 'form.linkprot_secret_'.$idx;
+            $env{$secretitem} =~ s/(`)/'/g;
+            if ($current{'usable'}) {
+                if ($env{'form.linkprot_changesecret_'.$idx}) {
+                    if ($env{$secretitem} ne '') {
+                        if ($privnum && $cipher) {
+                            $linkprot{$itemid}{'secret'} = $cipher->encrypt_hex($env{$secretitem});
+                            $linkprot{$itemid}{'cipher'} = $privnum;
+                        } else {
+                            $linkprot{$itemid}{'secret'} = $env{$secretitem};
+                        }
+                        $haschanges{$itemid} = 1;
+                    }
+                } else {
+                    $linkprot{$itemid}{'secret'} = $current{'secret'};
+                    $linkprot{$itemid}{'cipher'} = $current{'cipher'};
+                }
+            } elsif ($env{$secretitem} ne '') {
+                if ($privnum && $cipher) {
+                    $linkprot{$itemid}{'secret'} = $cipher->encrypt_hex($env{$secretitem});
+                    $linkprot{$itemid}{'cipher'} = $privnum;
+                } else {
+                    $linkprot{$itemid}{'secret'} = $env{$secretitem};
+                }
+                $haschanges{$itemid} = 1;
+            }
+        }
+    }
+    if (keys(%haschanges)) {
+        foreach my $entry (keys(%haschanges)) {
+            $changes->{$entry} = $linkprot{$entry};
+        }
+        if (ref($lastactref) eq 'HASH') {
+            $lastactref->{'courselti'} = 1;
+        }
+    }
+    return $errors;
+}
+
+sub get_linkprot_id {
+    my ($cdom,$cnum,$name,$context) = @_;
+    # get lock on lti db in course or linkprot db in domain
+    my $lockhash = {
+                      lock => $env{'user.name'}.
+                              ':'.$env{'user.domain'},
+                   };
+    my $tries = 0;
+    my $gotlock;
+    if ($context eq 'domain') {
+        $gotlock = &Apache::lonnet::newput_dom('linkprot',$lockhash,$cdom);
+    } else {
+        $gotlock = &Apache::lonnet::newput('lti',$lockhash,$cdom,$cnum);
+    }
+    my ($id,$error);
+    while (($gotlock ne 'ok') && ($tries<10)) {
+        $tries ++;
+        sleep (0.1);
+        if ($context eq 'domain') {
+            $gotlock = &Apache::lonnet::newput_dom('linkprot',$lockhash,$cdom);
+        } else {
+            $gotlock = &Apache::lonnet::newput('lti',$lockhash,$cdom,$cnum);
+        }
+    }
+    if ($gotlock eq 'ok') {
+        my %currids;
+        if ($context eq 'domain') {
+            %currids = &Apache::lonnet::dump_dom('linkprot',$cdom);
+        } else {
+            %currids  = &Apache::lonnet::dump('lti',$cdom,$cnum,undef,undef,undef,1);
+        }
+        if ($currids{'lock'}) {
+            delete($currids{'lock'});
+            if (keys(%currids)) {
+                my @curr = sort { $a <=> $b } keys(%currids);
+                if ($curr[-1] =~ /^\d+$/) {
+                    $id = 1 + $curr[-1];
+                } else {
+                    $id = 1;
+                }
+            } else {
+                $id = 1;
+            }
+            if ($id) {
+                if ($context eq 'domain') {
+                     unless (&Apache::lonnet::newput_dom('linkprot',{ $id => $name },$cdom) eq 'ok') {
+                         $error = 'nostore';
+                     }
+                } else {
+                    unless (&Apache::lonnet::newput('lti',{ $id => $name },$cdom,$cnum) eq 'ok') {
+                        $error = 'nostore';
+                    }
+                }
+            } else {
+                $error = 'nonumber';
+            }
+        }
+        my $dellockoutcome;
+        if ($context eq 'domain') {
+            $dellockoutcome = &Apache::lonnet::del_dom('linkprot',['lock'],$cdom);
+        } else {
+            $dellockoutcome = &Apache::lonnet::del('lti',['lock'],$cdom,$cnum);
+        }
+    } else {
+        $error = 'nolock';
+    }
+    return ($id,$error);
+}
+
+sub get_credentials {
+    my ($cdom,$cnum,$type,$context) = @_;
+    my ($cipher,$privnum,$home);
+    my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+    my @ids=&Apache::lonnet::current_machine_ids();
+    if ($context eq 'domain') {
+        $home = &Apache::lonnet::domain($cdom,'primary');
+    } else {
+        $home = &Apache::lonnet::homeserver($cnum,$cdom);
+    }
+    my ($hostskey,$domkey,$crskey);
+    if ($type eq 'ltitools') {
+        $hostskey = 'toolprivhosts';
+        $domkey = 'toolenc_dom';
+        $crskey = 'toolenc_crs';
+    } else {
+        $hostskey = 'ltiprivhosts';
+        $domkey = 'linkprotenc_dom';
+        $crskey = 'linkprotenc_crs';
+    }
+    if ((($context eq 'domain') && ($domdefs{$domkey})) ||
+        (($context eq 'course') && ($domdefs{$crskey}))) {
+        unless (($home eq 'no_host') || ($home eq '')) {
+            if (grep(/^\Q$home\E$/,@ids)) {
+                if (ref($domdefs{$hostskey}) eq 'ARRAY') {
+                    if (grep(/^\Q$home\E$/,@{$domdefs{$hostskey}})) {
+                        my %privhash  = &Apache::lonnet::restore_dom($type,'private',$cdom,$home,1);
+                        my $privkey = $privhash{'key'};
+                        $privnum = $privhash{'version'};
+                        if (($privnum) && ($privkey ne '')) {
+                            $cipher = Crypt::CBC->new({'key'     => $privkey,
+                                                       'cipher'  => 'DES'});
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return ($cipher,$privnum);
+}
+
+sub process_ltitools {
+    my ($r,$cdom,$cnum,$values,$changes,$context,$lastactref,$configuserok,$lonhost,
+        $author_ok,$confname) = @_;
+    my (%currconfig,$newid,@allpos,%changes,%ltitools,$errors);
+
+    my (%posslti,%possfield);
+    my @courseroles = ('cc','in','ta','ep','st');
+    my @ltiroles = qw(Instructor ContentDeveloper TeachingAssistant Learner);
+    map { $posslti{$_} = 1; } @ltiroles;
+    my @allfields = ('fullname','firstname','lastname','email','user','roles');
+    map { $possfield{$_} = 1; } @allfields;
+
+    my ($dest,$privnum,$cipher);
+
+    ($cipher,$privnum) = &get_credentials($cdom,$cnum,'ltitools',$context);
+    if ($context eq 'domain') {
+        $dest = '/adm/domainprefs';
+    } else {
+        $dest = '/adm/courseprefs';
+    }
+    my $switchserver = &check_switchserver($cdom,$cnum,$context,$dest);
+
+    my (@allpos,@items,%deletions,%itemids,%haschanges);
+    if ($env{'form.ltitools_add'}) {
+        my $title = $env{'form.ltitools_add_title'};
+        $title =~ s/(`)/'/g;
+        my ($newid,$error) = &Apache::lonnet::get_ltitools_id($context,$cdom,$cnum,$title);
+        if ($newid) {
+            my $position = $env{'form.ltitools_add_pos'};
+            $position =~ s/\D+//g;
+            if ($position ne '') {
+                $allpos[$position] = $newid;
+            }
+            $haschanges{$newid} = 1;
+            foreach my $item ('title','url','lifetime') {
+                $env{'form.ltitools_add_'.$item} =~ s/(`)/'/g;
+                if ($item eq 'lifetime') {
+                    $env{'form.ltitools_add_'.$item} =~ s/[^\d.]//g;
+                }
+                if ($env{'form.ltitools_add_'.$item}) {
+                    $ltitools{$newid}{$item} = $env{'form.ltitools_add_'.$item};
+                }
+            }
+            if ($env{'form.ltitools_add_version'} eq 'LTI-1p0') {
+                $ltitools{$newid}{'version'} = $env{'form.ltitools_add_version'};
+            }
+            if ($env{'form.ltitools_add_msgtype'} eq 'basic-lti-launch-request') {
+                $ltitools{$newid}{'msgtype'} = $env{'form.ltitools_add_msgtype'};
+            }
+            if ($env{'form.ltitools_add_sigmethod'} eq 'HMAC-SHA256') {
+                $ltitools{$newid}{'sigmethod'} = $env{'form.ltitools_add_sigmethod'};
+            } else {
+                $ltitools{$newid}{'sigmethod'} = 'HMAC-SHA1';
+            }
+            foreach my $item ('width','height','linktext','explanation') {
+                $env{'form.ltitools_add_'.$item} =~ s/^\s+//;
+                $env{'form.ltitools_add_'.$item} =~ s/\s+$//;
+                if (($item eq 'width') || ($item eq 'height')) {
+                    if ($env{'form.ltitools_add_'.$item} =~ /^\d+$/) {
+                        $ltitools{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item};
+                    }
+                } else {
+                    if ($env{'form.ltitools_add_'.$item} ne '') {
+                        $ltitools{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item};
+                    }
+                }
+            }
+            if ($env{'form.ltitools_add_target'} eq 'window') {
+                $ltitools{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'};
+            } elsif ($env{'form.ltitools_add_target'} eq 'tab') {
+                $ltitools{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'};
+            } else {
+                $ltitools{$newid}{'display'}{'target'} = 'iframe';
+            }
+            foreach my $item ('passback','roster') {
+                if ($env{'form.ltitools_'.$item.'_add'}) {
+                    $ltitools{$newid}{$item} = 1;
+                    if ($env{'form.ltitools_'.$item.'valid_add'} ne '') {
+                        my $lifetime = $env{'form.ltitools_'.$item.'valid_add'};
+                        $lifetime =~ s/^\s+|\s+$//g;
+                        if ($lifetime =~ /^\d+\.?\d*$/) {
+                            $ltitools{$newid}{$item.'valid'} = $lifetime;
+                        }
+                    }
+                }
+            }
+            if ($env{'form.ltitools_add_image.filename'} ne '') {
+                my ($imageurl,$error) =
+                    &process_ltitools_image($r,$context,$cdom,$cnum,$confname,'ltitools_add_image',
+                                            $newid,$configuserok,$lonhost,$author_ok);
+                if ($imageurl) {
+                    $ltitools{$newid}{'image'} = $imageurl;
+                }
+                if ($error) {
+                    &Apache::lonnet::logthis($error);
+                    $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+                }
+            }
+            my @fields = &Apache::loncommon::get_env_multiple('form.ltitools_add_fields');
+            foreach my $field (@fields) {
+                if ($possfield{$field}) {
+                    if ($field eq 'roles') {
+                        foreach my $role (@courseroles) {
+                            my $choice = $env{'form.ltitools_add_roles_'.$role};
+                            if (($choice ne '') && ($posslti{$choice})) {
+                                $ltitools{$newid}{'roles'}{$role} = $choice;
+                                if ($role eq 'cc') {
+                                    $ltitools{$newid}{'roles'}{'co'} = $choice;
+                                }
+                            }
+                        }
+                    } else {
+                        $ltitools{$newid}{'fields'}{$field} = 1;
+                    }
+                }
+            }
+            if (ref($ltitools{$newid}{'fields'}) eq 'HASH') {
+                if ($ltitools{$newid}{'fields'}{'user'}) {
+                    if ($env{'form.ltitools_add_userincdom'}) {
+                        $ltitools{$newid}{'incdom'} = 1;
+                    }
+                }
+            }
+            my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_add_courseconfig');
+            foreach my $item (@courseconfig) {
+                $ltitools{$newid}{'crsconf'}{$item} = 1;
+            }
+            if ($env{'form.ltitools_add_custom'}) {
+                my $name = $env{'form.ltitools_add_custom_name'};
+                my $value = $env{'form.ltitools_add_custom_value'};
+                $value =~ s/(`)/'/g;
+                $name =~ s/(`)/'/g;
+                $ltitools{$newid}{'custom'}{$name} = $value;
+            }
+            unless ($switchserver) {
+                my $keyitem = 'form.ltitools_add_key';
+                $env{$keyitem} =~ s/(`)/'/g;
+                if ($env{$keyitem} ne '') {
+                    $ltitools{$newid}{'key'} = $env{$keyitem};
+                }
+                my $secretitem = 'form.ltitools_secret_add';
+                $env{$secretitem} =~ s/(`)/'/g;
+                if ($env{$secretitem} ne '') {
+                    if ($privnum && $cipher) {
+                        $ltitools{$newid}{'secret'} = $cipher->encrypt_hex($env{$secretitem});
+                        $ltitools{$newid}{'cipher'} = $privnum;
+                    } else {
+                        $ltitools{$newid}{'secret'} = $env{$secretitem};
+                    }
+                }
+            }
+        } else {
+            $errors .= '<li><span class="LC_error">'.
+                       &mt('Failed to acquire unique ID for new external tool').
+                       '</span></li>';
+        }
+    }
+    if (ref($values) eq 'HASH') {
+        my %deletions;
+        my @todelete = &Apache::loncommon::get_env_multiple('form.ltitools_del');
+        if (@todelete) {
+            map { $deletions{$_} = 1; } @todelete;
+        }
+        my %customadds;
+        my @newcustom = &Apache::loncommon::get_env_multiple('form.ltitools_customadd');
+        if (@newcustom) {
+            map { $customadds{$_} = 1; } @newcustom;
+        }
+        my %imgdeletions;
+        my @todeleteimages = &Apache::loncommon::get_env_multiple('form.ltitools_image_del');
+        if (@todeleteimages) {
+            map { $imgdeletions{$_} = 1; } @todeleteimages;
+        }
+        my $maxnum = $env{'form.ltitools_maxnum'};
+        for (my $i=0; $i<=$maxnum; $i++) {
+            my $itemid = $env{'form.ltitools_id_'.$i};
+            $itemid =~ s/\D+//g;
+            if (ref($values->{$itemid}) eq 'HASH') {
+                if ($deletions{$itemid}) {
+                    if ($values->{$itemid}{'image'}) {
+                        #FIXME need to obsolete item in RES space
+                    }
+                    $haschanges{$itemid} = $values->{$itemid}{'title'};
+                    next;
+                } else {
+                    my $newpos = $env{'form.ltitools_'.$itemid};
+                    $newpos =~ s/\D+//g;
+                    foreach my $item ('title','url','lifetime') {
+                        $ltitools{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i};
+                        if ($values->{$itemid}{$item} ne $ltitools{$itemid}{$item}) {
+                            $haschanges{$itemid} = 1;
+                        }
+                    }
+                    if ($env{'form.ltitools_version_'.$i} eq 'LTI-1p0') {
+                        $ltitools{$itemid}{'version'} = $env{'form.ltitools_version_'.$i};
+                    }
+                    if ($env{'form.ltitools_msgtype_'.$i} eq 'basic-lti-launch-request') {
+                        $ltitools{$itemid}{'msgtype'} = $env{'form.ltitools_msgtype_'.$i};
+                    }
+                    if ($env{'form.ltitools_sigmethod_'.$i} eq 'HMAC-SHA256') {
+                        $ltitools{$itemid}{'sigmethod'} = $env{'form.ltitools_sigmethod_'.$i};
+                    } else {
+                        $ltitools{$itemid}{'sigmethod'} = 'HMAC-SHA1';
+                    }
+                    if ($values->{$itemid}{'sigmethod'} eq '') {
+                        if ($ltitools{$itemid}{'sigmethod'} ne 'HMAC-SHA1') {
+                            $haschanges{$itemid} = 1;
+                        }
+                    } elsif ($values->{$itemid}{'sigmethod'} ne $ltitools{$itemid}{'sigmethod'}) {
+                        $haschanges{$itemid} = 1;
+                    }
+                    foreach my $size ('width','height') {
+                        $env{'form.ltitools_'.$size.'_'.$i} =~ s/^\s+//;
+                        $env{'form.ltitools_'.$size.'_'.$i} =~ s/\s+$//;
+                        if ($env{'form.ltitools_'.$size.'_'.$i} =~ /^\d+$/) {
+                            $ltitools{$itemid}{'display'}{$size} = $env{'form.ltitools_'.$size.'_'.$i};
+                            if (ref($values->{$itemid}{'display'}) eq 'HASH') {
+                                if ($values->{$itemid}{'display'}{$size} ne $ltitools{$itemid}{'display'}{$size}) {
+                                    $haschanges{$itemid} = 1;
+                                }
+                            } else {
+                                $haschanges{$itemid} = 1;
+                            }
+                        } elsif (ref($values->{$itemid}{'display'}) eq 'HASH') {
+                            if ($values->{$itemid}{'display'}{$size} ne '') {
+                                $haschanges{$itemid} = 1;
+                            }
+                        }
+                    }
+                    foreach my $item ('linktext','explanation') {
+                        $env{'form.ltitools_'.$item.'_'.$i} =~ s/^\s+//;
+                        $env{'form.ltitools_'.$item.'_'.$i} =~ s/\s+$//;
+                        if ($env{'form.ltitools_'.$item.'_'.$i} ne '') {
+                            $ltitools{$itemid}{'display'}{$item} = $env{'form.ltitools_'.$item.'_'.$i};
+                            if (ref($values->{$itemid}{'display'}) eq 'HASH') {
+                                if ($values->{$itemid}{'display'}{$item} ne $ltitools{$itemid}{'display'}{$item}) {
+                                    $haschanges{$itemid} = 1;
+                                }
+                            } else {
+                                $haschanges{$itemid} = 1;
+                            }
+                        } elsif (ref($values->{$itemid}{'display'}) eq 'HASH') {
+                            if ($values->{$itemid}{'display'}{$item} ne '') {
+                                $haschanges{$itemid} = 1;
+                            }
+                        }
+                    }
+                    if ($env{'form.ltitools_target_'.$i} eq 'window') {
+                        $ltitools{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i};
+                    } elsif ($env{'form.ltitools_target_'.$i} eq 'tab') {
+                        $ltitools{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i};
+                    } else {
+                        $ltitools{$itemid}{'display'}{'target'} = 'iframe';
+                    }
+                    if (ref($values->{$itemid}{'display'}) eq 'HASH') {
+                        if ($values->{$itemid}{'display'}{'target'} ne $ltitools{$itemid}{'display'}{'target'}) {
+                            $haschanges{$itemid} = 1;
+                        }
+                    } else {
+                        $haschanges{$itemid} = 1;
+                    }
+                    foreach my $extra ('passback','roster') {
+                        if ($env{'form.ltitools_'.$extra.'_'.$i}) {
+                            $ltitools{$itemid}{$extra} = 1;
+                            if ($env{'form.ltitools_'.$extra.'valid_'.$i} ne '') {
+                                my $lifetime = $env{'form.ltitools_'.$extra.'valid_'.$i};
+                                $lifetime =~ s/^\s+|\s+$//g;
+                                if ($lifetime =~ /^\d+\.?\d*$/) {
+                                    $ltitools{$itemid}{$extra.'valid'} = $lifetime;
+                                }
+                            }
+                        }
+                        if ($values->{$itemid}{$extra} ne $ltitools{$itemid}{$extra}) {
+                            $haschanges{$itemid} = 1;
+                        }
+                        if ($values->{$itemid}{$extra.'valid'} ne $ltitools{$itemid}{$extra.'valid'}) {
+                            $haschanges{$itemid} = 1;
+                        }
+                    }
+                    my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig_'.$i);
+                    foreach my $item ('label','title','target','linktext','explanation','append') {
+                        if (grep(/^\Q$item\E$/,@courseconfig)) {
+                            $ltitools{$itemid}{'crsconf'}{$item} = 1;
+                            if (ref($values->{$itemid}{'crsconf'}) eq 'HASH') {
+                                if ($values->{$itemid}{'crsconf'}{$item} ne $ltitools{$itemid}{'crsconf'}{$item}) {
+                                    $haschanges{$itemid} = 1;
+                                }
+                            } else {
+                                $haschanges{$itemid} = 1;
+                            }
+                        }
+                    }
+                    my @fields = &Apache::loncommon::get_env_multiple('form.ltitools_fields_'.$i);
+                    foreach my $field (@fields) {
+                        if ($possfield{$field}) {
+                            if ($field eq 'roles') {
+                                foreach my $role (@courseroles) {
+                                    my $choice = $env{'form.ltitools_roles_'.$role.'_'.$i};
+                                    if (($choice ne '') && ($posslti{$choice})) {
+                                        $ltitools{$itemid}{'roles'}{$role} = $choice;
+                                        if ($role eq 'cc') {
+                                            $ltitools{$itemid}{'roles'}{'co'} = $choice;
+                                        }
+                                    }
+                                    if (ref($values->{$itemid}{'roles'}) eq 'HASH') {
+                                        if ($values->{$itemid}{'roles'}{$role} ne $ltitools{$itemid}{'roles'}{$role}) {
+                                            $haschanges{$itemid} = 1;
+                                        }
+                                    } elsif ($ltitools{$itemid}{'roles'}{$role}) {
+                                        $haschanges{$itemid} = 1;
+                                    }
+                                }
+                            } else {
+                                $ltitools{$itemid}{'fields'}{$field} = 1;
+                                if (ref($values->{$itemid}{'fields'}) eq 'HASH') {
+                                    if ($values->{$itemid}{'fields'}{$field} ne $ltitools{$itemid}{'fields'}{$field}) {
+                                        $haschanges{$itemid} = 1;
+                                    }
+                                } else {
+                                    $haschanges{$itemid} = 1;
+                                }
+                            }
+                        }
+                    }
+                    if (ref($ltitools{$itemid}{'fields'}) eq 'HASH') {
+                        if ($ltitools{$itemid}{'fields'}{'user'}) {
+                            if ($env{'form.ltitools_userincdom_'.$i}) {
+                                $ltitools{$itemid}{'incdom'} = 1;
+                            }
+                            if ($values->{$itemid}{'incdom'} ne $ltitools{$itemid}{'incdom'}) {
+                                $haschanges{$itemid} = 1;
+                            }
+                        }
+                    }
+                    $allpos[$newpos] = $itemid;
+                }
+                if ($imgdeletions{$itemid}) {
+                    $haschanges{$itemid} = 1;
+                    if ($context eq 'course') {
+                        my $currimgurl = $values->{$itemid}{'image'};
+                        if ($currimgurl =~ m{^(\Q/uploaded/$cdom/$cnum/toollogo/$itemid\E)/([^/]+)$}) {
+                            my ($path,$imagefile) = ($1,$2);
+                            if ($imagefile =~ /^tn\-(.+)$/) {
+                                my $origimg = $1;
+                                &Apache::lonnet::removeuploadedurl("$path/$origimg");
+                            }
+                            &Apache::lonnet::removeuploadedurl($currimgurl);
+                        }
+                    }
+                    #FIXME need to obsolete item in RES space
+                } elsif ($env{'form.ltitools_image_'.$i.'.filename'}) {
+                    my $currimgurl = $values->{$itemid}{'image'};
+                    my ($imgurl,$error) = &process_ltitools_image($r,$context,$cdom,$cnum,$confname,'ltitools_image_'.$i,
+                                                                 $itemid,$configuserok,$lonhost,$author_ok,$currimgurl);
+                    if ($imgurl) {
+                        $ltitools{$itemid}{'image'} = $imgurl;
+                        $haschanges{$itemid} = 1;
+                    }
+                    if ($error) {
+                        &Apache::lonnet::logthis($error);
+                        $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+                    }
+                } elsif ($values->{$itemid}{'image'}) {
+                    $ltitools{$itemid}{'image'} = $values->{$itemid}{'image'};
+                }
+                if ($customadds{$i}) {
+                    my $name = $env{'form.ltitools_custom_name_'.$i};
+                    $name =~ s/(`)/'/g;
+                    $name =~ s/^\s+//;
+                    $name =~ s/\s+$//;
+                    my $value = $env{'form.ltitools_custom_value_'.$i};
+                    $value =~ s/(`)/'/g;
+                    $value =~ s/^\s+//;
+                    $value =~ s/\s+$//;
+                    if ($name ne '') {
+                        $ltitools{$itemid}{'custom'}{$name} = $value;
+                        $haschanges{$itemid} = 1;
+                    }
+                }
+                my %customdels;
+                my @customdeletions = &Apache::loncommon::get_env_multiple('form.ltitools_customdel_'.$i);
+                if (@customdeletions) {
+                    $haschanges{$itemid} = 1;
+                }
+                map { $customdels{$_} = 1; } @customdeletions;
+                if (ref($values->{$itemid}{'custom'}) eq 'HASH') {
+                    foreach my $key (keys(%{$values->{$itemid}{'custom'}})) {
+                        unless ($customdels{$key}) {
+                            if ($env{'form.ltitools_customval_'.$key.'_'.$i} ne '') {
+                                $ltitools{$itemid}{'custom'}{$key} = $env{'form.ltitools_customval_'.$key.'_'.$i};
+                            }
+                            if ($values->{$itemid}{'custom'}{$key} ne $env{'form.ltitools_customval_'.$key.'_'.$i}) {
+                                $haschanges{$itemid} = 1;
+                            }
+                        }
+                    }
+                }
+                unless ($switchserver) {
+                    my $keyitem = 'form.ltitools_key_'.$i;
+                    $env{$keyitem} =~ s/(`)/'/g;
+                    if ($values->{$itemid}{'key'} ne $env{$keyitem}) {
+                        $haschanges{$itemid} = 1;
+                    }
+                    if ($env{$keyitem} ne '') {
+                        $ltitools{$itemid}{'key'} = $env{$keyitem};
+                    }
+                    my $secretitem = 'form.ltitools_secret_'.$i;
+                    $env{$secretitem} =~ s/(`)/'/g;
+                    if ($values->{$itemid}{'usable'}) {
+                        if ($env{'form.ltitools_changesecret_'.$i}) {
+                            if ($env{$secretitem} ne '') {
+                                if ($privnum && $cipher) {
+                                    $ltitools{$itemid}{'secret'} = $cipher->encrypt_hex($env{$secretitem});
+                                    $ltitools{$itemid}{'cipher'} = $privnum;
+                                } else {
+                                    $ltitools{$itemid}{'secret'} = $env{$secretitem};
+                                }
+                                $haschanges{$itemid} = 1;
+                            }
+                        } else {
+                            $ltitools{$itemid}{'secret'} = $values->{$itemid}{'secret'};
+                            $ltitools{$itemid}{'cipher'} = $values->{$itemid}{'cipher'};
+                        }
+                    } elsif ($env{$secretitem} ne '') {
+                        if ($privnum && $cipher) {
+                            $ltitools{$itemid}{'secret'} = $cipher->encrypt_hex($env{$secretitem});
+                            $ltitools{$itemid}{'cipher'} = $privnum;
+                        } else {
+                            $ltitools{$itemid}{'secret'} = $env{$secretitem};
+                        }
+                        $haschanges{$itemid} = 1;
+                    }
+                }
+                unless ($haschanges{$itemid}) {
+                    foreach my $key (keys(%{$values->{$itemid}})) {
+                        if (ref($values->{$itemid}{$key}) eq 'HASH') {
+                            if (ref($ltitools{$itemid}{$key}) eq 'HASH') {
+                                foreach my $innerkey (keys(%{$values->{$itemid}{$key}})) {
+                                    unless (exists($ltitools{$itemid}{$key}{$innerkey})) {
+                                        $haschanges{$itemid} = 1;
+                                        last;
+                                    }
+                                }
+                            } elsif (keys(%{$values->{$itemid}{$key}}) > 0) {
+                                $haschanges{$itemid} = 1;
+                            }
+                        }
+                        last if ($haschanges{$itemid});
+                    }
+                }
+            }
+        }
+    }
+    if (@allpos > 0) {
+        my $idx = 0;
+        foreach my $itemid (@allpos) {
+            if ($itemid ne '') {
+                $ltitools{$itemid}{'order'} = $idx;
+                if (ref($values) eq 'HASH') {
+                    if (ref($values->{$itemid}) eq 'HASH') {
+                        if ($values->{$itemid}{'order'} ne $idx) {
+                            $haschanges{$itemid} = 1;
+                        }
+                    }
+                }
+                $idx ++;
+            }
+        }
+    }
+    if (keys(%haschanges)) {
+        foreach my $entry (keys(%haschanges)) {
+            $changes->{$entry} = $ltitools{$entry};
+        }
+        if (ref($lastactref) eq 'HASH') {
+            $lastactref->{'courseltitools'} = 1;
+        }
+    }
+    return $errors;
+}
+
+sub process_ltitools_image {
+    my ($r,$context,$dom,$cnum,$confname,$caller,$itemid,$configuserok,$switch,$author_ok,$currimg) = @_;
+    my $filename = $env{'form.'.$caller.'.filename'};
+    my ($error,$url);
+    my ($width,$height) = (21,21);
+    if ($configuserok eq 'ok') {
+        if ($switch) {
+            $error = &mt('Upload of Tool Provider (LTI) icon is not permitted to this server: [_1]',
+                         $switch);
+        } elsif ($author_ok eq 'ok') {
+            my ($result,$imageurl,$madethumb);
+            if ($context eq 'domain') {
+                ($result,$imageurl,$madethumb) =
+                    &Apache::lonconfigsettings::publishlogo($r,'upload',$caller,$dom,$confname,
+                                                            "ltitools/$itemid/icon",$width,$height);
+            } else {
+                ($result,$imageurl,$madethumb) = &processlogo($dom,$cnum,$caller,$currimg,$itemid,$width,$height);
+            }
+            if ($result eq 'ok') {
+                if ($madethumb) {
+                    my ($path,$imagefile) = ($imageurl =~ m{^(.+)/([^/]+)$});
+                    my $imagethumb = "$path/tn-".$imagefile;
+                    $url = $imagethumb;
+                } else {
+                    $url = $imageurl;
+                }
+            } else {
+                if ($context eq 'domain') {
+                    $error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$filename,$result);
+                } else {
+                    $error = &mt("Upload of [_1] failed because an error occurred. Error was: [_2].",$filename,$result);
+                }
+            }
+        } else {
+            $error = &mt("Upload of [_1] failed because an author role could not be assigned to a Domain Configuration user ([_2]) in domain: [_3].  Error was: [_4].",$filename,$confname,$dom,$author_ok);
+        }
+    } else {
+        $error = &mt("Upload of [_1] failed because a Domain Configuration user ([_2]) could not be created in domain: [_3].  Error was: [_4].",$filename,$confname,$dom,$configuserok);
+    }
+    return ($url,$error);
+}
+
+sub processlogo {
+    my ($dom,$cnum,$caller,$currimg,$itemid,$width,$height) = @_;
+    my ($result,$imageurl,$madethumb);
+    if ($env{"form.$caller.filename"} ne '') {
+        unless ($caller eq 'ltitools_add_image') {
+            if ($currimg =~ m{^(\Q/uploaded/$dom/$cnum/toollogo/$itemid\E)/([^/]+)$}) {
+                my ($path,$imagefile) = ($1,$2);
+                if ($imagefile =~ /^tn\-(.+)$/) {
+                     my $origimg = $1;
+                     &Apache::lonnet::removeuploadedurl("$path/$origimg");
+                }
+                &Apache::lonnet::removeuploadedurl($currimg);
+            }
+        }
+        $imageurl = &Apache::lonnet::userfileupload($caller,'toollogo',"toollogo/$itemid",
+                                                    '','','',$cnum,$dom,$width,$height);
+        if ($imageurl =~ m{^(\Q/uploaded/$dom/$cnum/toollogo/$itemid\E)/([^/]+)$}) {
+            my ($path,$imagefile) = ($1,$2);
+            $result = 'ok';
+            my $thumburl = "$path/tn-".$imagefile;
+            my ($rtncode,$info);
+            my $res = &Apache::lonnet::getuploaded('HEAD',$thumburl,$dom,$cnum,\$info,\$rtncode);
+            if ($res eq 'ok') {
+                $madethumb = 1;
+            }
+        } elsif ($imageurl eq '/adm/notfound.html') {
+            undef($imageurl);
+            $result = 'store failed';
+        } elsif ($imageurl =~ /^error: (.+)$/) {
+            $result = $1;
+        }
+    }
+    return ($result,$imageurl,$madethumb);
 }
 
 sub get_sec_str {
@@ -1147,8 +2465,15 @@ sub check_clone {
 sub store_changes {
     my ($cdom,$cnum,$prefs_order,$actions,$prefs,$values,$changes,$crstype) = @_;
     my ($chome,$output);
-    my (%storehash,@delkeys,@need_env_update,@oldcloner);
+    my (%storehash,@delkeys,@need_env_update,@oldcloner,%oldlinkprot,%oldltitools);
     if ((ref($values) eq 'HASH') && (ref($changes) eq 'HASH')) {
+        if (ref($values->{'linkprot'}) eq 'HASH') {
+            %oldlinkprot = %{$values->{'linkprot'}};
+        }
+        delete($values->{'linkprot'});
+        if (ref($values->{'ltitools'}) eq 'HASH') {
+            %oldltitools = %{$values->{'ltitools'}};
+        }
         %storehash = %{$values};
     } else {
         if ($crstype eq 'Community') {
@@ -1158,6 +2483,22 @@ sub store_changes {
         }
         return $output;
     }
+    my ($numchanges,$skipstore);
+    if (ref($changes) eq 'HASH') {
+        $numchanges = scalar(keys(%{$changes}));
+        if (($numchanges == 1) && (exists($changes->{'linkprot'}))) {
+            $skipstore = 1;
+        } elsif (($numchanges == 1) && (exists($changes->{'ltitools'}))) {
+            $skipstore = 1;
+        } elsif (!$numchanges) {
+            if ($crstype eq 'Community') {
+                $output = &mt('No changes made to community settings.');
+            } else {
+                $output = &mt('No changes made to course settings.');
+            }
+            return $output;
+        }
+    }
     my %yesno = (
                  hidefromcat           => '1',
                  problem_stream_switch => '1',
@@ -1183,6 +2524,10 @@ sub store_changes {
                                            "'$storehash{$key}'")).'</li>';
                             }
                         }
+                    } elsif ($item eq 'linkprot') {
+                        $output .= &store_linkprot($cdom,$cnum,'course',$changes->{$item},\%oldlinkprot);
+                    } elsif ($item eq 'ltitools') {
+                        $output .= &store_ltitools($cdom,$cnum,'course',$changes->{$item},\%oldltitools);
                     } else {
                         if (ref($prefs->{$item}->{'ordered'}) eq 'ARRAY') {
                             my @settings = @{$prefs->{$item}->{'ordered'}};
@@ -1214,14 +2559,88 @@ sub store_changes {
                                     if ($msg ne '') {
                                         $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt($displayname)).'<ul class="LC_success">'.$msg.'</ul></li>';
                                     }
+                                } elsif ($key eq 'timezone') {
+                                    next unless ((exists($changes->{$item}{$key})) || (exists($changes->{$item}{'tzover'})));
+                                    my ($displayname,$text);
+                                    $text = $prefs->{$item}->{'itemtext'}{$key};
+                                    my $displayval;
+                                    if (exists($changes->{$item}{$key})) {
+                                        $displayname = &mt($text);
+                                        $storehash{$key} = $changes->{$item}{$key};
+                                        if ($changes->{$item}{$key} ne '') {
+                                            $displayval = '<b>'.$changes->{$item}{$key}.'</b>';
+                                        } else {
+                                            push(@delkeys,$key);
+                                            if (exists($values->{'tzover'})) {
+                                                push(@delkeys,'tzover');
+                                            }
+                                            $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('Deleted setting for [_1]',
+                                                                                                      '<i>'.$displayname.'</i>')).'</li>';
+                                        }
+                                    }
+                                    unless (grep(/^\Q$key\E$/,@delkeys)) {
+                                        if (exists($changes->{$item}{'tzover'})) {
+                                            $storehash{'tzover'} = $changes->{$item}{'tzover'};
+                                            my $tzovertext;
+                                            if ($changes->{$item}{'tzover'} ne '') {
+                                                $tzovertext = &mt('Course Time Zone overrides individual user preference');
+                                            } else {
+                                                push(@delkeys,'tzover');
+                                                $tzovertext = &mt('Course Time Zone does not override individual user preference');
+                                            }
+                                            if ($displayval eq '') {
+                                                $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success($tzovertext).'</li>';
+                                            } else {
+                                                $displayval .= '<br />'.('&nbsp;'x5).$tzovertext;
+                                            }
+                                        }
+                                        if ($displayval ne '') {
+                                            $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('[_1] set to [_2]',
+                                                              '<i>'.$displayname.'</i>',$displayval)).'</li>';
+                                        }
+                                    }
                                 } else {
                                     next if (!exists($changes->{$item}{$key}));
                                     my ($displayname,$text);
                                     $text = $prefs->{$item}->{'itemtext'}{$key};
                                     my $displayval;
-                                    unless ($key eq 'co-owners') {
+                                    unless (($key eq 'co-owners') || ($key eq 'discussion_post_fonts') || ($key eq 'extresource')) {
                                         $displayval = $changes->{$item}{$key};
                                     }
+                                    if (($item eq 'grading') && ($key eq 'grading')) {
+                                        if ($displayval eq 'standard') {
+                                            my $hidetotals;
+                                            if (exists($changes->{$item}{'hidetotals'})) {
+                                                if ($changes->{$item}{'hidetotals'} eq '') {
+                                                    if (exists($values->{'hidetotals'})) {
+                                                        push(@delkeys,'hidetotals');
+                                                    }
+                                                } else {
+                                                    $hidetotals = $changes->{$item}{'hidetotals'};
+                                                }
+                                            } elsif (exists($values->{'hidetotals'})) {
+                                                $hidetotals = $values->{'hidetotals'};
+                                            }
+                                            if ($hidetotals eq '') {
+                                                $displayval = &mt('standard with "hide course totals" set to "No"');
+                                                if (exists($values->{'hidetotals'})) {
+                                                    push(@delkeys,'hidetotals');
+                                                }
+                                            } elsif ($hidetotals =~ /^([\w,]+)$/) {
+                                                my $secstr = $1;
+                                                my @secs = split(/,/,$secstr);
+                                                if (grep(/^all$/,@secs)) {
+                                                    $displayval = &mt('standard with "hide course totals" set to "Yes" for all users');
+                                                    $hidetotals = 'all';
+                                                } else {
+                                                    $displayval = &mt('standard with "hide course totals" set to "Yes" for users in section(s): [_1]',join(', ',@secs));
+                                                }
+                                                $storehash{'hidetotals'} = $hidetotals;
+                                            }
+                                        } elsif (exists($values->{'hidetotals'})) {
+                                            push(@delkeys,'hidetotals');
+                                        }
+                                    }
                                     if ($item eq 'feedback') {
                                         if ($key =~ /^(question|policy|comment)(\.email)\.text$/) {
                                             $text = $prefs->{$item}->{'itemtext'}{$1.$2};
@@ -1255,6 +2674,36 @@ sub store_changes {
                                                     }
                                                     $displayval = join(', ',@longroles);
                                                 }
+                                            } elsif ($key eq 'discussion_post_fonts') {
+                                                my ($classorder,$classtitles)=&discussion_vote_classes();
+                                                my ($styleorder,$styleitems)=&discussion_vote_styles();
+                                                my $count = 1;
+                                                my $total = scalar(keys(%{$changes->{$item}}));
+                                                foreach my $class (@{$classorder}) {
+                                                    $count ++;
+                                                    next unless ($changes->{$item}{$key.'_'.$class});
+                                                    my @vals = split(/,/,$changes->{$item}{$key.'_'.$class});
+                                                    my $showval = '';
+                                                    for (my $i=0; $i<@{$styleorder}; $i++) {
+                                                        if ($vals[$i] ne '') {
+                                                            $showval .= 'font-'.$styleorder->[$i].': '.$vals[$i].'; ';
+                                                        }
+                                                    }
+                                                    if ($vals[3] ne '') {
+                                                        $showval .= $vals[3];
+                                                    }
+                                                    if ($showval ne '') {
+                                                        $displayval .= $classtitles->{$class}.':{ '.
+                                                                       $showval.'}';
+                                                        $storehash{$key.'_'.$class} = $changes->{$item}{$key.'_'.$class};
+                                                    } else {
+                                                        $displayval .= $classtitles->{$class}.': '.&mt('None');
+                                                        push(@delkeys,$key.'_'.$class);
+                                                    }
+                                                    unless ($count == $total) {
+                                                        $displayval .= ('&nbsp;'x2);
+                                                    }
+                                                }
                                             }
                                             $displayname = &mt($text);
                                         }
@@ -1269,6 +2718,16 @@ sub store_changes {
                                             }
                                         }
                                         $displayname = &mt($text);
+                                    } elsif ($item eq 'menuitems') {
+                                        unless ($changes->{$item}{$key} eq '') {
+                                            if ($key eq 'menudefault') {
+                                                $displayname = &mt('Default collection of menu items');
+                                                $displayval = &mt('Collection: [_1]',
+                                                                  $changes->{$item}{$key});
+                                            } elsif ($key eq 'menucollections') {
+                                                $displayval = &menucollections_display($changes->{$item}{$key});
+                                            }
+                                        }
                                     } else {
                                         $displayname = &mt($text);
                                     }
@@ -1281,12 +2740,44 @@ sub store_changes {
                                         $displayval = &Apache::lonlocal::locallocaltime($displayval);
                                     } elsif ($key eq 'categories') {
                                         $displayval = $env{'form.categories_display'};
-                                    } elsif ($key eq 'canuse_pdfforms') {
+                                    } elsif (($key eq 'canuse_pdfforms') || ($key eq 'usejsme') ||
+                                             ($key eq 'uselcmath') || ($key eq 'inline_chem')) {
                                         if ($changes->{$item}{$key} eq '1') {
                                             $displayval = &mt('Yes');
                                         } elsif ($changes->{$item}{$key} eq '0') {
                                             $displayval = &mt('No');
                                         }
+                                    } elsif ($key eq 'extresource') {
+                                        if ($changes->{$item}{$key} eq 'iframe') {
+                                            $displayval = &mt('In iframe');
+                                        } else {
+                                            my ($selected,$reuse,$width,$height) = split(/:/,$changes->{$item}{$key});
+                                            if ($selected eq 'tab') {
+                                                if ($reuse) {
+                                                    $displayval = &mt('[_1]In tab[_2],[_3] and tab re-used for different external resources in course',
+                                                                      "'<b>","</b>'",'<br />');
+                                                } else {
+                                                    $displayval = &mt('[_1]In tab[_2],[_3] with new tab for each external resource in course',
+                                                                      "'<b>","</b>'",'<br />');
+                                                }
+                                            } elsif ($selected eq 'window') {
+                                                 if ($reuse) {
+                                                     $displayval = &mt('[_1]In pop-up window[_2],[_3] and window re-used for different external resources in course',
+                                                                       "'<b>","</b>'",'<br />');
+                                                 } else {
+                                                     $displayval = &mt('[_1]In pop-up window[_2],[_3] with new window for each external resource in course',
+                                                                       "'<b>","</b>'",'<br />');
+                                                 }
+                                                 if (($width ne '') || ($height ne '')) {
+                                                     if ($width ne '') {
+                                                         $displayval .= '<br />'.&mt('Window width: [_1]px',$width);
+                                                     }
+                                                     if ($height ne '') {
+                                                         $displayval .= '<br />'.&mt('Window height: [_1]px',$height);
+                                                     }
+                                                 }
+                                            }
+                                        }
                                     }
                                     if ($key eq 'co-owners') {
                                         if (ref($changes->{$item}{$key}) eq 'HASH') {
@@ -1313,12 +2804,12 @@ sub store_changes {
                                                 }
                                             }
                                             unless (&Apache::lonnet::is_course_owner($cdom,$cnum)) {
-                                                if ($env{'form.pending_coowoner'} eq 'accept') {
+                                                if ($env{'form.pending_coowner'} eq 'accept') {
                                                         $displayval = &mt('on');
-                                                } elsif ($env{'form.pending_coowoner'} eq 'decline') {
+                                                } elsif ($env{'form.pending_coowner'} eq 'decline') {
                                                         $displayval = '';
                                                         $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('Invitation to be co-owner declined')).'</li>';
-                                                } elsif ($env{'form.remove_coowoner'}) {
+                                                } elsif ($env{'form.remove_coowner'}) {
                                                     $displayval = &mt('off');
                                                 }
                                                 if ($displayval) {
@@ -1331,12 +2822,25 @@ sub store_changes {
                                         }
                                     } elsif ($changes->{$item}{$key} eq '') {
                                         push(@delkeys,$key);
-                                        $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('Deleted setting for [_1]',
-                                                   '<i>'.$displayname.'</i>')).'</li>';
+                                        if ($item eq 'menuitems') {
+                                            if ($key eq 'menudefault') {
+                                                $output .= '<li>'.&mt("Default collection of menu items set to: 'Standard' (all menus shown)").'</li>';
+                                            } elsif ($key eq 'menucollections') {
+                                                $output .= '<li>'.&mt('Specific collections of menus no longer available').'</li>';
+                                            }
+                                        } else {
+                                            $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('Deleted setting for [_1]',
+                                                       '<i>'.$displayname.'</i>')).'</li>';
+                                        }
+                                    } elsif ($key eq 'menucollections') {
+                                        $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('Numbered menu collections:')).'<br />'.
+                                                   $displayval.'</li>';
                                     } else {
+                                        unless (($key eq 'extresource') && ($changes->{$item}{$key} ne 'iframe')) {
+                                            $displayval = "'<b>$displayval</b>'";
+                                        }
                                         $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('[_1] set to [_2]',
-                                                   '<i>'.$displayname.'</i>',
-                                                   "'<b>$displayval</b>'"));
+                                                   '<i>'.$displayname.'</i>',$displayval));
                                         if ($key eq 'url') {
                                             my $bkuptime=time;
                                             $output .= ('&nbsp;'x2).&mt('(Previous URL backed up)').': '.
@@ -1354,7 +2858,9 @@ sub store_changes {
                                             }
                                         }
                                     } else {
-                                        $storehash{$key} = $changes->{$item}{$key};
+                                        unless ($key eq 'discussion_post_fonts') {
+                                            $storehash{$key} = $changes->{$item}{$key};
+                                        }
                                     }
                                 }
                                 if ($key eq 'cloners') {
@@ -1386,6 +2892,9 @@ sub store_changes {
             }
         }
     }
+    if ($skipstore) {
+        return $output;
+    }
     if (&Apache::lonnet::put('environment',\%storehash,$cdom,$cnum) eq 'ok') {
         if (ref($changes) eq 'HASH') {
             if (ref($changes->{'courseinfo'}) eq 'HASH') {
@@ -1428,6 +2937,378 @@ sub store_changes {
     return $output;
 }
 
+sub store_linkprot {
+    my ($cdom,$cnum,$context,$changes,$oldlinkprot) = @_;
+    my ($ltiauth,$home,$lti_save_error,$output,$error,%ltienc,@deletions);
+    if ($context eq 'domain') {
+        $ltiauth = 1;
+        $home = &Apache::lonnet::domain($cdom,'primary');
+    } else {
+        $home = &Apache::lonnet::homeserver($cnum,$cdom);
+        if (exists($env{'course.'.$env{'request.course.id'}.'.internal.ltiauth'})) {
+            $ltiauth = $env{'course.'.$env{'request.course.id'}.'.internal.ltiauth'};
+        } else {
+            my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+            $ltiauth = $domdefs{'crsltiauth'};
+        }
+    }
+    if (ref($changes) eq 'HASH') {
+        foreach my $id (sort { $a <=> $b } keys(%{$changes})) {
+            if (ref($changes->{$id}) eq 'HASH') {
+                if (exists($changes->{$id}->{'key'})) {
+                    $ltienc{$id}{'key'} = $changes->{$id}->{'key'};
+                    delete($changes->{$id}->{'key'});
+                }
+                if (exists($changes->{$id}->{'secret'})) {
+                    $ltienc{$id}{'secret'} = $changes->{$id}->{'secret'};
+                    delete($changes->{$id}->{'secret'});
+                } elsif (ref($oldlinkprot->{$id}) eq 'HASH') {
+                    if (exists($oldlinkprot->{$id}{'usable'})) {
+                        $changes->{$id}->{'usable'} = 1;
+                    }
+                    if (exists($oldlinkprot->{$id}{'cipher'})) {
+                        $changes->{$id}->{'cipher'} = $oldlinkprot->{$id}{'cipher'};
+                    }
+                }
+            }
+        }
+    }
+    my @ids=&Apache::lonnet::current_machine_ids();
+    if (keys(%ltienc) > 0) {
+        if ($context eq 'domain') {
+            foreach my $id (keys(%ltienc)) {
+                if (exists($ltienc{$id}{'secret'})) {
+                    $changes->{$id}->{'usable'} = 1;
+                }
+            }
+        } else {
+            unless (($home eq 'no_host') || ($home eq '')) {
+                my $allowed;
+                foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+                if ($allowed) {
+                    if (&Apache::lonnet::put('nohist_ltienc',\%ltienc,$cdom,$cnum,1) eq 'ok') {
+                        foreach my $id (keys(%ltienc)) {
+                            if (exists($ltienc{$id}{'secret'})) {
+                                $changes->{$id}->{'usable'} = 1;
+                            }
+                        }
+                    } else {
+                        $lti_save_error = 1;
+                    }
+                }
+            }
+        }
+    }
+    unless ($lti_save_error) {
+        if ($context eq 'course') {
+            if (&Apache::lonnet::put('lti',$changes,$cdom,$cnum,1) eq 'ok') {
+                my $hashid=$cdom.'_'.$cnum;
+                &Apache::lonnet::devalidate_cache_new('courselti',$hashid);
+                unless (($home eq 'no_host') || ($home eq '')) {
+                    if (grep(/^\Q$home\E$/,@ids)) {
+                        &Apache::lonnet::devalidate_cache_new('courseltienc',$hashid);
+                    }
+                }
+            } else {
+                $lti_save_error = 1;
+            }
+        }
+        unless ($lti_save_error) {
+            foreach my $id (sort { $a <=> $b } %{$changes}) {
+                if (ref($changes->{$id}) eq 'HASH') {
+                    my %values = %{$changes->{$id}};
+                    my %desc = &linkprot_names();
+                    my $display;
+                    foreach my $title ('name','lifetime','version','key','secret','returnurl','passbackformat') {
+                        if (($title eq 'key') || ($title eq 'secret')) {
+                            if (ref($ltienc{$id}) eq 'HASH') {
+                                if (exists($ltienc{$id}{$title})) {
+                                    if ($title eq 'secret') {
+                                        my $length = length($ltienc{$id}{$title});
+                                        $display .= $desc{$title}.': ['.&mt('not shown').'], ';
+                                    } else {
+                                        $display .= $desc{$title}.': '.$ltienc{$id}{$title}.', ';
+                                    }
+                                }
+                            }
+                        } elsif ($title eq 'version') {
+                            if ($values{$title} eq 'LTI-1p0') {
+                                $display .= $desc{$title}.': 1.1, ';
+                            }
+                        } elsif ($title eq 'returnurl') {
+                            if ($values{$title}) {
+                                $display .= &mt('Return URL parameter').': '.$values{$title}.', ';
+                            }
+                        } elsif ($title eq 'passbackformat') {
+                            if ($values{$title} eq '1.0') {
+                                $display .= &mt('Can return grades to Launcher with Outcomes Service 1.0 format').', ';
+                            } elsif ($values{$title} eq '1.1') {
+                                $display .= &mt('Can return grades to Launcher with Outcomes Service 1.1 format').', ';
+                            }
+                        } else {
+                            $display .= $desc{$title}.': '.$values{$title}.', ';
+                        }
+                    }
+                    if ($ltiauth) {
+                        if (($values{'requser'}) && ($values{'mapuser'} ne '')) {
+                            if ($values{'mapuser'} eq 'lis_person_contact_email_primary') {
+                                $display .= &mt('Source of username: Email address [_1]',
+                                                '(lis_person_contact_email_primary)').', ';
+                            } elsif ($values{'mapuser'} eq 'lis_person_sourcedid') {
+                                $display .= &mt('Source of username: User ID [_1]',
+                                                '(lis_person_sourcedid)').', ';
+                            } else {
+                                $display .= &mt('Source of username: [_1]',$values{'mapuser'}).', ';
+                            }
+                            if ($values{'notstudent'} eq 'auth') {
+                                $display .= &mt('Display LON-CAPA login page if no match').', ';
+                            } elsif ($values{'notstudent'} eq 'reject') {
+                                $display .= &mt('Discontinue launch if no match').', ';
+                            }
+                        }
+                    }
+                    $display =~ s/, $//;
+                    $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('[_1] set to [_2]','<i>'.$id.'</i>',
+                                                                              "'$display'")).'</li>';
+                } elsif (ref($oldlinkprot->{$id}) eq 'HASH') {
+                    my $oldname = $oldlinkprot->{$id}{'name'};
+                    $output .= '<li>'.&Apache::lonhtmlcommon::confirm_success(&mt('Deleted setting for [_1]','<i>'."$id ($oldname)".'</i>')).'</li>';
+                }
+            }
+        } else {
+            $lti_save_error = 1;
+        }
+    }
+    unless ($lti_save_error) {
+        foreach my $id (sort { $a <=> $b } keys(%{$changes})) {
+            unless (ref($changes->{$id}) eq 'HASH') {
+                push(@deletions,$id);
+            }
+        }
+        if (@deletions) {
+            if ($context eq 'course') {
+                &Apache::lonnet::del('nohist_ltienc',\@deletions,$cdom,$cnum);
+            }
+        }
+    }
+    if ($lti_save_error) {
+        $output .= '<li>'.
+                   '<span class="LC_error">'.
+                   &mt('An error occurred when saving changes to link protection settings, which remain unchanged.').
+                   '</span>'.
+                   '</li>';
+    }
+    return $output;
+}
+
+sub store_ltitools {
+    my ($cdom,$cnum,$context,$changes,$oldltitools) = @_;
+    my ($home,$ltitools_save_error,$output,$error,%toolsenc,@deletions);
+    my %lt = &ltitools_names();
+    my @courseroles = ('cc','in','ta','ep','st');
+    my @allfields = ('fullname','firstname','lastname','email','user','roles');
+    if ($context eq 'domain') {
+        $home = &Apache::lonnet::domain($cdom,'primary');
+    } else {
+        $home = &Apache::lonnet::homeserver($cnum,$cdom);
+    }
+    if (ref($changes) eq 'HASH') {
+        foreach my $id (sort { $a <=> $b } keys(%{$changes})) {
+            if (ref($changes->{$id}) eq 'HASH') {
+                if (exists($changes->{$id}->{'key'})) {
+                    $toolsenc{$id}{'key'} = $changes->{$id}->{'key'};
+                    delete($changes->{$id}->{'key'});
+                }
+                if (exists($changes->{$id}->{'secret'})) {
+                    $toolsenc{$id}{'secret'} = $changes->{$id}->{'secret'};
+                    delete($changes->{$id}->{'secret'});
+                } elsif (ref($oldltitools->{$id}) eq 'HASH') {
+                    if (exists($oldltitools->{$id}{'usable'})) {
+                        $changes->{$id}->{'usable'} = 1;
+                    }
+                    if (exists($oldltitools->{$id}{'cipher'})) {
+                        $changes->{$id}->{'cipher'} = $oldltitools->{$id}{'cipher'};
+                    }
+                }
+            }
+        }
+    }
+    my @ids=&Apache::lonnet::current_machine_ids();
+    if (keys(%toolsenc) > 0) {
+        unless (($home eq 'no_host') || ($home eq '')) {
+            my $allowed;
+            foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+            if ($allowed) {
+                if (($context eq 'domain') ||
+                    (($context eq 'course') &&
+                     (&Apache::lonnet::put('nohist_toolsenc',\%toolsenc,$cdom,$cnum,1) eq 'ok'))) {
+                    foreach my $id (keys(%toolsenc)) {
+                        if (exists($toolsenc{$id}{'secret'})) {
+                            $changes->{$id}->{'usable'} = 1;
+                        }
+                    }
+                } else {
+                    $ltitools_save_error = 1;
+                }
+            }
+        }
+    }
+    unless ($ltitools_save_error) {
+        if ($context eq 'course') {
+            if (&Apache::lonnet::put('ltitools',$changes,$cdom,$cnum,1) eq 'ok') {
+                my $hashid=$cdom.'_'.$cnum;
+                &Apache::lonnet::devalidate_cache_new('courseltitools',$hashid);
+                unless (($home eq 'no_host') || ($home eq '')) {
+                    if (grep(/^\Q$home\E$/,@ids)) {
+                        &Apache::lonnet::devalidate_cache_new('crsltitoolsenc',$hashid);
+                    }
+                }
+            } else {
+                $ltitools_save_error = 1;
+            }
+        }
+        unless ($ltitools_save_error) {
+            my %bynum;
+            foreach my $itemid (sort(keys(%{$changes}))) {
+                my $position = $changes->{$itemid}{'order'};
+                $bynum{$position} = $itemid;
+            }
+            foreach my $pos (sort { $a <=> $b } keys(%bynum)) {
+                my $itemid = $bynum{$pos};
+                if (ref($changes->{$itemid}) ne 'HASH') {
+                    $output .= '<li>'.&mt('Deleted: [_1]',$changes->{$itemid}).'</li>';
+                } else {
+                    $output .= '<li><b>'.$changes->{$itemid}{'title'}.'</b>';
+                    if ($changes->{$itemid}{'image'}) {
+                        $output .= '&nbsp;'.
+                                   '<img src="'.$changes->{$itemid}{'image'}.'"'.
+                                   ' alt="'.&mt('Tool Provider icon').'" />';
+                    }
+                    $output .= '</li><ul>';
+                    my $position = $pos + 1;
+                    $output .= '<li>'.&mt('Order: [_1]',$position).'</li>';
+                    foreach my $item ('version','msgtype','sigmethod','url','lifetime') {
+                        if ($changes->{$itemid}{$item} ne '') {
+                            $output .= '<li>'.$lt{$item}.':&nbsp;'.$changes->{$itemid}{$item}.'</li>';
+                        }
+                    }
+                    if (ref($toolsenc{$itemid}) eq 'HASH') {
+                        foreach my $item ('key','secret') {
+                            if (exists($toolsenc{$itemid}{$item})) {
+                                if ($item eq 'secret') {
+                                    $output .= '<li>'.$lt{$item}.':&nbsp;['.&mt('not shown').']</li>';
+                                } else {
+                                    $output .= '<li>'.$lt{$item}.':&nbsp;'.$toolsenc{$itemid}{$item}.'</li>';
+                                }
+                            }
+                        }
+                    }
+                    $output .= '<li>'.&mt('Configurable in course:');
+                    my @possconfig = ('label','title','target','linktext','explanation','append');
+                    my $numconfig = 0;
+                    if (ref($changes->{$itemid}{'crsconf'}) eq 'HASH') {
+                        foreach my $item (@possconfig) {
+                            if ($changes->{$itemid}{'crsconf'}{$item}) {
+                                $numconfig ++;
+                                $output .= ' "'.$lt{'crs'.$item}.'"';
+                            }
+                        }
+                    }
+                    if (!$numconfig) {
+                        $output .= '&nbsp;'.&mt('None');
+                    }
+                    $output .= '</li>';
+                    foreach my $item ('passback','roster') {
+                        $output .= '<li>'.$lt{$item}.'&nbsp;';
+                        if ($changes->{$itemid}{$item}) {
+                            $output .= &mt('Yes');
+                            if ($changes->{$itemid}{$item.'valid'}) {
+                                if ($item eq 'passback') {
+                                    $output .= ' '.&mt('valid for at least [quant,_1,day] after launch',
+                                                       $changes->{$itemid}{$item.'valid'});
+                                } else {
+                                    $output .= ' '.&mt('valid for at least [quant,_1,second] after launch',
+                                                       $changes->{$itemid}{$item.'valid'});
+                                }
+                            }
+                        } else {
+                            $output .= &mt('No');
+                        }
+                        $output .= '</li>';
+                    }
+                    if (ref($changes->{$itemid}{'display'}) eq 'HASH') {
+                        my $displaylist;
+                        if ($changes->{$itemid}{'display'}{'target'}) {
+                            $displaylist = &mt('Display target').':&nbsp;'.
+                                           $changes->{$itemid}{'display'}{'target'}.',';
+                        }
+                        foreach my $size ('width','height') {
+                            if ($changes->{$itemid}{'display'}{$size}) {
+                                $displaylist .= ('&nbsp;'x2).$lt{$size}.':&nbsp;'.
+                                                $changes->{$itemid}{'display'}{$size}.',';
+                            }
+                        }
+                        if ($displaylist) {
+                            $displaylist =~ s/,$//;
+                            $output .= '<li>'.$displaylist.'</li>';
+                        }
+                        foreach my $item ('linktext','explanation') {
+                            if ($changes->{$itemid}{'display'}{$item}) {
+                                $output .= '<li>'.$lt{$item}.':&nbsp;'.$changes->{$itemid}{'display'}{$item}.'</li>';
+                            }
+                        }
+                    }
+                    if (ref($changes->{$itemid}{'fields'}) eq 'HASH') {
+                        my $fieldlist;
+                        foreach my $field (@allfields) {
+                            if ($changes->{$itemid}{'fields'}{$field}) {
+                                $fieldlist .= ('&nbsp;'x2).$lt{$field}.',';
+                            }
+                        }
+                        if ($fieldlist) {
+                            $fieldlist =~ s/,$//;
+                            if ($changes->{$itemid}{'fields'}{'user'}) {
+                                if ($changes->{$itemid}{'incdom'}) {
+                                    $fieldlist .= ' ('.&mt('username:domain').')';
+                                } else {
+                                    $fieldlist .= ' ('.&mt('username').')';
+                                }
+                            }
+                            $output .= '<li>'.&mt('Data sent').':'.$fieldlist.'</li>';
+                        }
+                    }
+                    if (ref($changes->{$itemid}{'roles'}) eq 'HASH') {
+                        my $rolemaps;
+                        foreach my $role (@courseroles) {
+                            if ($changes->{$itemid}{'roles'}{$role}) {
+                                $rolemaps .= ('&nbsp;'x2).&Apache::lonnet::plaintext($role,'Course').'='.
+                                             $changes->{$itemid}{'roles'}{$role}.',';
+                            }
+                        }
+                        if ($rolemaps) {
+                            $rolemaps =~ s/,$//;
+                            $output .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>';
+                        }
+                    }
+                    if (ref($changes->{$itemid}{'custom'}) eq 'HASH') {
+                        my $customlist;
+                        if (keys(%{$changes->{$itemid}{'custom'}})) {
+                            foreach my $key (sort(keys(%{$changes->{$itemid}{'custom'}}))) {
+                                $customlist .= $key.':'.$changes->{$itemid}{'custom'}{$key}.('&nbsp;'x2);
+                            }
+                        }
+                        if ($customlist) {
+                            $output .= '<li>'.&mt('Custom items').': '.$customlist.'</li>';
+                        }
+                    }
+                    $output .= '</ul></li>';
+                }
+            }
+        }
+    }
+    return $output;
+}
+
 sub update_env {
     my ($cnum,$cdom,$chome,$need_env_update,$storehash)  = @_;
     my $count = 0;
@@ -1551,16 +3432,103 @@ 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 {
-    my ($cid,$cdom,$phase,$crstype) = @_;
+    my ($cid,$cdom,$phase,$crstype,$settings,$noedit) = @_;
     my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
-    my ($jscript,$categorize_js,$loncaparev_js);
+    my ($jscript,$categorize_js,$loncaparev_js,$instcode_js,$extresource_js,$localization_js);
     my $stubrowse_js = &Apache::loncommon::studentbrowser_javascript();
     my $browse_js = &Apache::loncommon::browser_and_searcher_javascript('parmset');
     my $cloners_js = &cloners_javascript($phase);
+    my $currltitools;
+    if (ref($settings) eq 'HASH') {
+        $currltitools = $settings->{'ltitools'};
+    }
+    my $ltitools_js = &Apache::lonconfigsettings::ltitools_javascript($currltitools);
+    my @code_order;
+    if ($crstype ne 'Community') {
+        if (ref($settings) eq 'HASH') {
+            my %codedefaults;
+            &Apache::lonnet::auto_instcode_defaults($cdom,\%codedefaults,
+                                                    \@code_order);
+            if (@code_order > 0) {
+                if ($phase eq 'display') {
+                    my @actions = &Apache::loncommon::get_env_multiple('form.actions');
+                    if (grep(/^courseinfo$/,@actions)) {
+                        if ($settings->{'cloners'} ne '') {
+                            unless ($settings->{'cloners'} eq '*') {
+                                my @cloners = split(/,/,$settings->{'cloners'});
+                                my @standardnames = &Apache::loncommon::get_standard_codeitems();
+                                my %local_to_standard;
+                                for (my $i=0; $i<@code_order; $i++) {
+                                    $local_to_standard{$code_order[$i]} = $standardnames[$i];
+                                }
+                                foreach my $cloner (@cloners) {
+                                    if (($cloner !~ /^\Q*:\E$match_domain$/) &&
+                                        ($cloner !~ /^$match_username\:$match_domain$/)) {
+                                        foreach my $item (split(/\&/,$cloner)) {
+                                            my ($key,$val) = split(/\=/,$item);
+                                            $val = &unescape($val);
+                                            foreach my $code (@code_order) {
+                                                if ($key eq $local_to_standard{$code}) {
+                                                    $env{'form.'.$key} = $val;
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                my @codetitles;
+                (undef,$instcode_js) =
+                    &Apache::courseclassifier::instcode_selectors($cdom,'display',undef,
+                                                                  \@codetitles);
+                $instcode_js .= <<ENDSCRIPT;
+function toggleCloners(callerradio) {
+    if (document.getElementById('LC_cloners_instcode')) {
+        if (callerradio.value == 1) {
+            document.getElementById('LC_cloners_instcode').style.display = "block";
+        } else {
+            uncheckOfficialLists();
+            document.getElementById('LC_cloners_instcode').style.display = "none";
+        }
+    }
+}
+
+if (!document.getElementsByClassName) {
+    function getElementsByClassName(node, classname) {
+        var a = [];
+        var re = new RegExp('(^| )'+classname+'( |$)');
+        var els = node.getElementsByTagName("*");
+        for(var i=0,j=els.length; i<j; i++)
+            if(re.test(els[i].className))a.push(els[i]);
+        return a;
+    }
+}
+
+function uncheckOfficialLists() {
+    var codepicks;
+    if (document.getElementsByClassName) {
+        codepicks = document.getElementsByClassName('LC_cloners_instcodes');
+    } else {
+        codepicks = getElementsByClassName(document.body,'LC_cloners_instcodes');
+    }
+    if (codepicks.length) {
+        for (var i=0; i<codepicks.length; i++) {
+            codepicks[i].selectedIndex = 0;
+        }
+    }
+}
+
+ENDSCRIPT
+            }
+        }
+    }
     if ($can_categorize) {
         $categorize_js = <<ENDSCRIPT;
 function catsbrowser() {
@@ -1588,9 +3556,192 @@ function loncaparevinfo() {
 }
 ENDSCRIPT
     }
+    my $cnum = $env{'course.'.$cid.'.num'};
+    my $syllabus_js = <<ENDSCRIPT;
+function syllabusinfo() {
+    var syllwin = null;
+    var url = '/public/$cdom/$cnum/syllabus?only_body=1';
+    if (!syllwin || syllwin.closed) {
+        syllwin=window.open(url,'syllabuswin','height=480,width=600,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+    } else {
+        syllwin.focus();
+    }
+}
+ENDSCRIPT
+    my ($menuitems_js,$grading_js);
+    unless ($noedit) {
+        my $collections;
+        my $next = 1;
+        if (ref($settings) eq 'HASH') {
+            if ($settings->{'menucollections'} ne '') {
+                my @current;
+                foreach my $item (split(/;/,$settings->{'menucollections'})) {
+                    my ($num) = split(/\%/,$item);
+                    if ($num =~ /^\d+$/) {
+                        push(@current,$num);
+                    }
+                }
+                $collections = join("','",sort { $a <=> $b } @current);
+                if ($collections) {
+                    $collections = "'$collections'";
+                }
+                $next += $current[-1];
+            }
+        }
+        my $deftext = &mt('Standard (all menus shown)');
+        $menuitems_js = <<ENDSCRIPT;
+function toggleAddmenucoll() {
+    if (document.getElementById('menucollections_add')) {
+        var state = 'none';
+        var add = document.getElementById('menucollections_add').checked;
+        if (add) {
+            state = 'inline-block';
+        }
+        var fieldsets = new Array('shown','text','links','list','inline');
+        for (var i=0; i<fieldsets.length; i++) {
+            if (document.getElementById('addmenucoll_'+fieldsets[i])) {
+                document.getElementById('addmenucoll_'+fieldsets[i]).style.display = state;
+            }
+        }
+        var box = document.getElementsByClassName('LC_menucoll_add');
+        if (box.length) {
+            for (var i=0; i<box.length; i++) {
+                if (add) {
+                    box[i].checked = true;
+                } else {
+                    box[i].checked = false;
+                }
+            }
+        }
+        if (document.getElementById('menudefault')) {
+            var menudef = document.getElementById('menudefault');
+            var currsel = menudef.selectedIndex;
+            var colls = new Array($collections);
+            menudef.options.length = 0;
+            if (!add) {
+                if (currsel == 1 + colls.length) {
+                    currsel = 0;
+                }
+            }
+            if (currsel == 0) {
+                menudef.options[0] = new Option('$deftext','',true,true);
+            } else {
+                menudef.options[0] = new Option('$deftext','',false,false);
+            }
+            if (colls.length) {
+                for (var i=0; i<colls.length; i++) {
+                    var idx = i+1;
+                    if (currsel == colls[i]) {
+                        menudef.options[idx] = new Option(colls[i],colls[i],true,true);
+                    } else {
+                        menudef.options[idx] = new Option(colls[i],colls[i],false,false);
+                    }
+                }
+            }
+            if (add) {
+                var addidx = 1 + colls.length;
+                if (currsel == addidx) {
+                     menudef.options[addidx] = new Option('$next','$next',true,true);
+                } else {
+                    menudef.options[addidx] = new Option('$next','$next',false,false);
+                }
+            }
+        }
+    }
+}
+ENDSCRIPT
+        $grading_js = <<"ENDSCRIPT";
+function toggleGrading(form) {
+    if (document.getElementById('hidetotalsdiv')) {
+        var totalsdivid = document.getElementById('hidetotalsdiv');
+        var selname = form.elements['grading'];
+        if (selname) {
+            var current = selname.options[selname.selectedIndex].value
+            if (current == 'standard') {
+                totalsdivid.style.display = 'inline-block';
+            } else {
+                totalsdivid.style.display = 'none';
+            }
+        }
+    }
+    return;
+}
+
+function toggleHiddenTotalsSec(form) {
+    if (document.getElementById('sectotalsdiv')) {
+        var sectotalsdivid = document.getElementById('sectotalsdiv');
+        var radioname = form.elements['hidetotals'];
+        if (radioname) {
+            if (radioname.length > 0) {
+                var setvis;
+                for (var i=0; i<radioname.length; i++) {
+                    if (radioname[i].checked == true) {
+                        if (radioname[i].value == 1) {
+                            sectotalsdivid.style.display = 'inline-block';
+                            setvis = 1;
+                        }
+                        break;
+                    }
+                }
+                if (!setvis) {
+                    sectotalsdivid.style.display = 'none';
+                }
+            }
+        }
+    }
+    return;
+}
+ENDSCRIPT
+    }
+    $extresource_js = <<"ENDSCRIPT";
+function toggleExtRes() {
+    if (document.getElementById('LC_extresource')) {
+        var extressel = document.getElementById('LC_extresource').value;
+        if (document.getElementById('LC_extresreusediv')) {
+            var extresreuse = document.getElementById('LC_extresreusediv');
+            if (document.getElementById('LC_extressize')) {
+                var extressize = document.getElementById('LC_extressize');
+                var setvis;
+                if ((extressel == 'tab') || (extressel == 'window')) {
+                    extresreuse.style.display = 'inline-block';
+                    setvis = 1;
+                    if (extressel == 'window') {
+                        extressize.style.display = 'inline-block';
+                    } else {
+                        extressize.style.display = 'none';
+                    }
+                }
+                if (!setvis) {
+                    extresreuse.style.display = 'none';
+                    extressize.style.display = 'none';
+                }
+            }
+        }
+    }
+}
+ENDSCRIPT
+    $localization_js = <<"ENDSCRIPT";
+function toggleTimeZone() {
+    if (document.getElementById('LC_set_timezone')) {
+        var timezonesel = document.getElementById('LC_set_timezone').value;
+        if (document.getElementById('LC_tzoverdiv')) {
+            var tzoverdiv = document.getElementById('LC_tzoverdiv');
+            if (timezonesel == '') {
+                tzoverdiv.style.display = 'none';
+            } else {
+                tzoverdiv.style.display = 'block';
+            }
+        }
+    }
+}
+ENDSCRIPT
     $jscript = '<script type="text/javascript" language="Javascript">'."\n".
+               '// <![CDATA['."\n".
                $browse_js."\n".$categorize_js."\n".$loncaparev_js."\n".
-               $cloners_js."\n".'</script>'."\n".$stubrowse_js."\n";
+               $cloners_js."\n".$instcode_js."\n".$localization_js."\n".
+               $syllabus_js."\n".$menuitems_js."\n".$extresource_js."\n".
+               $grading_js."\n".&linkprot_javascript()."\n".'//]]>'."\n".
+               '</script>'."\n".$stubrowse_js."\n".$ltitools_js."\n";
     return $jscript;
 }
 
@@ -1624,7 +3775,7 @@ function update_cloners(caller,num) {
                         if (document.$formname.cloners_activate[i].value == '0') {
                             document.$formname.cloners_activate[i].checked = false;
                         }
-                        if (document.$formname.cloners_activate[i].value == '') {
+                        if (document.$formname.cloners_activate[i].value == '-1') {
                             document.$formname.cloners_activate[i].checked = true;
                         }
                     }
@@ -1675,31 +3826,114 @@ function getIndexByName(item) {
 ENDSCRIPT
 }
 
+sub linkprot_javascript {
+    return <<"ENDSCRIPT";
+function toggleLinkProtExtra(form,item,extra,valon,styleon,num) {
+    if (document.getElementById('linkprot_'+extra+'_'+num)) {
+        var extraid = document.getElementById('linkprot_'+extra+'_'+num);
+        var itemname = form.elements['linkprot_'+item+'_'+num];
+        if (itemname) {
+            if (itemname.length > 0) {
+                var setvis;
+                for (var i=0; i<itemname.length; i++) {
+                    if (itemname[i].checked == true) {
+                        if (itemname[i].value == valon) {
+                            extraid.style.display = styleon;
+                            setvis = 1;
+                        }
+                        break;
+                    }
+                }
+                if (!setvis) {
+                    extraid.style.display = 'none';
+                }
+            }
+        }
+    }
+    return;
+}
+
+ENDSCRIPT
+
+}
 
 sub print_courseinfo {
-    my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
+    my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
     unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
         return;
     }
-    my ($cathash,$categoriesform,$autocoowner);
+    my ($cathash,$categoriesform,$autocoowner,$clonedefaults,$disabled);
+    if ($noedit) {
+        $disabled = ' disabled="disabled"';
+    }
     my %domconf = 
-        &Apache::lonnet::get_dom('configuration',['coursecategories','autoenroll'],$cdom);
+        &Apache::lonnet::get_dom('configuration',
+                                 ['coursecategories','autoenroll','coursedefaults'],$cdom);
     if (ref($domconf{'coursecategories'}) eq 'HASH') {
         $cathash = $domconf{'coursecategories'}{'cats'};
         if (ref($cathash) eq 'HASH') {
             $categoriesform = 
                 &Apache::loncommon::assign_categories_table($cathash,
-                                                $settings->{'categories'},$crstype)."\n";
+                                                $settings->{'categories'},$crstype,$disabled)."\n";
         }
     }
     if (ref($domconf{'autoenroll'}) eq 'HASH') {
         $autocoowner = $domconf{'autoenroll'}{'co-owners'};
     }
+    my ($currcanclone,@code_order,$cloner_instcode);
+    my %codedefaults;
+    &Apache::lonnet::auto_instcode_defaults($cdom,\%codedefaults,
+                                            \@code_order);
+    if ($settings->{'cloners'}) {
+        unless ($settings->{'cloners'} eq '*') {
+            my @currclone = split(/,/,$settings->{'cloners'});
+            foreach my $item (@currclone) {
+                unless ($item eq '*') {
+                    if (($item !~ /\:/) && ($item =~ /=/)) {
+                        $cloner_instcode = 1;
+                    }
+                }
+            }
+        }
+    }
+    if (ref($domconf{'coursedefaults'}) eq 'HASH') {
+        my $canclone = $domconf{'coursedefaults'}{'canclone'};
+        if (ref($canclone) eq 'HASH') {
+            if (ref($canclone->{'instcode'}) eq 'ARRAY') {
+                if ($settings->{'internal.coursecode'}) {
+                    my @posscodes;
+                    if (@code_order > 0) {
+                        $currcanclone = 'instcode';
+                        foreach my $item (@{$canclone->{'instcode'}}) {
+                            if (grep(/^\Q$item\E$/,@code_order)) {
+                                push(@posscodes,$item);
+                            }
+                        }
+                        my $codestr = join(' + ',@posscodes);
+                        $clonedefaults = &mt('Default for official courses is to also allow cloning if [_1] match in cloner and cloned.',
+                                             '"<span class="LC_nobreak" style="font-style:italic">'.$codestr.'</span>"').'<br />';
+                    }
+                }
+            }
+        } elsif ($canclone eq 'domain') {
+            $clonedefaults = &mt('Default is for any course requester in [_1] domain to be able to clone.',
+                                 '<span class="LC_nobreak" style="font-style:italic">'.$cdom.'</span>').'<br />';
+            $currcanclone = 'domain';
+        }
+        if ($clonedefaults) {
+            if ($settings->{'cloners'} ne '') {
+                $clonedefaults .= '<br />'.&mt('Default does [_1]not[_2] currently apply because values have been set in the course.','<b>','</b>');
+            } else {
+                $clonedefaults .= &mt('Default is disregarded if [_1]any[_2] values are set here in the course.','<i>','</i>');
+            }
+            $clonedefaults = '<br /><br />'.$clonedefaults;
+        }
+    }
     if (!defined($categoriesform)) {
         $categoriesform = &mt('No categories defined in this domain.');
     }
-
     my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
 
     my $replace;
     if ($crstype eq 'Community') {
@@ -1707,21 +3941,28 @@ 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>'.('&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>',
+                   text => '<b>'.&mt($itemtext->{'url'}).'</b>'.$editmap,
                    input => 'textbox',
-                   size  => '40',
+                   size  => '55',
+                   advanced => 1
                  },
         'description'  => { 
                    text => '<b>'.&mt($itemtext->{'description'}).'</b>',
                    input => 'textbox',
-                   size  => '25',
+                   size  => '55',
                           },
         'owner'        => {
                    text => '<b>'.&mt($itemtext->{'owner'}).'</b>',
@@ -1729,29 +3970,36 @@ 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'),
+                           &mt('Owner and Coordinators included automatically').
+                           $clonedefaults,
                    input => 'textbox',
-                   size  => '40',
+                   size  => '40'
                          },
         'rolenames'  => { 
                    text  => '<b>'.&mt($itemtext->{'rolenames'}).'</b><br />'.
                             '('.$replace.')',
                    input => 'textbox',
                    size  => '20',
+                   advanced => 1
                         },
-        'externalsyllabus' => {
-                   text => '<b>'.&mt($itemtext->{'externalsyllabus'}).'</b><br />('.
-                           &mt('not using syllabus template)'),
-                   input => 'textbox',
-                   size  => '40',
+        'syllabus' => {
+                   text => '<b>'.&mt($itemtext->{'syllabus'}).'</b><br />'.
+                           &mt('(Syllabus type in use)').('&nbsp;' x2).
+                           $editsyllabus,
                         },
         'hidefromcat' => {
                    text => '<b>'.&mt($itemtext->{'hidefromcat'}).'</b><br />'.
@@ -1767,23 +4015,37 @@ sub print_courseinfo {
         'loncaparev' => {
                    text => '<b>'.&mt($itemtext->{'loncaparev'}).'</b>',
                         },
+        'defaultcredits' => {
+                   text => '<b>'.&mt($itemtext->{'defaultcredits'}).'</b>',
+                        },
     );
     my $datatable;
     my $count = 0;
     foreach my $item (@{$ordered}) {
+        my $colspan;
         if ($item eq 'hidefromcat') {
             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;
         }
         $count ++;
-        $datatable .= &item_table_row_start($items{$item}{text},$count);
+        if (exists $items{$item}{advanced} && $items{$item}{advanced} == 1) {
+        	$datatable .= &item_table_row_start($items{$item}{text},$count,"advanced",$colspan);
+        } else {
+        	$datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan);
+        }
         if ($items{$item}{input} eq 'radio') {
-            $datatable .= &yesno_radio($item,$settings);
+            $datatable .= &yesno_radio($item,$settings,undef,undef,undef,$noedit);
         } elsif ($item eq 'cloners') {
             my $includeempty = 1;
             my $num = 0;
-            $datatable .= &Apache::loncommon::start_data_table().
+            $datatable .= '</td><td align="right">'.
+                          &Apache::loncommon::start_data_table().
                           &Apache::loncommon::start_data_table_row().
                           '<td><span class="LC_nobreak"><label>'.
                           &mt('Any user in any domain:').
@@ -1792,21 +4054,28 @@ sub print_courseinfo {
                 $datatable .= ' checked="checked" ';
             }
             $datatable .= 'onchange="javascript:update_cloners('.
-                          "'cloners_all'".');" />'.&mt('Yes').'</label>'.
-                          ('&nbsp;'x2).'<input type="radio" name="cloners_all" value="0" ';
+                          "'cloners_all'".');"'.$disabled.' />'.&mt('Yes').'</label>'.
+                          ('&nbsp;'x2).'<label>'.
+                          '<input type="radio" name="cloners_all" value="0" ';
             if ($settings->{$item} ne '*') {
                 $datatable .= ' checked="checked" ';
             }
             $datatable .= ' onchange="javascript:update_cloners('.
-                          "'cloners_all'".');"/>'.&mt('No').'</label></td>'.
+                          "'cloners_all'".');"'.$disabled.' />'.&mt('No').'</label></td>'.
                           &Apache::loncommon::end_data_table_row().
                           &Apache::loncommon::end_data_table().
-                          '<table><tr><td align="left">'.&mt('Or').
-                          '</td></tr></table>'.
+                          '<table><tr><td align="left"><b>'.&mt('Or').
+                          '</b></td></tr></table>'.
                           &Apache::loncommon::start_data_table();
             my @cloners;
             if ($settings->{$item} eq '') {
-                $datatable .= &new_cloners_dom_row($cdom,'0');
+                unless ($noedit) {
+                    my $default;
+                    if ($currcanclone eq 'domain') {
+                        $default = '0';
+                    }
+                    $datatable .= &new_cloners_dom_row($cdom,'0',$default);
+                }
             } elsif ($settings->{$item} ne '*') {
                 my @entries = split(/,/,$settings->{$item});
                 if (@entries > 0) {
@@ -1827,7 +4096,7 @@ sub print_courseinfo {
                                 '</b><input type="hidden" name="cloners_dom_'.$num.
                                 '" value="'.$udom.'" /></span><br />'.
                                 '<span class="LC_nobreak"><label><input type="checkbox" '.
-                                'name="cloners_delete" value="'.$num.'" onchange="javascript:update_cloners('."'cloners_delete','$num'".');" />'.
+                                'name="cloners_delete" value="'.$num.'" onchange="javascript:update_cloners('."'cloners_delete','$num'".');"'.$disabled.' />'.
                                 &mt('Delete').'</label></span></td>'.
                                 &Apache::loncommon::end_data_table_row();
                             $num ++;
@@ -1850,23 +4119,56 @@ sub print_courseinfo {
                           '<td align="left"><span class="LC_nobreak">'.
                           $add_domtitle.'</span><br />'.
                           &Apache::loncommon::select_dom_form('','cloners_newdom',
-                                                              $includeempty).
+                                                              $includeempty,undef,undef,
+                                                              undef,undef,$noedit).
                           '<input type="hidden" name="cloners_total" value="'.$num.'" />'.
                           '</td>'.&Apache::loncommon::end_data_table_row().
                           &Apache::loncommon::end_data_table().
-                          '<table><tr><td align="left">'.&mt('And').
-                          '</td></tr></table>'.
+                          '<table><tr><td align="left"><b>'.&mt('And').
+                          '</b></td></tr></table>'.
                           &Apache::loncommon::start_data_table().
                           &Apache::loncommon::start_data_table_row().
                           '<td align="left">'.
                           &mt('Specific users').'&nbsp;(<tt>'.
                           &mt('user:domain,user:domain').'</tt>)<br />'.
                           &Apache::lonhtmlcommon::textbox($item,$cloners_str,
-                                                          $items{$item}{'size'}).
+                                                          $items{$item}{'size'},$disabled).
                           '</td>'.&Apache::loncommon::end_data_table_row().
                           &Apache::loncommon::end_data_table();
+            if (@code_order > 0) {
+                my (%cat_items,@codetitles,%cat_titles,%cat_order);
+                my ($jscript,$totcodes,$numtitles,$lasttitle) =
+                    &Apache::courseclassifier::instcode_selectors_data($cdom,'display',
+                                                                       \%cat_items,\@codetitles,
+                                                                       \%cat_titles,\%cat_order);
+                my $showncodes = 'off';
+                my $checkedoff = ' checked="checked"';
+                my $checkedon = '';
+                if ($cloner_instcode) {
+                    $checkedon = $checkedoff;
+                    $checkedoff = '';
+                    $showncodes = 'on';
+                }
+                $datatable .= '<table><tr><td align="left"><b>'.&mt('And').
+                              '</b></td></tr></table>'.
+                              &Apache::loncommon::start_data_table().
+                              &Apache::loncommon::start_data_table_row().
+                              '<td align="left"><span class="LC_nobreak">'.
+                              &mt('Cloning by official course(s) based on course category').('&nbsp;'x2).
+                              '<label>'.
+                              '<input type="radio" name="cloners_instcode" value="1" onclick="toggleCloners(this);"'.$checkedon.$disabled.' />'.&mt('Yes').'</label>'.
+                              ('&nbsp;').
+                              '<label>'.
+                              '<input type="radio" name="cloners_instcode" value="0" onclick="toggleCloners(this);"'.$checkedoff.$disabled.' />'.&mt('No').'</label>'.
+                              &Apache::courseclassifier::build_instcode_selectors($numtitles,
+                                  $lasttitle,\%cat_items,\@codetitles,\%cat_titles,\%cat_order,
+                                  $showncodes,'LC_cloners_instcodes','LC_cloners_instcode',$noedit).
+                              '</td>'.&Apache::loncommon::end_data_table_row().
+                              &Apache::loncommon::end_data_table();
+            }
         } elsif ($item eq 'rolenames') {
-            $datatable .= &Apache::loncommon::start_data_table();
+            $datatable .= '</td><td align="right">'.
+                          &Apache::loncommon::start_data_table();
             my @roles;
             if ($crstype eq 'Community') {
                 @roles = ('co');
@@ -1881,12 +4183,17 @@ sub print_courseinfo {
                               '</span></td><td align="left">'.
                               &Apache::lonhtmlcommon::textbox('rolenames_'.$role,
                                                  $settings->{$role.'.plaintext'},
-                                                 $items{$item}{size}).'</td>'.
+                                                 $items{$item}{size},$disabled).'</td>'.
                               &Apache::loncommon::end_data_table_row();
             }
             $datatable .= &Apache::loncommon::end_data_table().'</td>';
         } elsif ($item eq 'categories') {
-            my $launcher = 'onFocus="this.blur();javascript:catsbrowser();";';
+            my $launcher;
+            if ($noedit) {
+                $launcher = $disabled;
+            } else {
+                $launcher = 'onfocus="this.blur();javascript:catsbrowser();"';
+            }
             $datatable .= '<input type="hidden" name="categories" value="'.$settings->{$item}.'" />'.
                           &Apache::lonhtmlcommon::textbox($item.'_display',$settings->{$item},
                                                           $items{$item}{size},$launcher);
@@ -1901,8 +4208,22 @@ 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 $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
             my $coowners = $env{'course.'.$env{'request.course.id'}.'.internal.co-owners'};
             my @currcoown;
             if ($coowners) {
@@ -1912,15 +4233,45 @@ sub print_courseinfo {
                 if (($crstype eq 'Course') && ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) && ($autocoowner)) {
                     $datatable .= &show_autocoowners(@currcoown);
                 } else {
-                    $datatable .= &coowner_invitations($cnum,$cdom,@currcoown);
+                    $datatable .= &coowner_invitations($cnum,$cdom,\@currcoown,$noedit);
                 }
             } else {
                 if (($crstype eq 'Course') && ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) && ($autocoowner)) {
                     $datatable .= &show_autocoowners(@currcoown);
                 } else {
-                    $datatable .= &manage_coownership($cnum,$cdom,@currcoown);
+                    $datatable .= &manage_coownership($cnum,$cdom,\@currcoown,$noedit);
+                }
+            }
+        } elsif ($item eq 'syllabus') {
+            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'};
+            if (($minimal =~/\w/) || ($uploaded =~/\w/)) {
+                if ($minimal =~/\w/) {
+                    if ($external =~ m{\Q$minimal\E$}) {
+                        undef($external);
+                    }
+                } elsif ($uploaded =~/\w/) {
+                    if ($external =~ m{\Q$uploaded\E$}) {
+                        undef($external);
+                    }
                 }
+            } elsif ($external!~/\w/) {
+                undef($external);
+            }
+            if ($external) {
+                $datatable .= &mt('External URL');
+            } elsif ($minimal) {
+                $datatable .= &mt('Minimal template');
+            } elsif ($uploaded) {
+                $datatable .= &mt('Uploaded file');
+            } else {
+                $datatable .= &mt('Standard template');
             }
+            $datatable .= ('&nbsp;' x 2).
+                          &mt('[_1]View[_2]',
+                              '<a href="javascript:syllabusinfo();">',
+                              '</a>');
         } elsif ($item eq 'loncaparev') {
             my $loncaparev = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
             my $showreqd;
@@ -1932,7 +4283,7 @@ sub print_courseinfo {
             }
             $datatable .= $showreqd;
         } else {
-            $datatable .= &Apache::lonhtmlcommon::textbox($item,$settings->{$item},$items{$item}{size});
+            $datatable .= &Apache::lonhtmlcommon::textbox($item,$settings->{$item},$items{$item}{size},$disabled);
         }
         $datatable .= &item_table_row_end();
     }
@@ -1941,19 +4292,24 @@ sub print_courseinfo {
 }
 
 sub new_cloners_dom_row {
-    my ($newdom,$num) = @_;
-    my $output;
+    my ($newdom,$num,$default) = @_;
+    my ($output,$checkedon,$checkedoff);
     if ($newdom ne '') {
+        if ($num eq $default) {
+           $checkedon = 'checked="checked" ';
+        } else {
+           $checkedoff = 'checked="checked" ';
+        }
         $output .= &Apache::loncommon::start_data_table_row().
                    '<td valign="top"><span class="LC_nobreak">'.
                    &mt('Any user in domain:').'&nbsp;<b>'.$newdom.'</b>'.
                    ('&nbsp;'x2).'<label><input type="radio" '.
-                   'name="cloners_activate" value="'.$num.'" '.
+                   'name="cloners_activate" value="'.$num.'" '.$checkedon.
                    'onchange="javascript:update_cloners('.
                    "'cloners_activate','$num'".');" />'.
                    &mt('Yes').'</label>'.('&nbsp;'x2).
                    '<label><input type="radio" '.
-                   'name="cloners_activate" value="" checked="checked" '.
+                   'name="cloners_activate" value="-1" '.$checkedoff.
                    'onchange="javascript:update_cloners('.
                    "'cloners_activate','$num'".');" />'.
                    &mt('No').'</label><input type="hidden" name="cloners_dom_'.
@@ -2014,6 +4370,7 @@ sub assign_course_categories {
         } else {
             $alert = &mt("Use 'Save' in the main window to save course categories");
         }
+        &js_escape(\$alert);
         $catwin_js = <<ENDSCRIPT;
 <script type="text/javascript">
 
@@ -2090,6 +4447,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'};
@@ -2099,25 +4457,45 @@ 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 $now = time;
     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)) {
+                                 $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$/,@{$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);
@@ -2126,7 +4504,7 @@ sub display_loncaparev_constraints {
                              if ($key =~ /^\Q$start\E(\[useropt\:($match_username\:$match_domain)\]\.)/) {
                                  $middle = $1;
                                  $which = $2;
-                                 $scope = 'user';
+                                 $scope = 'user'; 
                              } elsif ($key =~ /^\Q$start\E(\[(\w+)\]\.)/) {
                                  $middle = $1;
                                  $which = $2;
@@ -2209,6 +4587,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;
@@ -2239,6 +4620,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'};
@@ -2248,7 +4698,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();
@@ -2265,6 +4715,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;
@@ -2277,12 +4734,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;
                 }
             }
@@ -2300,9 +4772,9 @@ sub display_loncaparev_constraints {
         }
         foreach my $map (keys(%allmaps)) {
             my $mapres = $navmap->getResourceByUrl($map);
-            my $mapsymb = $mapres->symb();
-            $toshow{$mapsymb} = 1;
             if (ref($mapres)) {
+                my $mapsymb = $mapres->symb();
+                $toshow{$mapsymb} = 1;
                 my $pcslist = $mapres->map_hierarchy();
                 if ($pcslist ne '') {
                     foreach my $pc (split(/,/,$pcslist)) {
@@ -2321,7 +4793,7 @@ sub display_loncaparev_constraints {
     my $mapres_header = '<h4>'.
                         &mt('Requirements for specific folders or resources').
                         '</h4>';
-    if ((keys(%toshow) > 0) || (keys(%byresource) > 0) ||
+    if ((keys(%toshow) > 0) || (keys(%byresource) > 0) || 
         (keys(%bysubmission) > 0) || (keys(%byresponsetype))) {
         $output .= $mapres_header;
     }
@@ -2336,20 +4808,24 @@ sub display_loncaparev_constraints {
             &show_contents_view($r,$navmap,$cid,\%toshow,\%bymap,\%byresource,\%bysubmission,
                                 \%byresponsetype,\@scopeorder,\%lt);
         }
-        $r->print('<br /><br />');
+        $r->print('<br /><br />'); 
     } else {
         $r->print('<p class="LC_info">'.
                   &mt('No version requirements from resource content or settings.').
-                  '</p>');
+                  '</p>'); 
     }
     $r->print(&Apache::loncommon::end_page());
+    my ($currmajor,$currminor) = split(/\./,$loncaparev);
+    if (($currmajor != $reqdmajor) || ($currminor != $reqdminor)) {
+        return 1;
+    }
     return;
 }
 
 sub show_contents_view {
     my ($r,$navmap,$cid,$toshow,$bymap,$byresource,$bysubmission,$byresponsetype,
         $scopeorder,$lt) = @_;
-    if ((keys(%{$toshow}) > 0) || (keys(%{$byresource}) > 0) ||
+    if ((keys(%{$toshow}) > 0) || (keys(%{$byresource}) > 0) || 
         (keys(%{$bysubmission}) > 0) || (keys(%{$byresponsetype}) > 0)) {
         my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
         my $whitespace = '<img src="'.$location.'/whitespace_21.gif" alt="" />';
@@ -2361,7 +4837,7 @@ sub show_contents_view {
                   '<th>'.&mt('Attribute/Setting').'</th>'.
                   &Apache::loncommon::end_data_table_header_row().
                   &Apache::loncommon::start_data_table_row().
-                  '<td>&nbsp;'.$icon.'&nbsp;'.&mt('Main Course Documents').'</td>');
+                  '<td>&nbsp;'.$icon.'&nbsp;'.&mt('Main Content').'</td>');
                   &releases_by_map($r,$bymap,$topmap,$scopeorder,$lt);
                   $r->print(&Apache::loncommon::end_data_table_row());
         my $it=$navmap->getIterator(undef,undef,undef,1,1,undef);
@@ -2484,13 +4960,19 @@ sub show_contents_view {
         }
         $r->print(&Apache::loncommon::end_data_table());
     }
+    return;
 }
 
 sub releases_by_map {
     my ($r,$bymap,$url,$scopeorder,$lt) = @_;
     return unless ((ref($bymap) eq 'HASH') && (ref($scopeorder) eq 'ARRAY'));
+    my $newrow = 0;
     if (ref($bymap->{$url}) eq 'HASH') {
         foreach my $rev (sort(keys(%{$bymap->{$url}}))) {
+            if ($newrow) {
+                $r->print(&Apache::loncommon::end_data_table_row().
+                          &Apache::loncommon::continue_data_table_row());
+            }
             $r->print('<td valign="middle">'.$rev.'</td><td>');
             if (ref($bymap->{$url}{$rev}) eq 'HASH') {
                 $r->print('<table border="0">');
@@ -2512,6 +4994,7 @@ sub releases_by_map {
                 $r->print('</table>');
             }
             $r->print('</td>');
+            $newrow = 1;
         }
     } else {
         $r->print('<td colspan="2">&nbsp;</td>');
@@ -2537,9 +5020,27 @@ 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>'.&mt('Co-ownership is set automatically when a Course Coordinator role is assigned to official course personnel (from institutional data).').'</i>';
+    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>';
     if (@currcoown > 0) { 
         $output .= '<br />'.&mt('Current co-owners are:').'&nbsp;'.
                    join(', ',map { &Apache::loncommon::plainname(split(':',$_)); } (@currcoown));
@@ -2550,13 +5051,20 @@ sub show_autocoowners {
 }
 
 sub coowner_invitations {
-    my ($cnum,$cdom,@currcoown) = @_;
-    my ($output,@pendingcoown,@othercoords);
+    my ($cnum,$cdom,$currcoownref,$noedit) = @_;
+    my ($output,@pendingcoown,@othercoords,@currcoown);
     my $pendingcoowners =
         $env{'course.'.$env{'request.course.id'}.'.internal.pendingco-owners'};
     if ($pendingcoowners) {
         @pendingcoown = split(',',$pendingcoowners);
     }
+    if (ref($currcoownref) eq 'ARRAY') {
+        @currcoown = @{$currcoownref};
+    }
+    my $disabled;
+    if ($noedit) {
+        $disabled = ' disabled="disabled"';
+    }
     my $ccrole = 'cc';
     my %ccroles = &Apache::lonnet::get_my_roles($cnum,$cdom,undef,undef,[$ccrole]);
     foreach my $key (sort(keys(%ccroles))) {
@@ -2574,7 +5082,7 @@ sub coowner_invitations {
                           '<td><i>'.&mt('Current co-owners').'</i></td><td>';
             foreach my $person (@currcoown) {
                 my ($co_uname,$co_dom) = split(':',$person);
-                $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="coowners" checked="checked" value="'.$person.'" />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.('&nbsp;'x2).' ';
+                $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="coowners" checked="checked" value="'.$person.'"'.$disabled.' />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.('&nbsp;'x2).' ';
             }
             $output .= '</td>'.
                           &Apache::loncommon::end_data_table_row();
@@ -2584,7 +5092,7 @@ sub coowner_invitations {
                           '<td><i>'.&mt('Invited as co-owners [_1](agreement pending)','<br />').'</i></td><td>';
             foreach my $person (@pendingcoown) {
                 my ($co_uname,$co_dom) = split(':',$person);
-                $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="pendingcoowners" checked="checked" value="'.$person.'" />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.('&nbsp;'x2).' ';
+                $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="pendingcoowners" checked="checked" value="'.$person.'"'.$disabled.' />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.('&nbsp;'x2).' ';
             }
             $output .= '</td>'.
                        &Apache::loncommon::end_data_table_row();
@@ -2594,7 +5102,7 @@ sub coowner_invitations {
                           '<td><i>'.&mt('Invite other Coordinators [_1]to become co-owners','<br />').'</i></td><td>';
             foreach my $person (@othercoords) {
                 my ($co_uname,$co_dom) = split(':',$person);
-                $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="invitecoowners" value="'.$person.'" />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.('&nbsp;'x2).' ';
+                $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="invitecoowners" value="'.$person.'"'.$disabled.' />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.('&nbsp;'x2).' ';
             }
             $output .= '</td>'.
                           &Apache::loncommon::end_data_table_row();
@@ -2607,13 +5115,20 @@ sub coowner_invitations {
 }
 
 sub manage_coownership  {
-    my ($cnum,$cdom,@currcoown) = @_;
-    my (@pendingcoown);
+    my ($cnum,$cdom,$currcoownref,$noedit) = @_;
+    my (@pendingcoown,@currcoown);
     my $pendingcoowners =
         $env{'course.'.$env{'request.course.id'}.'.internal.pendingco-owners'};
     if ($pendingcoowners) {
         @pendingcoown = split(',',$pendingcoowners);
     }
+    if (ref($currcoownref) eq 'ARRAY') {
+        @currcoown = @{$currcoownref};
+    }
+    my $disabled;
+    if ($noedit) {
+        $disabled = ' disabled="disabled"';
+    }
     my ($is_coowner,$is_pending,$output);
     my $uname = $env{'user.name'};
     my $udom = $env{'user.domain'};
@@ -2643,10 +5158,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_coowoner" value="'.$uname.':'.$udom.'" />'.&mt('Discontinue?').'</label>';
+            $output .= &mt('You are currently a co-owner:').'&nbsp;<label><input type="checkbox" name="remove_coowner" 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_coowoner" value="accept" />'.&mt('Accept?').'</label>'.('&nbsp;'x2).
-                       '<label><input type="radio" name=pending_coowoner" value="decline" />'.&mt('Decline?').'</label>';
+            $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 .= '</span>';
         if (@currcoown) {
@@ -2660,7 +5175,7 @@ sub manage_coownership  {
 }
 
 sub print_localization {
-    my ($cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
+    my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$noedit) = @_;
     unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
         return;
     }
@@ -2679,17 +5194,38 @@ sub print_localization {
                          input => 'selectbox',
                        },
     );
-    my $datatable;
+    my ($datatable,$disabled);
     my $count = 0;
+    if ($noedit) {
+        $disabled = ' disabled="disabled"';
+    }
     foreach my $item (@{$ordered}) {
         $count ++;
-        $datatable .= &item_table_row_start($items{$item}{text},$count);
+        my $colspan;
+        unless ($item eq 'languages') {
+            $colspan = 2;
+        }
+        $datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan);
         if ($item eq 'timezone') {
             my $includeempty = 1;
             my $timezone = &Apache::lonlocal::gettimezone();
+            my $onchange;
+            unless ($noedit) {
+               $onchange = ' onchange="javascript:toggleTimeZone();"';
+            }
+            my $id = ' id="LC_set_timezone"';
             $datatable .= 
-                &Apache::loncommon::select_timezone($item,$timezone,undef,
-                                                    $includeempty);
+                &Apache::loncommon::select_timezone($item,$timezone,$onchange,
+                                                    $includeempty,$id,$disabled);
+            my $tzsty = 'none';
+            if ($timezone ne '') {
+                $tzsty = 'block';
+            }
+            $datatable .= '<div id="LC_tzoverdiv" style="display:'.$tzsty.';">'.
+                          '<span class="LC_nobreak">'.
+                          &mt('Override individual user preference?').
+                          &yesno_radio('tzover',$settings,undef,1,'',$noedit).
+                          '</span></div>';
         } elsif ($item eq 'datelocale') {
             my $includeempty = 1;
             my $locale_obj = &Apache::lonlocal::getdatelocale();
@@ -2699,15 +5235,18 @@ sub print_localization {
             }
             $datatable .= 
                 &Apache::loncommon::select_datelocale($item,$currdatelocale,
-                                                      undef,$includeempty);
+                                                      undef,$includeempty,$disabled);
         } else {
             if ($settings->{$item} eq '') {
-                $datatable .= 
-                    &Apache::loncommon::select_language('languages_0','',1);
+                unless ($noedit) {
+                    $datatable .= '</td><td align="right">'.
+                        &Apache::loncommon::select_language('languages_0','',1);
+                }
             } else {
                 my $num = 0;
                 my @languages = split(/\s*[,;:]\s*/,$settings->{$item});
-                $datatable .= &Apache::loncommon::start_data_table();
+                $datatable .= '</td><td align="right"><br />'.
+                              &Apache::loncommon::start_data_table();
                 if (@languages > 0) {
                     my %langchoices = &get_lang_choices();
                     foreach my $lang (@languages) {
@@ -2722,19 +5261,22 @@ sub print_localization {
                             '</b><input type="hidden" name="languages_'.$num.
                             '" value="'.$lang.'" /></span><br />'.
                             '<span class="LC_nobreak"><label><input type="checkbox" '.
-                            'name="languages_delete" value="'.$num.'" />'.
+                            'name="languages_delete" value="'.$num.'"'.$disabled.' />'.
                             &mt('Delete').'</label></span></td>'.
                             &Apache::loncommon::end_data_table_row();
                             $num ++;
                     }
                 }
-                $datatable .= &Apache::loncommon::start_data_table_row().
+                unless ($noedit) {
+                    $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().
-                              &Apache::loncommon::end_data_table();
+                              '</td>'.&Apache::loncommon::end_data_table_row();
+                }
+                $datatable .= &Apache::loncommon::end_data_table().'<br />';
             }
         }
         $datatable .= &item_table_row_end();
@@ -2755,7 +5297,7 @@ sub get_lang_choices {
 }
 
 sub print_feedback {
-    my ($position,$cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
+    my ($position,$cdom,$settings,$ordered,$itemtext,$rowtotal,$noedit) = @_;
     unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
         return;
     }
@@ -2790,17 +5332,25 @@ sub print_feedback {
                                            del      => 'Delete?',
                                            sec      => 'Sections:',
                                          );
-
+    my $disabled;
+    if ($noedit) {
+        $disabled = ' disabled="disabled"';
+    }
     foreach my $item (@{$ordered}) {
         $count ++;
-       	$datatable .= &item_table_row_start($items{$item}{text},$count);
+        if ($position eq 'top') {
+        	$datatable .= &item_table_row_start($items{$item}{text},$count);
+        } else {
+        	$datatable .= &item_table_row_start($items{$item}{text}."<br/>(Custom text)",$count, "advanced",2);
+        }
         if ($position eq 'top') {
             my $includeempty = 0;
-            $datatable .= &user_table($cdom,$item,\@sections,
-                                      $settings->{$item},\%lt);
+            $datatable .= '</td><td align="right">'.
+                          &user_table($cdom,$item,\@sections,
+                                      $settings->{$item},\%lt,$noedit);
         } else {
             $datatable .= &Apache::lonhtmlcommon::textbox($item.'.text',
-                              $settings->{$item.'.text'},$items{$item}{size});
+                              $settings->{$item.'.text'},$items{$item}{size},$disabled);  
         }
         $datatable .= &item_table_row_end();
     }
@@ -2809,15 +5359,21 @@ sub print_feedback {
 }
 
 sub user_table {
-    my ($cdom,$item,$sections,$currvalue,$lt) = @_;
+    my ($cdom,$item,$sections,$currvalue,$lt,$noedit) = @_;
     my $output;
     if ($currvalue eq '') {
-        $output .= &select_recipient($item,'0',$cdom,$sections);
+        unless ($noedit) {
+            $output .= &select_recipient($item,'0',$cdom,$sections);
+        }
     } else {
         my $num = 0;
         my @curr = split(/,/,$currvalue);
-        $output .= '<table class="LC_nested_outer">';
+        $output .= '<table class="LC_data_table">';
         my ($currusers);
+        my $disabled;
+        if ($noedit) {
+            $disabled = ' disabled="disabled"';
+        }
         foreach my $val (@curr) {
             next if ($val eq '');
             my ($uname,$udom,$seclist) = ($val =~ /^($match_username):($match_domain)(\(?[^\)]*\)?)$/);
@@ -2829,7 +5385,7 @@ sub user_table {
             $currusers .= '<tr>'.
                         '<td valign="top"><span class="LC_nobreak">'.
                         '<label><input type="checkbox" '.
-                        'name="'.$item.'_delete" value="'.$num.'" />'.
+                        'name="'.$item.'_delete" value="'.$num.'"'.$disabled.' />'.
                         $lt->{'del'}.'</label>'.
                         '<input type="hidden" name="'.$item.'_user_'.
                         $num.'" value="'.$uname.':'.$udom.'" />'.('&nbsp;'x2).
@@ -2840,7 +5396,7 @@ sub user_table {
                 if (@{$sections}) {
                     $currusers.= ('&nbsp;'x3).$lt->{'sec'}.'&nbsp;'.
                                   &select_sections($item,$num,$sections,
-                                  \@selsec);
+                                  \@selsec,$noedit);
                 }
             }
             $currusers .= '</span></td></tr>';
@@ -2858,12 +5414,16 @@ sub user_table {
                           '<table>'.$currusers.'</table></td>'.
                           '</tr>';
         }
-        $output .= '<tr>'.
+        unless ($noedit) {
+            $output .= 
+                  '<tr>'.
                   '<td align="left"><span class="LC_nobreak"><i>'.
                   $lt->{'add'}.'</i></span><br />'.
                   &select_recipient($item,$num,$cdom,$sections).
                   '<input type="hidden" name="'.$item.'_total" value="'.$num.'" />'.
-                  '</td></tr></table>';
+                  '</td></tr>';
+        }
+        $output .= '</table>';
     }
     return $output;
 }
@@ -2873,7 +5433,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,1);
+                                               $item.'_udom_'.$num,'only');
     my $output = 
         '<table><tr><td align="center">'.&mt('Username').'<br />'.
         '<input type="text" name="'.$item.'_uname_'.$num.'" value="" /></td>'.
@@ -2890,29 +5450,40 @@ sub select_recipient {
 }
 
 sub select_sections {
-    my ($item,$num,$sections,$selected) = @_;
-    my ($output,@currsecs,$allsec);
+    my ($item,$num,$sections,$selected,$noedit,$allval) = @_;
+    my ($output,@currsecs,$allsec,$disabled);
     if (ref($selected) eq 'ARRAY') {
         @currsecs = @{$selected};
     }
     if (!@currsecs) {
         $allsec = ' selected="selected"';
     }
+    if ($noedit) {
+        $disabled = ' disabled="disabled"';
+    }
     if (ref($sections) eq 'ARRAY') {
         if (@{$sections}) {
             my $mult;
             if (@{$sections} > 1) {
                 $mult = ' multiple="multiple"';
+                my $size;
                 if (@{$sections} > 3) {
-                    $mult .= ' size="4"';
+                    $size = 4;
+                } else {
+                    $size = 1 + scalar(@{$sections});
                 }
+                $mult .= ' size="'.$size.'"';
+            }
+            my $name = $item.'_sections';
+            unless ($item eq 'hidetotals') {
+                $name .= '_'.$num;
             }
-            $output = '<select name="'.$item.'_sections_'.$num.'"'.$mult.'>'.
-                      ' <option value=""'.$allsec.'>'.&mt('All').'</option>';
+            $output = '<select name="'.$name.'"'.$mult.$disabled.'>'.
+                      ' <option value="'.$allval.'"'.$allsec.'>'.&mt('All').'</option>';
             foreach my $sec (@{$sections}) {
                 my $is_sel;
                 if ((@currsecs) && (grep(/^\Q$sec\E$/,@currsecs))) {
-                    $is_sel = 'selected="selected"';
+                    $is_sel = ' selected="selected"';
                 }
                 $output .= '<option value="'.$sec.'"'.$is_sel.'>'.$sec.'</option>';
             }
@@ -2923,7 +5494,7 @@ sub select_sections {
 }
 
 sub print_discussion {
-    my ($cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
+    my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$noedit) = @_;
     unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
         return;
     }
@@ -2962,6 +5533,11 @@ sub print_discussion {
                    text => '<b>'.&mt($itemtext->{'allow_discussion_post_editing'}).'</b>',
                    input => 'checkbox',
                  },
+        'discussion_post_fonts' => {
+                   text => '<b>'.&mt($itemtext->{'discussion_post_fonts'}).'</b>',
+                   input => 'textbox',
+                   size  => '20',
+                 },
     );
     my $datatable;
     my $count;
@@ -2975,32 +5551,52 @@ sub print_discussion {
                                           del      => 'Delete?',
                                           sec      => 'Sections:',
                                          );
-
     foreach my $item (@{$ordered}) {
         $count ++;
-        $datatable .= &item_table_row_start($items{$item}{text},$count);
+        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 .= '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings).
+            $datatable .= '</td><td align="right">'.
+                          '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings,undef,undef,$noedit).
                           '</table>';
         } elsif ($item eq 'plc.users.denied') {
-            $datatable .= &user_table($cdom,$item,undef,
-                                      $settings->{$item},\%lt);
+            $datatable .= '</td><td align="right">'.
+                          &user_table($cdom,$item,undef,
+                                      $settings->{$item},\%lt,$noedit);
         } elsif ($item eq 'pch.roles.denied') {
-            $datatable .= '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings).
+            $datatable .= '</td><td align="right">'.
+                          '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings,undef,undef,$noedit).
                           '</table>';
         } elsif ($item eq 'pch.users.denied') {
-            $datatable .= &user_table($cdom,$item,undef,
-                                      $settings->{$item},\%lt);
+            $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);
+            $datatable .= &yesno_radio($item,$settings,undef,undef,undef,$noedit);
         } elsif ($item eq 'allow_discussion_post_editing') {
-            $datatable .= &Apache::loncommon::start_data_table().
+            $datatable .= '</td><td align="right"><br />'.
+                          &Apache::loncommon::start_data_table().
                           &Apache::loncommon::start_data_table_row().
                           '<th align="left">'.&mt('Role').'</th><th>'.
                           &mt('Sections').'</th>'.
                           &Apache::loncommon::end_data_table_row().
-                          &role_checkboxes($cdom,$cnum,$item,$settings,1).
-                          &Apache::loncommon::end_data_table();
+                          &role_checkboxes($cdom,$cnum,$item,$settings,1,undef,$noedit).
+                          &Apache::loncommon::end_data_table().'<br />';
+        } elsif ($item eq 'discussion_post_fonts') {
+            $datatable .= '</td><td align="right"><br />'.
+                          &Apache::loncommon::start_data_table().
+                          &Apache::loncommon::start_data_table_row().
+                          '<th align="center">'.&mt('Sum of likes/dislikes').'</th>'.
+                          '<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>'.
+                          &Apache::loncommon::end_data_table_row().
+                          &set_discussion_fonts($cdom,$cnum,$item,$settings,$noedit).
+                          &Apache::loncommon::end_data_table().'<br />';
         }
         $datatable .= &item_table_row_end();
     }
@@ -3009,7 +5605,7 @@ sub print_discussion {
 }
 
 sub role_checkboxes {
-    my ($cdom,$cnum,$item,$settings,$showsections,$crstype) = @_;
+    my ($cdom,$cnum,$item,$settings,$showsections,$crstype,$noedit) = @_;
     my @roles = ('st','ad','ta','ep','in');
     if ($crstype eq 'Community') {
         push(@roles,'co');
@@ -3047,6 +5643,10 @@ sub role_checkboxes {
     }
     my $numinrow = 3;
     my $count = 0;
+    my $disabled;
+    if ($noedit) {
+        $disabled = ' disabled="disabled"';
+    }
     foreach my $role (@roles) {
         my $checked = '';
         if (grep(/^\Q$role\E$/,@current)) {
@@ -3065,11 +5665,11 @@ sub role_checkboxes {
             }
         }
         $output .= '<td align="left"><span class="LC_nobreak"><label><input type="checkbox" name="'.
-                   $item.'" value="'.$role.'"'.$checked.'/>&nbsp;'.
+                   $item.'" value="'.$role.'"'.$checked.$disabled.'/>&nbsp;'.
                    $plrole.'</label></span></td>';
         if ($showsections) {
             $output .= '<td align="left">'.
-                       &select_sections($item,$role,\@sections,$currsec{$role}).
+                       &select_sections($item,$role,\@sections,$currsec{$role},$noedit).
                        '</td></tr>';
         }
         $count ++;
@@ -3097,11 +5697,11 @@ sub role_checkboxes {
                 }
             }
             $output .= '<td><span class="LC_nobreak"><label><input type="checkbox" name="'.
-                       $item.'" value="'.$value.'"'.$checked.' />&nbsp;'.$rolename.
+                       $item.'" value="'.$value.'"'.$checked.$disabled.' />&nbsp;'.$rolename.
                        '</label></span></td>';
             if ($showsections) {
                 $output .= '<td>'.
-                           &select_sections($item,$role,\@sections,$currsec{$role}).
+                           &select_sections($item,$role,\@sections,$currsec{$role},$noedit).
                            '</td>'.&Apache::loncommon::end_data_table_row();
             }
             $total ++;
@@ -3122,14 +5722,90 @@ sub role_checkboxes {
     return $output;
 }
 
+sub set_discussion_fonts {
+    my ($cdom,$cnum,$item,$settings,$noedit) = @_;
+    my ($classorder,$classtitles) = &discussion_vote_classes();
+    my ($styleorder,$styleitems) = &discussion_vote_styles();
+    my $output;
+    if (ref($classorder) eq 'ARRAY') {
+        my $disabled;
+        if ($noedit) {
+            $disabled = ' disabled="disabled"';
+        }
+        foreach my $cat (@{$classorder}) {
+            my %curr = ();
+            ($curr{'size'},$curr{'weight'},$curr{'style'},$curr{'other'}) =
+                split(/,/,$settings->{'discussion_post_fonts_'.$cat});
+            $output .= &Apache::loncommon::start_data_table_row().
+                       '<td>'.$classtitles->{$cat}.'</td>';
+            if (ref($styleorder) eq 'ARRAY') {
+                foreach my $item (@{$styleorder}) {
+                    $output .= '<td><span class="LC_nobreak">';
+                    my $selitem = $item;
+                    if ($item eq 'size') {
+                        my ($currsize,$currunit);
+                        if ($curr{'size'} =~ /^(\d+)(px|%)$/) {
+                            ($currsize,$currunit) = ($1,$2);
+                            $curr{'size'} = $currunit;
+                        }
+                        $output .= '<input type="textbox" name="discussion_post_fonts_'.$cat.'_'.$item.'" value="'.$currsize.'" size="5"'.$disabled.' />'.
+                                   '&nbsp;';
+                        $selitem = 'unit';
+                    }
+                    if ((ref($styleitems) eq 'HASH') && (ref($styleitems->{$item}) eq 'ARRAY')) {
+                        $output .= '<select name="discussion_post_fonts_'.$cat.'_'.$selitem.'"'.$disabled.'>';
+                        foreach my $val (@{$styleitems->{$item}}) {
+                            my $sel;
+                            if ($val eq $curr{$item}) {
+                                $sel = ' selected="selected"';
+                            }
+                            $output .= '<option value="'.$val.'"'.$sel.'>'.$val.'</option>';
+                        }
+                    }
+                }
+            }
+            $output .= '</span></td><td><input type="textbox" size="10" name="discussion_post_fonts_'.$cat.'_other" value="'.$curr{'other'}.'"'.$disabled.' /></td>';
+       }
+       $output .= &Apache::loncommon::end_data_table_row();
+    }
+    return $output;
+}
+
+sub discussion_vote_classes {
+    my $classorder = ['twoplus','oneplus','zero','oneminus','twominus'];
+    my %classtitles = &Apache::lonlocal::texthash(
+                        'twoplus'  => 'Two sigma above mean',
+                        'oneplus'  => 'One sigma above mean',
+                        'zero'     => 'Within one sigma of mean',
+                        'oneminus' => 'One sigma below mean',
+                        'twominus' => 'Two sigma below mean',
+                      );
+    return ($classorder,\%classtitles);
+}
+
+sub discussion_vote_styles {
+    my $styleorder = ['size','weight','style'];
+    my $styleitems = {
+                         size => ['','px','%','xx-small','x-small','small','medium','large',
+                                  'x-large','xx-large','smaller','larger'],
+                         weight => ['','normal','bold','bolder','lighter','100','200','300','400',
+                                    '500','600','700','800','900'],
+                         style => ['','normal','italic','oblique'],
+                     };
+    return ($styleorder,$styleitems);
+}
+
 sub print_classlists {
-    my ($position,$cdom,$settings,$itemtext,$rowtotal,$crstype) = @_;
+    my ($position,$cdom,$settings,$itemtext,$rowtotal,$crstype,$noedit) = @_;
     my @ordered;
     if ($position eq 'top') {
         @ordered = ('default_enrollment_start_date',
                     'default_enrollment_end_date');
+        if ($crstype eq 'Course') {
+            push(@ordered,'defaultcredits');
+        }
     } elsif ($position eq 'middle') {
-        @ordered = ('nothideprivileged');
+        @ordered = ('nothideprivileged','checkforpriv');
     } else {
         @ordered = ('student_classlist_view',
                     'student_classlist_opt_in',
@@ -3160,12 +5836,20 @@ sub print_classlists {
                    text => '<b>'.&mt($itemtext->{'default_enrollment_end_date'}).'</b>',
                    input => 'dates',
                  },
+        'defaultcredits' => {
+                   text => '<b>'.&mt($itemtext->{'defaultcredits'}).'</b>',
+                 },
 
         'nothideprivileged'   => {
                    text => '<b>'.&mt($itemtext->{'nothideprivileged'}).'</b>',
                    input => 'checkbox',
                  },
 
+        'checkforpriv' => {
+                   text => '<b>'.&mt($itemtext->{'checkforpriv'}).'</b>',
+                   input => 'selectbox',
+                 },
+
         'student_classlist_view'   => {
                    text => '<b>'.&mt($itemtext->{'student_classlist_view'}).'</b>',
                    input => 'selectbox',
@@ -3186,11 +5870,11 @@ sub print_classlists {
             ($settings->{'student_classlist_view'} eq 'section')) { 
         $settings->{'student_classlist_view'} = 'disabled';
     }
-    return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype);
+    return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'classlists',$noedit);
 }
 
 sub print_appearance {
-    my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
+    my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
     unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
         return;
     }
@@ -3222,11 +5906,11 @@ sub print_appearance {
                    text => '<b>'.&mt($itemtext->{'texengine'}).'</b>',
                    input => 'selectbox',
                    options => {
-                                jsMath   => 'jsMath',
+                                MathJax  => 'MathJax',
                                 mimetex => &mt('Convert to Images'),
                                 tth      => &mt('TeX to HTML'),
                               },
-                   order  => ['jsMath','mimetex','tth'],
+                   order  => ['MathJax','mimetex','tth'],
                    nullval => $mathdef,
                  },
         'tthoptions' => {
@@ -3234,12 +5918,34 @@ sub print_appearance {
                    input => 'textbox',
                    size => 40,
                  },
+         'uselcmath' => {
+                   text => '<b>'.&mt($itemtext->{'uselcmath'}).'</b>',
+                   input => 'radio',
+                 },
+         'usejsme'  => {
+                   text => '<b>'.&mt($itemtext->{'usejsme'}).'</b>',
+                   input => 'radio',
+                 },
+         'inline_chem' => {
+                   text => '<b>'.&mt($itemtext->{'inline_chem'}).'</b>',
+                   input => 'radio',
+                 },
+         'extresource' => {
+                   text => '<b>'.&mt($itemtext->{'extresource'}).'</b>',
+                   input => 'selectbox',
+                   options => {
+                                iframe => 'In iframe',
+                                tab    => 'In new tab',
+                                window => 'In pop-up window',
+                              },
+                   order  => ['iframe','tab','window'],
+                 },
     );
-    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
+    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'appearance',$noedit);
 }
 
 sub print_grading {
-    my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
+    my ($cdom,$cnum,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
     unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
         return;
     }
@@ -3258,7 +5964,7 @@ sub print_grading {
                  },
         'rndseed' => {
                    text => '<b>'.&mt($itemtext->{'rndseed'}).'</b>'.
-                           '<span class="LC_warning">'.'<br />'.
+                           '<br /><span class="LC_warning LC_nobreak">'.'<br />'.
                            &mt('Modifying this will make problems have different numbers and answers!').
                            '</span>',
                    input => 'selectbox',
@@ -3271,6 +5977,7 @@ sub print_grading {
                                 '64bit5' => '64bit5',
                               },
                    order => ['32bit','64bit','64bit2','64bit3','64bit4','64bit5'],
+                   advanced => 1
                  },
         'receiptalg'  => {
                    text => '<b>'.&mt($itemtext->{'receiptalg'}).'</b><br />'.
@@ -3282,17 +5989,18 @@ sub print_grading {
                                 receipt3 => 'receipt3',
                               },
                    order => ['receipt','receipt2','receipt3'],
+                   advanced => 1
                  },
         'disablesigfigs' => {
                    text => '<b>'.&mt($itemtext->{'disablesigfigs'}).'</b>',
                    input => 'radio',
                  },
     );
-    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
+    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'grading',$noedit,$cnum);
 }
 
 sub print_printouts {
-    my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
+    my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
     unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
         return;
     }
@@ -3320,7 +6028,7 @@ sub print_printouts {
                          A6        => &mt('A6').' [105x148 mm]',
                        },
             order => ['Letter','Legal','Tabloid','Executive','A2','A3','A4','A5','A6'],
-            nullval => 'None specified',
+            nullval => &mt('None specified'),
                               },
         print_header_format => {
             text => '<b>'.&mt($itemtext->{'print_header_format'}).'</b>',
@@ -3338,14 +6046,14 @@ sub print_printouts {
                          0    => &mt('No'),
                        },
             order => ['1','0'],
-            nullval => 'None specified - use domain default',
+            nullval => &mt('None specified - use domain default'),
                     }
     );
-    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
+    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'printouts',$noedit);
 }
 
 sub print_spreadsheet {
-    my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
+    my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
     unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
         return;
     }
@@ -3377,11 +6085,11 @@ sub print_spreadsheet {
             input => 'radio',
                          },
                 );
-    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
+    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'spreadsheet',$noedit);
 }
 
 sub print_bridgetasks {
-    my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
+    my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
     unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
         return;
     }
@@ -3419,11 +6127,1252 @@ sub print_bridgetasks {
              input => 'radio',
                                   },
                 );
-    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype);
+    return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'bridgetasks',$noedit);
+}
+
+sub print_ltitools {
+    my ($cdom,$cnum,$settings,$rowtotal,$crstype,$noedit,$context) = @_;
+    my ($datatable,$disabled,$css_class,$dest);
+    if ($noedit) {
+        $disabled = ' disabled="disabled"';
+    }
+    my $itemcount = 1;
+    unless ($context eq 'domain') {
+        my %tooltypes = &Apache::loncommon::usable_exttools();
+        unless ($tooltypes{'crs'}) {
+            my $showtype = 'course';
+            if ($crstype eq 'Community') {
+                $showtype = lc($crstype);
+            }
+            $css_class = $itemcount%2?' class="LC_odd_row"':'';
+            $datatable = '<tr '.$css_class.'><td colspan="2">'.
+                         &mt("Definition of external tools is not enabled for this $showtype.").'<br />';
+            if ($tooltypes{'dom'}) {
+                         $datatable .= &mt("Contact an administrator for the $showtype domain ([_1]) to request this feature be enabled.",
+                                           '<i>'.$cdom.'</i>').
+                         '<br /><br />'.
+                         &mt("Use of external tools defined at a domain level is enabled, so the $showtype editor can be used to add tool(s), if any have been defined.");
+            } else {
+                $datatable .= &mt("Use of external tools defined at a domain level is not enabled, either, for this $showtype.").
+                              '<br /><br />'.
+                              &mt("Contact an administrator for the $showtype domain ([_1]) to request changes.",
+                                  '<i>'.$cdom.'</i>');
+
+            }
+            $datatable .= '</tr>';
+            $itemcount ++;
+            return $datatable;
+        }
+    }
+    my %lt = &ltitools_names();
+    my $maxnum = 0;
+    my %ordered;
+    if (ref($settings) eq 'HASH') {
+        foreach my $item (keys(%{$settings})) {
+            if (ref($settings->{$item}) eq 'HASH') {
+                my $num = $settings->{$item}{'order'};
+                $ordered{$num} = $item;
+            }
+        }
+    }
+
+    if ($context eq 'domain') {
+        $dest = '/adm/domainprefs';
+    } else {
+        $dest = '/adm/courseprefs';
+    }
+    my ($switchserver,$switchmessage);
+    $switchserver = &check_switchserver($cdom,$cnum,$context,$dest);
+    if ($switchserver) {
+        if ($context eq 'domain') {
+            $switchmessage = &mt("submit from domain's primary library server: [_1].",$switchserver);
+        } elsif ($crstype eq 'Community') {
+            $switchmessage = &mt("submit from community's home server: [_1].",$switchserver);
+        } else {
+            $switchmessage = &mt("submit from course's home server: [_1].",$switchserver);
+        }
+    }
+    my $maxnum = scalar(keys(%ordered));
+    my @courseroles = ('cc','in','ta','ep','st');
+    my @ltiroles = qw(Instructor ContentDeveloper TeachingAssistant Learner);
+    my @fields = ('fullname','firstname','lastname','email','roles','user');
+    if (keys(%ordered)) {
+        my @items = sort { $a <=> $b } keys(%ordered);
+        for (my $i=0; $i<@items; $i++) {
+            $css_class = $itemcount%2?' class="LC_odd_row"':'';
+            my $item = $ordered{$items[$i]};
+            my ($title,$key,$url,$usable,$lifetime,$imgsrc,%sigsel);
+            if (ref($settings->{$item}) eq 'HASH') {
+                $title = $settings->{$item}->{'title'};
+                $url = $settings->{$item}->{'url'};
+                $key = $settings->{$item}->{'key'};
+                $usable = $settings->{$item}->{'usable'};
+                $lifetime = $settings->{$item}->{'lifetime'};
+                my $image = $settings->{$item}->{'image'};
+                if ($image ne '') {
+                    $imgsrc = '<img src="'.$image.'" alt="'.&mt('Tool Provider icon').'" />';
+                }
+                if ($settings->{$item}->{'sigmethod'} eq 'HMAC-256') {
+                    $sigsel{'HMAC-256'} = ' selected="selected"';
+                } else {
+                    $sigsel{'HMAC-SHA1'} = ' selected="selected"';
+                }
+            }
+            my $chgstr = ' onchange="javascript:reorderLTITools(this.form,'."'ltitools_".$item."'".');"';
+            $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
+                         .'<select name="ltitools_'.$item.'"'.$chgstr.'>';
+            for (my $k=0; $k<=$maxnum; $k++) {
+                my $vpos = $k+1;
+                my $selstr;
+                if ($k == $i) {
+                    $selstr = ' selected="selected" ';
+                }
+                $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+            }
+            $datatable .= '</select>'.('&nbsp;'x2).
+                '<label><input type="checkbox" name="ltitools_del" value="'.$item.'" />'.
+                &mt('Delete?').'</label></span></td>'.
+                '<td colspan="2">'.
+                '<fieldset><legend>'.&mt('Required settings').'</legend>'.
+                '<span class="LC_nobreak">'.$lt{'title'}.':<input type="text" size="20" name="ltitools_title_'.$i.'" value="'.$title.'" /></span> '.
+                ('&nbsp;'x2).
+                '<span class="LC_nobreak">'.$lt{'version'}.':<select name="ltitools_version_'.$i.'">'.
+                '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '.
+                ('&nbsp;'x2).
+                '<span class="LC_nobreak">'.$lt{'msgtype'}.':<select name="ltitools_msgtype_'.$i.'">'.
+                '<option value="basic-lti-launch-request" selected="selected">Launch</option></select></span> '.
+                ('&nbsp;'x2).
+                '<span class="LC_nobreak">'.$lt{'sigmethod'}.':<select name="ltitools_sigmethod_'.$i.'">'.
+                '<option value="HMAC-SHA1"'.$sigsel{'HMAC-SHA1'}.'>HMAC-SHA1</option>'.
+                '<option value="HMAC-SHA256"'.$sigsel{'HMAC-SHA256'}.'>HMAC-SHA256</option></select></span>'.
+                '<br /><br />'.
+                '<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="60" name="ltitools_url_'.$i.'"'.
+                ' value="'.$url.'" /></span>'.
+                ('&nbsp;'x2).
+                '<span class="LC_nobreak">'.$lt{'lifetime'}.':'.
+                '<input type="text" size="5" name="ltitools_lifetime_'.$i.'" value="'.$lifetime.'" /></span><br /><br />';
+            if ($key ne '') {
+                $datatable .= '<span class="LC_nobreak">'.$lt{'key'};
+                if ($noedit) {
+                    $datatable .= ': ['.&mt('not shown').']';
+                } elsif ($switchserver) {
+                    $datatable .= ': ['.&mt('[_1] to view/edit',$switchserver).']';
+                } else {
+                    $datatable .= ':<input type="text" size="25" name="ltitools_key_'.$i.'" value="'.$key.'" autocomplete="off"'.$disabled.' />';
+                }
+                $datatable .= '</span> '.('&nbsp;'x2);
+            } elsif (!$switchserver) {
+                $datatable .= '<span class="LC_nobreak">'.$lt{'key'}.':'.
+                              '<input type="text" size="25" name="ltitools_key_'.$i.'" value="'.$key.'" autocomplete="off"'.$disabled.' />'.
+                              '</span> '.('&nbsp;'x2);
+            }
+            if ($switchserver) {
+                if ($usable ne '') {
+                    $datatable .= '<div id="ltitools_divcurrsecret_'.$i.'" style="display:inline-block" /><span class="LC_nobreak">'.
+                                  $lt{'secret'}.': ['.&mt('not shown').'] '.('&nbsp;'x2).'</span></div>'.
+                                  '<span class="LC_nobreak">'.&mt('Change secret?').
+                                  '<label><input type="radio" value="0" name="ltitools_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','ltitools'".');" checked="checked"'.$disabled.' />'.&mt('No').'</label>'.
+                                  ('&nbsp;'x2).
+                                  '<label><input type="radio" value="1" name="ltitools_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','ltitools'".');" '.$disabled.' />'.&mt('Yes').'</label>'.('&nbsp;'x2).
+                                  '</span><div id="ltitools_divchgsecret_'.$i.'" style="display:none" />'.
+                                  '<span class="LC_nobreak"> - '.$switchmessage.'</span>'.
+                                  '</div>';
+                } elsif ($key eq '') {
+                    $datatable .= '<span class="LC_nobreak">'.&mt('Key and Secret are required').' - '.$switchmessage.'</span>'."\n";
+                } else {
+                    $datatable .= '<span class="LC_nobreak">'.&mt('Secret required').' - '.$switchmessage.'</span>'."\n";
+                }
+                $datatable .= '<input type="hidden" name="ltitools_id_'.$i.'" value="'.$item.'" />';
+            } else {
+                if ($usable ne '') {
+                    $datatable .= '<div id="ltitools_divcurrsecret_'.$i.'" style="display:inline-block" /><span class="LC_nobreak">'.
+                                  $lt{'secret'}.': ['.&mt('not shown').'] '.('&nbsp;'x2).'</span></div>'.
+                                  '<span class="LC_nobreak">'.&mt('Change?').
+                                  '<label><input type="radio" value="0" name="ltitools_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','ltitools'".');" checked="checked"'.$disabled.' />'.&mt('No').'</label>'.
+                                  ('&nbsp;'x2).
+                                  '<label><input type="radio" value="1" name="ltitools_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','ltitools'".');"'.$disabled.' />'.&mt('Yes').
+                                  '</label>&nbsp;&nbsp;</span><div id="ltitools_divchgsecret_'.$i.'" style="display:none" />'.
+                                  '<span class="LC_nobreak">'.&mt('New Secret').':'.
+                                  '<input type="password" size="20" name="ltitools_secret_'.$i.'" value="" autocomplete="new-password"'.$disabled.' />'.
+                                  '<label><input type="checkbox" name="ltitools_visible_'.$i.'" id="ltitools_visible_'.$i.'" onclick="if (this.checked) { this.form.ltitools_secret_'.$i.'.type='."'text'".' } else { this.form.ltitools_secret_'.$i.'.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label>'.
+                                  '<input type="hidden" name="ltitools_id_'.$i.'" value="'.$item.'" /></span></div>';
+                } else {
+                    $datatable .=
+                        '<span class="LC_nobreak">'.$lt{'secret'}.':'.
+                        '<input type="password" size="20" name="ltitools_secret_'.$i.'" value="" autocomplete="new-password"'.$disabled.' />'.
+                        '<label><input type="checkbox" name="ltitools_visible_'.$i.'" id="ltitools_visible_'.$i.'" onclick="if (this.checked) { this.form.ltitools_secret_'.$i.'.type='."'text'".' } else { this.form.ltitools_secret_'.$i.'.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label>'.
+                        '<input type="hidden" name="ltitools_id_'.$i.'" value="'.$item.'" /></span>';
+                }
+            }
+            $datatable .= '</fieldset>'.
+                          '<fieldset><legend>'.&mt('Optional settings').'</legend>'.
+                          '<span class="LC_nobreak">'.&mt('Display target:');
+            my %currdisp;
+            if (ref($settings->{$item}->{'display'}) eq 'HASH') {
+                if ($settings->{$item}->{'display'}->{'target'} eq 'window') {
+                    $currdisp{'window'} = ' checked="checked"';
+                } elsif ($settings->{$item}->{'display'}->{'target'} eq 'tab') {
+                    $currdisp{'tab'} = ' checked="checked"';
+                } else {
+                    $currdisp{'iframe'} = ' checked="checked"';
+                }
+                if ($settings->{$item}->{'display'}->{'width'} =~ /^(\d+)$/) {
+                    $currdisp{'width'} = $1;
+                }
+                if ($settings->{$item}->{'display'}->{'height'} =~ /^(\d+)$/) {
+                    $currdisp{'height'} = $1;
+                }
+                $currdisp{'linktext'} = $settings->{$item}->{'display'}->{'linktext'};
+                $currdisp{'explanation'} = $settings->{$item}->{'display'}->{'explanation'};
+            } else {
+                $currdisp{'iframe'} = ' checked="checked"';
+            }
+            foreach my $disp ('iframe','tab','window') {
+                $datatable .= '<label><input type="radio" name="ltitools_target_'.$i.'" value="'.$disp.'"'.$currdisp{$disp}.' />'.
+                              $lt{$disp}.'</label>'.('&nbsp;'x2);
+            }
+            $datatable .= ('&nbsp;'x4);
+            foreach my $dimen ('width','height') {
+                $datatable .= '<label>'.$lt{$dimen}.'&nbsp;'.
+                              '<input type="text" name="ltitools_'.$dimen.'_'.$i.'" size="5" value="'.$currdisp{$dimen}.'" /></label>'.
+                              ('&nbsp;'x2);
+            }
+            $datatable .= '</span><br />'.
+                          '<div class="LC_left_float">'.$lt{'linktext'}.'<br />'.
+                          '<input type="text" name="ltitools_linktext_'.$i.'" size="25" value="'.$currdisp{'linktext'}.'" /></div>'.
+                          '<div class="LC_left_float">'.$lt{'explanation'}.'<br />'.
+                          '<textarea name="ltitools_explanation_'.$i.'" rows="5" cols="40">'.$currdisp{'explanation'}.
+                          '</textarea></div><div style=""></div><br />';
+            my %units = (
+                          'passback' => 'days',
+                          'roster'   => 'seconds',
+                        );
+            foreach my $extra ('passback','roster') {
+                my $validsty = 'none';
+                my $currvalid;
+                my $checkedon = '';
+                my $checkedoff = ' checked="checked"';
+                if ($settings->{$item}->{$extra}) {
+                    $checkedon = $checkedoff;
+                    $checkedoff = '';
+                    $validsty = 'inline-block';
+                    if ($settings->{$item}->{$extra.'valid'} =~ /^\d+\.?\d*$/) {
+                        $currvalid = $settings->{$item}->{$extra.'valid'};
+                    }
+                }
+                my $onclick = ' onclick="toggleLTITools(this.form,'."'$extra','$i'".');"';
+                $datatable .= '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{$extra}.'&nbsp;'.
+                              '<label><input type="radio" name="ltitools_'.$extra.'_'.$i.'" value="0"'.$checkedoff.$onclick.' />'.
+                              &mt('No').'</label>'.('&nbsp;'x2).
+                              '<label><input type="radio" name="ltitools_'.$extra.'_'.$i.'" value="1"'.$checkedon.$onclick.' />'.
+                              &mt('Yes').'</label></span></div>'.
+                              '<div class="LC_floatleft" style="display:'.$validsty.';" id="ltitools_'.$extra.'time_'.$i.'">'.
+                              '<span class="LC_nobreak">'.
+                              &mt("until at least [_1] $units{$extra} after launch",
+                                  '<input type="text" name="ltitools_'.$extra.'valid_'.$i.'" value="'.$currvalid.'" />').
+                              '</span></div><div style="padding:0;clear:both;margin:0;border:0"></div>';
+            }
+            $datatable .= '<span class="LC_nobreak">'.$lt{'icon'}.':&nbsp;';
+            if ($imgsrc) {
+                $datatable .= $imgsrc.
+                              '<label><input type="checkbox" name="ltitools_image_del"'.
+                              ' value="'.$item.'" />'.&mt('Delete?').'</label></span> '.
+                              '<span class="LC_nobreak">&nbsp;'.&mt('Replace:').'&nbsp;';
+            } else {
+                $datatable .= '('.&mt('if larger than 21x21 pixels, image will be scaled').')&nbsp;';
+            }
+            if ($switchserver) {
+                $datatable .= &mt('Upload to library server: [_1]',$switchserver);
+            } else {
+                $datatable .= '<input type="file" name="ltitools_image_'.$i.'" value="" />';
+            }
+            $datatable .= '</span></fieldset>';
+            my (%checkedfields,%rolemaps,$userincdom);
+            if (ref($settings->{$item}) eq 'HASH') {
+                if (ref($settings->{$item}->{'fields'}) eq 'HASH') {
+                    %checkedfields = %{$settings->{$item}->{'fields'}};
+                }
+                $userincdom = $settings->{$item}->{'incdom'};
+                if (ref($settings->{$item}->{'roles'}) eq 'HASH') {
+                    %rolemaps = %{$settings->{$item}->{'roles'}};
+                    $checkedfields{'roles'} = 1;
+                }
+            }
+            $datatable .= '<fieldset><legend>'.&mt('User data sent on launch').'</legend>'.
+                          '<span class="LC_nobreak">';
+            my $userfieldstyle = 'display:none;';
+            my $seluserdom = '';
+            my $unseluserdom = ' selected="selected"';
+            foreach my $field (@fields) {
+                my ($checked,$onclick,$id,$spacer);
+                if ($checkedfields{$field}) {
+                    $checked = ' checked="checked"';
+                }
+                if ($field eq 'user') {
+                    $id = ' id="ltitools_user_field_'.$i.'"';
+                    $onclick = ' onclick="toggleLTITools(this.form,'."'$field','$i'".')"';
+                    if ($checked) {
+                        $userfieldstyle = 'display:inline-block';
+                        if ($userincdom) {
+                            $seluserdom = $unseluserdom;
+                            $unseluserdom = '';
+                        }
+                    }
+                } else {
+                    $spacer = ('&nbsp;' x2);
+                }
+                $datatable .= '<label>'.
+                              '<input type="checkbox" name="ltitools_fields_'.$i.'" value="'.$field.'"'.$id.$checked.$onclick.' />'.
+                              $lt{$field}.'</label>'.$spacer;
+            }
+            $datatable .= '</span>';
+            $datatable .= '<div style="'.$userfieldstyle.'" id="ltitools_user_div_'.$i.'">'.
+                          '<span class="LC_nobreak"> : '.
+                          '<select name="ltitools_userincdom_'.$i.'">'.
+                          '<option value="">'.&mt('Select').'</option>'.
+                          '<option value="0"'.$unseluserdom.'>'.&mt('username').'</option>'.
+                          '<option value="1"'.$seluserdom.'>'.&mt('username:domain').'</option>'.
+                          '</select></span></div>';
+            $datatable .= '</fieldset>'.
+                          '<fieldset><legend>'.&mt('Role mapping').'</legend><table><tr>';
+            foreach my $role (@courseroles) {
+                my ($selected,$selectnone);
+                if (!$rolemaps{$role}) {
+                    $selectnone = ' selected="selected"';
+                }
+                $datatable .= '<td style="text-align: center">'.
+                              &Apache::lonnet::plaintext($role,'Course').'<br />'.
+                              '<select name="ltitools_roles_'.$role.'_'.$i.'">'.
+                              '<option value=""'.$selectnone.'>'.&mt('Select').'</option>';
+                foreach my $ltirole (@ltiroles) {
+                    unless ($selectnone) {
+                        if ($rolemaps{$role} eq $ltirole) {
+                            $selected = ' selected="selected"';
+                        } else {
+                            $selected = '';
+                        }
+                    }
+                    $datatable .= '<option value="'.$ltirole.'"'.$selected.'>'.$ltirole.'</option>';
+                }
+                $datatable .= '</select></td>';
+            }
+            $datatable .= '</tr></table></fieldset>';
+            my %courseconfig;
+            if (ref($settings->{$item}) eq 'HASH') {
+                if (ref($settings->{$item}->{'crsconf'}) eq 'HASH') {
+                    %courseconfig = %{$settings->{$item}->{'crsconf'}};
+                }
+            }
+            $datatable .= '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">';
+            foreach my $item ('label','title','target','linktext','explanation','append') {
+                my $checked;
+                if ($courseconfig{$item}) {
+                    $checked = ' checked="checked"';
+                }
+                $datatable .= '<label>'.
+                       '<input type="checkbox" name="ltitools_courseconfig_'.$i.'" value="'.$item.'"'.$checked.' />'.
+                       $lt{'crs'.$item}.'</label>&nbsp; '."\n";
+            }
+            $datatable .= '</span></fieldset>'.
+                          '<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'.
+                          '<table><tr><th>'.&mt('Action').'</th><th>'.&mt('Name').'</th><th>'.&mt('Value').'</th></tr>';
+            if (ref($settings->{$item}->{'custom'}) eq 'HASH') {
+                my %custom = %{$settings->{$item}->{'custom'}};
+                if (keys(%custom) > 0) {
+                    foreach my $key (sort(keys(%custom))) {
+                        $datatable .= '<tr><td><span class="LC_nobreak">'.
+                                      '<label><input type="checkbox" name="ltitools_customdel_'.$i.'" value="'.
+                                      $key.'" />'.&mt('Delete').'</label></span></td><td>'.$key.'</td>'.
+                                      '<td><input type="text" name="ltitools_customval_'.$key.'_'.$i.'"'.
+                                      ' value="'.$custom{$key}.'" /></td></tr>';
+                    }
+                }
+            }
+            $datatable .= '<tr><td><span class="LC_nobreak">'.
+                          '<label><input type="checkbox" name="ltitools_customadd" value="'.$i.'" />'.
+                          &mt('Add').'</label></span></td><td><input type="text" name="ltitools_custom_name_'.$i.'" />'.
+                          '</td><td><input type="text" name="ltitools_custom_value_'.$i.'" /></td></tr>';
+            $datatable .= '</table></fieldset></td></tr>'."\n";
+            $itemcount ++;
+        }
+    }
+    $css_class = $itemcount%2?' class="LC_odd_row"':'';
+    my $chgstr = ' onchange="javascript:reorderLTITools(this.form,'."'ltitools_add_pos'".');"';
+    $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n".
+                  '<input type="hidden" name="ltitools_maxnum" value="'.$maxnum.'" />'."\n".
+                  '<select name="ltitools_add_pos"'.$chgstr.'>';
+    for (my $k=0; $k<$maxnum+1; $k++) {
+        my $vpos = $k+1;
+        my $selstr;
+        if ($k == $maxnum) {
+            $selstr = ' selected="selected" ';
+        }
+        $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+    }
+    $datatable .= '</select>&nbsp;'."\n".
+                  '<input type="checkbox" name="ltitools_add" value="1" />'.&mt('Add').'</span></td>'."\n".
+                  '<td colspan="2">'.
+                  '<fieldset><legend>'.&mt('Required settings').'</legend>'.
+                  '<span class="LC_nobreak">'.$lt{'title'}.':<input type="text" size="20" name="ltitools_add_title" value="" /></span> '."\n".
+                  ('&nbsp;'x2).
+                  '<span class="LC_nobreak">'.$lt{'version'}.':<select name="ltitools_add_version">'.
+                  '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '."\n".
+                  ('&nbsp;'x2).
+                  '<span class="LC_nobreak">'.$lt{'msgtype'}.':<select name="ltitools_add_msgtype">'.
+                  '<option value="basic-lti-launch-request" selected="selected">Launch</option></select></span> '.
+                  '<span class="LC_nobreak">'.$lt{'sigmethod'}.':<select name="ltitools_add_sigmethod">'.
+                  '<option value="HMAC-SHA1" selected="selected">HMAC-SHA1</option>'.
+                  '<option value="HMAC-SHA256">HMAC-SHA256</option></select></span>'.
+                  '<br />'.
+                  '<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="60" name="ltitools_add_url" value="" /></span> '."\n".
+                  ('&nbsp;'x2).
+                  '<span class="LC_nobreak">'.$lt{'lifetime'}.':<input type="text" size="5" name="ltitools_add_lifetime" value="300" /></span><br />';
+    if ($switchserver) {
+        $datatable .= '<span class="LC_nobreak">'.&mt('Key and Secret are required').' - '.$switchmessage.'</span>'."\n";
+    } else {
+        $datatable .= '<span class="LC_nobreak">'.$lt{'key'}.':<input type="text" size="25" name="ltitools_add_key" value="" autocomplete="off"'.$disabled.' /></span> '."\n".
+                      ('&nbsp;'x2).
+                      '<span class="LC_nobreak">'.$lt{'secret'}.':<input type="password" size="20" name="ltitools_secret_add" value="" autocomplete="new-password"'.$disabled.' />'.
+                      '<label><input type="checkbox" name="ltitools_add_visible" id="ltitools_add_visible" onclick="if (this.checked) { this.form.ltitools_secret_add.type='."'text'".' } else { this.form.ltitools_secret_add.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label></span> '."\n";
+    }
+    $datatable .= '<br /><br />'.
+                  '</fieldset>'.
+                  '<fieldset><legend>'.&mt('Optional settings').'</legend>'.
+                  '<span class="LC_nobreak">'.&mt('Display target:');
+    my %defaultdisp;
+    $defaultdisp{'iframe'} = ' checked="checked"';
+    foreach my $disp ('iframe','tab','window') {
+        $datatable .= '<label><input type="radio" name="ltitools_add_target" value="'.$disp.'"'.$defaultdisp{$disp}.' />'.
+                      $lt{$disp}.'</label>'.('&nbsp;'x2);
+    }
+    $datatable .= ('&nbsp;'x4);
+    foreach my $dimen ('width','height') {
+        $datatable .= '<label>'.$lt{$dimen}.'&nbsp;'.
+                      '<input type="text" name="ltitools_add_'.$dimen.'" size="5" /></label>'.
+                      ('&nbsp;'x2);
+    }
+    $datatable .= '</span><br />'.
+                  '<div class="LC_left_float">'.$lt{'linktext'}.'<br />'.
+                  '<input type="text" name="ltitools_add_linktext" size="5" /></div>'.
+                  '<div class="LC_left_float">'.$lt{'explanation'}.'<br />'.
+                  '<textarea name="ltitools_add_explanation" rows="5" cols="40"></textarea>'.
+                  '</div><div style=""></div><br />';
+    my %units = (
+                  'passback' => 'days',
+                  'roster'   => 'seconds',
+                );
+    my %defaulttimes = (
+                     'passback' => '7',
+                     'roster'   => '300',
+                   );
+    foreach my $extra ('passback','roster') {
+        my $onclick = ' onclick="toggleLTITools(this.form,'."'$extra','add'".');"';
+        $datatable .= '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{$extra}.'&nbsp;'.
+                      '<label><input type="radio" name="ltitools_'.$extra.'_add" value="0" checked="checked"'.$onclick.' />'.
+                      &mt('No').'</label></span>'.('&nbsp;'x2).'<span class="LC_nobreak">'.
+                      '<label><input type="radio" name="ltitools_'.$extra.'_add" value="1"'.$onclick.' />'.
+                      &mt('Yes').'</label></span></div>'.
+                      '<div class="LC_floatleft" style="display:none;" id="ltitools_'.$extra.'time_add">'.
+                      '<span class="LC_nobreak">'.
+                      &mt("until at least [_1] $units{$extra} after launch",
+                          '<input type="text" name="ltitools_'.$extra.'valid_add" value="'.$defaulttimes{$extra}.'" />').
+                      '</span></div><div style="padding:0;clear:both;margin:0;border:0"></div>';
+    }
+    $datatable .= '<span class="LC_nobreak">'.$lt{'icon'}.':&nbsp;'.
+                  '('.&mt('if larger than 21x21 pixels, image will be scaled').')&nbsp;';
+    if ($switchserver) {
+        $datatable .= &mt('Upload to library server: [_1]',$switchserver);
+    } else {
+        $datatable .= '<input type="file" name="ltitools_add_image" value="" />';
+    }
+    $datatable .= '</span></fieldset>'.
+                  '<fieldset><legend>'.&mt('User data sent on launch').'</legend>'.
+                  '<span class="LC_nobreak">';
+    foreach my $field (@fields) {
+        my ($id,$onclick,$spacer);
+        if ($field eq 'user') {
+            $id = ' id="ltitools_user_field_add"';
+            $onclick = ' onclick="toggleLTITools(this.form,'."'$field','add'".')"';
+        } else {
+            $spacer = ('&nbsp;' x2);
+        }
+        $datatable .= '<label>'.
+                      '<input type="checkbox" name="ltitools_add_fields" value="'.$field.'"'.$id.$onclick.' />'.
+                      $lt{$field}.'</label>'.$spacer;
+    }
+    $datatable .= '</span>'.
+                  '<div style="display:none;" id="ltitools_user_div_add">'.
+                  '<span class="LC_nobreak"> : '.
+                  '<select name="ltitools_add_userincdom">'.
+                  '<option value="" selected="selected">'.&mt('Select').'</option>'.
+                  '<option value="0">'.&mt('username').'</option>'.
+                  '<option value="1">'.&mt('username:domain').'</option>'.
+                  '</select></span></div></fieldset>';
+    $datatable .= '<fieldset><legend>'.&mt('Role mapping').'</legend><table><tr>';
+    foreach my $role (@courseroles) {
+        my ($checked,$checkednone);
+        $datatable .= '<td style="text-align: center">'.
+                      &Apache::lonnet::plaintext($role,'Course').'<br />'.
+                      '<select name="ltitools_add_roles_'.$role.'">'.
+                      '<option value="" selected="selected">'.&mt('Select').'</option>';
+        foreach my $ltirole (@ltiroles) {
+            $datatable .= '<option value="'.$ltirole.'">'.$ltirole.'</option>';
+        }
+        $datatable .= '</select></td>';
+    }
+    $datatable .= '</tr></table></fieldset>'.
+                  '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">';
+    foreach my $item ('label','title','target','linktext','explanation','append') {
+        $datatable .= '<label>'.
+                      '<input type="checkbox" name="ltitools_add_courseconfig" value="'.$item.'" checked="checked" />'.
+                      $lt{'crs'.$item}.'</label>'.('&nbsp;' x2)."\n";
+    }
+    $datatable .= '</span></fieldset>'.
+                  '<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'.
+                  '<table><tr><th>'.&mt('Action').'</th><th>'.&mt('Name').'</th><th>'.&mt('Value').'</th></tr>'.
+                  '<tr><td><span class="LC_nobreak">'.
+                  '<label><input type="checkbox" name="ltitools_add_custom" value="1" />'.
+                  &mt('Add').'</label></span></td><td><input type="text" name="ltitools_add_custom_name" />'.
+                  '</td><td><input type="text" name="ltitools_add_custom_value" /></td></tr>'.
+                  '</table></fieldset>'."\n".
+                  '</td>'."\n".
+                  '</tr>'."\n";
+    $itemcount ++;
+    return $datatable;
+}
+
+sub ltitools_names {
+    my %lt = &Apache::lonlocal::texthash(
+                                          'title'          => 'Title',
+                                          'version'        => 'Version',
+                                          'msgtype'        => 'Message Type',
+                                          'sigmethod'      => 'Signature Method',
+                                          'url'            => 'URL',
+                                          'key'            => 'Key',
+                                          'lifetime'       => 'Nonce lifetime (s)',
+                                          'secret'         => 'Secret',
+                                          'icon'           => 'Icon',
+                                          'user'           => 'User',
+                                          'fullname'       => 'Full Name',
+                                          'firstname'      => 'First Name',
+                                          'lastname'       => 'Last Name',
+                                          'email'          => 'E-mail',
+                                          'roles'          => 'Role',
+                                          'window'         => 'Window',
+                                          'tab'            => 'Tab',
+                                          'iframe'         => 'iFrame',
+                                          'height'         => 'Height',
+                                          'width'          => 'Width',
+                                          'linktext'       => 'Default Link Text',
+                                          'explanation'    => 'Default Explanation',
+                                          'passback'       => 'Tool can return grades:',
+                                          'roster'         => 'Tool can retrieve roster:',
+                                          'crstarget'      => 'Display target',
+                                          'crslabel'       => 'Course label',
+                                          'crstitle'       => 'Course title',
+                                          'crslinktext'    => 'Link Text',
+                                          'crsexplanation' => 'Explanation',
+                                          'crsappend'      => 'Provider URL',
+                                        );
+    return %lt;
+}
+
+sub ltimenu_titles {
+    return &Apache::lonlocal::texthash(
+                                        fullname    => 'Full name',
+                                        coursetitle => 'Course title',
+                                        role        => 'Role',
+                                        logout      => 'Logout',
+                                        grades      => 'Grades',
+    );
+}
+
+sub print_menuitems {
+    my ($position,$cdom,$settings,$itemtext,$rowtotal,$crstype,$noedit) = @_;
+    unless ((ref($settings) eq 'HASH') && (ref($itemtext) eq 'HASH')) {
+        return;
+    }
+    if ($position eq 'top') {
+        my (%defaultmenu_options,@defaultmenu_order,$addcollection);
+        if ($settings->{'menucollections'} ne '') {
+            foreach my $item (split(/;/,$settings->{'menucollections'})) {
+                my ($num,$value) = split(/\%/,$item);
+                if ($num =~ /^\d+$/) {
+                    $defaultmenu_options{$num} = $num;
+                }
+            }
+            @defaultmenu_order = sort { $a <=> $b } keys(%defaultmenu_options);
+            $addcollection = $defaultmenu_order[-1] + 1;
+        } else {
+            $addcollection = 1;
+        }
+        $defaultmenu_options{$addcollection} = $addcollection;
+        my %items = (
+            'menudefault' => {
+                   text => '<b>'.&mt($itemtext->{'menudefault'}).'</b><br />'.
+                           &mt("(can be overriden in deep-link context)"),
+                   input => 'selectbox',
+                   options => \%defaultmenu_options,
+                   order  => \@defaultmenu_order,
+                   nullval => &mt('Standard (all menus shown)'),
+                            },
+        );
+        return &make_item_rows($cdom,\%items,['menudefault'],$settings,$rowtotal,$crstype,'menuitems',$noedit);
+    } else {
+        my %menu;
+        my $count = 0;
+        my $next = 1;
+        my ($datatable,$disabled);
+        if ($noedit) {
+            $disabled = ' disabled="disabled"';
+        }
+
+        my ($ordered,$cats) = &menuitems_categories();
+        my @order = @{$ordered};
+        my %categories = %{$cats};
+        my %menutitles = &menuitems_titles();
+        my %menufields = &menuitems_fields();
+
+        if ($settings->{'menucollections'} ne '') {
+            foreach my $item (split(/;/,$settings->{'menucollections'})) {
+                my ($num,$value) = split(/\%/,$item);
+                if ($num =~ /^\d+$/) {
+                    my @entries = split(/\&/,$value);
+                    foreach my $entry (@entries) {
+                        my ($name,$fields) = split(/=/,$entry);
+                        $menu{$num}{$name} = $fields;
+                    }
+                }
+            }
+            if (keys(%menu)) {
+                my @current = sort { $a <=> $b } keys(%menu);
+                $next += $current[-1];
+                foreach my $num (@current) {
+                    my %checked;
+                    my $on = ' checked="checked"';
+                    foreach my $key (keys(%{$menu{$num}})) {
+                        if (($key eq 'top') || ($key eq 'inline') || ($key eq 'foot') || ($key eq 'main')) {
+                            if ($menu{$num}{$key} eq 'y') {
+                                $checked{$key} = $on;
+                            }
+                        } else {
+                            foreach my $field (split(/,/,$menu{$num}{$key})) {
+                                if (exists($menufields{$field})) {
+                                    $checked{$field} = $on;
+                                }
+                            }
+                        }
+                    }
+                    if (ref($menu{$num}) eq 'HASH') {
+                        $datatable .= &item_table_row_start('<em class="LC_nav_bar">'.$num.'</em>',$count,'','','','LC_left_item');
+                        foreach my $category (@order) {
+                            if ((ref($categories{$category}) eq 'ARRAY') && (@{$categories{$category}} > 0)) {
+                                $datatable .= '<fieldset style="vertical-align:top; display:inline-block"><legend>'.$menutitles{$category}.'</legend>'."\n";
+                                if ($category eq 'text') {
+                                    $datatable .= '<i>'.&mt('Header').'</i><br />';
+                                }
+                                foreach my $field (@{$categories{$category}}) {
+                                    if ($field eq 'disc') {
+                                        $datatable .= '<br /><i>'.&mt('Footer').'</i><br />';
+                                    }
+                                    $datatable .= '<label><input type="checkbox" name="menucollections_'.$num.'" value="'.$field.'"'.$checked{$field}.$disabled.' />'.
+                                                  $menufields{$field}.'</label><br />';
+                                }
+                                $datatable .= '</fieldset>';
+                            }
+                        }
+                        $datatable .= &item_table_row_end();
+                        $count ++;
+                    }
+                }
+            }
+        } elsif ($noedit) {
+            my $text = &mt('No menu collections defined for this course.');
+            $datatable .= &item_table_row_start($text,$count);
+        }
+        unless ($noedit) {
+            my $add = '<label><input type="checkbox" name="menucollections_add" id="menucollections_add" value="'.$next.'" '.
+                      'onclick="javascript:toggleAddmenucoll();" />'.&mt('Add').'</label>';
+            $datatable .= &item_table_row_start($add,$count,'','','','LC_left_item');
+            foreach my $category (@order) {
+                if ((ref($categories{$category}) eq 'ARRAY') && (@{$categories{$category}} > 0)) {
+                    $datatable .= '<fieldset id="addmenucoll_'.$category.'" style="display:none; vertical-align:top;"><legend>'.$menutitles{$category}.'</legend>'."\n";
+                    foreach my $field (@{$categories{$category}}) {
+                        $datatable .= '<label><input type="checkbox" class="LC_menucoll_add" name="menucollections_'.$next.'" value="'.$field.'"'.$disabled.' />'.
+                                      $menufields{$field}.'</label><br />';
+                    }
+                    $datatable .= '</fieldset>';
+                }
+            }
+            $datatable .= &item_table_row_end();
+            $count ++;
+        }
+        return $datatable;
+    }
+}
+
+sub menuitems_abbreviations {
+    my %briefcats = (
+                     text => 'pt',
+                     links => 'p',
+                     list => 'ps',
+                     inline => 's',
+                    );
+    return %briefcats;
+}
+
+sub menuitems_categories {
+    my @order = ('shown','text','links','list','inline');
+    my %categories = (
+                       shown => ['top','inline','foot','main'],
+                       text  => ['name','role','crs','disc','fdbk'],
+                       links => ['pers','logo','comm','roles','help','logout'],
+                       list => ['about','prefs','port','wish','anno','rss','srch','brse'],
+                       inline => ['cont','grades','chat','people','groups','resv','syll','feeds'],
+                     );
+    return (\@order,\%categories);
+}
+
+sub menuitems_titles {
+    return &Apache::lonlocal::texthash (
+        shown => 'Hierarchy',
+        text  => 'Text',
+        links => 'Header links',
+        list => 'Drop-down list',
+        inline => 'Inline links',
+    );
+}
+
+sub menuitems_fields {
+    return &Apache::lonlocal::texthash (
+               top => 'Display header',
+               inline => 'Display inline menu',
+               foot => 'Display footer',
+               main => 'Access to main menu',
+               pers => 'Personal',
+               logo => 'LON-CAPA',
+               comm => 'Messages',
+               roles => 'Roles/Courses',
+               help => 'Help',
+               logout => 'Logout',
+               name => 'Fullname',
+               crs => 'Course Title',
+               role => 'Current Role',
+               disc => 'Discussion',
+               fdbk => 'Feedback',
+               about => 'Information',
+               prefs => 'Preferences',
+               port => 'Portfolio',
+               wish => 'Stored Links',
+               anno => 'Calendar',
+               rss => 'RSS Feeds',
+               srch => 'Search Library',
+               brse => 'Browse Library',
+               cont => 'Contents',
+               grades => 'Grades',
+               chat => 'Chat',
+               people => 'People',
+               groups => 'Groups',
+               resv => 'Reservations',
+               syll => 'Syllabus',
+               feeds => 'Feeds',
+    );
+}
+
+sub menucollections_display {
+    my ($collections) = @_;
+    my %menu;
+    my ($ordered,$cats) = &menuitems_categories();
+    my @order = @{$ordered};
+    my %categories = %{$cats};
+    my %menutitles = &menuitems_titles();
+    my %menufields = &menuitems_fields();
+    foreach my $item (split(/;/,$collections)) {
+        my ($num,$value) = split(/\%/,$item);
+        if ($num =~ /^\d+$/) {
+            my @entries = split(/\&/,$value);
+            foreach my $entry (@entries) {
+                my ($name,$fields) = split(/=/,$entry);
+                $menu{$num}{$name} = $fields;
+            }
+        }
+    }
+    my $output = '';
+    if (keys(%menu)) {
+        my @current = sort { $a <=> $b } keys(%menu);
+        foreach my $num (@current) {
+            my %checked;
+            foreach my $key (keys(%{$menu{$num}})) {
+                if (($key eq 'top') || ($key eq 'inline') || ($key eq 'foot') || ($key eq 'main')) {
+                    if ($menu{$num}{$key} eq 'y') {
+                        $checked{$key} = 1;
+                    }
+                } else {
+                    foreach my $field (split(/,/,$menu{$num}{$key})) {
+                        if (exists($menufields{$field})) {
+                            $checked{$field} = 1;
+                        }
+                    }
+                }
+            }
+            if (ref($menu{$num}) eq 'HASH') {
+                $output .= '<fieldset><legend>'.&mt('Collection [_1]',$num).'</legend>';
+                foreach my $category (@order) {
+                    if ((ref($categories{$category}) eq 'ARRAY') && (@{$categories{$category}} > 0)) {
+                        $output .= '<fieldset style="vertical-align:top; display:inline-block">'.
+                                   '<legend>'.$menutitles{$category}.'</legend>'."\n";
+                        if ($category eq 'text') {
+                            $output .= '<b>'.&mt('Header Text').'</b><br /><br />';
+                        }
+                        foreach my $field (@{$categories{$category}}) {
+                            if ($field eq 'disc') {
+                                $output .= '<br /><b>'.&mt('Footer Text').'</b><br /><br />';
+                            }
+                            if ($checked{$field}) {
+                                $output .= &Apache::lonhtmlcommon::confirm_success($menufields{$field});
+                            } else {
+                                $output .= &Apache::lonhtmlcommon::confirm_success($menufields{$field},1);
+                            }
+                            $output .= '<br />';
+                        }
+                        $output .= '</fieldset>';
+                    }
+                }
+                $output .= '</fieldset>';
+            }
+        }
+    }
+    return $output;
+}
+
+sub print_linkprotection {
+    my ($cdom,$cnum,$settings,$rowtotal,$crstype,$noedit,$context) = @_;
+
+    my %linkprotection;
+    my $count = 0;
+    my $next = 1;
+    my ($datatable,$disabled,$css_class,$dest);
+    if ($noedit) {
+        $disabled = ' disabled="disabled"';
+    }
+    my %desc = &linkprot_names();
+    my %lt = &Apache::lonlocal::texthash (
+       'requ'      => 'Required settings',
+       'opti'      => 'Optional settings',
+    );
+    my $itemcount = 0;
+
+    my $ltiauth;
+    if ($context eq 'domain') {
+        $ltiauth = 1;
+    } else {
+        if (exists($env{'course.'.$env{'request.course.id'}.'.internal.ltiauth'})) {
+            $ltiauth = $env{'course.'.$env{'request.course.id'}.'.internal.ltiauth'};
+        } else {
+            my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+            $ltiauth = $domdefs{'crsltiauth'};
+        }
+    }
+    if ($context eq 'domain') {
+        $dest = '/adm/domainprefs';
+    } else {
+        $dest = '/adm/courseprefs';
+    }
+
+    my ($switchserver,$switchmessage);
+    $switchserver = &check_switchserver($cdom,$cnum,$context,$dest);
+    if ($switchserver) {
+        if ($context eq 'domain') {
+            $switchmessage = &mt("submit from domain's primary library server: [_1].",$switchserver);
+        } elsif ($crstype eq 'Community') {
+           $switchmessage = &mt("submit from community's home server: [_1].",$switchserver);
+        } else {
+            $switchmessage = &mt("submit from course's home server: [_1].",$switchserver);
+        }
+    }
+
+    if ((ref($settings) eq 'HASH') && (ref($settings->{'linkprot'}) eq 'HASH')) {
+        if (keys(%{$settings->{'linkprot'}})) {
+            my @current = sort { $a <=> $b } keys(%{$settings->{'linkprot'}});
+            $next += $current[-1];
+            for (my $i=0; $i<@current; $i++) {
+                my $num = $current[$i];
+                my %values;
+                if (ref($settings->{'linkprot'}->{$num}) eq 'HASH') {
+                    %values = %{$settings->{'linkprot'}->{$num}};
+                } else {
+                    next;
+                }
+                my $selected;
+                if (($values{'version'} eq 'LTI-1p0') || ($values{'version'} eq '')) {
+                    $selected = ' selected="selected"';
+                }
+                $css_class = $itemcount%2?' class="LC_odd_row"':'';
+                $datatable .=
+                    '<tr '.$css_class.'><td><span class="LC_nobreak">'.
+                    '<label><input type="checkbox" name="linkprot_del" value="'.$i.'"'.$disabled.' />'.
+                    &mt('Delete?').'</label></span></td><td>';
+                my ($usersty,$onclickrequser,%checkedrequser,$onclickreturnurl,%checkedreturnurl,
+                    $onclickpassback,%checkedpassback,$passbacksty,%checkedpassbackfmt);
+                $passbacksty = 'none';
+                $onclickpassback = ' onclick="toggleLinkProtExtra(this.form,'."'passback','passbackparam','1','inline-block','$i'".');"';
+                %checkedpassback = (
+                    'no' => ' checked="checked"',
+                    'yes' => '',
+                );
+                %checkedpassbackfmt = (
+                    '1p1' => ' checked="checked"',
+                    '1p0' => '',
+                );
+                if ($values{'passback'} ne '') {
+                    $passbacksty = 'inline-block';
+                    $checkedpassback{'yes'} = ' checked="checked"';
+                    $checkedpassback{'no'} = '';
+                    if ($values{'passbackformat'} eq '1.0') {
+                        $checkedpassbackfmt{'1p0'} = ' checked="checked"';
+                        $checkedpassbackfmt{'1p1'} = '';
+                    }
+                }
+                if ($ltiauth) {
+                    $usersty = 'display:none';
+                    $onclickrequser = ' onclick="toggleLinkProtExtra(this.form,'."'requser','optional','1','block','$i'".');"';
+                    %checkedrequser = (
+                        no => ' checked="checked"',
+                        yes  => '',
+                    );
+                    if ($values{'requser'}) {
+                        $checkedrequser{'yes'} = $checkedrequser{'no'};
+                        $checkedrequser{'no'} = '';
+                    }
+                    $datatable .= '<fieldset><legend>'.$lt{'requ'}.'</legend>';
+                    if ($values{'requser'}) {
+                        $usersty = 'display:inline-block';
+                    }
+                }
+                $onclickreturnurl = ' onclick="toggleLinkProtExtra(this.form,'."'returnurl','divurlparam','1','inline-block','$i'".');"';
+                %checkedreturnurl = (
+                    no => ' checked="checked"',
+                    yes  => '',
+                );
+                if ($values{'returnurl'} ne '') {
+                    $checkedreturnurl{'yes'} = $checkedreturnurl{'no'};
+                    $checkedreturnurl{'no'} = '';
+                }
+                $datatable .=
+                    '<span class="LC_nobreak">'.$desc{'name'}.
+                    ':<input type="text" size="15" name="linkprot_name_'.$i.'" value="'.$values{'name'}.'" autocomplete="off"'.$disabled.' /></span> '.
+                    ('&nbsp;'x2).
+                    '<span class="LC_nobreak">'.$desc{'version'}.':<select name="linkprot_version_'.$i.'"'.$disabled.'>'.
+                    '<option value="LTI-1p0" '.$selected.'>1.1</option></select></span> '."\n".
+                    ('&nbsp;'x2).
+                    '<span class="LC_nobreak">'.$desc{'lifetime'}.':<input type="text" name="linkprot_lifetime_'.$i.'"'.
+                    ' value="'.$values{'lifetime'}.'" size="3"'.$disabled.' /></span><br /><br />';
+                if ($values{'key'} ne '') {
+                    $datatable .= '<span class="LC_nobreak">'.$desc{'key'};
+                    if ($noedit) {
+                        $datatable .= ': ['.&mt('not shown').']';
+                    } elsif ($switchserver) {
+                        $datatable .= ': ['.&mt('[_1] to view/edit',$switchserver).']';
+                    } else {
+                        $datatable .= ':<input type="text" size="25" name="linkprot_key_'.$i.'" value="'.$values{'key'}.'" autocomplete="off"'.$disabled.' />';
+                    }
+                    $datatable .= '</span> '.('&nbsp;'x2);
+                } elsif (!$switchserver) {
+                    $datatable .= '<span class="LC_nobreak">'.$desc{'key'}.':'.
+                                  '<input type="text" size="25" name="linkprot_key_'.$i.'" value="'.$values{'key'}.'" autocomplete="off"'.$disabled.' />'.
+                                  '</span> '.('&nbsp;'x2);
+                }
+                if ($switchserver) {
+                    if ($values{'usable'} ne '') {
+                        $datatable .= '<div id="linkprot_divcurrsecret_'.$i.'" style="display:inline-block" /><span class="LC_nobreak">'.
+                                      $desc{'secret'}.': ['.&mt('not shown').'] '.('&nbsp;'x2).'</span></div>'.
+                                      '<span class="LC_nobreak">'.&mt('Change secret?').
+                                      '<label><input type="radio" value="0" name="linkprot_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','linkprot'".');" checked="checked"'.$disabled.' />'.&mt('No').'</label>'.
+                                      ('&nbsp;'x2).
+                                      '<label><input type="radio" value="1" name="linkprot_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','linkprot'".');" '.$disabled.' />'.&mt('Yes').'</label>'.('&nbsp;'x2).
+                                      '</span><div id="linkprot_divchgsecret_'.$i.'" style="display:none" />'.
+                                      '<span class="LC_nobreak"> - '.$switchmessage.'</span>'.
+                                      '</div>';
+                    } elsif ($values{'key'} eq '') {
+                        $datatable .= '<span class="LC_nobreak">'.&mt('Key and Secret are required').' - '.$switchmessage.'</span>'."\n";
+                    } else {
+                        $datatable .= '<span class="LC_nobreak">'.&mt('Secret required').' - '.$switchmessage.'</span>'."\n";
+                    }
+                    $datatable .= '<input type="hidden" name="linkprot_id_'.$i.'" value="'.$num.'" />';
+                } else {
+                    if ($values{'usable'} ne '') {
+                        $datatable .= '<div id="linkprot_divcurrsecret_'.$i.'" style="display:inline-block" /><span class="LC_nobreak">'.
+                                      $desc{'secret'}.': ['.&mt('not shown').'] '.('&nbsp;'x2).'</span></div>'.
+                                      '<span class="LC_nobreak">'.&mt('Change?').
+                                      '<label><input type="radio" value="0" name="linkprot_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','linkprot'".');" checked="checked"'.$disabled.' />'.&mt('No').'</label>'.
+                                      ('&nbsp;'x2).
+                                      '<label><input type="radio" value="1" name="linkprot_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','linkprot'".');"'.$disabled.' />'.&mt('Yes').
+                                      '</label>&nbsp;&nbsp;</span><div id="linkprot_divchgsecret_'.$i.'" style="display:none" />'.
+                                      '<span class="LC_nobreak">'.&mt('New Secret').':'.
+                                      '<input type="password" size="20" name="linkprot_secret_'.$i.'" value="" autocomplete="new-password"'.$disabled.' />'.
+                                      '<label><input type="checkbox" name="linkprot_visible_'.$i.'" id="linkprot_visible_'.$i.'" onclick="if (this.checked) { this.form.linkprot_secret_'.$i.'.type='."'text'".' } else { this.form.linkprot_secret_'.$i.'.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label>'.
+                                      '<input type="hidden" name="linkprot_id_'.$i.'" value="'.$num.'" /></span></div>';
+                    } else {
+                        $datatable .=
+                            '<span class="LC_nobreak">'.$desc{'secret'}.':'.
+                            '<input type="password" size="20" name="linkprot_secret_'.$i.'" value="" autocomplete="new-password"'.$disabled.' />'.
+                            '<label><input type="checkbox" name="linkprot_visible_'.$i.'" id="linkprot_visible_'.$i.'" onclick="if (this.checked) { this.form.linkprot_secret_'.$i.'.type='."'text'".' } else { this.form.linkprot_secret_'.$i.'.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label>'.
+                            '<input type="hidden" name="linkprot_id_'.$i.'" value="'.$num.'" /></span>';
+                    }
+                }
+                $datatable .= '<br /><br />'.
+                              '<span class="LC_nobreak">'.$desc{'passback'}.'?'.
+                              '<label><input type="radio" name="linkprot_passback_'.$i.'" value="0"'.
+                              $onclickpassback.$checkedpassback{'no'}.$disabled.' />'.&mt('No').'</label>&nbsp;'.
+                              '<label><input type="radio" name="linkprot_passback_'.$i.'" value="1"'.
+                              $onclickpassback.$checkedpassback{'yes'}.$disabled.' />'.&mt('Yes').'</label></span><br />'.
+                              '<div id="linkprot_passbackparam_'.$i.'" class="LC_floatleft" style="display:'.$passbacksty.'" />'.
+                              '<span class="LC_nobreak">'.&mt('Grade format').
+                              '<label><input type="radio" name="linkprot_passbackformat_'.$i.'" value="1.1"'.$checkedpassbackfmt{'1p1'}.' />'.
+                              &mt('Outcomes Service (1.1)').'</label>'.('&nbsp;'x2).
+                              '<label><input type="radio" name="linkprot_passbackformat_'.$i.'" value="1.0"'.$checkedpassbackfmt{'1p0'}.'/>'.
+                              &mt('Outcomes Extension (1.0)').'</label></span></div>'.
+                              '<div style="padding:0;clear:both;margin:0;border:0"></div>'.
+                              '<br />'.
+                              '<span class="LC_nobreak">'.$desc{'returnurl'}.'?'.
+                              '<label><input type="radio" name="linkprot_returnurl_'.$i.'" value="0"'.
+                              $onclickreturnurl.$checkedreturnurl{'no'}.$disabled.' />'.&mt('No').'</label>&nbsp;'.
+                              '<label><input type="radio" name="linkprot_returnurl_'.$i.'" value="1"'.
+                              $onclickreturnurl.$checkedreturnurl{'yes'}.$disabled.' />'.&mt('Yes').'</label></span>'.
+                              '&nbsp;&nbsp;</span><div id="linkprot_divurlparam_'.$i.'" style="display:none" />'.
+                              '<span class="LC_nobreak">'.&mt('Parameter name').':'.
+                              '<input type="text" size="15" name="linkprot_urlparam_'.$i.'" value="'.$values{'returnurl'}.'" autocomplete="off"'.$disabled.' />'.
+                              '</span></div> ';
+                if ($ltiauth) {
+                    $datatable .= ('&nbsp;'x2).'<span class="LC_nobreak">'.$desc{'requser'}.'?'.
+                                  '<label><input type="radio" name="linkprot_requser_'.$i.'" value="0"'.
+                                  $onclickrequser.$checkedrequser{'no'}.$disabled.' />'.&mt('No').'</label>&nbsp;'.
+                                  '<label><input type="radio" name="linkprot_requser_'.$i.'" value="1"'.
+                                  $onclickrequser.$checkedrequser{'yes'}.$disabled.' />'.&mt('Yes').'</label></span>'.
+                        '</fieldset>'.
+                        '<fieldset id="linkprot_optional_'.$i.'" style="'.$usersty.'"><legend>'.$lt{'opti'}.'</legend>'.
+                        &linkprot_options($i,$itemcount,$disabled,\%values,\%desc).
+                        '</fieldset>';
+                }
+                $datatable .= '</td></tr>';
+                $itemcount ++;
+            }
+        }
+    }
+    $css_class = $itemcount%2?' class="LC_odd_row"':'';
+    $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n".
+                  '<input type="hidden" name="linkprot_maxnum" value="'.$next.'" />'."\n".
+                  '<input type="checkbox" name="linkprot_add" value="1"'.$disabled.' />'.&mt('Add').'</span></td>'."\n".
+                  '<td width="100%">';
+    my ($usersty,$onclickrequser,%checkedrequser,$onclickreturnurl,%checkedreturnurl,
+       $onclickpassback,%checkedpassback,%checkedpassbackfmt);
+    if ($ltiauth) {
+        $usersty = 'display:none';
+        $onclickrequser = ' onclick="toggleLinkProtExtra(this.form,'."'requser','optional','1','block','add'".');"';
+        %checkedrequser = (
+            no => ' checked="checked"',
+            yes  => '',
+        );
+        $datatable .= '<fieldset><legend>'.$lt{'requ'}.'</legend>';
+    }
+    $onclickpassback = ' onclick="toggleLinkProtExtra(this.form,'."'passback','passbackparam','1','inline-block','add'".');"';
+    %checkedpassback = (
+        'no' => ' checked="checked"',
+        'yes' => '',
+    );
+    %checkedpassbackfmt = (
+        '1p1' => ' checked="checked"',
+        '1p0' => '',
+    );
+    $onclickreturnurl = ' onclick="toggleLinkProtExtra(this.form,'."'returnurl','divurlparam','1','inline-block','add'".');"';
+    %checkedreturnurl = (
+        no => ' checked="checked"',
+        yes => '',
+    );
+    $datatable .= '<span class="LC_nobreak">'.$desc{'name'}.
+                  ':<input type="text" size="15" name="linkprot_name_add" value="" autocomplete="off"'.$disabled.' /></span> '."\n".
+                  ('&nbsp;'x2).
+                  '<span class="LC_nobreak">'.$desc{'version'}.':<select name="linkprot_version_add"'.$disabled.'>'.
+                  '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '."\n".
+                  ('&nbsp;'x2).
+                  '<span class="LC_nobreak">'.$desc{'lifetime'}.':<input type="text" size="3" name="linkprot_lifetime_add" value="300"'.$disabled.' /></span> '."\n".
+                  '<br /><br />';
+    if ($switchserver) {
+        $datatable .= '<span class="LC_nobreak">'.&mt('Key and Secret are required').' - '.$switchmessage.'</span>'."\n";
+    } else {
+        $datatable .= '<span class="LC_nobreak">'.$desc{'key'}.':<input type="text" size="25" name="linkprot_key_add" value="" autocomplete="off"'.$disabled.' /></span> '."\n".
+                      ('&nbsp;'x2).
+                      '<span class="LC_nobreak">'.$desc{'secret'}.':<input type="password" size="20" name="linkprot_secret_add" value="" autocomplete="new-password"'.$disabled.' />'.
+                      '<label><input type="checkbox" name="linkprot_visible_add" id="linkprot_visible_add" onclick="if (this.checked) { this.form.linkprot_secret_add.type='."'text'".' } else { this.form.linkprot_secret_add.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label></span> '."\n";
+    }
+    $datatable .= '<br /><br />'.
+                  '<span class="LC_nobreak">'.$desc{'passback'}.'?'.
+                  '<label><input type="radio" name="linkprot_passback_add" value="0"'.
+                  $onclickpassback.$checkedpassback{'no'}.$disabled.' />'.&mt('No').'</label>&nbsp;'.
+                  '<label><input type="radio" name="linkprot_passback_add" value="1"'.
+                  $onclickpassback.$checkedpassback{'yes'}.$disabled.' />'.&mt('Yes').'</label></span>'.
+                  '<br /><div id="linkprot_passbackparam_add" class="LC_floatleft" style="display:none" />'.
+                  '<span class="LC_nobreak">'.&mt('Grade format').
+                  '<label><input type="radio" name="linkprot_passbackformat_add" value="1.1"'.$checkedpassbackfmt{'1p1'}.$disabled.' />'.
+                  &mt('Outcomes Service (1.1)').'</label>'.('&nbsp;'x2).
+                  '<label><input type="radio" name="linkprot_passbackformat_add" value="1.0"'.$checkedpassbackfmt{'1p0'}.$disabled.' />'.
+                  &mt('Outcomes Extension (1.0)').'</label></span></div>'.
+                  '<div style="padding:0;clear:both;margin:0;border:0"></div>'.
+                  '<br />'.
+                  '<span class="LC_nobreak">'.$desc{'returnurl'}.'?'.
+                  '<label><input type="radio" name="linkprot_returnurl_add" value="0"'.
+                  $onclickreturnurl.$checkedreturnurl{'no'}.$disabled.' />'.&mt('No').'</label>&nbsp;'.
+                  '<label><input type="radio" name="linkprot_returnurl_add" value="1"'.
+                  $onclickreturnurl.$checkedreturnurl{'yes'}.$disabled.' />'.&mt('Yes').'</label></span>'.
+                  '&nbsp;&nbsp;</span><div id="linkprot_divurlparam_add" style="display:none" />'.
+                  '<span class="LC_nobreak">'.&mt('Parameter name').':'.
+                  '<input type="text" size="15" name="linkprot_urlparam_add" value="" autocomplete="off"'.$disabled.' />'.
+                  '</span></div> ';
+    if ($ltiauth) {
+        $datatable .= ('&nbsp;'x2).'<span class="LC_nobreak">'.$desc{'requser'}.'?'.
+                      '<label><input type="radio" name="linkprot_requser_add" value="0"'.
+                      $onclickrequser.$checkedrequser{'no'}.$disabled.' />'.&mt('No').'</label>&nbsp;'.
+                      '<label><input type="radio" name="linkprot_requser_add" value="1"'.
+                      $onclickrequser.$checkedrequser{'yes'}.$disabled.' />'.&mt('Yes').'</label></span>'.
+                      '</fieldset>'.
+                      '<fieldset id="linkprot_optional_add" style="'.$usersty.'"><legend>'.$lt{'opti'}.'</legend>'.
+                      &linkprot_options('add',$itemcount,$disabled,{},\%desc).
+                     '</fieldset>';
+    }
+    $datatable .= '</td></tr>';
+    $$rowtotal ++;
+    return $datatable;
+}
+
+sub linkprot_names {
+    return &Apache::lonlocal::texthash(
+                                          'version'   => 'LTI Version',
+                                          'key'       => 'Key',
+                                          'lifetime'  => 'Nonce lifetime (s)',
+                                          'name'      => 'Launcher Application',
+                                          'secret'    => 'Secret',
+                                          'passback'  => 'Can return grades to Launcher',
+                                          'returnurl' => 'Launcher return URL',
+                                          'requser'   => 'Use identity',
+                                          'email'     => 'Email address',
+                                          'sourcedid' => 'User ID',
+                                          'other'     => 'Other',
+                                          'auth'      => 'Display LON-CAPA login page',
+                                          'reject'    => 'Discontinue launch process',
+                                        );
+}
+
+sub check_switchserver {
+    my ($cdom,$cnum,$context,$dest) = @_;
+    my ($allowed,$switchserver,$home);
+    if ($context eq 'domain') {
+        $home = &Apache::lonnet::domain($cdom,'primary');
+    } else {
+        $home = &Apache::lonnet::homeserver($cnum,$cdom);
+    }
+    unless (($home eq 'no_host') || ($home eq '')) {
+        my @ids=&Apache::lonnet::current_machine_ids();
+        foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+        if (!$allowed) {
+            $switchserver='<a href="/adm/switchserver?otherserver='.$home.'&amp;role='.
+                          &HTML::Entities::encode($env{'request.role'},'\'<>"&').
+                          '&amp;destinationurl='.$dest.'">'.&mt('Switch Server').'</a>';
+        }
+    }
+    return $switchserver;
+}
+
+sub linkprot_options {
+    my ($num,$itemcount,$disabled,$current,$desc) = @_;
+    my %lt;
+    if (ref($desc) eq 'HASH') {
+        %lt = %{$desc};
+    }
+    my $userfieldsty = 'none';
+    my (%checked,$userfield);
+    $checked{'sourcedid'} = ' checked="checked"';
+    $checked{'reject'} = ' checked="checked"';
+    if (ref($current) eq 'HASH') {
+        if (($current->{'mapuser'} ne '') && ($current->{'mapuser'} ne 'lis_person_sourcedid')) {
+            $checked{'sourcedid'} = '';
+            if ($current->{'mapuser'} eq 'lis_person_contact_email_primary') {
+                $checked{'email'} = ' checked="checked"';
+            } else {
+                $checked{'other'} = ' checked="checked"';
+                $userfield = $current->{'mapuser'};
+                $userfieldsty = 'inline-block';
+            }
+        }
+        if (($current->{'notstudent'} ne '') && ($current->{'notstudent'} ne 'reject')) {
+            $checked{'reject'} = '';
+            $checked{'auth'} = ' checked="checked"';
+        }
+    }
+    my $onclickuser = ' onclick="toggleLinkProtExtra(this.form,'."'mapuser','userfield','other','inline-block','$num'".');"';
+    my $output = '<div class="LC_floatleft"><span class="LC_nobreak">'.
+                 &mt('Source of LON-CAPA username in LTI request').':&nbsp;';
+    foreach my $option ('sourcedid','email','other') {
+        $output .= '<label><input type="radio" name="linkprot_mapuser_'.$num.'" value="'.$option.'"'.
+                   $checked{$option}.$onclickuser.$disabled.' />'.$lt{$option}.'</label>'.
+                   ($option eq 'other' ? '' : ('&nbsp;'x2) );
+    }
+    $output .= '</span></div>'.
+               '<div class="LC_floatleft" style="display:'.$userfieldsty.';" id="linkprot_userfield_'.$num.'">'.
+               '<input type="text" name="linkprot_customuser_'.$num.'" '.
+               'value="'.$userfield.'"'.$disabled.' /></div>';
+    $output .= '<br />'.
+               '<div class="LC_floatleft"><span class="LC_nobreak">'.
+               &mt('Action when username is not for an enrolled student').':&nbsp;';
+    foreach my $option ('reject','auth') {
+        $output .= '<label><input type="radio" name="linkprot_notstudent_'.$num.'" value="'.$option.'"'.
+                   $checked{$option}.$disabled.' />'.$lt{$option}.'</label>'.
+                   ($option eq 'auth' ? '' : ('&nbsp;'x2) );
+    }
+    $output .= '</span></div>';
+    return $output;
+}
+
+sub print_extresource_row {
+    my ($item,$config,$curr,$noedit) = @_;
+    my $onchange;
+    unless ($noedit) {
+        $onchange = ' onchange="javascript:toggleExtRes();"';
+    }
+    my $id = 'LC_'.$item;
+    my ($selected,$reuse,$width,$height) = split(/:/,$curr);
+    my $output = &select_from_options($item,$config->{'order'},
+                                      $config->{'options'},$selected,
+                                      $config->{'nullval'},
+                                      undef,undef,$onchange,$noedit,$id);
+    my ($checked,$reusesty,$sizesty);
+    if ($reuse) {
+        $checked = ' checked="checked"';
+    }
+    $reusesty = 'none';
+    $sizesty = 'none';
+    if (($selected eq 'window') || ($selected eq 'tab')) {
+        $reusesty = 'inline-block';
+        if ($selected eq 'window') {
+            $sizesty = 'inline-block';
+        }
+    }
+    $output .= '<div id="LC_extresreusediv" style="display:'.$reusesty.';">'.
+               '<span class="LC_nobreak">'.
+               '<label><input type="checkbox" name="extwintabreuse" value="1"'.$checked.'>'.
+               &mt('Re-use tab/window').'</label>'.
+               '</span></div>'.
+               '<fieldset id="LC_extressize" style="display:'.$sizesty.';">'.
+               '<legend>'.&mt('Window size (optional)').'</legend>'.
+               '<span class="LC_nobreak">'.
+               &mt('width').':<input type="text" name="extreswinwidth" value="'.$width.'" size="3" />px'.
+               ('&nbsp;' x 3).
+               &mt('height').':<input type="text" name="extreswinheight" value="'.$height.'" size="3" />px'.
+               '</span></fieldset>';
+    return $output;
 }
 
 sub print_other {
-    my ($cdom,$settings,$allitems,$rowtotal,$crstype) = @_;
+    my ($cdom,$settings,$allitems,$rowtotal,$crstype,$noedit) = @_;
     unless ((ref($settings) eq 'HASH') && (ref($allitems) eq 'ARRAY')) {
         return;
     }
@@ -3444,7 +7393,7 @@ sub print_other {
                             input => 'textbox',
                             size  => '30',
                            };
-    my $output = &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype);
+    return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'other',$noedit);
 }
 
 sub get_other_items {
@@ -3461,7 +7410,10 @@ sub get_other_items {
             unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./) ||
                     ($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/)
                     || ($parameter eq 'type') ||
-                    ($parameter =~ m/^(cc|co|in|ta|ep|ad|st)\.plaintext$/)) {
+                    ($parameter =~ m/^(cc|co|in|ta|ep|ad|st)\.plaintext$/)
+                    || ($parameter =~ m/^discussion_post_fonts/) ||
+                    ($parameter =~ m{^(minimal|updated|uploaded|external)syllabus$}) ||
+                    ($parameter eq 'clonedfrom')) {
                 push(@ordered,$parameter);
             }
         }
@@ -3470,13 +7422,24 @@ sub get_other_items {
 }
 
 sub item_table_row_start {
-    my ($text,$count,$add_class) = @_;
+    my ($text,$count,$add_class,$colspan,$leftclass,$rightclass) = @_;
     my $output;
-	my $css_class = ($count % 2) ? 'LC_odd_row' : 'LC_even_row';
-	$css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');
-	$output .= '<tr class="'.$css_class.'">'."\n";;
-    $output .= '<td class="LC_left_item">'.$text.
-               '</td><td class="LC_right_item">';
+    my $css_class = ($count % 2) ? 'LC_odd_row' : 'LC_even_row';
+    $css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');
+    if ($leftclass eq '') {
+        $leftclass = 'LC_left_item';
+    }
+    if ($rightclass eq '') {
+        $rightclass = 'LC_right_item';
+    }
+    $output .= '<tr class="'.$css_class.'">'."\n".
+               '<td class="'.$leftclass.'">'.$text.
+               '</td>';
+    if ($colspan > 1) {
+        $output .= '<td class="'.$rightclass.'" colspan="'.$colspan.'">';
+    } else {
+        $output .= '<td class="'.$rightclass.'">';
+    }
     return $output;
 }
 
@@ -3485,25 +7448,53 @@ sub item_table_row_end {
 }
 
 sub yesno_radio {
-    my ($item,$settings) = @_;
+    my ($item,$settings,$unsetdefault,$valueyes,$valueno,$noedit,$onclick,$reverse) = @_;
     my $itemon = ' ';
     my $itemoff = ' checked="checked" ';
+    if (($valueyes eq '') && ($valueno eq '')) {
+        $valueyes = 'yes';
+        $valueno = '';
+    }
     if (ref($settings) eq 'HASH') {
-        if ($settings->{$item} eq 'yes') {
+        if ($settings->{$item} eq $valueyes) {
             $itemon = $itemoff;
             $itemoff = ' ';
         }
+        unless (exists($settings->{$item})) {
+            if ($unsetdefault eq $valueyes) {
+                $itemon = $itemoff;
+                $itemoff = ' ';
+            }
+        }
+    }
+    my $disabled;
+    if ($noedit) {
+        $disabled = ' disabled="disabled"';
+    } elsif ($onclick) {
+        $onclick = ' onclick="'.$onclick.'"';
+    }
+    if ($reverse) {
+        return '<span class="LC_nobreak"><label>'.
+               '<input type="radio" name="'.$item.'"'.
+               $itemoff.' value="'.$valueno.'"'.$disabled.$onclick.' />'.&mt('No').'</label>&nbsp;'.
+               '<label><input type="radio" name="'.$item.'"'.
+               $itemon.' value="'.$valueyes.'"'.$disabled.$onclick.' />'.&mt('Yes').'</label></span>';
+    } else {
+        return '<span class="LC_nobreak"><label>'.
+               '<input type="radio" name="'.$item.'"'.
+               $itemon.' value="'.$valueyes.'"'.$disabled.$onclick.' />'.&mt('Yes').'</label>&nbsp;'.
+               '<label><input type="radio" name="'.$item.'"'.
+               $itemoff.' value="'.$valueno.'"'.$disabled.$onclick.' />'.&mt('No').'</label></span>';
     }
-    return '<span class="LC_nobreak"><label>'.
-           '<input type="radio" name="'.$item.'"'.
-           $itemon.' value="yes" />'.&mt('Yes').'</label>&nbsp;'.
-           '<label><input type="radio" name="'.$item.'"'.
-           $itemoff.' value="" />'.&mt('No').'</label></span>';
 }
 
 sub select_from_options {
-    my ($item,$order,$options,$curr,$nullval,$multiple,$maxsize,$onchange) = @_;
+    my ($item,$order,$options,$curr,$nullval,$multiple,$maxsize,$onchange,$noedit,$id) = @_;
     my $output;
+    my $disabled;
+    if ($noedit) {
+        $disabled = ' disabled=disabled"';
+    }
     if ((ref($order) eq 'ARRAY') && (ref($options) eq 'HASH')) {
         $output='<select name="'.$item.'" '.$onchange;
         if ($multiple) {
@@ -3514,7 +7505,10 @@ sub select_from_options {
                 $output .= ' size="'.$maxsize.'"';
             }
         }
-        $output .= '>'."\n";
+        if ($id ne '') {
+            $output .= ' id="'.$id.'"';
+        }
+        $output .= $disabled.'>'."\n";
         if ($nullval ne '') {
             $output .= '<option value=""';
             if (ref($curr) eq 'ARRAY') {
@@ -3547,33 +7541,133 @@ sub select_from_options {
 }
 
 sub make_item_rows {
-    my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype) = @_;
+    my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype,$caller,$noedit,$cnum) = @_;
     my $datatable;
     if ((ref($items) eq 'HASH') && (ref($ordered) eq 'ARRAY')) {
         my $count = 0;
         foreach my $item (@{$ordered}) {
             $count ++;
-            $datatable .= &item_table_row_start($items->{$item}{text},$count);
-            if ($item eq 'nothideprivileged') {
-                $datatable .= &nothidepriv_row($cdom,$item,$settings,$crstype);
+            my $colspan;
+            if ((($caller eq 'classlists') && ($item eq 'nothideprivileged')) ||
+                (($caller eq 'printouts') && ($item ne 'print_header_format'))) {
+                $colspan = 2;
+            }
+            my $rowdesc;
+            if ($caller eq 'appearance') {
+                $rowdesc = '<span class="LC_nobreak">'.$items->{$item}{text}.'</span>';
+            } else {
+                $rowdesc = $items->{$item}{text};
+            }
+            if (exists $items->{$item}{advanced} && $items->{$item}{advanced} == 1) {
+                $datatable .= &item_table_row_start($rowdesc,$count,"advanced",$colspan);
+            } else {
+                $datatable .= &item_table_row_start($rowdesc,$count,undef,$colspan);
+            }
+            if ($item eq 'defaultcredits') {
+                my $defaultcredits = $env{'course.'.$env{'request.course.id'}.'.internal.defaultcredits'};
+                my $showcredits;
+                if ($defaultcredits ne '') {
+                    $showcredits = &mt('Default is [quant,_1,credit]',$defaultcredits);
+                } else {
+                    $showcredits = &mt('No default set');
+                }
+                $datatable .= $showcredits;
+            } elsif ($item eq 'nothideprivileged') {
+                $datatable .= &nothidepriv_row($cdom,$item,$settings,$crstype,$noedit);
+            } elsif ($item eq 'checkforpriv') {
+                $datatable .= &checkforpriv_row($cdom,$item,$settings,$crstype,$noedit);
             } elsif ($item eq 'print_header_format') {
-                $datatable .= &print_hdrfmt_row($item,$settings);
+                $datatable .= &print_hdrfmt_row($item,$settings,$noedit);
+            } elsif ($item eq 'extresource') {
+                $datatable .= &print_extresource_row($item,$items->{$item},$settings->{$item},$noedit);
             } elsif ($items->{$item}{input} eq 'dates') {
+               my $disabled;
+               if ($noedit) {
+                  $disabled = ' disabled="disabled"';
+               }
                $datatable .=
                    &Apache::lonhtmlcommon::date_setter('display',$item,
-                                                       $settings->{$item});
+                                                       $settings->{$item},$disabled);
             } elsif ($items->{$item}{input} eq 'radio') {
-                $datatable .= &yesno_radio($item,$settings);
+                my ($unsetdefault,$valueyes,$valueno);
+                if (($item eq 'usejsme') || ($item eq 'uselcmath') || ($item eq 'inline_chem')) {
+                     my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+                     unless ($domdefs{$item} eq '0') {
+                         $unsetdefault = 1;
+                     }
+                     $valueyes = "1";
+                     $valueno = "0";
+                }
+                $datatable .= &yesno_radio($item,$settings,$unsetdefault,$valueyes,$valueno,$noedit);
             } elsif ($items->{$item}{input} eq 'selectbox') {
+                my ($id,$onchange);
+                if ($caller eq 'menuitems') {
+                    $id = $item;
+                } elsif ($caller eq 'grading') {
+                    if ($item eq 'grading') {
+                        $onchange = ' onchange="javascript:toggleGrading(this.form);"';
+                        $id = $item;
+                    }
+                }
                 my $curr = $settings->{$item};
                 $datatable .=
                     &select_from_options($item,$items->{$item}{'order'},
                                          $items->{$item}{'options'},$curr,
-                                         $items->{$item}{'nullval'});
+                                         $items->{$item}{'nullval'},
+                                         undef,undef,$onchange,$noedit,$id);
+                if ($item eq 'grading') {
+                    my ($unsetdefault,$valueyes,$valueno,$sectionbox);
+                    my $gradingsty = 'none';
+                    my $gradingsecsty = 'none';
+                    $unsetdefault = 0;
+                    my (@selsec,@sections,%current);
+                    if ($curr eq 'standard') {
+                        $gradingsty = 'inline-block';
+                        if (ref($settings) eq 'HASH') {
+                            $current{'hidetotals'} = $settings->{'hidetotals'};
+                            if ($settings->{'hidetotals'} =~ /^([\w,]+)$/) {
+                                my $secstr = $1;
+                                unless ($secstr eq 'all') {
+                                    @selsec = split(/,/,$secstr);
+                                }
+                                $current{'hidetotals'} = 1;
+                            }
+                        }
+                    }
+                    $valueyes = "1";
+                    $valueno = "0";
+                    my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
+                    if (keys(%sections)) {
+                        @sections = sort( { $a <=> $b } keys(%sections));
+                    }
+                    my $onclick = 'javascript:toggleHiddenTotalsSec(this.form);';
+                    my $sectionbox = '<div id="sectotalsdiv" style="display:'.$gradingsecsty.'; float:right">';
+                    my $reverse = 1;
+                    if (@sections) {
+                        $sectionbox .= '&nbsp;...&nbsp;'.&mt('hidden in sections').':&nbsp;'.
+                                       '<div style="position: relative; top: 0%;">'.
+                                       &select_sections('hidetotals','',\@sections,\@selsec,$noedit,'all').
+                                       '</div>';
+                    }
+                    $sectionbox .= '</div>';
+                    $datatable .= '<fieldset id="hidetotalsdiv" style="display:'.$gradingsty.';">'.
+                                  '<legend style="font-weight: normal;">'.
+                                  &mt('Hide Course Points Totals').'</legend>'.
+                                  '<div style="position: relative; top: 0%; float:left">'.
+                                  &yesno_radio('hidetotals',\%current,$unsetdefault,$valueyes,$valueno,$noedit,
+                                               $onclick,$reverse).'</div>'.
+                                  $sectionbox.
+                                  '</fieldset><div style="padding:0;clear:both;margin:0;border:0"></div>';
+                }
             } elsif ($items->{$item}{input} eq 'textbox') {
+                my $disabled;
+                if ($noedit) {
+                    $disabled = ' disabled=disabled"';
+                }
                 $datatable .= 
                     &Apache::lonhtmlcommon::textbox($item,$settings->{$item},
-                                                    $items->{$item}{size});
+                                                    $items->{$item}{size},
+                                                    $disabled);
             }
             $datatable .= &item_table_row_end();
         }
@@ -3585,10 +7679,9 @@ sub make_item_rows {
 }
 
 sub nothidepriv_row {
-    my ($cdom,$item,$settings,$crstype) = @_;
+    my ($cdom,$item,$settings,$crstype,$noedit) = @_;
     my ($cnum) = &get_course();
-    my %nothide;
-    my $datatable;
+    my ($datatable,%nothide,@checkdoms);
     if (ref($settings) eq 'HASH') {
         if ($settings->{$item} ne '') {
             foreach my $user (split(/\s*\,\s*/,$settings->{$item})) {
@@ -3599,38 +7692,34 @@ sub nothidepriv_row {
                 }
             }
         }
+        if ($settings->{'checkforpriv'}) {
+            @checkdoms = split(/,/,$settings->{'checkforpriv'});
+        }
     }
-    my %coursepersonnel = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
-    my $now = time;
+    push(@checkdoms,$cdom);
+    my %coursepersonnel =
+        &Apache::lonnet::get_my_roles($cnum,$cdom,'',['previous','future','active']);
     my @privusers;
-    my %privileged;
     foreach my $person (keys(%coursepersonnel)) {
-        my ($role,$user,$usec) = ($person =~ /^([^:]*):([^:]+:[^:]+):([^:]*)/);
-        $user =~ s/:$//;
-        my ($end,$start) = split(/:/,$coursepersonnel{$person});
+        my ($uname,$udom,$role) = split(/:/,$person);
+        my $user = $uname.':'.$udom;
+        my ($start,$end) = split(/:/,$coursepersonnel{$person});
         if ($end == -1 || $start == -1) {
             next;
         }
-        my ($uname,$udom) = split(':',$user);
-        unless (ref($privileged{$udom}) eq 'HASH') {
-            my %dompersonnel = &Apache::lonnet::get_domain_roles($udom,['dc'],undef,$now);
-            $privileged{$udom} = {};
-            if (keys(%dompersonnel)) {
-                foreach my $server (keys(%dompersonnel)) {
-                    foreach my $user (sort(keys(%{$dompersonnel{$server}}))) {
-                        my ($trole,$uname,$udom) = split(/:/,$user); 
-                        $privileged{$udom}{$uname} = $trole;
-                    }
+        foreach my $dom (@checkdoms) {
+            if (&Apache::lonnet::privileged($uname,$udom,\@checkdoms,['dc','su'])) {
+                unless (grep(/^\Q$user\E$/,@privusers)) {
+                    push(@privusers,$user);
                 }
             }
         }
-        if (exists($privileged{$udom}{$uname})) {
-            unless (grep(/^\Q$user\E$/,@privusers)) {
-                push(@privusers,$user);
-            }
-        }
     }
-    if (@privusers) {
+    if (@privusers > 0) {
+        my $disabled;
+        if ($noedit) {
+           $disabled = ' disabled="disabled"';
+        }
         $datatable .= '<table align="right">';
         foreach my $user (sort(@privusers)) {
             my $hideon = ' checked="checked" ';
@@ -3647,8 +7736,9 @@ sub nothidepriv_row {
                           '</td><td align="left">'.
                           '<span class="LC_nobreak"><label>'.
                           '<input type="radio" name="'.$item.'_'.$user.'"'.
-                          $hideon.' value="" />'.&mt('Hidden').'</label>&nbsp;'.
-                          '<label><input type="radio" name="'.$item.'_'.$user.'"'.                          $hideoff.' value="yes" />'.&mt('Shown').'</label></span></td>'.
+                          $hideon.' value=""'.$disabled.' />'.&mt('Hidden').'</label>&nbsp;'.
+                          '<label><input type="radio" name="'.$item.'_'.$user.'"'.
+                          $hideoff.' value="yes"'.$disabled.' />'.&mt('Shown').'</label></span></td>'.
                           '</tr>';
         }
         $datatable .= '</table>';
@@ -3662,8 +7752,72 @@ sub nothidepriv_row {
     return $datatable;
 }
 
+sub checkforpriv_row {
+    my ($cdom,$item,$settings,$crstype,$noedit) = @_;
+    my $datatable;
+    my %domains=map { $_ => 1; } &Apache::lonnet::all_domains();
+    if (keys(%domains) == 1) {
+        $datatable = '</td><td align="right">'.
+                     &mt("Course's domain is only domain");
+        return $datatable;
+    }
+    my @excdoms = ($cdom);
+    my $num = 0;
+    if ($settings->{$item} eq '') {
+        $datatable = '</td><td align="right">'.
+                     &Apache::loncommon::select_dom_form('','checkforpriv_'.$num,
+                                                         1,1,undef,undef,\@excdoms,
+                                                         $noedit);
+    } else {
+        my @privdoms = split(/,/,$settings->{$item});
+        my %domains=map { $_ => 1; } &Apache::lonnet::all_domains();
+        $datatable = '</td><td align="right"><br />'.
+                     &Apache::loncommon::start_data_table();
+        my $disabled;
+        if ($noedit) {
+            $disabled = ' disabled="disabled"';
+        }
+        if (@privdoms > 0) {
+            foreach my $currdom (@privdoms) {
+                next unless ($domains{$currdom});
+                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">'.
+                    &mt('Domain:').'<b>&nbsp;'.$domdesc.
+                    '</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>'.
+                    &Apache::loncommon::end_data_table_row();
+                $num ++;
+                unless (grep(/^\Q$currdom\E$/,@excdoms)) {
+                    push(@excdoms,$currdom);
+                }
+            }
+        }
+        if ((scalar(keys(%domains)) - scalar(@excdoms)) > 0) {
+            $datatable .=
+                &Apache::loncommon::start_data_table_row().
+                '<td align="left"><span class="LC_nobreak">'.
+                &mt('Additional domain:'). '</span><br />'.
+                &Apache::loncommon::select_dom_form('','checkforpriv_'.$num,1,
+                                                    1,undef,undef,\@excdoms,$noedit).
+                '</td>'.&Apache::loncommon::end_data_table_row();
+        }
+        $datatable .= &Apache::loncommon::end_data_table().
+                      '<input type="hidden" name="checkforpriv_total" value="'.$num.'" />'.
+                      '<br />';
+    }
+    return $datatable;
+}
+
 sub print_hdrfmt_row {
-    my ($item,$settings) = @_;
+    my ($item,$settings,$noedit) = @_;
     my @curr;
     my $currnum = 0;
     my $maxnum = 2;
@@ -3734,37 +7888,45 @@ function getIndexByName(item) {
 </script>
 
 ENDJS
-    $output .= $currstr.'<table class="LC_nested_outer">';
+    $output .= '</td><td align="right"><br />'.
+               $currstr.'<table class="LC_data_table">';
+    my $disabled;
+    if ($noedit) {
+        $disabled = ' disabled="disabled"';
+    }
     if (@curr > 0) {
         for (my $i=0; $i<@curr; $i++) {
             my $pos = $i+1;
             $output .= '<tr>'.
                        '<td align="left"><span class="LC_nobreak">'.
-                       &position_selector($pos,$i,$maxnum).&mt('Delete:').
+                       &position_selector($pos,$i,$maxnum,$disabled).&mt('Delete:').
                        '<input type="checkbox" name="printfmthdr_del_'.$i.
-                       '" /></span></td>';
+                       '"'.$disabled.' /></span></td>';
             if ($curr[$i] =~ /^%\d*[nca]$/) {
                 my ($limit,$subst) = ($curr[$i] =~ /^%(\d*)([nca])$/);
                 $output .= '<td align="left">'.
-                           &substitution_selector($i,$subst,$limit).'</td>';
+                           &substitution_selector($i,$subst,$limit,$disabled).'</td>';
             } else {
                 $output .= '<td colspan="2" align="left">'.&mt('Text').'<br />'.
                            '<input type="textbox" name="printfmthdr_text_'.$i.'"'.
-                           ' value="'.$curr[$i].'" size="25" /></td>';
+                           ' value="'.$curr[$i].'" size="25"'.$disabled.' /></td>';
             }
             $output .= '</tr>';
         }
     }
-    my $pos = $currnum+1; 
-    $output .= '<tr>'.
+    my $pos = $currnum+1;
+    unless ($noedit) {
+        $output .= 
+               '<tr>'.
                '<td align="left"><span class="LC_nobreak">'.
                &position_selector($pos,$currnum,$maxnum).
                '<b>'.&mt('New').'</b></span></td><td align="left">'.
                &substitution_selector($currnum).'</td>'.
                '</tr>'; 
-    $pos ++;
-    $currnum ++;
-    $output .= '<tr>'.
+        $pos ++;
+        $currnum ++;
+        $output .= 
+               '<tr>'.
                '<td align="left"><span class="LC_nobreak">'.
                &position_selector($pos,$currnum,$maxnum).
                '<b>'.&mt('New').'</b></span></td>'.
@@ -3773,14 +7935,15 @@ ENDJS
                '" value="" size ="25" />'.
                '<input type="hidden" name="printfmthdr_maxnum" value="'.
                 $maxnum.'" /></td>'.
-               '</tr>'.
-               '</table>'; 
+               '</tr>';
+    }
+    $output .= '</table><br />';
     return $output;
 }
 
 sub position_selector {
-    my ($pos,$num,$maxnum) = @_;
-    my $output = '<select name="printfmthdr_pos_'.$num.'" onchange="reOrder('."'$num'".');">';
+    my ($pos,$num,$maxnum,$disabled) = @_;
+    my $output = '<select name="printfmthdr_pos_'.$num.'" onchange="reOrder('."'$num'".');"'.$disabled.'>';
     for (my $j=1; $j<=$maxnum; $j++) {
         my $sel = '';
         if ($pos == $j) {
@@ -3794,7 +7957,7 @@ sub position_selector {
 }
 
 sub substitution_selector {
-    my ($num,$subst,$limit,$crstype) = @_;
+    my ($num,$subst,$limit,$crstype,$disabled) = @_;
     my ($stunametxt,$crsidtxt);
     if ($crstype eq 'Community') {
         $stunametxt = 'member name';
@@ -3809,7 +7972,7 @@ sub substitution_selector {
                     a => 'assignment note',
              );
     my $output .= &mt('Substitution').'<br />'.
-                  '<select name="printfmthdr_sub_'.$num.'">';
+                  '<select name="printfmthdr_sub_'.$num.'"'.$disabled.'>';
     if ($subst eq '') {
         $output .= '<option value="" selected="selected"> </option>';
     }
@@ -3823,7 +7986,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" /></span>';
+               '" value="'.$limit.'" size="5"'.$disabled.' /></span>';
     return $output;
 }
 
@@ -3841,17 +8004,19 @@ sub change_clone {
         foreach my $currclone (@allowclone) {
             if (!grep(/^$currclone$/,@$oldcloner)) {
                 if ($currclone ne '*') {
-                    my ($uname,$udom) = split(/:/,$currclone);
-                    if ($uname && $udom && $uname ne '*') {
-                        if (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
-                            my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
-                            if ($currclonecrs{'cloneable'} !~ /\Q$clone_crs\E/) {
-                                if ($currclonecrs{'cloneable'} eq '') {
-                                    $currclonecrs{'cloneable'} = $clone_crs;
-                                } else {
-                                    $currclonecrs{'cloneable'} .= ','.$clone_crs;
+                    if ($currclone =~ /:/) {
+                        my ($uname,$udom) = split(/:/,$currclone);
+                        if ($uname && $udom && $uname ne '*') {
+                            if (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
+                                my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
+                                if ($currclonecrs{'cloneable'} !~ /\Q$clone_crs\E/) {
+                                    if ($currclonecrs{'cloneable'} eq '') {
+                                        $currclonecrs{'cloneable'} = $clone_crs;
+                                    } else {
+                                        $currclonecrs{'cloneable'} .= ','.$clone_crs;
+                                    }
+                                    &Apache::lonnet::put('environment',\%currclonecrs,$udom,$uname);
                                 }
-                                &Apache::lonnet::put('environment',\%currclonecrs,$udom,$uname);
                             }
                         }
                     }
@@ -3861,24 +8026,26 @@ sub change_clone {
         foreach my $oldclone (@$oldcloner) {
             if (!grep(/^\Q$oldclone\E$/,@allowclone)) {
                 if ($oldclone ne '*') {
-                    my ($uname,$udom) = split(/:/,$oldclone);
-                    if ($uname && $udom && $uname ne '*' ) {
-                        if (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
-                            my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
-                            my %newclonecrs = ();
-                            if ($currclonecrs{'cloneable'} =~ /\Q$clone_crs\E/) {
-                                if ($currclonecrs{'cloneable'} =~ /,/) {
-                                    my @currclonecrs = split/,/,$currclonecrs{'cloneable'};
-                                    foreach my $crs (@currclonecrs) {
-                                        if ($crs ne $clone_crs) {
-                                            $newclonecrs{'cloneable'} .= $crs.',';
+                    if ($oldclone =~ /:/) {
+                        my ($uname,$udom) = split(/:/,$oldclone);
+                        if ($uname && $udom && $uname ne '*' ) {
+                            if (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
+                                my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
+                                my %newclonecrs = ();
+                                if ($currclonecrs{'cloneable'} =~ /\Q$clone_crs\E/) {
+                                    if ($currclonecrs{'cloneable'} =~ /,/) {
+                                        my @currclonecrs = split/,/,$currclonecrs{'cloneable'};
+                                        foreach my $crs (@currclonecrs) {
+                                            if ($crs ne $clone_crs) {
+                                                $newclonecrs{'cloneable'} .= $crs.',';
+                                            }
                                         }
+                                        $newclonecrs{'cloneable'} =~ s/,$//;
+                                    } else {
+                                        $newclonecrs{'cloneable'} = '';
                                     }
-                                    $newclonecrs{'cloneable'} =~ s/,$//;
-                                } else {
-                                    $newclonecrs{'cloneable'} = '';
+                                    &Apache::lonnet::put('environment',\%newclonecrs,$udom,$uname);
                                 }
-                                &Apache::lonnet::put('environment',\%newclonecrs,$udom,$uname);
                             }
                         }
                     }
@@ -3886,6 +8053,30 @@ sub change_clone {
             }
         }
     }
+    return;
+}
+
+sub devalidate_remote_courseprefs {
+    my ($cdom,$cnum,$cachekeys) = @_;
+    return unless (ref($cachekeys) eq 'HASH');
+    my %servers = &Apache::lonnet::internet_dom_servers($cdom);
+    my %thismachine;
+    map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
+    my @posscached = ('courselti','courseltitools');
+    if (keys(%servers)) {
+        foreach my $server (keys(%servers)) {
+            next if ($thismachine{$server});
+            my @cached;
+            foreach my $name (@posscached) {
+                if ($cachekeys->{$name}) {
+                    push(@cached,&escape($name).':'.&escape($cdom.'_'.$cnum));
+                }
+            }
+            if (@cached) {
+                &Apache::lonnet::remote_devalidate_cache($server,\@cached);
+            }
+        }
+    }
     return;
 }