--- loncom/interface/domainprefs.pm	2024/01/02 02:34:06	1.433
+++ loncom/interface/domainprefs.pm	2025/03/15 01:07:42	1.447.2.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.433 2024/01/02 02:34:06 raeburn Exp $
+# $Id: domainprefs.pm,v 1.447.2.6 2025/03/15 01:07:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -222,10 +222,10 @@ sub handler {
                 'coursedefaults','usersessions','loadbalancing',
                 'requestauthor','selfenrollment','inststatus',
                 'ltitools','toolsec','ssl','trust','lti','ltisec',
-                'privacy','passwords','proctoring','wafproxy',
+                'privacy','passwords','wafproxy',
                 'ipaccess','authordefaults'],$dom);
     my %encconfig =
-        &Apache::lonnet::get_dom('encconfig',['ltitools','lti','proctoring','linkprot'],$dom,undef,1);
+        &Apache::lonnet::get_dom('encconfig',['ltitools','lti','linkprot'],$dom,undef,1);
     my ($checked_is_home,$is_home);
     if (ref($domconfig{'ltitools'}) eq 'HASH') {
         if (ref($encconfig{'ltitools'}) eq 'HASH') {
@@ -288,24 +288,12 @@ sub handler {
             }
         }
     }
-    if (ref($domconfig{'proctoring'}) eq 'HASH') {
-        if (ref($encconfig{'proctoring'}) eq 'HASH') {
-            foreach my $provider (keys(%{$domconfig{'proctoring'}})) {
-                if ((ref($domconfig{'proctoring'}{$provider}) eq 'HASH') &&
-                    (ref($encconfig{'proctoring'}{$provider}) eq 'HASH')) {
-                    foreach my $item ('key','secret') {
-                        $domconfig{'proctoring'}{$provider}{$item} = $encconfig{'proctoring'}{$provider}{$item};
-                    }
-                }
-            }
-        }
-    }
     my @prefs_order = ('rolecolors','login','ipaccess','defaults','wafproxy','passwords',
                        'quotas','autoenroll','autoupdate','autocreate','directorysrch',
                        'contacts','privacy','usercreation','selfcreation',
                        'usermodification','scantron','requestcourses','requestauthor',
                        'coursecategories','serverstatuses','helpsettings','coursedefaults',
-                       'authordefaults','ltitools','proctoring','selfenrollment',
+                       'authordefaults','ltitools','selfenrollment',
                        'usersessions','ssl','trust','lti');
     my %existing;
     if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
@@ -386,7 +374,7 @@ sub handler {
                       help => 'Domain_Configuration_Quotas',
                       header => [{col1 => 'User affiliation',
                                   col2 => 'Available tools',
-                                  col3 => 'Portfilo quota (MB)',}],
+                                  col3 => 'Portfolio quota (MB)',}],
                       print => \&print_quotas,
                       modify => \&modify_quotas,
                     },
@@ -472,6 +460,8 @@ sub handler {
                     header => [{col1 => 'Target user has role',
                                 col2 => 'User information updatable in author context'},
                                {col1 => 'Target user has role',
+                                col2 => 'User information updatable by co-author manager'},
+                               {col1 => 'Target user has role',
                                 col2 => 'User information updatable in course context'}],
                     print => \&print_usermodification,
                     modify => \&modify_usermodification,
@@ -573,11 +563,7 @@ sub handler {
                   header => [{col1 => 'Role assigned in different domain',
                               col2 => 'Approval options'},
                              {col1 => 'Role assigned in different domain to user of type',
-                              col2 => 'User information available in that domain'},
-                             {col1 => "Role assigned in user's domain",
-                              col2 => 'Information viewable by privileged user'},
-                             {col1 => "Role assigned in user's domain",
-                              col2 => 'Information viewable by unprivileged user'}],
+                              col2 => 'User information available in that domain'}],
                   print => \&print_privacy,
                   modify => \&modify_privacy,
                  },
@@ -616,14 +602,6 @@ sub handler {
                   print => \&print_ltitools,
                   modify => \&modify_ltitools,
                  },
-        'proctoring' =>
-                 {text => 'Remote Proctoring Integration',
-                  help => 'Domain_Configuration_Proctoring',
-                  header => [{col1 => 'Name',
-                              col2 => 'Configuration'}],
-                  print => \&print_proctoring,
-                  modify => \&modify_proctoring,
-                 },
         'ssl' =>
                  {text  => 'LON-CAPA Network (SSL)',
                   help  => 'Domain_Configuration_Network_SSL',
@@ -669,6 +647,8 @@ sub handler {
                               col2 => 'Settings'},
                              {col1 => 'Rules for shared secrets',
                               col2 => 'Settings'},
+                             {col1 => 'Link Protectors in Courses',
+                              col2 => 'Values'},
                              {col1 => 'Link Protectors',
                               col2 => 'Settings'},
                              {col1 => 'Consumers',
@@ -684,7 +664,7 @@ sub handler {
                         print  => \&print_ipaccess,
                         modify => \&modify_ipaccess,
                        },
-        'authordefaults' => 
+        'authordefaults' =>
                             {text => 'Authoring Space defaults',
                              help => 'Domain_Configuration_Author_Defaults',
                              header => [{col1 => 'Defaults which can be overridden by Author',
@@ -883,8 +863,6 @@ sub process_changes {
         $output = &modify_loadbalancing($dom,%domconfig);
     } elsif ($action eq 'ltitools') {
         $output = &modify_ltitools($r,$dom,$action,$lastactref,%domconfig);
-    } elsif ($action eq 'proctoring') {
-        $output = &modify_proctoring($r,$dom,$action,$lastactref,%domconfig);
     } elsif ($action eq 'ssl') {
         $output = &modify_ssl($dom,$lastactref,%domconfig);
     } elsif ($action eq 'trust') {
@@ -936,8 +914,6 @@ sub print_config_box {
     } elsif ($action eq 'lti') {
         $output .= &passwords_javascript('ltisecrets')."\n".
                    &lti_javascript($dom,$settings);
-    } elsif ($action eq 'proctoring') {
-        $output .= &proctoring_javascript($settings);
     } elsif ($action eq 'wafproxy') {
         $output .= &wafproxy_javascript($dom);
     } elsif ($action eq 'autoupdate') {
@@ -1028,8 +1004,8 @@ sub print_config_box {
             ($action eq 'selfcreation') || ($action eq 'selfenrollment') ||
             ($action eq 'usersessions') || ($action eq 'coursecategories') || 
             ($action eq 'trust') || ($action eq 'contacts') || ($action eq 'defaults') ||
-            ($action eq 'privacy') || ($action eq 'passwords') || ($action eq 'lti') ||
-            ($action eq 'ltitools')) {
+            ($action eq 'passwords') || ($action eq 'lti') || ($action eq 'ltitools') ||
+            ($action eq 'usermodification')) {
             if ($action eq 'coursecategories') {
                 $output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal);
                 $colspan = ' colspan="2"';
@@ -1037,6 +1013,19 @@ sub print_config_box {
                 $output .= $item->{'print'}->('shared',$dom,$settings,\$rowtotal);
             } elsif ($action eq 'passwords') {
                 $output .= $item->{'print'}->('middle',$dom,$confname,$settings,\$rowtotal);
+            } elsif ($action eq 'lti') {
+                $output .= $item->{'print'}->('upper',$dom,$settings,\$rowtotal).'
+                           </table>
+                          </td>
+                         </tr>
+                         <tr>
+                          <td>
+                          <table class="LC_nested">
+                           <tr class="LC_info_row">
+                            <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
+                            <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>
+                           </tr>'."\n".
+                           $item->{'print'}->('middle',$dom,$settings,\$rowtotal);
             } else {
                 $output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal);
             }
@@ -1069,6 +1058,10 @@ sub print_config_box {
               <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[8]->{'col2'}).'</td></tr>'.
                            $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
             } else {
+                my $hdridx = 2;
+                if ($action eq 'lti') {
+                    $hdridx = 3;
+                }
                 $output .= '
            </table>
           </td>
@@ -1077,18 +1070,19 @@ sub print_config_box {
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
-              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
-              <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[$hdridx]->{'col1'}).'</td>
+              <td class="LC_right_item">'.&mt($item->{'header'}->[$hdridx]->{'col2'}).'</td>
              </tr>'."\n";
                 if ($action eq 'coursecategories') {
                     $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
-                } elsif (($action eq 'contacts') || ($action eq 'privacy') || 
-                         ($action eq 'passwords') || ($action eq 'lti')) {
+                } elsif (($action eq 'contacts') || ($action eq 'passwords') || 
+                         ($action eq 'lti')) {
                     if ($action eq 'passwords') {
                         $output .= $item->{'print'}->('lower',$dom,$confname,$settings,\$rowtotal);
                     } else {
                         $output .= $item->{'print'}->('lower',$dom,$settings,\$rowtotal);
                     }
+                    $hdridx ++;
                     $output .= '
              </tr>
             </table>
@@ -1098,8 +1092,8 @@ sub print_config_box {
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
-              <td class="LC_left_item'.$leftnobr.'"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
-              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td></tr>'."\n";
+              <td class="LC_left_item'.$leftnobr.'"'.$colspan.'>'.&mt($item->{'header'}->[$hdridx]->{'col1'}).'</td>
+              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[$hdridx]->{'col2'}).'</td></tr>'."\n";
                     if ($action eq 'passwords') {
                         $output .= $item->{'print'}->('bottom',$dom,$confname,$settings,\$rowtotal);
                     } else {
@@ -1115,9 +1109,9 @@ sub print_config_box {
                 }
             }
             $rowtotal ++;
-        } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') ||
+        } elsif (($action eq 'coursedefaults') || ($action eq 'authordefaults') ||
                  ($action eq 'directorysrch') || ($action eq 'helpsettings') ||
-                 ($action eq 'wafproxy') || ($action eq 'authordefaults')) {
+                 ($action eq 'wafproxy') || ($action eq 'privacy')) {
             $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'scantron') {
             $output .= $item->{'print'}->($r,'bottom',$dom,$confname,$settings,\$rowtotal);
@@ -1320,7 +1314,7 @@ sub print_config_box {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
         } elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || 
                  ($action eq 'serverstatuses') || ($action eq 'loadbalancing') || 
-                 ($action eq 'proctoring') || ($action eq 'ipaccess')) {
+                 ($action eq 'ipaccess')) {
             $output .= $item->{'print'}->($dom,$settings,\$rowtotal);
         }
     }
@@ -1987,10 +1981,11 @@ sub commblocktype_text {
         'passwd' => 'Change Password',
         'grades' => 'Gradebook',
         'search' => 'Course search',
+        'index'  => 'Course content index',
         'wishlist' => 'Stored links',
         'annotate' => 'Annotations',
     );
-    my $typeorder = ['com','chat','boards','port','groups','blogs','about','wishlist','printout','grades','search','annotate','passwd'];
+    my $typeorder = ['com','chat','boards','port','groups','blogs','about','wishlist','printout','grades','search','index','annotate','passwd'];
     return ($typeorder,\%types);
 }
 
@@ -1999,7 +1994,7 @@ sub print_rolecolors {
     my %choices = &color_font_choices();
     my @bgs = ('pgbg','tabbg','sidebg');
     my @links = ('link','alink','vlink');
-    my @images = ('img');
+    my @images = ();
     my %alt_text = &Apache::lonlocal::texthash(img => "Banner for $role role");
     my %designhash = &Apache::loncommon::get_domainconf($dom);
     my %defaultdesign = %Apache::loncommon::defaultdesign;
@@ -2007,10 +2002,6 @@ sub print_rolecolors {
     my %defaults = &role_defaults($role,\@bgs,\@links,\@images);
     if (ref($settings) eq 'HASH') {
         if (ref($settings->{$role}) eq 'HASH') {
-            if ($settings->{$role}->{'img'} ne '') {
-                $designs{'img'} = $settings->{$role}->{'img'};
-                $is_custom{'img'} = 1;
-            }
             if ($settings->{$role}->{'font'} ne '') {
                 $designs{'font'} = $settings->{$role}->{'font'};
                 $is_custom{'font'} = 1;
@@ -2033,10 +2024,6 @@ sub print_rolecolors {
             }
         }
     } else {
-        if ($designhash{$dom.'.'.$role.'.img'} ne '') {
-            $designs{img} = $designhash{$dom.'.'.$role.'.img'};
-            $is_custom{'img'} = 1;
-        }
         if ($designhash{$dom.'.'.$role.'.fontmenu'} ne '') {
             $designs{fontmenu} = $designhash{$dom.'.'.$role.'.fontmenu'};
             $is_custom{'fontmenu'} = 1; 
@@ -2086,7 +2073,6 @@ sub role_defaults {
         }
     } else {
         %defaults = (
-                       img => $defaultdesign{$role.'.img'},
                        font => $defaultdesign{$role.'.font'},
                        fontmenu => $defaultdesign{$role.'.fontmenu'},
                     );
@@ -5385,42 +5371,6 @@ sub print_ltitools {
     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 secrets_form {
     my ($dom,$context,$encrypt,$privkeys,$rowtotal) = @_;
     my @ids=&Apache::lonnet::current_machine_ids();
@@ -6176,7 +6126,7 @@ sub print_lti {
     my ($position,$dom,$settings,$rowtotal) = @_;
     my $itemcount = 1;
     my ($datatable,$css_class);
-    my (%rules,%encrypt,%privkeys,%linkprot);
+    my (%rules,%encrypt,%privkeys,%linkprot,%suggestions);
     if (ref($settings) eq 'HASH') {
         if ($position eq 'top') {
             if (exists($settings->{'encrypt'})) {
@@ -6199,12 +6149,18 @@ sub print_lti {
                     }
                 }
             }
-        } elsif ($position eq 'middle') {
+        } elsif ($position eq 'upper') {
             if (exists($settings->{'rules'})) {
                 if (ref($settings->{'rules'}) eq 'HASH') {
                     %rules = %{$settings->{'rules'}};
                 }
             }
+        } elsif ($position eq 'middle') {
+            if (exists($settings->{'suggested'})) {
+                if (ref($settings->{'suggested'}) eq 'HASH') {
+                    %suggestions = %{$settings->{'suggested'}};
+                }
+            }
         } elsif ($position eq 'lower') {
             if (exists($settings->{'linkprot'})) {
                 if (ref($settings->{'linkprot'}) eq 'HASH') {
@@ -6215,7 +6171,7 @@ sub print_lti {
                 }
             }
         } else {
-            foreach my $key ('encrypt','private','rules','linkprot') {
+            foreach my $key ('encrypt','private','rules','linkprot','suggestions') {
                 if (exists($settings->{$key})) {
                     delete($settings->{$key});
                 }
@@ -6224,11 +6180,14 @@ sub print_lti {
     }
     if ($position eq 'top') {
         $datatable = &secrets_form($dom,'ltisec',\%encrypt,\%privkeys,$rowtotal);
-    } elsif ($position eq 'middle') {
+    } elsif ($position eq 'upper') {
         $datatable = &password_rules('ltisecrets',\$itemcount,\%rules);
         $$rowtotal += $itemcount;
+    } elsif ($position eq 'middle') {
+        $datatable = &linkprot_suggestions(\%suggestions,\$itemcount);
+        $$rowtotal += $itemcount;
     } elsif ($position eq 'lower') {
-         $datatable .= &Apache::courseprefs::print_linkprotection($dom,'',$settings,$rowtotal,'','','domain');
+        $datatable .= &Apache::courseprefs::print_linkprotection($dom,'',$settings,$rowtotal,'','','domain');
     } else {
         my ($switchserver,$switchmessage);
         $switchserver = &check_switchserver($dom);
@@ -6815,6 +6774,58 @@ sub ltimenu_titles {
     );
 }
 
+sub linkprot_suggestions {
+    my ($suggested,$itemcount) = @_;
+    my $count = 0;
+    my $next = 1;
+    my %lt = &Apache::lonlocal::texthash(
+                                          'name' => 'Suggested Launcher',
+                                          'info' => 'Recommendations',
+                                        );
+    my ($datatable,$css_class,$dest);
+    if (ref($suggested) eq 'HASH') {
+        my @current = sort { $a <=> $b } keys(%{$suggested});
+        $next += $current[-1];
+        for (my $i=0; $i<@current; $i++) {
+            my $num = $current[$i];
+            my %values;
+            if (ref($suggested->{$num}) eq 'HASH') {
+                %values = %{$suggested->{$num}};
+            } else {
+                next;
+            }
+            $css_class = $$itemcount%2?' class="LC_odd_row"':'';
+            $datatable .=
+                '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n".
+                '<label><input type="checkbox" name="linkprot_suggested_del" value="'.$i.'" />'."\n".
+                &mt('Delete?').'</label></span></td><td>'."\n".
+                '<div class="LC_floatleft"><fieldset><legend>'.$lt{'name'}.'</legend>'."\n".
+                '<input type="text" size="15" name="linkprot_suggested_name_'.$i.'" value="'.$values{'name'}.'" autocomplete="off" />'."\n".
+                '</fieldset></div>'.
+                '<div class="LC_floatleft"><fieldset><legend>'.$lt{'info'}.'</legend>'."\n".
+                '<textarea cols="55" rows="5" name="linkprot_suggested_info_'.$i.'">'.$values{'info'}.'</textarea>'.
+                '</fieldset></div>'.
+                '<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n".
+                '<input type="hidden" name="linkprot_suggested_id_'.$i.'" value="'.$num.'" /></td></tr>'."\n";
+            $$itemcount ++;
+        }
+    }
+    $css_class = $$itemcount%2?' class="LC_odd_row"':'';
+    $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n".
+                  '<input type="hidden" name="linkprot_suggested_maxnum" value="'.$next.'" />'."\n".
+                  '<input type="checkbox" name="linkprot_suggested_add" value="1" />'.&mt('Add').'</span></td>'."\n".
+                  '<td>'."\n".
+                  '<div class="LC_floatleft"><fieldset><legend>'.$lt{'name'}.'</legend>'."\n".
+                  '<input type="text" size="15" name="linkprot_suggested_name_add" value="" autocomplete="off" />'."\n".
+                  '</fieldset></div>'.
+                  '<div class="LC_floatleft"><fieldset><legend>'.$lt{'info'}.'</legend>'."\n".
+                  '<textarea cols="55" rows="5" name="linkprot_suggested_info_add"></textarea>'.
+                  '</fieldset></div>'.
+                  '<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n".
+                  '</td></tr>'."\n";
+    return $datatable;
+}
+
 sub print_coursedefaults {
     my ($position,$dom,$settings,$rowtotal) = @_;
     my ($css_class,$datatable,%checkedon,%checkedoff,%defaultchecked,@toggles);
@@ -6836,6 +6847,7 @@ sub print_coursedefaults {
         domexttool           => 'External Tools defined in the domain may be used in courses/communities (by type)',
         exttool              => 'External Tools can be defined and configured in courses/communities (by type)',
         crsauthor            => 'Standard LON-CAPA problems can be created within a course/community (by type)',
+        crseditors           => 'Available editors for web pages and/or problems created in a course/community',
     );
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
@@ -6846,6 +6858,7 @@ sub print_coursedefaults {
                            domexttool           => 1,
                            exttool              => 0,
                            crsauthor            => 1,
+                           crseditors           => ['edit','xml'],  
                          );
     if ($position eq 'top') {
         %defaultchecked = (
@@ -6967,6 +6980,7 @@ sub print_coursedefaults {
         my %domexttool;
         my %exttool;
         my %crsauthor;
+        my %crseditors;
         my @types = ('official','unofficial','community','textbook','placement');
         if (ref($settings) eq 'HASH') {
             if ($settings->{'ltiauth'}) {
@@ -7005,6 +7019,15 @@ sub print_coursedefaults {
                     }
                 }
             }
+            if (ref($settings->{'crseditors'}) eq 'ARRAY') {
+                foreach my $editor (@{$settings->{'crseditors'}}) {
+                    $crseditors{$editor} = ' checked="checked"';
+                }
+            } else {
+                foreach my $editor (@{$staticdefaults{'crseditors'}}) {
+                    $crseditors{$editor} = ' checked="checked"';
+                }
+            }
             $currdefresponder = $settings->{'anonsurvey_threshold'};
             if (ref($settings->{'uploadquota'}) eq 'HASH') {
                 foreach my $type (keys(%{$settings->{'uploadquota'}})) {
@@ -7068,6 +7091,9 @@ sub print_coursedefaults {
                     $crsauthor{$type} = ' checked="checked"';
                 }
             }
+            foreach my $editor (@{$staticdefaults{'crseditors'}}) {
+                $crseditors{$editor} = ' checked="checked"';
+            }
         }
         if (!$currdefresponder) {
             $currdefresponder = $staticdefaults{'anonsurvey_threshold'};
@@ -7195,9 +7221,9 @@ sub print_coursedefaults {
         foreach my $type (@types) {
             $datatable .= '<td style="text-align: left">'.
                           '<span class="LC_nobreak">'.
-                          '<input type="checkbox" name="domexttool"'.
+                          '<label><input type="checkbox" name="domexttool"'.
                           ' value="'.$type.'"'.$domexttool{$type}.' />'.
-                          &mt($type).'</span></td>'."\n";
+                          &mt($type).'</label></span></td>'."\n";
         }
         $datatable .= '</tr></table></td></tr>'."\n";
         $itemcount ++;
@@ -7210,9 +7236,9 @@ sub print_coursedefaults {
         foreach my $type (@types) {
             $datatable .= '<td style="text-align: left">'.
                           '<span class="LC_nobreak">'.
-                          '<input type="checkbox" name="exttool"'.
+                          '<label><input type="checkbox" name="exttool"'.
                           ' value="'.$type.'"'.$exttool{$type}.' />'.
-                          &mt($type).'</span></td>'."\n";
+                          &mt($type).'</label></span></td>'."\n";
         }
         $datatable .= '</tr></table></td></tr>'."\n";
         $itemcount ++;
@@ -7225,9 +7251,26 @@ sub print_coursedefaults {
         foreach my $type (@types) {
             $datatable .= '<td style="text-align: left">'.
                           '<span class="LC_nobreak">'.
-                          '<input type="checkbox" name="crsauthor"'.
+                          '<label><input type="checkbox" name="crsauthor"'.
                           ' value="'.$type.'"'.$crsauthor{$type}.' />'.
-                          &mt($type).'</span></td>'."\n";
+                          &mt($type).'</label></span></td>'."\n";
+        }
+        $datatable .= '</tr></table></td></tr>'."\n";
+        $itemcount ++;
+        $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+        $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.
+                      $choices{'crseditors'}.
+                      '</span></td>'.
+                      '<td style="text-align: right" class="LC_right_item">'.
+                      '<table><tr>';
+        my @editors = ('edit','xml','daxe');
+        my %editornames = &crseditor_titles();
+        foreach my $editor (@editors) {
+            $datatable .= '<td style="text-align: left">'.
+                          '<span class="LC_nobreak">'.
+                          '<label><input type="checkbox" name="crseditors"'.
+                          ' value="'.$editor.'"'.$crseditors{$editor}.' />'.
+                          $editornames{$editor}.'</label></span></td>'."\n";
         }
         $datatable .= '</tr></table></td></tr>'."\n";
     }
@@ -7235,6 +7278,14 @@ sub print_coursedefaults {
     return $datatable;
 }
 
+sub crseditor_titles {
+    return &Apache::lonlocal::texthash(
+               edit  => 'Standard editor (Edit)',
+               xml   => 'Text editor (EditXML)',
+               daxe  => 'Daxe editor (Daxe)',
+           );
+}
+
 sub print_authordefaults {
     my ($position,$dom,$settings,$rowtotal) = @_;
     my ($css_class,$datatable,%checkedon,%checkedoff);
@@ -7243,9 +7294,10 @@ sub print_authordefaults {
     if ($position eq 'top') {
         my %defaultchecked = (
                             'nocodemirror' => 'off',
+                            'daxecollapse' => 'off',
                             'domcoordacc'  => 'on',
                           );
-        my @toggles = ('nocodemirror','domcoordacc');
+        my @toggles = ('nocodemirror','daxecollapse','domcoordacc');
         ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
                                                      \%titles,$itemcount);
         my %staticdefaults = (
@@ -7364,7 +7416,7 @@ sub print_authordefaults {
         my $checkedno = ' checked="checked"';
         my ($checkedon,$checkedoff);
         if (ref($quotas{'webdav'}) eq 'HASH') {
-            if ($quotas{'webdav'}{'_LC_adv'} =~ /^0|1$/) { 
+            if ($quotas{'webdav'}{'_LC_adv'} =~ /^0|1$/) {
                 if ($quotas{'webdav'}{'_LC_adv'}) {
                     $checkedon = $checkedno;
                 } else {
@@ -7393,7 +7445,7 @@ sub print_authordefaults {
                 $text = $titles{'overon'};
                 $val = 1;
                 $checked = $checkedon;
-            } 
+            }
             $datatable .= '<span class="LC_nobreak"><label>'.
                           '<input type="radio" name="webdav_LC_adv"'.
                           ' value="'.$val.'"'.$checked.' />'.
@@ -7401,6 +7453,15 @@ sub print_authordefaults {
         }
         $datatable .= '</td></tr>';
         $itemcount ++;
+        my %defchecked = (
+                                'archive' => 'off',
+                             );
+        my @toggles = ('archive');
+        (my $archive,$itemcount) = &radiobutton_prefs($settings,['archive'],
+                                                      {'archive' => 'off'},
+                                                      \%titles,$itemcount);
+        $datatable .= $archive."\n";
+        $itemcount ++;
     }
     $$rowtotal += $itemcount;
     return $datatable;
@@ -7414,6 +7475,7 @@ sub authordefaults_titles {
                webdav => 'WebDAV',
                authorquota => 'Authoring Space quotas (MB)',
                nocodemirror => 'Deactivate CodeMirror for EditXML editor',
+               daxecollapse => 'Daxe editor: LON-CAPA standard menus start collapsed',
                domcoordacc => 'Dom. Coords. can enter Authoring Spaces in domain',
                edit  => 'Standard editor (Edit)',
                xml   => 'Text editor (EditXML)',
@@ -7422,7 +7484,8 @@ sub authordefaults_titles {
                webdav_LC_adv_over => '(overrides access based on affiliation, if set)',
                none => 'No override set',
                overon => 'Override -- webDAV on',
-               overoff => 'Override -- webDAV off', 
+               overoff => 'Override -- webDAV off',
+               archive => 'Authors can download tar.gz file of Authoring Space',
     );
 }
 
@@ -7686,7 +7749,7 @@ sub print_privacy {
         ($othertitle,$usertypes,$types) =
             &Apache::loncommon::sorted_inst_types($dom);
     }
-    if (($position eq 'top') || ($position eq 'middle')) {
+    if (($position eq 'top') || ($position eq 'bottom')) {
         my (%by_ip,%by_location,@intdoms,@instdoms);
         &build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms);
         if ($position eq 'top') {
@@ -7773,7 +7836,7 @@ sub print_privacy {
                 $datatable .= &mt('Nothing to set here, as there are no other domains');
             }
             $datatable .='</td></tr>';
-        } elsif ($position eq 'middle') {
+        } elsif ($position eq 'bottom') {
             if ((@instdoms > 1) || (keys(%by_location) > 0)) {
                 if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
                     foreach my $item (@{$types}) {
@@ -7810,19 +7873,6 @@ sub print_privacy {
                 }
             }
         }
-    } else {
-        my $prefix;
-        if ($position eq 'lower') {
-            $prefix = 'priv';
-        } else {
-            $prefix = 'unpriv';
-        }
-        foreach my $item (@items) {
-            $datatable .= &modifiable_userdata_row('privacy',$prefix.'_'.$item,$settings,
-                                                   $numinrow,$itemcount,'','','','','',
-                                                   '',$names{$item});
-            $itemcount ++;
-        }
     }
     if (ref($rowtotal)) {
         $$rowtotal += $itemcount;
@@ -7851,7 +7901,6 @@ sub print_passwords {
         min            => 'Minimum password length',
         max            => 'Maximum password length',
         chars          => 'Required characters',
-        expire         => 'Password expiration (days)',
         numsaved       => 'Number of previous passwords to save and disallow reuse',
     );
     if ($position eq 'top') {
@@ -8178,7 +8227,7 @@ sub print_passwords {
 
 sub password_rules {
     my ($prefix,$itemcountref,$settings) = @_;
-    my ($min,$max,%chars,$expire,$numsaved,$numinrow);
+    my ($min,$max,%chars,$numsaved,$numinrow);
     my %titles;
     if ($prefix eq 'passwords') {
         %titles = &Apache::lonlocal::texthash (
@@ -8210,9 +8259,6 @@ sub password_rules {
             map { $chars{$_} = 1; } (@{$settings->{chars}});
         }
         if ($prefix eq 'passwords') {
-            if ($settings->{expire}) {
-                $expire = $settings->{expire};
-            }
             if ($settings->{numsaved}) {
                 $numsaved = $settings->{numsaved};
             }
@@ -8274,17 +8320,8 @@ sub password_rules {
     $datatable .='</table></td></tr>';
     $itemcount ++;
     if ($prefix eq 'passwords') {
-        $titles{'expire'} = &mt('Password expiration (days)');
         $titles{'numsaved'} = &mt('Number of previous passwords to save and disallow reuse');
         $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .= '<tr'.$css_class.'><td>'.$titles{'expire'}.'</td>'.
-                      '<td class="LC_left_item"><span class="LC_nobreak">'.
-                      '<input type="text" name="'.$prefix.'_expire" value="'.$expire.'" size="4" '.
-                      'onblur="javascript:warnInt'.$prefix.'(this);" />'.
-                      '<span class="LC_fontsize_small"> '.&mt('(Leave blank for no expiration)').'</span>'.
-                      '</span></td></tr>';
-        $itemcount ++;
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
         $datatable .= '<tr'.$css_class.'><td>'.$titles{'numsaved'}.'</td>'.
                       '<td class="LC_left_item"><span class="LC_nobreak">'.
                       '<input type="text" name="'.$prefix.'_numsaved" value="'.$numsaved.'" size="3" '.
@@ -10591,6 +10628,15 @@ sub print_usermodification {
             $$rowtotal ++;
             $rowcount ++;
         }
+    } elsif ($position eq 'middle') {
+        $rowcount = 0;
+        $context = 'coauthor';
+        foreach my $role ('ca','aa') {
+            $datatable .= &modifiable_userdata_row($context,$role,$settings,
+                                                   $numinrow,$rowcount);
+            $$rowtotal ++;
+            $rowcount ++;
+        }
     } elsif ($position eq 'bottom') {
         $context = 'course';
         $rowcount = 0;
@@ -11657,29 +11703,15 @@ function warnInt$prefix(field) {
             field.value = '';
         }
         if (field.value != '') {
-            if (field.name == '${prefix}_expire') {
-                var regexpposnum=/^\\d+(|\\.\\d*)\$/; 
-                if (!regexpposnum.test(field.value)) {
-                    alert('$intalert{passexp}');
-                    field.value = '';
+            if (!regexdigit.test(field.value)) {
+                if (field.name == '${prefix}_max') {
+                    alert('$intalert{passmax}');
                 } else {
-                    var expval = parseFloat(field.value);
-                    if (expval == 0) {
-                        alert('$intalert{passexp}');
-                        field.value = '';
+                    if (field.name == '${prefix}_numsaved') {
+                        alert('$intalert{passnum}');
                     }
                 }
-            } else {
-                if (!regexdigit.test(field.value)) {
-                    if (field.name == '${prefix}_max') {
-                        alert('$intalert{passmax}');
-                    } else {
-                        if (field.name == '${prefix}_numsaved') {
-                            alert('$intalert{passnum}');
-                        }
-                    }
-                    field.value = '';
-                }
+                field.value = '';
             }
         }
     }
@@ -12004,7 +12036,11 @@ sub modifiable_userdata_row {
         my $hashref;
         if ($context eq 'lti') {
             if (ref($settings) eq 'HASH') {
-                $hashref = $settings->{'instdata'};
+                my %instdata;
+                if (ref($settings->{'instdata'}) eq 'ARRAY') {
+                    map { $instdata{$_} = 1; } @{$settings->{'instdata'}};
+                }
+                $hashref = \%instdata;
             }
         } elsif ($context eq 'privacy') {
             my ($key,$inner) = split(/_/,$role);
@@ -12015,7 +12051,7 @@ sub modifiable_userdata_row {
             }
         } elsif (ref($settings->{$context}) eq 'HASH') {
             if (ref($settings->{$context}->{$role}) eq 'HASH') {
-                $hashref = $settings->{'lti_instdata'};
+                $hashref = $settings->{$context}->{$role};
             }
             if ($role eq 'emailusername') {
                 if ($statustype) {
@@ -12096,6 +12132,8 @@ sub modifiable_userdata_row {
         } else {
             if ($context eq 'lti') {
                 $prefix = 'lti';
+            } elsif ($context eq 'coauthor') {
+                $prefix = 'cacanmodify';
             } elsif ($context eq 'privacy') {
                 $prefix = 'privacy';
             }
@@ -12988,7 +13026,6 @@ sub check_exempt_addresses {
 sub color_font_choices {
     my %choices =
         &Apache::lonlocal::texthash (
-            img => "Header",
             bgs => "Background colors",
             links => "Link colors",
             images => "Images",
@@ -13043,13 +13080,15 @@ sub modify_ipaccess {
     foreach my $idx (@items) {
         my $itemid = $itemids{$idx};
         next unless ($itemid);
-        my %current;
-        unless ($idx eq 'add') {
+        my ($position,%current);
+        if ($idx eq 'add') {
+            $position = $env{'form.ipaccess_pos_add'};
+        } else {
+            $position = $env{'form.ipaccess_pos_'.$itemid};
             if (ref($domconfig{'ipaccess'}{$itemid}) eq 'HASH') {
                 %current = %{$domconfig{'ipaccess'}{$itemid}};
             }
         }
-        my $position = $env{'form.ipaccess_pos_'.$itemid};
         $position =~ s/\D+//g;
         if ($position ne '') {
             $allpos[$position] = $itemid;
@@ -13300,13 +13339,15 @@ sub modify_authordefaults {
                            'copyright'    => 'default',
                            'sourceavail'  => 'closed',
                            'nocodemirror' => 'off',
+                           'daxecollapse' => 'off',
                            'domcoordacc'  => 'on',
-                           'editors'      => ['edit','xml'].
+                           'editors'      => ['edit','xml'],
                            'authorquota'  => 500,
                            'webdav'       => 0,
+                           'archive'      => 'off',
                          );
     my %titles = &authordefaults_titles();
-    foreach my $item ('nocodemirror','domcoordacc') {
+    foreach my $item ('nocodemirror','daxecollapse','domcoordacc','archive') {
         if ($env{'form.'.$item} =~ /^(0|1)$/) {
             $confhash{$item} = $env{'form.'.$item};
         }
@@ -13326,7 +13367,7 @@ sub modify_authordefaults {
         }
     }
     $confhash{'editors'} = \@editors;
-   
+
     my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
     my @insttypes;
     if (ref($types) eq 'ARRAY') {
@@ -13350,13 +13391,13 @@ sub modify_authordefaults {
         $save_quotas{'webdav'}{'_LC_adv'} = $env{'form.webdav_LC_adv'};
     }
     if (ref($domconfig{'authordefaults'}) eq 'HASH') {
-        foreach my $item ('nocodemirror','domcoordacc','copyright','sourceavail') {
+        foreach my $item ('nocodemirror','daxecollapse','domcoordacc','copyright','sourceavail','archive') {
             if ($domconfig{'authordefaults'}{$item} ne $confhash{$item}) {
                 $changes{$item} = 1;
              }
         }
         if (ref($domconfig{'authordefaults'}{'editors'}) eq 'ARRAY') {
-            my @diffs = 
+            my @diffs =
                 &Apache::loncommon::compare_arrays($confhash{'editors'},
                                                    $domconfig{'authordefaults'}{'editors'});
             unless (@diffs == 0) {
@@ -13372,8 +13413,8 @@ sub modify_authordefaults {
         }
     } else {
         my @offon = ('off','on');
-        foreach my $item ('nocodemirror','domcoordacc') {
-            if ($offon[$confhash{$item}] ne $staticdefaults{$item}) { 
+        foreach my $item ('nocodemirror','daxecollapse','domcoordacc','archive') {
+            if ($offon[$confhash{$item}] ne $staticdefaults{$item}) {
                 $changes{$item} = 1; 
             }
         }
@@ -13382,6 +13423,12 @@ sub modify_authordefaults {
                 $changes{$item} = 1;
             }
         }
+        my @diffs =
+            &Apache::loncommon::compare_arrays($confhash{'editors'},
+                                               $staticdefaults{'editors'});
+        unless (@diffs == 0) {
+            $changes{'editors'} = 1;
+        }
     }
     foreach my $key ('authorquota','webdav') {
         if (ref($curr_quotas{$key}) eq 'HASH') {
@@ -13410,7 +13457,7 @@ sub modify_authordefaults {
     }
     if (ref($curr_quotas{'webdav'}) eq 'HASH') {
         if (exists($save_quotas{'webdav'}{'_LC_adv'})) {
-            if ($save_quotas{'webdav'}{'_LC_adv'} ne $curr_quotas{'webdav'}{'_LC_adv'}) { 
+            if ($save_quotas{'webdav'}{'_LC_adv'} ne $curr_quotas{'webdav'}{'_LC_adv'}) {
                 $changes{'webdav_LC_adv'} = 1;
             }
         } elsif (exists($curr_quotas{'webdav'}{'_LC_adv'})) {
@@ -13430,7 +13477,7 @@ sub modify_authordefaults {
         if (keys(%changes)) {
             my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
             if ((exists($changes{'authorquota'})) || (exists($changes{'webdav'})) ||
-                ($changes{'webdav_LC_adv'})) { 
+                ($changes{'webdav_LC_adv'})) {
                 if ((exists($changes{'authorquota'})) && (ref($save_quotas{'authorquota'}) eq 'HASH')) {
                     $domdefaults{'authorquota'} = $save_quotas{'authorquota'};
                 }
@@ -13441,7 +13488,7 @@ sub modify_authordefaults {
             }
             $resulttext = &mt('Changes made:').'<ul>';
             my $authoroverride;
-            foreach my $key ('nocodemirror','domcoordacc','copyright','sourceavail') {
+            foreach my $key ('nocodemirror','daxecollapse','domcoordacc','copyright','sourceavail') {
                 if (exists($changes{$key})) {
                     $domdefaults{$key} = $confhash{$key};
                     my $shown;
@@ -13449,21 +13496,21 @@ sub modify_authordefaults {
                         $resulttext .= '<li>'.&mt('Defaults which can be overridden by Author').'<ul>';
                         $authoroverride = 1;
                     }
-                    if (($key eq 'nocodemirror') || ($key eq 'domcoordacc')) { 
+                    if (($key eq 'nocodemirror') || ($key eq 'daxecollapse') || ($key eq 'domcoordacc')) {
                         $shown = ($confhash{$key} ? &mt('Yes') : &mt('No'));
                     } elsif ($key eq 'copyright') {
                         $shown = &Apache::loncommon::copyrightdescription($confhash{$key});
                     } elsif ($key eq 'sourceavail') {
                         $shown = &Apache::loncommon::source_copyrightdescription($confhash{$key});
                     }
-                    $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$titles{$key},$shown).'</li>'; 
+                    $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$titles{$key},$shown).'</li>';
                 }
             }
             if ($authoroverride) {
                 $resulttext .= '</ul></li>';
             }
             my $domcoordoverride;
-            foreach my $key ('editors','authorquota','webdav','webdav_LC_adv') {
+            foreach my $key ('editors','authorquota','webdav','webdav_LC_adv','archive') {
                 if (exists($changes{$key})) {
                     my $shown;
                     unless ($domcoordoverride) {
@@ -13495,13 +13542,17 @@ sub modify_authordefaults {
                         } else {
                             $shown = $titles{'none'};
                         }
+                    } elsif ($key eq 'archive') {
+                        $domdefaults{$key} = $confhash{$key};
+                        $shown = ($confhash{$key} ? &mt('Yes') : &mt('No'));
                     }
                     $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$titles{$key},$shown).'</li>';
-                }                               
+                }
             }
             if ($domcoordoverride) {
                 $resulttext .= '</ul></li>';
             }
+            $resulttext .= '</ul>';
             my $cachetime = 24*60*60;
             &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
             if (ref($lastactref) eq 'HASH') {
@@ -13570,11 +13621,15 @@ sub modify_colors {
             @images = ('img','logo','domlogo','login');
             @bgs = ('pgbg','mainbg','sidebg');
         } else {
-            @images = ('img');
+            @images = ();
             @bgs = ('pgbg','tabbg','sidebg');
         }
         my %defaults = &role_defaults($role,\@bgs,\@links,\@images,\@logintext);
-        unless ($env{'form.'.$role.'_font'} eq $defaults{'font'}) {
+        $env{'form.'.$role.'_font'} = lc($env{'form.'.$role.'_font'});
+        if ($env{'form.'.$role.'_font'} =~ /^\w+/) {
+            $env{'form.'.$role.'_font'} = '#'.$env{'form.'.$role.'_font'};
+        }
+        unless ($env{'form.'.$role.'_font'} eq lc($defaults{'font'})) {
             $confhash->{$role}{'font'} = $env{'form.'.$role.'_font'};
         }
         if ($role eq 'login') {
@@ -13592,7 +13647,7 @@ sub modify_colors {
             if ($env{'form.'.$role.'_fontmenu'} =~ /^\w+/) {
                 $env{'form.'.$role.'_fontmenu'} = '#'.$env{'form.'.$role.'_fontmenu'};
             }
-            unless($env{'form.'.$role.'_fontmenu'} eq lc($defaults{'fontmenu'})) {
+            unless ($env{'form.'.$role.'_fontmenu'} eq lc($defaults{'fontmenu'})) {
                 $confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'};
             }
         }
@@ -14705,6 +14760,7 @@ sub modify_quotas {
                             $resulttext .= '<li>'.&mt('Validated course requests identified as processed by: [_1]',
                                                      '<b>'.$changes{'validation'}{'dc'}.'</b>').'</li>';
                         }
+                        $resulttext .= '</ul></li>';
                     }
                 }
             }
@@ -15016,7 +15072,6 @@ sub lti_security_results {
                                        off => &mt('Encryption of stored external tool secrets defined in domain disabled'),
                                      },
                              );
-
             }
             my @types= ('crs','dom');
             if ($context eq 'lti') {
@@ -15112,6 +15167,28 @@ sub lti_security_results {
             }
         } elsif ($item eq 'linkprot') {
             next;
+        } elsif ($item eq 'suggested') {
+            if ((ref($secchanges->{'suggested'}) eq 'HASH') &&
+                (ref($newsec->{'suggested'}) eq 'HASH')) {
+                my $suggestions;
+                foreach my $id (sort { $a <=> $b } keys(%{$secchanges->{'suggested'}})) {
+                    if (ref($newsec->{'suggested'}->{$id}) eq 'HASH') {
+                        my $name = $newsec->{'suggested'}->{$id}->{'name'};
+                        my $info = $newsec->{'suggested'}->{$id}->{'info'};
+                        $suggestions .= '<li>'.&mt('Launcher: [_1]',$name).'<br />'.
+                                               &mt('Recommend: [_1]','<pre>'.$info.'</pre>').
+                                        '</li>';
+                    } else {
+                        $suggestions .= '<li>'.&mt('Recommendations deleted for Launcher: [_1]',
+                                                   $newsec->{'suggested'}->{$id}).'</li>';
+                    }
+                }
+                if ($suggestions) {
+                    $output .= '<li>'.&mt('Hints in Courses for Link Protector Configuration').
+                               '<ul>'.$suggestions.'</ul>'.
+                               '</li>';
+                }
+            }
         }
     }
     if ($needs_update) {
@@ -15716,7 +15793,7 @@ sub modify_lti {
         }
     }
     if (ref($currltisec{'linkprot'}) eq 'HASH') {
-        foreach my $id (%{$currltisec{'linkprot'}}) {
+        foreach my $id (keys(%{$currltisec{'linkprot'}})) {
             next if ($id !~ /^\d+$/);
             unless (exists($linkprotchg{$id})) {
                 if (ref($currltisec{'linkprot'}{$id}) eq 'HASH') {
@@ -15738,17 +15815,75 @@ sub modify_lti {
     if ($proterror) {
         $errors .= '<li>'.$proterror.'</li>';
     }
+
+    my (%delsuggested,%suggids,@suggested);;
+    if (ref($currltisec{'suggested'}) eq 'HASH') {
+        my $maxnum = $env{'form.linkprot_suggested_maxnum'};
+        my @todelete = &Apache::loncommon::get_env_multiple('form.linkprot_suggested_del');
+        for (my $i=0; $i<$maxnum; $i++) {
+            my $itemid = $env{'form.linkprot_suggested_id_'.$i};
+            $itemid =~ s/\D+//g;
+            if ($itemid) {
+                if (ref($currltisec{'suggested'}->{$itemid}) eq 'HASH') {
+                    push(@suggested,$i);
+                    $suggids{$i} = $itemid;
+                    if ((@todelete > 0) && (grep(/^$i$/,@todelete))) {
+                        if (ref($currltisec{'suggested'}{$itemid}) eq 'HASH') {
+                            $delsuggested{$itemid} = $currltisec{'suggested'}{$itemid}{'name'};
+                        }
+                    } else {
+                        if ($env{'form.linkprot_suggested_name_'.$i} eq '') {
+                            $delsuggested{$itemid} = $currltisec{'suggested'}{$itemid}{'name'};
+                        } else {
+                            $env{'form.linkprot_suggested_name_'.$i} =~ s/(`)/'/g;
+                            $env{'form.linkprot_suggested_info_'.$i} =~ s/(`)/'/g;
+                            $newltisec{'suggested'}{$itemid}{'name'} = $env{'form.linkprot_suggested_name_'.$i};
+                            $newltisec{'suggested'}{$itemid}{'info'} = $env{'form.linkprot_suggested_info_'.$i};
+                            if (($currltisec{'suggested'}{$itemid}{'name'} ne $newltisec{'suggested'}{$itemid}{'name'}) ||
+                                ($currltisec{'suggested'}{$itemid}{'info'} ne $newltisec{'suggested'}{$itemid}{'info'})) {
+                                $secchanges{'suggested'}{$itemid} = 1;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    foreach my $key (keys(%delsuggested)) {
+        $newltisec{'suggested'}{$key} = $delsuggested{$key};
+        $secchanges{'suggested'}{$key} = 1;
+    }
+    if (($env{'form.linkprot_suggested_add'}) &&
+        ($env{'form.linkprot_suggested_name_add'} ne '')) {
+        $env{'form.linkprot_suggested_name_add'} =~ s/(`)/'/g;
+        $env{'form.linkprot_suggested_info_add'} =~ s/(`)/'/g;
+        my ($newsuggid,$errormsg) = &get_lti_id($dom,$env{'form.linkprot_suggested_name_add'},'suggested');
+        if ($newsuggid) {
+            $newltisec{'suggested'}{$newsuggid}{'name'} = $env{'form.linkprot_suggested_name_add'};
+            $newltisec{'suggested'}{$newsuggid}{'info'} = $env{'form.linkprot_suggested_info_add'};
+            $secchanges{'suggested'}{$newsuggid} = 1;
+        } else {
+            my $error = &mt('Failed to acquire unique ID for new Link Protectors in Courses Suggestion');
+            if ($errormsg) {
+                $error .= ' ('.$errormsg.')';
+            }
+            $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+        }
+    }
     my (@items,%deletions,%itemids);
     if ($env{'form.lti_add'}) {
         my $consumer = $env{'form.lti_consumer_add'};
         $consumer =~ s/(`)/'/g;
-        ($newid,my $error) = &get_lti_id($dom,$consumer);
+        ($newid,my $errormsg) = &get_lti_id($dom,$consumer,'lti');
         if ($newid) {
             $itemids{'add'} = $newid;
             push(@items,'add');
             $changes{$newid} = 1;
         } else {
             my $error = &mt('Failed to acquire unique ID for new LTI configuration');
+            if ($errormsg) {
+                $error .= ' ('.$errormsg.')';
+            }
             $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
         }
     }
@@ -15852,9 +15987,9 @@ sub modify_lti {
             }
             my @possinstdata =  &Apache::loncommon::get_env_multiple('form.lti_instdata_'.$idx);
             if (@possinstdata) {
-                foreach my $field (@possinstdata) {
+                foreach my $field (sort(@possinstdata)) {
                     if (exists($fieldtitles{$field})) {
-                        push(@{$confhash{$itemid}{'instdata'}});
+                        push(@{$confhash{$itemid}{'instdata'}},$field);
                     }
                 }
             }
@@ -16016,7 +16151,7 @@ sub modify_lti {
                         }
                     }
                     unless ($changes{$itemid}) {
-                        foreach my $field ('makeuser','lcmenu') {
+                        foreach my $field ('makeuser','lcmenu','instdata') {
                             if (ref($currlti{$field}) eq 'ARRAY') {
                                 if (ref($confhash{$itemid}{$field}) eq 'ARRAY') {
                                     my @diffs = &Apache::loncommon::compare_arrays($currlti{$field},
@@ -16230,8 +16365,10 @@ sub modify_lti {
                                 $resulttext .= '<li>'.&mt('Institutional data will be used when creating a new user for: [_1]',
                                                           join(', ',map { $fieldtitles{$_}; } @{$confhash{$itemid}{'instdata'}})).'</li>';
                             } else {
-                                $resulttext .= '<li>'.&mt('No institutional data used when creating a new user.').'</li>';
+                                $resulttext .= '<li>'.&mt('No institutional data used when creating a new user').'</li>';
                             }
+                        } else {
+                            $resulttext .= '<li>'.&mt('No institutional data used when creating a new user').'</li>';
                         }
                         foreach my $item ('topmenu','inlinemenu') {
                             $resulttext .= '<li>'.$lt{$item}.':&nbsp;';
@@ -16342,7 +16479,8 @@ sub modify_lti {
         }
         $resulttext .= '</ul>';
         if (ref($lastactref) eq 'HASH') {
-            if (($secchanges{'encrypt'}) || ($secchanges{'private'})) {
+            if (($secchanges{'encrypt'}) || ($secchanges{'private'}) || (exists($secchanges{'suggested'}))) {
+                &Apache::lonnet::get_domain_defaults($dom,1);
                 $lastactref->{'domdefaults'} = 1;
             }
         }
@@ -16381,23 +16519,26 @@ sub get_priv_creds {
 }
 
 sub get_lti_id {
-    my ($domain,$consumer) = @_;
-    # get lock on lti db
+    my ($domain,$consumer,$dbname) = @_;
+    unless (($dbname eq 'lti') || ($dbname eq 'suggested')) {
+        return ('','invalid db');
+    }
+    # get lock on db
     my $lockhash = {
                       lock => $env{'user.name'}.
                               ':'.$env{'user.domain'},
                    };
     my $tries = 0;
-    my $gotlock = &Apache::lonnet::newput_dom('lti',$lockhash,$domain);
+    my $gotlock = &Apache::lonnet::newput_dom($dbname,$lockhash,$domain);
     my ($id,$error);
 
     while (($gotlock ne 'ok') && ($tries<10)) {
         $tries ++;
         sleep (0.1);
-        $gotlock = &Apache::lonnet::newput_dom('lti',$lockhash,$domain);
+        $gotlock = &Apache::lonnet::newput_dom($dbname,$lockhash,$domain);
     }
     if ($gotlock eq 'ok') {
-        my %currids = &Apache::lonnet::dump_dom('lti',$domain);
+        my %currids = &Apache::lonnet::dump_dom($dbname,$domain);
         if ($currids{'lock'}) {
             delete($currids{'lock'});
             if (keys(%currids)) {
@@ -16409,14 +16550,14 @@ sub get_lti_id {
                 $id = 1;
             }
             if ($id) {
-                unless (&Apache::lonnet::newput_dom('lti',{ $id => $consumer },$domain) eq 'ok') {
+                unless (&Apache::lonnet::newput_dom($dbname,{ $id => $consumer },$domain) eq 'ok') {
                     $error = 'nostore';
                 }
             } else {
                 $error = 'nonumber';
             }
         }
-        my $dellockoutcome = &Apache::lonnet::del_dom('lti',['lock'],$domain);
+        my $dellockoutcome = &Apache::lonnet::del_dom($dbname,['lock'],$domain);
     } else {
         $error = 'nolock';
     }
@@ -17689,8 +17830,6 @@ sub modify_privacy {
                                        extdom  => {},
                                      },
                        'othdom'   => {},
-                       'priv'     => {},
-                       'unpriv'   => {},
                       );
     foreach my $item (@items) {
         if (@instdoms > 1) {
@@ -17721,39 +17860,6 @@ sub modify_privacy {
                 $changes{'approval'} = 1;
             }
         }
-        foreach my $status ('priv','unpriv') {
-            my @possibles = sort(&Apache::loncommon::get_env_multiple('form.privacy_'.$status.'_'.$item));
-            my @newvalues;
-            foreach my $field (@possibles) {
-                if (grep(/^\Q$field\E$/,@fields)) {
-                    $privacyhash{$status}{$item}{$field} = 1;
-                    push(@newvalues,$field);
-                }
-            }
-            @newvalues = sort(@newvalues);
-            if (ref($current{$status}) eq 'HASH') {
-                if (ref($current{$status}{$item}) eq 'HASH') {
-                    my @currvalues = sort(keys(%{$current{$status}{$item}}));
-                    my @diffs = &Apache::loncommon::compare_arrays(\@currvalues,\@newvalues);
-                    if (@diffs > 0) {
-                        $changes{$status} = 1;
-                    }
-                }
-            } else {
-                my @stdfields;
-                foreach my $field (@fields) {
-                    if ($field eq 'id') {
-                        next if ($status eq 'unpriv');
-                        next if (($status eq 'priv') && ($item eq 'community'));
-                    }
-                    push(@stdfields,$field);
-                }
-                my @diffs = &Apache::loncommon::compare_arrays(\@stdfields,\@newvalues);
-                if (@diffs > 0) {
-                    $changes{$status} = 1;
-                }
-            }
-        }
     }
     if ((@instdoms > 1) || (keys(%by_location) > 0)) {
         my @statuses;
@@ -17777,6 +17883,8 @@ sub modify_privacy {
                     if (@diffs > 0) {
                         $changes{'othdom'} = 1;
                     }
+                } elsif (@newvalues > 0) {
+                    $changes{'othdom'} = 1;
                 }
             } else {
                 my @stdfields = ('lastname','firstname','middlename','generation','permanentemail');
@@ -17806,7 +17914,7 @@ sub modify_privacy {
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made: ').'<ul>';
-            foreach my $key ('approval','notify','othdom','priv','unpriv') {
+            foreach my $key ('approval','notify','othdom') {
                 if ($changes{$key}) {
                     $resulttext .= '<li>'.$titles{$key}.':<ul>';
                     if ($key eq 'approval') {
@@ -17857,18 +17965,6 @@ sub modify_privacy {
                                 $resulttext .= '</li>';
                             }
                         }
-                    } else {
-                        foreach my $item (@items) {
-                            if (ref($privacyhash{$key}{$item}) eq 'HASH') {
-                                $resulttext .= '<li>'.$names{$item}.': ';
-                                if (keys(%{$privacyhash{$key}{$item}})) {
-                                    $resulttext .= join(', ', map { $fieldnames{$_}; } (sort(keys(%{$privacyhash{$key}{$item}}))));
-                                } else {
-                                    $resulttext .= &mt('none');
-                                }
-                                $resulttext .= '</li>';
-                            }
-                        }
                     }
                     $resulttext .= '</ul></li>';
                 }
@@ -17931,7 +18027,6 @@ sub modify_passwords {
         min            => 'Minimum password length',
         max            => 'Maximum password length',
         chars          => 'Required characters',
-        expire         => 'Password expiration (days)',
         numsaved       => 'Number of previous passwords to save',
         reset          => 'Resetting Forgotten Password',
         intauth        => 'Encryption of Stored Passwords (Internal Auth)',
@@ -18315,7 +18410,7 @@ sub modify_passwords {
                             $resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$titles{$key.'_'.$item},$value).'</li>';
                         }
                     } elsif ($key eq 'rules') {
-                        foreach my $rule ('min','max','expire','numsaved') {
+                        foreach my $rule ('min','max','numsaved') {
                             if ($confighash{'passwords'}{$rule} eq '') {
                                 if ($rule eq 'min') {
                                     $resulttext .= '<li>'.&mt('[_1] not set.',$titles{$rule});
@@ -18410,7 +18505,7 @@ sub password_rule_changes {
                    (ref($changes) eq 'HASH'));
     my (@rules,%staticdefaults);
     if ($prefix eq 'passwords') {
-        @rules = ('min','max','expire','numsaved');
+        @rules = ('min','max','numsaved');
     } elsif (($prefix eq 'ltisecrets') || ($prefix eq 'toolsecrets')) {
         @rules = ('min','max');
     }
@@ -18418,12 +18513,7 @@ sub password_rule_changes {
     foreach my $rule (@rules) {
         $env{'form.'.$prefix.'_'.$rule} =~ s/^\s+|\s+$//g;
         my $ruleok;
-        if ($rule eq 'expire') {
-            if (($env{'form.'.$prefix.'_'.$rule} =~ /^\d+(|\.\d*)$/) &&
-                ($env{'form.'.$prefix.'_'.$rule} ne '0')) {
-                $ruleok = 1;
-            }
-        } elsif ($rule eq 'min') {
+        if ($rule eq 'min') {
             if ($env{'form.'.$prefix.'_'.$rule} =~ /^\d+$/) {
                 if ($env{'form.'.$prefix.'_'.$rule} >= $staticdefaults{$rule}) {
                     $ruleok = 1;
@@ -19652,21 +19742,27 @@ sub modify_usermodification {
             }
         }
     }
-    my @contexts = ('author','course');
+    my @contexts = ('author','coauthor','course');
     my %context_title = (
                            author => 'In author context',
+                           coauthor => 'As co-author manager',
                            course => 'In course context',
                         );
     my @fields = ('lastname','firstname','middlename','generation',
                   'permanentemail','id');
     my %roles = (
                   author => ['ca','aa'],
+                  coauthor => ['ca','aa'],
                   course => ['st','ep','ta','in','cr'],
                 );
     my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
     foreach my $context (@contexts) {
+        my $prefix = 'canmodify';
+        if ($context eq 'coauthor') {
+            $prefix = 'cacanmodify';
+        }
         foreach my $role (@{$roles{$context}}) {
-            my @modifiable =  &Apache::loncommon::get_env_multiple('form.canmodify_'.$role);
+            my @modifiable =  &Apache::loncommon::get_env_multiple('form.'.$prefix.'_'.$role);
             foreach my $item (@fields) {
                 if (grep(/^\Q$item\E$/,@modifiable)) {
                     $modifyhash{$context}{$role}{$item} = 1;
@@ -21046,12 +21142,17 @@ sub modify_coursedefaults {
                            mysqltables          => 172800,
                            domexttool           => 1,
                            crsauthor            => 1,
+                           crseditors           => ['edit','xml'],
                          );
     my %texoptions = (
                         MathJax  => 'MathJax',
                         mimetex  => &mt('Convert to Images'),
                         tth      => &mt('TeX to HTML'),
                      );
+
+    my @editors = ('edit','xml','daxe');
+    my %editornames = &crseditor_titles();
+
     $defaultshash{'coursedefaults'} = {};
 
     if (ref($domconfig{'coursedefaults'}) ne 'HASH') {
@@ -21237,10 +21338,12 @@ sub modify_coursedefaults {
                 $changes{'postsubmit'} = 1;
             }
         }
-        my (%newdomexttool,%newexttool,%newcrsauthor,%olddomexttool,%oldexttool,%oldcrsauthor);
+        my (%newdomexttool,%newexttool,%newcrsauthor,%olddomexttool,%oldexttool,%oldcrsauthor,
+            %posscrseditors);
         map { $newdomexttool{$_} = 1; } &Apache::loncommon::get_env_multiple('form.domexttool');
         map { $newexttool{$_} = 1; } &Apache::loncommon::get_env_multiple('form.exttool');
         map { $newcrsauthor{$_} = 1; } &Apache::loncommon::get_env_multiple('form.crsauthor');
+        map { $posscrseditors{$_} = 1; } &Apache::loncommon::get_env_multiple('form.crseditors');
         if (ref($domconfig{'coursedefaults'}{'domexttool'}) eq 'HASH') {
             %olddomexttool = %{$domconfig{'coursedefaults'}{'domexttool'}};
         } else {
@@ -21274,6 +21377,27 @@ sub modify_coursedefaults {
                }
             }
         }
+        my @newcrseditors = ();
+        foreach my $editor (@editors) {
+            if ($posscrseditors{$editor}) {
+                push(@newcrseditors,$editor);
+            }
+        }
+        if (ref($domconfig{'coursedefaults'}{'crseditors'}) eq 'ARRAY') {
+            my @diffs =
+                &Apache::loncommon::compare_arrays($domconfig{'coursedefaults'}{'crseditors'},
+                                                   \@newcrseditors);
+            if (@diffs) {
+                $changes{'crseditors'} = 1; 
+            }
+        } else {
+            my @diffs =
+                &Apache::loncommon::compare_arrays($staticdefaults{'crseditors'},
+                                                   \@newcrseditors);
+            unless (@diffs == 0) {
+                $changes{'crseditors'} = 1;
+            }       
+        }
         foreach my $type (@types) {
             unless ($newdomexttool{$type}) {
                 $newdomexttool{$type} = 0;
@@ -21297,6 +21421,7 @@ sub modify_coursedefaults {
         $defaultshash{'coursedefaults'}{'domexttool'} = \%newdomexttool;
         $defaultshash{'coursedefaults'}{'exttool'} = \%newexttool;
         $defaultshash{'coursedefaults'}{'crsauthor'} = \%newcrsauthor;
+        $defaultshash{'coursedefaults'}{'crseditors'} = \@newcrseditors;
     }
     my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
                                              $dom);
@@ -21380,6 +21505,11 @@ sub modify_coursedefaults {
                         }
                     }
                 }
+                if ($changes{'crseditors'}) {
+                    if (ref($defaultshash{'coursedefaults'}{'crseditors'}) eq 'ARRAY') {
+                        $domdefaults{'crseditors'}=join(',',@{$defaultshash{'coursedefaults'}{'crseditors'}});
+                    }
+                }
                 my $cachetime = 24*60*60;
                 &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
                 if (ref($lastactref) eq 'HASH') {
@@ -21559,6 +21689,16 @@ sub modify_coursedefaults {
                     } else {
                         $resulttext .= '<li>'.$status{$item}{'default'}.'</li>';
                     }
+                } elsif ($item eq 'crseditors') {
+                    if (ref($defaultshash{'coursedefaults'}{$item}) eq 'ARRAY') {
+                        my $shown;
+                        if (@{$defaultshash{'coursedefaults'}{$item}}) {
+                            $shown = join(', ', map { $editornames{$_} } @{$defaultshash{'coursedefaults'}{$item}});
+                        } else {
+                            $shown = &mt('None');
+                        }
+                        $resulttext .= '<li>'.&mt('Available editors for course/community resources: [_1]',$shown).'</li>';
+                    }
                 }
             }
             $resulttext .= '</ul>';