--- loncom/interface/domainprefs.pm	2014/04/16 13:33:14	1.160.6.39
+++ loncom/interface/domainprefs.pm	2016/09/18 19:22:48	1.160.6.71
@@ -1,8 +1,8 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.39 2014/04/16 13:33:14 raeburn Exp $
-##
+# $Id: domainprefs.pm,v 1.160.6.71 2016/09/18 19:22:48 raeburn Exp $
+#
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -215,7 +215,7 @@ sub handler {
                 'contacts','defaults','scantron','coursecategories',
                 'serverstatuses','requestcourses','coursedefaults',
                 'usersessions','loadbalancing','requestauthor',
-                'selfenrollment'],$dom);
+                'selfenrollment','inststatus'],$dom);
     my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
                        'autoupdate','autocreate','directorysrch','contacts',
                        'usercreation','selfcreation','usermodification','scantron',
@@ -250,15 +250,19 @@ sub handler {
                       header => [{col1 => 'Log-in Page Items',
                                   col2 => '',},
                                  {col1 => 'Log-in Help',
+                                  col2 => 'Value'},
+                                 {col1 => 'Custom HTML in document head',
                                   col2 => 'Value'}],
                       print => \&print_login,
                       modify => \&modify_login,
                     },
         'defaults' => 
-                    { text => 'Default authentication/language/timezone/portal',
+                    { text => 'Default authentication/language/timezone/portal/types',
                       help => 'Domain_Configuration_LangTZAuth',
                       header => [{col1 => 'Setting',
-                                  col2 => 'Value'}],
+                                  col2 => 'Value'},
+                                 {col1 => 'Institutional user types',
+                                  col2 => 'Assignable to e-mail usernames'}],
                       print => \&print_defaults,
                       modify => \&modify_defaults,
                     },
@@ -367,6 +371,8 @@ sub handler {
                               col2 => 'Value'},
                              {col1 => 'Available textbooks',
                               col2 => ''},
+                             {col1 => 'Available templates',
+                              col2 => ''},
                              {col1 => 'Validation (not official courses)',
                               col2 => 'Value'},],
                   print => \&print_quotas,
@@ -385,7 +391,9 @@ sub handler {
         'coursecategories' =>
                   { text => 'Cataloging of courses/communities',
                     help => 'Domain_Configuration_Cataloging_Courses',
-                    header => [{col1 => 'Category settings',
+                    header => [{col1 => 'Catalog type/availability',
+                                col2 => '',},
+                               {col1 => 'Category settings for standard catalog',
                                 col2 => '',},
                                {col1 => 'Categories',
                                 col2 => '',
@@ -457,6 +465,8 @@ sub handler {
                                        {col1 => 'Log-in Page Items',
                                         col2 => ''},
                                        {col1 => 'Log-in Help',
+                                        col2 => 'Value'},
+                                       {col1 => 'Custom HTML in document head',
                                         col2 => 'Value'}],
                             print => \&print_login,
                             modify => \&modify_login,
@@ -479,7 +489,7 @@ sub handler {
         }
     } elsif ($phase eq 'display') {
         my $js = &recaptcha_js().
-                 &credits_js();
+                 &toggle_display_js();
         if ((keys(%servers) > 1) || (keys(%existing) > 0)) {
             my ($othertitle,$usertypes,$types) =
                 &Apache::loncommon::sorted_inst_types($dom);
@@ -602,7 +612,7 @@ sub process_changes {
     } elsif ($action eq 'scantron') {
         $output = &modify_scantron($r,$dom,$confname,$lastactref,%domconfig);
     } elsif ($action eq 'coursecategories') {
-        $output = &modify_coursecategories($dom,%domconfig);
+        $output = &modify_coursecategories($dom,$lastactref,%domconfig);
     } elsif ($action eq 'serverstatuses') {
         $output = &modify_serverstatuses($dom,%domconfig);
     } elsif ($action eq 'requestcourses') {
@@ -627,8 +637,10 @@ sub print_config_box {
     my $output;
     if ($action eq 'coursecategories') {
         $output = &coursecategories_javascript($settings);
+    } elsif ($action eq 'defaults') {
+        $output = &defaults_javascript($settings); 
     }
-    $output .= 
+    $output .=
          '<table class="LC_nested_outer">
           <tr>
            <th align="left" valign="middle"><span class="LC_nobreak">'.
@@ -643,8 +655,8 @@ sub print_config_box {
     if ($numheaders > 1) {
         my $colspan = '';
         my $rightcolspan = '';
-        if (($action eq 'rolecolors') || ($action eq 'coursecategories') ||
-            (($action eq 'login') && ($numheaders < 3))) {
+        if (($action eq 'rolecolors') || ($action eq 'defaults') ||
+            (($action eq 'login') && ($numheaders < 4))) {
             $colspan = ' colspan="2"';
         }
         if ($action eq 'usersessions') {
@@ -660,13 +672,13 @@ sub print_config_box {
              </tr>';
         $rowtotal ++;
         if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') ||
-            ($action eq 'usermodification') || ($action eq 'selfenrollment') ||
-            ($action eq 'usersessions')) {
+            ($action eq 'usermodification') || ($action eq 'defaults') || ($action eq 'coursedefaults') ||
+            ($action eq 'selfenrollment') || ($action eq 'usersessions')) {
             $output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'coursecategories') {
             $output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal);
         } elsif ($action eq 'login') {
-            if ($numheaders == 3) {
+            if ($numheaders == 4) {
                 $colspan = ' colspan="2"';
                 $output .= &print_login('service',$dom,$confname,$phase,$settings,\$rowtotal);
             } else {
@@ -691,8 +703,14 @@ sub print_config_box {
             $rowtotal ++;
         if (($action eq 'autoupdate') || ($action eq 'usercreation') ||
             ($action eq 'selfcreation') || ($action eq 'selfenrollment') ||
-            ($action eq 'usersessions')) {
-            $output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal).'
+            ($action eq 'usersessions') || ($action eq 'coursecategories')) {
+            if ($action eq 'coursecategories') {
+                $output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal);
+                $colspan = ' colspan="2"';
+            } else {
+                $output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal);
+            }
+            $output .= '
            </table>
           </td>
          </tr>
@@ -702,15 +720,18 @@ sub print_config_box {
              <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'}->('bottom',$dom,$settings,\$rowtotal);
+             </tr>'."\n";
+            if ($action eq 'coursecategories') {
+                $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
+            } else {
+                $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
+            }
             $rowtotal ++;
-        } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults')) {
+        } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') ||
+                  ($action eq 'defaults')) {
             $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
-        } elsif ($action eq 'coursecategories') {
-            $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
         } elsif ($action eq 'login') {
-            if ($numheaders == 3) {
+            if ($numheaders == 4) {
                 $output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).'
            </table>
           </td>
@@ -726,9 +747,31 @@ sub print_config_box {
             } else {
                 $output .= &print_login('help',$dom,$confname,$phase,$settings,\$rowtotal);
             }
+            $output .= '
+           </table>
+          </td>
+         </tr>
+         <tr>
+           <td>
+            <table class="LC_nested">
+             <tr class="LC_info_row">';
+            if ($numheaders == 4) {
+                $output .= '
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
+              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td>
+             </tr>';
+            } else {
+                $output .= '
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
+              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col2'}).'</td>
+             </tr>';
+            }
+            $rowtotal ++;
+            $output .= &print_login('headtag',$dom,$confname,$phase,$settings,\$rowtotal);
         } elsif ($action eq 'requestcourses') {
-            $output .= &print_requestmail($dom,$action,$settings,\$rowtotal).
-                       &print_studentcode($settings,\$rowtotal).'
+            $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
+            $rowtotal ++;
+            $output .= &print_studentcode($settings,\$rowtotal).'
            </table>
           </td>
          </tr>
@@ -738,7 +781,18 @@ sub print_config_box {
              <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>'.
-                       &print_textbookcourses($dom,$settings,\$rowtotal).'
+                       &textbookcourses_javascript($settings).
+                       &print_textbookcourses($dom,'textbooks',$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'}->[3]->{'col1'}).'</td>
+              <td class="LC_right_item">'.&mt($item->{'header'}->[3]->{'col2'}).'</td> </tr>'.
+                       &print_textbookcourses($dom,'templates',$settings,\$rowtotal).'
             </table>
            </td>
           </tr>
@@ -746,12 +800,13 @@ sub print_config_box {
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
-              <td class="LC_left_item"'.$colspan.' valign="top">'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
-              <td class="LC_right_item" valign="top">'.&mt($item->{'header'}->[3]->{'col2'}).'</td>
+              <td class="LC_left_item"'.$colspan.' valign="top">'.&mt($item->{'header'}->[4]->{'col1'}).'</td>
+              <td class="LC_right_item" valign="top">'.&mt($item->{'header'}->[4]->{'col2'}).'</td>
              </tr>'.
             &print_validation_rows('requestcourses',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'requestauthor') {
             $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
+            $rowtotal ++;
         } elsif ($action eq 'rolecolors') {
             $output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).'
            </table>
@@ -831,8 +886,7 @@ sub print_config_box {
         if ($action eq 'quotas') {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
         } elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || ($action eq 'directorysrch') ||
-                 ($action eq 'contacts') || ($action eq 'defaults') || ($action eq 'serverstatuses') ||
-                 ($action eq 'loadbalancing')) {
+                 ($action eq 'contacts') || ($action eq 'serverstatuses') || ($action eq 'loadbalancing')) {
             $output .= $item->{'print'}->($dom,$settings,\$rowtotal);
         } elsif ($action eq 'scantron') {
             $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
@@ -1134,6 +1188,57 @@ sub print_login {
             $itemcount ++;
         }
         $datatable .= &captcha_choice('login',$settings,$itemcount);
+    } elsif ($caller eq 'headtag') {
+        my %domservers = &Apache::lonnet::get_servers($dom);
+        my $choice = $choices{'headtag'};
+        $css_class = ' class="LC_odd_row"';
+        $datatable .= '<tr'.$css_class.'><td colspan="2">'.$choice.'</td>'.
+                      '<td align="left"><table><tr><th>'.$choices{'hostid'}.'</th>'.
+                      '<th>'.$choices{'current'}.'</th>'.
+                      '<th>'.$choices{'action'}.'</th>'.
+                      '<th>'.$choices{'exempt'}.'</th></tr>'."\n";
+        my (%currurls,%currexempt);
+        if (ref($settings) eq 'HASH') {
+            if (ref($settings->{'headtag'}) eq 'HASH') {
+                foreach my $lonhost (keys(%{$settings->{'headtag'}})) {
+                    if (ref($settings->{'headtag'}{$lonhost}) eq 'HASH') {
+                        $currurls{$lonhost} = $settings->{'headtag'}{$lonhost}{'url'};
+                        $currexempt{$lonhost} = $settings->{'headtag'}{$lonhost}{'exempt'};
+                    }
+                }
+            }
+        }
+        my %lt = &Apache::lonlocal::texthash(
+                                               del  => 'Delete?',
+                                               rep  => 'Replace:',
+                                               upl  => 'Upload:',
+                                               curr => 'View contents',
+                                               none => 'None',
+        );
+        my $switchserver = &check_switchserver($dom,$confname);
+        foreach my $lonhost (sort(keys(%domservers))) {
+            my $exempt = &check_exempt_addresses($currexempt{$lonhost});
+            $datatable .= '<tr><td>'.$domservers{$lonhost}.'</td>';
+            if ($currurls{$lonhost}) {
+                $datatable .= '<td class="LC_right_item"><a href="'.
+                              "javascript:void(open('$currurls{$lonhost}?inhibitmenu=yes','Custom_HeadTag',
+                              'menubar=0,toolbar=1,scrollbars=1,width=600,height=500,resizable=yes'))".
+                              '">'.$lt{'curr'}.'</a></td>'.
+                              '<td><span class="LC_nobreak"><label>'.
+                              '<input type="checkbox" name="loginheadtag_del" value="'.$lonhost.'" />'.
+                              $lt{'del'}.'</label>&nbsp;'.$lt{'rep'}.'</span>';
+            } else {
+                $datatable .= '<td class="LC_right_item">'.$lt{'none'}.'</td><td>'.$lt{'upl'};
+            }
+            $datatable .='<br />';
+            if ($switchserver) {
+                $datatable .= &mt('Upload to library server: [_1]',$switchserver);
+            } else {
+                $datatable .= '<input type="file" name="loginheadtag_'.$lonhost.'" />';
+            }
+            $datatable .= '</td><td><input type="textbox" name="loginheadtagexempt_'.$lonhost.'" value="'.$exempt.'" /></td></tr>';
+        }
+        $datatable .= '</table></td></tr>';
     }
     return $datatable;
 }
@@ -1167,6 +1272,9 @@ sub login_choices {
             link          => "Link",
             alink         => "Active link",
             vlink         => "Visited link",
+            headtag       => "Custom markup",
+            action        => "Action",
+            current       => "Current",
         );
     return %choices;
 }
@@ -2029,7 +2137,6 @@ sub print_requestmail {
         $datatable .= &mt('There are no active Domain Coordinators');
     }
     $datatable .='</td></tr>';
-    $$rowtotal += $rows;
     return $datatable;
 }
 
@@ -2038,9 +2145,11 @@ sub print_studentcode {
     my $rownum = 0; 
     my ($output,%current);
     my @crstypes = ('official','unofficial','community','textbook');
-    if (ref($settings->{'uniquecode'}) eq 'HASH') {
-        foreach my $type (@crstypes) {
-            $current{$type} = $settings->{'uniquecode'}{$type};
+    if (ref($settings) eq 'HASH') {
+        if (ref($settings->{'uniquecode'}) eq 'HASH') {
+            foreach my $type (@crstypes) {
+                $current{$type} = $settings->{'uniquecode'}{$type};
+            }
         }
     }
     $output .= '<tr>'.
@@ -2061,14 +2170,14 @@ sub print_studentcode {
 }
 
 sub print_textbookcourses {
-    my ($dom,$settings,$rowtotal) = @_;
+    my ($dom,$type,$settings,$rowtotal) = @_;
     my $rownum = 0;
     my $css_class;
     my $itemcount = 1;
     my $maxnum = 0;
     my $bookshash;
     if (ref($settings) eq 'HASH') {
-        $bookshash = $settings->{'textbooks'};
+        $bookshash = $settings->{$type};
     }
     my %ordered;
     if (ref($bookshash) eq 'HASH') {
@@ -2082,7 +2191,7 @@ sub print_textbookcourses {
     my $confname = $dom.'-domainconfig';
     my $switchserver = &check_switchserver($dom,$confname);
     my $maxnum = scalar(keys(%ordered));
-    my $datatable = &textbookcourses_javascript(\%ordered);
+    my $datatable;
     if (keys(%ordered)) {
         my @items = sort { $a <=> $b } keys(%ordered);
         for (my $i=0; $i<@items; $i++) {
@@ -2090,21 +2199,24 @@ sub print_textbookcourses {
             my $key = $ordered{$items[$i]};
             my %coursehash=&Apache::lonnet::coursedescription($key);
             my $coursetitle = $coursehash{'description'};
-            my ($subject,$title,$author,$image,$imgsrc,$cdom,$cnum);
+            my ($subject,$title,$author,$publisher,$image,$imgsrc,$cdom,$cnum);
             if (ref($bookshash->{$key}) eq 'HASH') {
                 $subject = $bookshash->{$key}->{'subject'};
                 $title = $bookshash->{$key}->{'title'};
-                $author = $bookshash->{$key}->{'author'};
-                $image = $bookshash->{$key}->{'image'};
-                if ($image ne '') {
-                    my ($path,$imagefile) = ($image =~ m{^(.+)/([^/]+)$});
-                    my $imagethumb = "$path/tn-".$imagefile;
-                    $imgsrc = '<img src="'.$imagethumb.'" alt="'.&mt('Textbook image').'" />';
+                if ($type eq 'textbooks') {
+                    $publisher = $bookshash->{$key}->{'publisher'};
+                    $author = $bookshash->{$key}->{'author'};
+                    $image = $bookshash->{$key}->{'image'};
+                    if ($image ne '') {
+                        my ($path,$imagefile) = ($image =~ m{^(.+)/([^/]+)$});
+                        my $imagethumb = "$path/tn-".$imagefile;
+                        $imgsrc = '<img src="'.$imagethumb.'" alt="'.&mt('Textbook image').'" />';
+                    }
                 }
             }
-            my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'$key'".');"';
+            my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'$type".'_'."$key','$type'".');"';
             $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
-                         .'<select name="'.$key.'"'.$chgstr.'>';
+                         .'<select name="'.$type.'_'.$key.'"'.$chgstr.'>';
             for (my $k=0; $k<=$maxnum; $k++) {
                 my $vpos = $k+1;
                 my $selstr;
@@ -2114,39 +2226,43 @@ sub print_textbookcourses {
                 $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
             }
             $datatable .= '</select>'.('&nbsp;'x2).
-                '<label><input type="checkbox" name="book_del" value="'.$key.'" />'.
+                '<label><input type="checkbox" name="'.$type.'_del" value="'.$key.'" />'.
                 &mt('Delete?').'</label></span></td>'.
                 '<td colspan="2">'.
-                '<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="book_subject_'.$i.'" value="'.$subject.'" /></span> '.
-                ('&nbsp;'x2).
-                '<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="book_title_'.$i.'" value="'.$title.'" /></span> '.
+                '<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="'.$type.'_subject_'.$i.'" value="'.$subject.'" /></span> '.
                 ('&nbsp;'x2).
-                '<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="book_author_'.$i.'" value="'.$author.'" /></span> '.
-                ('&nbsp;'x2).
-                '<span class="LC_nobreak">'.&mt('Thumbnail:');
-            if ($image) {
-                $datatable .= '<span class="LC_nobreak">'.
-                              $imgsrc.
-                              '<label><input type="checkbox" name="book_image_del"'.
-                              ' value="'.$key.'" />'.&mt('Delete?').'</label></span> '.
-                              '<span class="LC_nobreak">&nbsp;'.&mt('Replace:').'&nbsp;';
-            }
-            if ($switchserver) {
-                $datatable .= &mt('Upload to library server: [_1]',$switchserver);
-            } else {
-                $datatable .= '<input type="file" name="book_image_'.$i.'" value="" />';
+                '<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="'.$type.'_title_'.$i.'" value="'.$title.'" /></span> ';
+            if ($type eq 'textbooks') {
+                $datatable .= ('&nbsp;'x2).
+                              '<span class="LC_nobreak">'.&mt('Publisher:').'<input type="text" size="10" name="'.$type.'_publisher_'.$i.'" value="'.$publisher.'" /></span> '.
+                              ('&nbsp;'x2).
+                              '<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="'.$type.'_author_'.$i.'" value="'.$author.'" /></span> '.
+                              ('&nbsp;'x2).
+                              '<span class="LC_nobreak">'.&mt('Thumbnail:');
+                if ($image) {
+                    $datatable .= '<span class="LC_nobreak">'.
+                                  $imgsrc.
+                                  '<label><input type="checkbox" name="'.$type.'_image_del"'.
+                                  ' value="'.$key.'" />'.&mt('Delete?').'</label></span> '.
+                                  '<span class="LC_nobreak">&nbsp;'.&mt('Replace:').'&nbsp;';
+                }
+                if ($switchserver) {
+                    $datatable .= &mt('Upload to library server: [_1]',$switchserver);
+                } else {
+                    $datatable .= '<input type="file" name="'.$type.'_image_'.$i.'" value="" />';
+                }
             }
-            $datatable .= '<input type="hidden" name="book_id_'.$i.'" value="'.$key.'" /></span> '.
+            $datatable .= '<input type="hidden" name="'.$type.'_id_'.$i.'" value="'.$type.'_'.$key.'" /></span> '.
                           '<span class="LC_nobreak">'.&mt('LON-CAPA course:').'&nbsp;'.
                           $coursetitle.'</span></td></tr>'."\n";
             $itemcount ++;
         }
     }
     $css_class = $itemcount%2?' class="LC_odd_row"':'';
-    my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'addbook_pos'".');"';
+    my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'$type"."_addbook_pos','$type'".');"';
     $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n".
-                  '<input type="hidden" name="book_maxnum" value="'.$maxnum.'" />'."\n".
-                  '<select name="addbook_pos"'.$chgstr.'>';
+                  '<input type="hidden" name="'.$type.'_maxnum" value="'.$maxnum.'" />'."\n".
+                  '<select name="'.$type.'_addbook_pos"'.$chgstr.'>';
     for (my $k=0; $k<$maxnum+1; $k++) {
         my $vpos = $k+1;
         my $selstr;
@@ -2156,26 +2272,30 @@ sub print_textbookcourses {
         $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
     }
     $datatable .= '</select>&nbsp;'."\n".
-                  '<input type="checkbox" name="addbook" value="1" />'.&mt('Add').'</td>'."\n".
+                  '<input type="checkbox" name="'.$type.'_addbook" value="1" />'.&mt('Add').'</td>'."\n".
                   '<td colspan="2">'.
-                  '<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="addbook_subject" value="" /></span> '."\n".
-                  ('&nbsp;'x2).
-                  '<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="addbook_title" value="" /></span> '."\n".
-                  ('&nbsp;'x2).
-                  '<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="addbook_author" value="" /></span> '."\n".
+                  '<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="'.$type.'_addbook_subject" value="" /></span> '."\n".
                   ('&nbsp;'x2).
-                  '<span class="LC_nobreak">'.&mt('Image:').'&nbsp;';
-    if ($switchserver) {
-        $datatable .= &mt('Upload to library server: [_1]',$switchserver);
-    } else {
-        $datatable .= '<input type="file" name="addbook_image" value="" />';
+                  '<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="'.$type.'_addbook_title" value="" /></span> '."\n".
+                  ('&nbsp;'x2);
+    if ($type eq 'textbooks') {
+        $datatable .= '<span class="LC_nobreak">'.&mt('Publisher:').'<input type="text" size="10" name="'.$type.'_addbook_publisher" value="" /></span> '."\n".
+                      ('&nbsp;'x2).
+                      '<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="'.$type.'_addbook_author" value="" /></span> '."\n".
+                      ('&nbsp;'x2).
+                      '<span class="LC_nobreak">'.&mt('Image:').'&nbsp;';
+        if ($switchserver) {
+            $datatable .= &mt('Upload to library server: [_1]',$switchserver);
+        } else {
+            $datatable .= '<input type="file" name="'.$type.'_addbook_image" value="" />';
+        }
     }
     $datatable .= '</span>'."\n".
                   '<span class="LC_nobreak">'.&mt('LON-CAPA course:').'&nbsp;'.
-                  &Apache::loncommon::select_dom_form($env{'request.role.domain'},'addbook_cdom').
-                  '<input type="text" size="25" name="addbook_cnum" value="" />'.
+                  &Apache::loncommon::select_dom_form($env{'request.role.domain'},$type.'_addbook_cdom').
+                  '<input type="text" size="25" name="'.$type.'_addbook_cnum" value="" />'.
                   &Apache::loncommon::selectcourse_link
-                      ('display','addbook_cnum','addbook_cdom',undef,undef,undef,'Course');
+                      ('display',$type.'_addbook_cnum',$type.'_addbook_cdom',undef,undef,undef,'Course');
                   '</span></td>'."\n".
                   '</tr>'."\n";
     $itemcount ++;
@@ -2183,23 +2303,42 @@ sub print_textbookcourses {
 }
 
 sub textbookcourses_javascript {
-    my ($textbooks) = @_;
-    return unless(ref($textbooks) eq 'HASH');
-    my $num = scalar(keys(%{$textbooks}));
-    my @jsarray;
-    foreach my $item (sort {$a <=> $b } (keys(%{$textbooks}))) {
-        push(@jsarray,$textbooks->{$item});
+    my ($settings) = @_;
+    return unless(ref($settings) eq 'HASH');
+    my (%ordered,%total,%jstext);
+    foreach my $type ('textbooks','templates') {
+        $total{$type} = 0;
+        if (ref($settings->{$type}) eq 'HASH') {
+            foreach my $item (keys(%{$settings->{$type}})) {
+                if (ref($settings->{$type}->{$item}) eq 'HASH') {
+                    my $num = $settings->{$type}->{$item}{'order'};
+                    $ordered{$type}{$num} = $item;
+                }
+            }
+            $total{$type} = scalar(keys(%{$settings->{$type}}));
+        }
+        my @jsarray = ();
+        foreach my $item (sort {$a <=> $b } (keys(%{$ordered{$type}}))) {
+            push(@jsarray,$ordered{$type}{$item});
+        }
+        $jstext{$type} = '    var '.$type.' = Array('."'".join("','",@jsarray)."'".');'."\n";
     }
-    my $jstext = '    var textbooks = Array('."'".join("','",@jsarray)."'".');'."\n";
     return <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
-function reorderBooks(form,item) {
+function reorderBooks(form,item,caller) {
     var changedVal;
-$jstext 
-    var newpos = 'addbook_pos';
-    var current = new Array;
-    var maxh = 1 + $num;
+$jstext{'textbooks'};
+$jstext{'templates'};
+    var newpos;
+    var maxh;
+    if (caller == 'textbooks') {  
+        newpos = 'textbooks_addbook_pos';
+        maxh = 1 + $total{'textbooks'};
+    } else {
+        newpos = 'templates_addbook_pos';
+        maxh = 1 + $total{'templates'};
+    }
     var current = new Array;
     var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value;
     if (item == newpos) {
@@ -2208,12 +2347,25 @@ $jstext
         changedVal = form.elements[item].options[form.elements[item].selectedIndex].value;
         current[newitemVal] = newpos;
     }
-    for (var i=0; i<textbooks.length; i++) {
-        var elementName = textbooks[i];
-        if (elementName != item) {
-            if (form.elements[elementName]) {
-                var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value;
-                current[currVal] = elementName;
+    if (caller == 'textbooks') {
+        for (var i=0; i<textbooks.length; i++) {
+            var elementName = 'textbooks_'+textbooks[i];
+            if (elementName != item) {
+                if (form.elements[elementName]) {
+                    var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value;
+                    current[currVal] = elementName;
+                }
+            }
+        }
+    }
+    if (caller == 'templates') {
+        for (var i=0; i<templates.length; i++) {
+            var elementName = 'templates_'+templates[i];
+            if (elementName != item) {
+                if (form.elements[elementName]) {
+                    var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value;
+                    current[currVal] = elementName;
+                }
             }
         }
     }
@@ -2246,7 +2398,7 @@ ENDSCRIPT
 sub print_autoenroll {
     my ($dom,$settings,$rowtotal) = @_;
     my $autorun = &Apache::lonnet::auto_run(undef,$dom),
-    my ($defdom,$runon,$runoff,$coownerson,$coownersoff);
+    my ($defdom,$runon,$runoff,$coownerson,$coownersoff,$failsafe);
     if (ref($settings) eq 'HASH') {
         if (exists($settings->{'run'})) {
             if ($settings->{'run'} eq '0') {
@@ -2280,6 +2432,9 @@ sub print_autoenroll {
         if (exists($settings->{'sender_domain'})) {
             $defdom = $settings->{'sender_domain'};
         }
+        if (exists($settings->{'autofailsafe'})) {
+            $failsafe = $settings->{'autofailsafe'};
+        }
     } else {
         if ($autorun) {
             $runon = ' checked="checked" ';
@@ -2315,8 +2470,12 @@ sub print_autoenroll {
                   $coownerson.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
                   '<label><input type="radio" name="autoassign_coowners"'.
                   $coownersoff.' value="0" />'.&mt('No').'</label></span></td>'.
-                  '</tr>';
-    $$rowtotal += 3;
+                  '</tr><tr>'.
+                  '<td>'.&mt('Failsafe for no drops when institutional data missing').'</td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak">'.
+                  '<input type="text" name="autoenroll_failsafe"'.
+                  ' value="'.$failsafe.'" size="4" /></td></tr>';
+    $$rowtotal += 4;
     return $datatable;
 }
 
@@ -2431,13 +2590,15 @@ sub print_autocreate {
                   $createoff{'req'}.' value="0" />'.&mt('No').'</label></span>';
     my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio',
                                                    'autocreate_xmldc',%currhash);
+    $datatable .= '</td></tr><tr class="LC_odd_row"><td>';
     if ($numdc > 1) {
-        $datatable .= '</td></tr><tr class="LC_odd_row"><td>'.
-                      &mt('Course creation processed as: (choose Dom. Coord.)').
-                      '</td><td class="LC_left_item">'.$dctable.'</td></tr>';
+        $datatable .= &mt('Course creation processed as: (choose Dom. Coord.)').
+                      '</td><td class="LC_left_item">';
     } else {
-        $datatable .= $dctable.'</td></tr>';
+        $datatable .= &mt('Course creation processed as:').
+                      '</td><td class="LC_right_item">';
     }
+    $datatable .= $dctable.'</td></tr>';
     $$rowtotal += $rows;
     return $datatable;
 }
@@ -2672,7 +2833,7 @@ sub print_helpsettings {
 
 sub radiobutton_prefs {
     my ($settings,$toggles,$defaultchecked,$choices,$itemcount,$onclick,
-        $additional) = @_;
+        $additional,$align) = @_;
     return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') &&
                    (ref($choices) eq 'HASH'));
 
@@ -2706,8 +2867,14 @@ sub radiobutton_prefs {
         $datatable .=
             '<tr'.$css_class.'><td valign="top">'.
             '<span class="LC_nobreak">'.$choices->{$item}.
-            '</span></td>'.
-            '<td class="LC_right_item"><span class="LC_nobreak">'.
+            '</span></td>';
+        if ($align eq 'left') {
+            $datatable .= '<td class="LC_left_item">';
+        } else {
+            $datatable .= '<td class="LC_right_item">';
+        }
+        $datatable .=
+            '<span class="LC_nobreak">'.
             '<label><input type="radio" name="'.
             $item.'" '.$checkedon{$item}.' value="1"'.$onclick.' />'.&mt('Yes').
             '</label>&nbsp;<label><input type="radio" name="'.$item.'" '.
@@ -2725,25 +2892,106 @@ sub print_coursedefaults {
     my ($css_class,$datatable,%checkedon,%checkedoff,%defaultchecked,@toggles);
     my $itemcount = 1;
     my %choices =  &Apache::lonlocal::texthash (
-        canuse_pdfforms      => 'Course/Community users can create/upload PDF forms',
         uploadquota          => 'Default quota for files uploaded directly to course/community using Course Editor (MB)',
         anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys',
         coursecredits        => 'Credits can be specified for courses',
+        uselcmath            => 'Math preview uses LON-CAPA previewer (javascript) in place of DragMath (Java)',
+        usejsme              => 'Molecule editor uses JSME (HTML5) in place of JME (Java)',
+        postsubmit           => 'Disable submit button/keypress following student submission',
+        canclone             => "People who may clone a course (besides course's owner and coordinators)",
+        mysqltables          => 'Lifetime (s) of "Temporary" MySQL tables (student performance data) on homeserver',
     );
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
                            uploadquota          => 500,
+                           postsubmit           => 60,
+                           mysqltables          => 172800,
                          );
     if ($position eq 'top') {
-        %defaultchecked = ('canuse_pdfforms' => 'off');
-        @toggles = ('canuse_pdfforms');
+        %defaultchecked = (
+                            'uselcmath'       => 'on',
+                            'usejsme'         => 'on',
+                            'canclone'        => 'none',
+                          );
+        @toggles = ('uselcmath','usejsme');
         ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
-                                                 \%choices,$itemcount);
+                                                     \%choices,$itemcount);
+        $css_class = $itemcount%2?' class="LC_odd_row"':'';
+        $datatable .=
+            '<tr'.$css_class.'><td valign="top">'.
+            '<span class="LC_nobreak">'.$choices{'canclone'}.
+            '</span></td><td class="LC_left_item">';
+        my $currcanclone = 'none';
+        my $onclick;
+        my @cloneoptions = ('none','domain');
+        my %clonetitles = (
+                             none     => 'No additional course requesters',
+                             domain   => "Any course requester in course's domain",
+                             instcode => 'Course requests for official courses ...',
+                          );
+        my (%codedefaults,@code_order,@posscodes);
+        if (&Apache::lonnet::auto_instcode_defaults($dom,\%codedefaults,
+                                                    \@code_order) eq 'ok') {
+            if (@code_order > 0) {
+                push(@cloneoptions,'instcode');
+                $onclick = ' onclick="toggleDisplay(this.form,'."'cloneinstcode'".');"';
+            }
+        }
+        if (ref($settings) eq 'HASH') {
+            if ($settings->{'canclone'}) {
+                if (ref($settings->{'canclone'}) eq 'HASH') {
+                    if (ref($settings->{'canclone'}{'instcode'}) eq 'ARRAY') {
+                        if (@code_order > 0) {
+                            $currcanclone = 'instcode';
+                            @posscodes = @{$settings->{'canclone'}{'instcode'}};
+                        }
+                    }
+                } elsif ($settings->{'canclone'} eq 'domain') {
+                    $currcanclone = $settings->{'canclone'};
+                }
+            }
+        }
+        foreach my $option (@cloneoptions) {
+            my ($checked,$additional);
+            if ($currcanclone eq $option) {
+                $checked = ' checked="checked"';
+            }
+            if ($option eq 'instcode') {
+                if (@code_order) {
+                    my $show = 'none';
+                    if ($checked) {
+                        $show = 'block';
+                    }
+                    $additional = '<div id="cloneinstcode" style="display:'.$show.'" />'.
+                                  &mt('Institutional codes for new and cloned course have identical:').
+                                  '<br />';
+                    foreach my $item (@code_order) {
+                        my $codechk;
+                        if ($checked) {
+                            if (grep(/^\Q$item\E$/,@posscodes)) {
+                                $codechk = ' checked="checked"';
+                            }
+                        }
+                        $additional .= '<label>'.
+                                       '<input type="checkbox" name="clonecode" value="'.$item.'"'.$codechk.' />'.
+                                       $item.'</label>';
+                    }
+                    $additional .= ('&nbsp;'x2).'('.&mt('check as many as needed').')</div>';
+                }
+            }
+            $datatable .=
+                '<span class="LC_nobreak"><label><input type="radio" name="canclone"'.$checked.
+                ' value="'.$option.'"'.$onclick.' />'.$clonetitles{$option}.
+                '</label>&nbsp;'.$additional.'</span><br />';
+        }
+        $datatable .= '</td>'.
+                      '</tr>';
+        $itemcount ++;
     } else {
         $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
-        my ($currdefresponder,$def_official_credits,$def_unofficial_credits,$def_textbook_credits,
-            %curruploadquota);
+        my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout,%currmysql);
         my $currusecredits = 0;
+        my $postsubmitclient = 1;
         my @types = ('official','unofficial','community','textbook');
         if (ref($settings) eq 'HASH') {
             $currdefresponder = $settings->{'anonsurvey_threshold'};
@@ -2753,14 +3001,51 @@ sub print_coursedefaults {
                 }
             }
             if (ref($settings->{'coursecredits'}) eq 'HASH') {
-                $def_official_credits = $settings->{'coursecredits'}->{'official'};
-                $def_unofficial_credits = $settings->{'coursecredits'}->{'unofficial'};
-                $def_textbook_credits = $settings->{'coursecredits'}->{'textbook'};
-                if (($def_official_credits ne '') || ($def_unofficial_credits ne '') ||
-                    ($def_textbook_credits ne '')) {
-                    $currusecredits = 1;
+                foreach my $type (@types) {
+                    next if ($type eq 'community');
+                    $defcredits{$type} = $settings->{'coursecredits'}->{$type};
+                    if ($defcredits{$type} ne '') {
+                        $currusecredits = 1;
+                    }
                 }
             }
+            if (ref($settings->{'postsubmit'}) eq 'HASH') {
+                if ($settings->{'postsubmit'}->{'client'} eq 'off') {
+                    $postsubmitclient = 0;
+                    foreach my $type (@types) {
+                        $deftimeout{$type} = $staticdefaults{'postsubmit'};
+                    }
+                } else {
+                    foreach my $type (@types) {
+                        if (ref($settings->{'postsubmit'}->{'timeout'}) eq 'HASH') {
+                            if ($settings->{'postsubmit'}->{'timeout'}->{$type} =~ /^\d+$/) {
+                                $deftimeout{$type} = $settings->{'postsubmit'}->{'timeout'}->{$type};
+                            } else {
+                                $deftimeout{$type} = $staticdefaults{'postsubmit'};
+                            }
+                        } else {
+                            $deftimeout{$type} = $staticdefaults{'postsubmit'};
+                        }
+                    }
+                }
+            } else {
+                foreach my $type (@types) {
+                    $deftimeout{$type} = $staticdefaults{'postsubmit'};
+                }
+            }
+            if (ref($settings->{'mysqltables'}) eq 'HASH') {
+                foreach my $type (keys(%{$settings->{'mysqltables'}})) {
+                    $currmysql{$type} = $settings->{'mysqltables'}{$type};
+                }
+            } else {
+                foreach my $type (@types) {
+                    $currmysql{$type} = $staticdefaults{'mysqltables'};
+                }
+            }
+        } else {
+            foreach my $type (@types) {
+                $deftimeout{$type} = $staticdefaults{'postsubmit'};
+            }
         }
         if (!$currdefresponder) {
             $currdefresponder = $staticdefaults{'anonsurvey_threshold'};
@@ -2794,27 +3079,20 @@ sub print_coursedefaults {
         }
         $datatable .= '</tr></table></td></tr>'."\n";
         $itemcount ++;
-        my $onclick = 'toggleCredits(this.form);';
+        my $onclick = "toggleDisplay(this.form,'credits');";
         my $display = 'none';
         if ($currusecredits) {
             $display = 'block';
         }
         my $additional = '<div id="credits" style="display: '.$display.'">'.
-                         '<span class="LC_nobreak">'.
-                         &mt('Default credits for official courses [_1]',
-                         '<input type="text" name="official_credits" value="'.
-                         $def_official_credits.'" size="3" />').
-                         '</span><br />'.
-                         '<span class="LC_nobreak">'.
-                         &mt('Default credits for unofficial courses [_1]',
-                         '<input type="text" name="unofficial_credits" value="'.
-                         $def_unofficial_credits.'" size="3" />').
-                         '</span><br />'.
-                         '<span class="LC_nobreak">'.
-                         &mt('Default credits for textbook courses [_1]',
-                         '<input type="text" name="textbook_credits" value="'.
-                         $def_textbook_credits.'" size="3" />').
-                         '</span></div>'."\n";
+                         '<i>'.&mt('Default credits').'</i><br /><table><tr>';
+        foreach my $type (@types) {
+            next if ($type eq 'community');
+            $additional .= '<td align="center">'.&mt($type).'<br />'.
+                           '<input type="text" name="'.$type.'_credits"'.
+                           ' value="'.$defcredits{$type}.'" size="3" /></td>';
+        }
+        $additional .= '</tr></table></div>'."\n";
         %defaultchecked = ('coursecredits' => 'off');
         @toggles = ('coursecredits');
         my $current = {
@@ -2822,9 +3100,46 @@ sub print_coursedefaults {
                       };
         (my $table,$itemcount) =
             &radiobutton_prefs($current,\@toggles,\%defaultchecked,
-                               \%choices,$itemcount,$onclick,$additional);
+                               \%choices,$itemcount,$onclick,$additional,'left');
         $datatable .= $table;
+        $onclick = "toggleDisplay(this.form,'studentsubmission');";
+        my $display = 'none';
+        if ($postsubmitclient) {
+            $display = 'block';
+        }
+        $additional = '<div id="studentsubmission" style="display: '.$display.'">'.
+                      &mt('Number of seconds submit is disabled').'<br />'.
+                      '<i>'.&mt('Enter 0 to remain disabled until page reload.').'</i><br />'.
+                      '<table><tr>';
+        foreach my $type (@types) {
+            $additional .= '<td align="center">'.&mt($type).'<br />'.
+                           '<input type="text" name="'.$type.'_timeout" value="'.
+                           $deftimeout{$type}.'" size="5" /></td>';
+        }
+        $additional .= '</tr></table></div>'."\n";
+        %defaultchecked = ('postsubmit' => 'on');
+        @toggles = ('postsubmit');
+        $current = {
+                       'postsubmit' => $postsubmitclient,
+                   };
+        ($table,$itemcount) =
+            &radiobutton_prefs($current,\@toggles,\%defaultchecked,
+                               \%choices,$itemcount,$onclick,$additional,'left');
+        $datatable .= $table;
+        $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+        $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.
+                      $choices{'mysqltables'}.
+                      '</span></td>'.
+                      '<td align="right" class="LC_right_item">'.
+                      '<table><tr>';
+        foreach my $type (@types) {
+            $datatable .= '<td align="center">'.&mt($type).'<br />'.
+                           '<input type="text" name="mysqltables_'.$type.'"'.
+                           ' value="'.$currmysql{$type}.'" size="5" /></td>';
+        }
+        $datatable .= '</tr></table></td></tr>'."\n";
         $itemcount ++;
+
     }
     $$rowtotal += $itemcount;
     return $datatable;
@@ -3029,21 +3344,24 @@ sub print_validation_rows {
     }
     if ($caller eq 'requestcourses') {
         my %currhash;
-        if (ref($settings->{'validation'}) eq 'HASH') {
-            if ($settings->{'validation'}{'dc'} ne '') {
-                $currhash{$settings->{'validation'}{'dc'}} = 1;
+        if (ref($settings) eq 'HASH') {
+            if (ref($settings->{'validation'}) eq 'HASH') {
+                if ($settings->{'validation'}{'dc'} ne '') {
+                    $currhash{$settings->{'validation'}{'dc'}} = 1;
+                }
             }
         }
         my $numinrow = 2;
         my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio',
                                                        'validationdc',%currhash);
+        my $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+        $datatable .= '</td></tr><tr'.$css_class.'><td>';
         if ($numdc > 1) {
-            $datatable .= '</td></tr><tr class="LC_odd_row"><td>'.
-                          &mt('Course creation processed as: (choose Dom. Coord.)').
-                          '</td><td class="LC_left_item">'.$dctable.'</td></tr>';
+            $datatable .= &mt('Course creation processed as: (choose Dom. Coord.)');
         } else {
-            $datatable .= $dctable.'</td></tr>';
+            $datatable .=  &mt('Course creation processed as: ');
         }
+        $datatable .= '</td><td class="LC_left_item">'.$dctable.'</td></tr>';
         $itemcount ++;
     }
     if (ref($rowtotal)) {
@@ -3066,7 +3384,13 @@ sub print_usersessions {
     if ($position eq 'top') {
         if (keys(%serverhomes) > 1) {
             my %spareid = &current_offloads_to($dom,$settings,\%servers);
-            $datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$rowtotal);
+            my $curroffloadnow;
+            if (ref($settings) eq 'HASH') {
+                if (ref($settings->{'offloadnow'}) eq 'HASH') {
+                    $curroffloadnow = $settings->{'offloadnow'};
+                }
+            }
+            $datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$curroffloadnow,$rowtotal);
         } else {
             $datatable .= '<tr'.$css_class.'><td colspan="2">'.
                           &mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.');
@@ -3316,7 +3640,7 @@ sub current_offloads_to {
 }
 
 sub spares_row {
-    my ($dom,$servers,$spareid,$serverhomes,$altids,$rowtotal) = @_;
+    my ($dom,$servers,$spareid,$serverhomes,$altids,$curroffloadnow,$rowtotal) = @_;
     my $css_class;
     my $numinrow = 4;
     my $itemcount = 1;
@@ -3336,12 +3660,21 @@ sub spares_row {
                 }
             }
             next unless (ref($spareid->{$server}) eq 'HASH');
+            my $checkednow;
+            if (ref($curroffloadnow) eq 'HASH') {
+                if ($curroffloadnow->{$server}) {
+                    $checkednow = ' checked="checked"';
+                }
+            }
             $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
             $datatable .= '<tr'.$css_class.'>
                            <td rowspan="2">
                             <span class="LC_nobreak">'.
                           &mt('[_1] when busy, offloads to:'
-                              ,'<b>'.$server.'</b>').
+                              ,'<b>'.$server.'</b>').'</span><br />'.
+                          '<span class="LC_nobreak">'."\n".
+                          '<label><input type="checkbox" name="offloadnow" value="'.$server.'"'.$checkednow.' />'.
+                          '&nbsp;'.&mt('Switch active users on next access').'</label></span>'.
                           "\n";
             my (%current,%canselect);
             my @choices = 
@@ -3565,9 +3898,10 @@ sub print_loadbalancing {
                     $disabled = ' disabled="disabled"';
                 }
                 $targettable .=
-                    '<td><label><input type="checkbox" name="loadbalancing_target_'.$balnum.'_'.$sparetype.'"'.
+                    '<td><span class="LC_nobreak"><label>'.
+                    '<input type="checkbox" name="loadbalancing_target_'.$balnum.'_'.$sparetype.'"'.
                     $checked.$disabled.' value="'.$chkboxval.'" id="loadbalancing_target_'.$balnum.'_'.$sparetype.'_'.$i.'" onclick="checkOffloads('."this,'$balnum','$sparetype'".');" /><span id="loadbalancing_targettxt_'.$balnum.'_'.$sparetype.'_'.$i.'">&nbsp;'.$chkboxval.
-                    '</span></label></td>';
+                    '</span></label></span></td>';
                 my $rem = $i%($numinrow);
                 if ($rem == 0) {
                     if (($i > 0) && ($i < $numspares-1)) {
@@ -3657,7 +3991,7 @@ sub loadbalancing_rules {
             if (ref($currrules) eq 'HASH') {
                 $current = $currrules->{$type};
             }
-            if (($type eq '_LC_external') || ($type eq '_LC_internetdom') || ($type eq '_LC_ipchange')) {
+            if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) {
                 if ($dom ne &Apache::lonnet::host_domain($lonhost)) {
                     $current = '';
                 }
@@ -3709,7 +4043,7 @@ sub loadbalance_rule_row {
     my @rulenames;
     my %ruletitles = &offloadtype_text();
     if (($type eq '_LC_ipchangesso') || ($type eq '_LC_ipchange')) {
-        @rulenames = ('balancer','offloadedto');
+        @rulenames = ('balancer','offloadedto','specific');
     } else {
         @rulenames = ('default','homeserver');
         if ($type eq '_LC_external') {
@@ -3720,7 +4054,7 @@ sub loadbalance_rule_row {
         push(@rulenames,'none');
     }
     my $style = $targets_div_style;
-    if (($type eq '_LC_external') || ($type eq '_LC_internetdom') || ($type eq '_LC_ipchange')) {
+    if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) {
         $style = $homedom_div_style;
     }
     my $space;
@@ -3771,8 +4105,13 @@ sub loadbalance_rule_row {
                    '<input type="radio" name="loadbalancing_rules_'.$balnum.'_'.$type.
                    '" id="loadbalancing_rules_'.$balnum.'_'.$type.'_'.$i.'" value="'.
                    $rule.'" onclick="balanceruleChange('."this.form,'$balnum','$type'".
-                   ')"'.$checked.' />&nbsp;'.$ruletitles{$rulenames[$i]}.
-                   '</label>'.$extra.'</span><br />'."\n";
+                   ')"'.$checked.' />&nbsp;';
+        if (($rulenames[$i] eq 'specific') && ($type =~ /^_LC_ipchange/)) {
+            $output .= $ruletitles{'particular'};
+        } else {
+            $output .= $ruletitles{$rulenames[$i]};
+        }
+        $output .= '</label>'.$extra.'</span><br />'."\n";
     }
     $output .= '</div></td></tr>'."\n";
     return $output;
@@ -3787,6 +4126,7 @@ sub offloadtype_text {
            'none'             => 'No offload',
            'balancer'         => 'Session hosted on Load Balancer, after re-authentication',
            'offloadedto'      => 'Session hosted on offload server, after re-authentication',
+           'particular'       => 'Session hosted (after re-auth) on server:',
     );
     return %ruletitles;
 }
@@ -4002,17 +4342,22 @@ sub print_usercreation {
 
 sub print_selfcreation {
     my ($position,$dom,$settings,$rowtotal) = @_;
-    my (@selfcreate,$createsettings,$datatable);
+    my (@selfcreate,$createsettings,$processing,$datatable);
     if (ref($settings) eq 'HASH') {
         if (ref($settings->{'cancreate'}) eq 'HASH') {
             $createsettings = $settings->{'cancreate'};
-            if (ref($settings->{'cancreate'}{'selfcreate'}) eq 'ARRAY') {
-                @selfcreate = @{$settings->{'cancreate'}{'selfcreate'}};
-            } elsif ($settings->{'cancreate'}{'selfcreate'} ne '') {
-                if ($settings->{'cancreate'}{'selfcreate'} eq 'any') {
-                    @selfcreate = ('email','login','sso');
-                } elsif ($settings->{'cancreate'}{'selfcreate'} ne 'none') {
-                    @selfcreate = ($settings->{'cancreate'}{'selfcreate'});
+            if (ref($createsettings) eq 'HASH') {
+                if (ref($createsettings->{'selfcreate'}) eq 'ARRAY') {
+                    @selfcreate = @{$createsettings->{'selfcreate'}};
+                } elsif ($createsettings->{'selfcreate'} ne '') {
+                    if ($settings->{'cancreate'}{'selfcreate'} eq 'any') {
+                        @selfcreate = ('email','login','sso');
+                    } elsif ($createsettings->{'selfcreate'} ne 'none') {
+                        @selfcreate = ($createsettings->{'selfcreate'});
+                    }
+                }
+                if (ref($createsettings->{'selfcreateprocessing'}) eq 'HASH') {
+                    $processing = $createsettings->{'selfcreateprocessing'};
                 }
             }
         }
@@ -4045,6 +4390,45 @@ sub print_selfcreation {
                 $$rowtotal ++;
             }
         }
+        my @fields = ('lastname','firstname','middlename','permanentemail','id','inststatus');
+        my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
+        $fieldtitles{'inststatus'} = &mt('Institutional status');
+        my $rem;
+        my $numperrow = 2;
+        my $css_class = $$rowtotal%2?' class="LC_odd_row"':'';
+        $datatable .= '<tr'.$css_class.'>'.
+                     '<td class="LC_left_item">'.&mt('Mapping of Shibboleth environment variable names to user data fields (SSO auth)').'</td>'.
+                     '<td class="LC_left_item">'."\n".
+                     '<table><tr><td>'."\n";
+        for (my $i=0; $i<@fields; $i++) {
+            $rem = $i%($numperrow);
+            if ($rem == 0) {
+                if ($i > 0) {
+                    $datatable .= '</tr>';
+                }
+                $datatable .= '<tr>';
+            }
+            my $currval;
+            if (ref($createsettings) eq 'HASH') {
+                if (ref($createsettings->{'shibenv'}) eq 'HASH') {
+                    $currval = $createsettings->{'shibenv'}{$fields[$i]};
+                }
+            }
+            $datatable .= '<td class="LC_left_item">'.
+                          '<span class="LC_nobreak">'.
+                          '<input type="text" name="shibenv_'.$fields[$i].'" '.
+                          'value="'.$currval.'" size="10" />&nbsp;'.
+                          $fieldtitles{$fields[$i]}.'</span></td>';
+        }
+        my $colsleft = $numperrow - $rem;
+        if ($colsleft > 1 ) {
+            $datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'.
+                         '&nbsp;</td>';
+        } elsif ($colsleft == 1) {
+            $datatable .= '<td class="LC_left_item">&nbsp;</td>';
+        }
+        $datatable .= '</tr></table></td></tr>';
+        $$rowtotal ++;
     } elsif ($position eq 'middle') {
         my %domconf = &Apache::lonnet::get_dom('configuration',['usermodification'],$dom);
         my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
@@ -4059,49 +4443,56 @@ sub print_selfcreation {
             }
         }
     } else {
-        my $css_class = $$rowtotal%2?' class="LC_odd_row"':'';
-        my %choices =
-            &Apache::lonlocal::texthash(
-                                          email         => 'Approved automatically',
-                                          emailapproval => 'Queued for approval by DC',
-                                          off           => 'Not enabled',
-                                       );
-        $datatable .= '<tr'.$css_class.'>'.
-                      '<td>'.&mt('E-mail address as username').
-                      '</td><td class="LC_left_item">'.
-                      '<span class="LC_nobreak">';
-        foreach my $option ('email','emailapproval','off') {
-            my $checked;
-            if ($option eq 'email') {
-                if ($radiohash{'cancreate_email'}) {
-                    $checked = 'checked="checked"';
-                }
-            } elsif ($option eq 'emailapproval') {
-                if ($radiohash{'cancreate_emailapproval'}) {
-                    $checked = 'checked="checked"';
+        my %choices = &Apache::lonlocal::texthash (
+                                                      cancreate_email => 'E-mail address as username',
+                                                  );
+        my @toggles = sort(keys(%choices));
+        my %defaultchecked = (
+                               'cancreate_email' => 'off',
+                             );
+        my $itemcount = 0;
+        my $display = 'none';
+        if (grep(/^\Qemail\E$/,@selfcreate)) {
+            $display = 'block';
+        }
+        my $onclick = "toggleDisplay(this.form,'emailoptions');";
+        my $additional = '<div id="emailoptions" style="display: '.$display.'">';
+        my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+        my $usertypes = {};
+        my $order = [];
+        if ((ref($domdefaults{'inststatustypes'}) eq 'HASH') && (ref($domdefaults{'inststatusguest'}) eq 'ARRAY')) {
+            $usertypes = $domdefaults{'inststatustypes'};
+            $order = $domdefaults{'inststatusguest'};
+        }
+        if (ref($order) eq 'ARRAY') {
+            push(@{$order},'default');
+            if (@{$order} > 1) {
+                $usertypes->{'default'} = &mt('Other users');
+                $additional .= '<table><tr>';
+                foreach my $status (@{$order}) {
+                    $additional .= '<th>'.$usertypes->{$status}.'</th>';
+                }
+                $additional .= '</tr><tr>';
+                foreach my $status (@{$order}) {
+                    $additional .= '<td>'.&email_as_username($rowtotal,$processing,$status).'</td>';
                 }
+                $additional .= '</tr></table>';
             } else {
-                if ((!$radiohash{'cancreate_email'}) && (!$radiohash{'cancreate_emailapproval'})) {
-                    $checked = 'checked="checked"';  
-                }
+                $usertypes->{'default'} = &mt('All users');
+                $additional .= &email_as_username($rowtotal,$processing);
             }
-            $datatable .= '<label>'.
-                          '<input type="radio" name="cancreate_email" '.
-                          $checked.' value="'.$option.'" />'.
-                          $choices{$option}.'</label>&nbsp;';
         }
+        $additional .= '</div>'."\n";
+
+        ($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
+                                                     \%choices,$$rowtotal,$onclick,$additional);
         $$rowtotal ++;
-        $datatable .= '</span></td></tr>'.
-                      &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal);
+        $datatable .= &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal);
         $$rowtotal ++;
         my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
         $numinrow = 1;
-        my ($othertitle,$usertypes,$types) =  &Apache::loncommon::sorted_inst_types($dom);
-        $usertypes->{'default'} = $othertitle;
-        if (ref($types) eq 'ARRAY') {
-            push(@{$types},'default');
-            $usertypes->{'default'} = $othertitle;
-            foreach my $status (@{$types}) {
+        if (ref($order) eq 'ARRAY') {
+            foreach my $status (@{$order}) {
                 $datatable .= &modifiable_userdata_row('cancreate','emailusername_'.$status,$settings,
                                                        $numinrow,$$rowtotal,$usertypes,$infofields,$infotitles);
                 $$rowtotal ++;
@@ -4121,9 +4512,63 @@ sub print_selfcreation {
     return $datatable;
 }
 
+sub email_as_username {
+    my ($rowtotal,$processing,$type) = @_;
+    my %choices =
+        &Apache::lonlocal::texthash (
+                                      automatic => 'Automatic approval',
+                                      approval  => 'Queued for approval',
+                                    );
+    my $output;
+    foreach my $option ('automatic','approval') {
+        my $checked;
+        if (ref($processing) eq 'HASH') {
+            if ($type eq '') {   
+                if (!exists($processing->{'default'})) {
+                    if ($option eq 'automatic') {
+                        $checked = ' checked="checked"';
+                    }
+                } else {
+                    if ($processing->{'default'} eq $option) {
+                        $checked = ' checked="checked"';
+                    }
+                }
+            } else {
+                if (!exists($processing->{$type})) {
+                    if ($option eq 'automatic') {
+                        $checked = ' checked="checked"';
+                    }
+                } else {
+                    if ($processing->{$type} eq $option) {
+                        $checked = ' checked="checked"';
+                    }
+                }
+            }
+        } elsif ($option eq 'automatic') {
+            $checked = ' checked="checked"'; 
+        }
+        my $name = 'cancreate_emailprocess';
+        if (($type ne '') && ($type ne 'default')) {
+            $name .= '_'.$type;
+        }
+        $output .= '<span class="LC_nobreak"><label>'.
+                   '<input type="radio" name="'.$name.'"'.
+                   $checked.' value="'.$option.'" />'.
+                   $choices{$option}.'</label></span>';
+        if ($type eq '') {
+            $output .= '&nbsp;';
+        } else {
+            $output .= '<br />';
+        }
+    }
+    $$rowtotal ++;
+    return $output;
+}
+
 sub captcha_choice {
     my ($context,$settings,$itemcount) = @_;
-    my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext);
+    my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext,
+        $vertext,$currver); 
     my %lt = &captcha_phrases();
     $keyentry = 'hidden';
     if ($context eq 'cancreate') {
@@ -4141,6 +4586,11 @@ sub captcha_choice {
             $pubtext = $lt{'pub'};
             $privtext = $lt{'priv'};
             $keyentry = 'text';
+            $vertext = $lt{'ver'};
+            $currver = $settings->{'recaptchaversion'};
+            if ($currver ne '2') {
+                $currver = 1;
+            }
         }
         if (ref($settings->{'recaptchakeys'}) eq 'HASH') {
             $currpub = $settings->{'recaptchakeys'}{'public'};
@@ -4174,7 +4624,11 @@ sub captcha_choice {
                $currpub.'" size="40" /></span><br />'."\n".
                '<span class="LC_nobreak"><span id="'.$context.'_recaptchaprivtxt">'.$privtext.'</span>&nbsp;'."\n".
                '<input type="'.$keyentry.'" id="'.$context.'_recaptchapriv" name="'.$context.'_recaptchapriv" value="'.
-               $currpriv.'" size="40" /></span></td></tr></table>'."\n".
+               $currpriv.'" size="40" /></span><br />'.
+               '<span class="LC_nobreak"><span id="'.$context.'_recaptchavertxt">'.$vertext.'</span>&nbsp;'."\n".
+               '<input type="'.$keyentry.'" id="'.$context.'_recaptchaversion" name="'.$context.'_recaptchaversion" value="'.
+               $currver.'" size="3" /></span><br />'.
+               '</td></tr></table>'."\n".
                '</td></tr>';
     return $output;
 }
@@ -4307,70 +4761,140 @@ sub print_usermodification {
 }
 
 sub print_defaults {
-    my ($dom,$settings,$rowtotal) = @_;
-    my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',
-                 'datelocale_def','portal_def');
-    my %defaults;
-    if (ref($settings) eq 'HASH') {
-        %defaults = %{$settings};
-    } else {
-        my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
-        foreach my $item (@items) {
-            $defaults{$item} = $domdefaults{$item};
-        }
-    }
-    my $titles = &defaults_titles($dom);
+    my ($position,$dom,$settings,$rowtotal) = @_;
     my $rownum = 0;
     my ($datatable,$css_class);
-    foreach my $item (@items) {
-        if ($rownum%2) {
-            $css_class = '';
+    if ($position eq 'top') {
+        my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',
+                     'datelocale_def','portal_def');
+        my %defaults;
+        if (ref($settings) eq 'HASH') {
+            %defaults = %{$settings};
         } else {
-            $css_class = ' class="LC_odd_row" ';
+            my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
+            foreach my $item (@items) {
+                $defaults{$item} = $domdefaults{$item};
+            }
         }
-        $datatable .= '<tr'.$css_class.'>'.
-                  '<td><span class="LC_nobreak">'.$titles->{$item}.
-                  '</span></td><td class="LC_right_item">';
-        if ($item eq 'auth_def') {
-            my @authtypes = ('internal','krb4','krb5','localauth');
-            my %shortauth = (
-                             internal => 'int',
-                             krb4 => 'krb4',
-                             krb5 => 'krb5',
-                             localauth  => 'loc'
-                           );
-            my %authnames = &authtype_names();
-            foreach my $auth (@authtypes) {
-                my $checked = ' ';
-                if ($defaults{$item} eq $auth) {
-                    $checked = ' checked="checked" ';
-                }
-                $datatable .= '<label><input type="radio" name="'.$item.
-                              '" value="'.$auth.'"'.$checked.'/>'.
-                              $authnames{$shortauth{$auth}}.'</label>&nbsp;&nbsp;';
+        my $titles = &defaults_titles($dom);
+        foreach my $item (@items) {
+            if ($rownum%2) {
+                $css_class = '';
+            } else {
+                $css_class = ' class="LC_odd_row" ';
             }
-        } elsif ($item eq 'timezone_def') {
-            my $includeempty = 1;
-            $datatable .= &Apache::loncommon::select_timezone($item,$defaults{$item},undef,$includeempty);
-        } elsif ($item eq 'datelocale_def') {
-            my $includeempty = 1;
-            $datatable .= &Apache::loncommon::select_datelocale($item,$defaults{$item},undef,$includeempty);
-        } elsif ($item eq 'lang_def') {
-            my %langchoices = &get_languages_hash();
-            $langchoices{''} = 'No language preference';
-            %langchoices = &Apache::lonlocal::texthash(%langchoices);
-            $datatable .= &Apache::loncommon::select_form($defaults{$item},$item,
-                                                          \%langchoices);
-        } else {
-            my $size;
-            if ($item eq 'portal_def') {
-                $size = ' size="25"';
+            $datatable .= '<tr'.$css_class.'>'.
+                          '<td><span class="LC_nobreak">'.$titles->{$item}.
+                          '</span></td><td class="LC_right_item" colspan="3">';
+            if ($item eq 'auth_def') {
+                my @authtypes = ('internal','krb4','krb5','localauth');
+                my %shortauth = (
+                                 internal => 'int',
+                                 krb4 => 'krb4',
+                                 krb5 => 'krb5',
+                                 localauth  => 'loc'
+                                );
+                my %authnames = &authtype_names();
+                foreach my $auth (@authtypes) {
+                    my $checked = ' ';
+                    if ($defaults{$item} eq $auth) {
+                        $checked = ' checked="checked" ';
+                    }
+                    $datatable .= '<label><input type="radio" name="'.$item.
+                                  '" value="'.$auth.'"'.$checked.'/>'.
+                                  $authnames{$shortauth{$auth}}.'</label>&nbsp;&nbsp;';
+                }
+            } elsif ($item eq 'timezone_def') {
+                my $includeempty = 1;
+                $datatable .= &Apache::loncommon::select_timezone($item,$defaults{$item},undef,$includeempty);
+            } elsif ($item eq 'datelocale_def') {
+                my $includeempty = 1;
+                $datatable .= &Apache::loncommon::select_datelocale($item,$defaults{$item},undef,$includeempty);
+            } elsif ($item eq 'lang_def') {
+                my $includeempty = 1;
+                $datatable .= &Apache::loncommon::select_language($item,$defaults{$item},$includeempty);
+            } else {
+                my $size;
+                if ($item eq 'portal_def') {
+                    $size = ' size="25"';
+                }
+                $datatable .= '<input type="text" name="'.$item.'" value="'.
+                              $defaults{$item}.'"'.$size.' />';
+            }
+            $datatable .= '</td></tr>';
+            $rownum ++;
+        }
+    } else {
+        my (%defaults);
+        if (ref($settings) eq 'HASH') {
+            if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH') &&
+                (ref($settings->{'inststatusguest'}) eq 'ARRAY')) {
+                my $maxnum = @{$settings->{'inststatusorder'}};
+                for (my $i=0; $i<$maxnum; $i++) {
+                    $css_class = $rownum%2?' class="LC_odd_row"':'';
+                    my $item = $settings->{'inststatusorder'}->[$i];
+                    my $title = $settings->{'inststatustypes'}->{$item};
+                    my $guestok;
+                    if (grep(/^\Q$item\E$/,@{$settings->{'inststatusguest'}})) {
+                        $guestok = 1;
+                    }
+                    my $chgstr = ' onchange="javascript:reorderTypes(this.form,'."'$item'".');"';
+                    $datatable .= '<tr'.$css_class.'>'.
+                                  '<td><span class="LC_nobreak">'.
+                                  '<select name="inststatus_pos_'.$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>';
+                    }
+                    my ($checkedon,$checkedoff);
+                    $checkedoff = ' checked="checked"';
+                    if ($guestok) {
+                        $checkedon = $checkedoff;
+                        $checkedoff = ''; 
+                    }
+                    $datatable .= '</select>&nbsp;'.&mt('Internal ID:').'&nbsp;<b>'.$item.'</b>&nbsp;'.
+                                  '<input type="checkbox" name="inststatus_delete" value="'.$item.'" />'.
+                                  &mt('delete').'</span></td>'.
+                                  '<td class="LC_left_item"><span class="LC_nobreak">'.&mt('Name displayed:').
+                                  '<input type="text" size="20" name="inststatus_title_'.$item.'" value="'.$title.'" />'.
+                                  '</span></td>'.
+                                  '<td class="LC_right_item"><span class="LC_nobreak">'.
+                                  '<label><input type="radio" value="1" name="inststatus_guest_'.$item.'"'.$checkedon.' />'.
+                                  &mt('Yes').'</label>'.('&nbsp;'x2).
+                                  '<label><input type="radio" value="0" name="inststatus_guest_'.$item.'"'.$checkedoff.' />'.
+                                  &mt('No').'</label></span></td></tr>';
+                }
+                $css_class = $rownum%2?' class="LC_odd_row"':'';
+                my $chgstr = ' onchange="javascript:reorderTypes(this.form,'."'addinststatus_pos'".');"';
+                $datatable .= '<tr '.$css_class.'>'.
+                              '<td><span class="LC_nobreak"><select name="addinststatus_pos"'.$chgstr.'>';
+                for (my $k=0; $k<=$maxnum; $k++) {
+                    my $vpos = $k+1;
+                    my $selstr;
+                    if ($k == $maxnum) {
+                        $selstr = ' selected="selected" ';
+                    }
+                    $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
+                }
+                $datatable .= '</select>&nbsp;'.&mt('Internal ID:').
+                              '<input type="text" size="10" name="addinststatus" value="" />'.
+                              '&nbsp;'.&mt('(new)').
+                              '</span></td><td class="LC_left_item"><span class="LC_nobreak">'.
+                              &mt('Name displayed:').
+                              '<input type="text" size="20" name="addinststatus_title" value="" /></span></td>'.
+                              '<td class="LC_right_item"><span class="LC_nobreak">'.
+                              '<label><input type="radio" value="1" name="addinststatus_guest" />'.
+                              &mt('Yes').'</label>'.('&nbsp;'x2).
+                              '<label><input type="radio" value="0" name="addinststatus_guest" />'.
+                              &mt('No').'</label></span></td></tr>';
+                              '</tr>'."\n";
+                $rownum ++;
             }
-            $datatable .= '<input type="text" name="'.$item.'" value="'.
-                          $defaults{$item}.'"'.$size.' />';
         }
-        $datatable .= '</td></tr>';
-        $rownum ++;
     }
     $$rowtotal += $rownum;
     return $datatable;
@@ -4587,6 +5111,49 @@ sub print_coursecategories {
     my ($position,$dom,$hdritem,$settings,$rowtotal) = @_;
     my $datatable;
     if ($position eq 'top') {
+        my (%checked);
+        my @catitems = ('unauth','auth');
+        my @cattypes = ('std','domonly','codesrch','none');
+        $checked{'unauth'} = 'std';
+        $checked{'auth'} = 'std';
+        if (ref($settings) eq 'HASH') {
+            foreach my $type (@cattypes) {
+                if ($type eq $settings->{'unauth'}) {
+                    $checked{'unauth'} = $type;
+                }
+                if ($type eq $settings->{'auth'}) {
+                    $checked{'auth'} = $type;
+                }
+            }
+        }
+        my %lt = &Apache::lonlocal::texthash (
+                                               unauth   => 'Catalog type for unauthenticated users',
+                                               auth     => 'Catalog type for authenticated users',
+                                               none     => 'No catalog',
+                                               std      => 'Standard catalog',
+                                               domonly  => 'Domain-only catalog',
+                                               codesrch => "Code search form",
+                                             );
+       my $itemcount = 0;
+       foreach my $item (@catitems) {
+           my $css_class = $itemcount%2? ' class="LC_odd_row"':'';
+           $datatable .= '<tr '.$css_class.'>'.
+                         '<td>'.$lt{$item}.'</td>'.
+                         '<td class="LC_right_item"><span class="LC_nobreak">';
+           foreach my $type (@cattypes) {
+               my $ischecked;
+               if ($checked{$item} eq $type) {
+                   $ischecked=' checked="checked"';
+               }
+               $datatable .= '<label>'.
+                             '<input type="radio" name="coursecat_'.$item.'" value="'.$type.'"'.$ischecked.
+                             ' />'.$lt{$type}.'</label>&nbsp;';
+           }
+           $datatable .= '</td></tr>';
+           $itemcount ++;
+        }
+        $$rowtotal += $itemcount;
+    } elsif ($position eq 'middle') {
         my $toggle_cats_crs = ' ';
         my $toggle_cats_dom = ' checked="checked" ';
         my $can_cat_crs = ' ';
@@ -4793,7 +5360,7 @@ sub print_coursecategories {
                 $datatable .= &initialize_categories($itemcount);
             }
         } else {
-            $datatable .= '<td class="LC_right_item">'.$hdritem->{'header'}->[0]->{'col2'}.'</td>'
+            $datatable .= '<td class="LC_right_item">'.$hdritem->{'header'}->[1]->{'col2'}.'</td>'
                           .&initialize_categories($itemcount);
         }
         $$rowtotal += $itemcount;
@@ -4851,7 +5418,70 @@ sub serverstatus_pages {
     return ('userstatus','lonstatus','loncron','server-status','codeversions',
             'checksums','clusterstatus','metadata_keywords','metadata_harvest',
             'takeoffline','takeonline','showenv','toggledebug','ping','domconf',
-            'uniquecodes','diskusage');
+            'uniquecodes','diskusage','coursecatalog');
+}
+
+sub defaults_javascript {
+    my ($settings) = @_;
+    return unless (ref($settings) eq 'HASH');
+    if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) {
+        my $maxnum = scalar(@{$settings->{'inststatusorder'}});
+        if ($maxnum eq '') {
+            $maxnum = 0;
+        }
+        $maxnum ++;
+        my $jstext = '    var inststatuses = Array('."'".join("','",@{$settings->{'inststatusorder'}})."'".');';  
+        return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+function reorderTypes(form,caller) {
+    var changedVal;
+$jstext 
+    var newpos = 'addinststatus_pos';
+    var current = new Array;
+    var maxh = $maxnum;
+    var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value;
+    var oldVal;
+    if (caller == newpos) {
+        changedVal = newitemVal;
+    } else {
+        var curritem = 'inststatus_pos_'+caller;
+        changedVal = form.elements[curritem].options[form.elements[curritem].selectedIndex].value;
+        current[newitemVal] = newpos;
+    }
+    for (var i=0; i<inststatuses.length; i++) {
+        if (inststatuses[i] != caller) {
+            var elementName = 'inststatus_pos_'+inststatuses[i];
+            if (form.elements[elementName]) {
+                var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value;
+                current[currVal] = elementName;
+            }
+        }
+    }
+    for (var j=0; j<maxh; j++) {
+        if (current[j] == undefined) {
+            oldVal = j;
+        }
+    }
+    if (oldVal < changedVal) {
+        for (var k=oldVal+1; k<=changedVal ; k++) {
+           var elementName = current[k];
+           form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex - 1;
+        }
+    } else {
+        for (var k=changedVal; k<oldVal; k++) {
+            var elementName = current[k];
+            form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex + 1;
+        }
+    }
+    return;
+}
+
+// ]]>
+</script>
+
+ENDSCRIPT
+    }
 }
 
 sub coursecategories_javascript {
@@ -4876,9 +5506,12 @@ sub coursecategories_javascript {
         $jstext  = '    var categories = Array(1);'."\n".
                    '    categories[0] = Array("instcode_pos");'."\n"; 
     }
-    my $instcode_reserved = &mt('The name: "instcode" is a reserved category');
-    my $communities_reserved = &mt('The name: "communities" is a reserved category');
-    my $choose_again = '\\n'.&mt('Please use a different name for the new top level category'); 
+    my $instcode_reserved = &mt('The name: [_1] is a reserved category.','"instcode"');
+    my $communities_reserved = &mt('The name: [_1] is a reserved category.','"communities"');
+    my $choose_again = "\n".&mt('Please use a different name for the new top level category.'); 
+    &js_escape(\$instcode_reserved);
+    &js_escape(\$communities_reserved);
+    &js_escape(\$choose_again);
     $output = <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
@@ -4886,7 +5519,6 @@ function reorderCats(form,parent,item,id
     var changedVal;
 $jstext
     var newpos = 'addcategory_pos';
-    var current = new Array;
     if (parent == '') {
         var has_instcode = 0;
         var maxtop = categories[idx].length;
@@ -5394,6 +6026,7 @@ sub modify_login {
     }
 
     my %servers = &Apache::lonnet::internet_dom_servers($dom);
+    my %domservers = &Apache::lonnet::get_servers($dom);
     my @loginvia_attribs = ('serverpath','custompath','exempt');
     if (keys(%servers) > 1) {
         foreach my $lonhost (keys(%servers)) {
@@ -5436,22 +6069,7 @@ sub modify_login {
                             $changes{'loginvia'}{$lonhost} = 1;
                         }
                         if ($item eq 'exempt') {
-                            $new =~ s/^\s+//;
-                            $new =~ s/\s+$//;
-                            my @poss_ips = split(/\s*[,:]\s*/,$new);
-                            my @okips;
-                            foreach my $ip (@poss_ips) {
-                                if ($ip =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) {
-                                    if (($1 <= 255) && ($2 <= 255) && ($3 <= 255) && ($4 <= 255)) {
-                                        push(@okips,$ip); 
-                                    }
-                                }
-                            }
-                            if (@okips > 0) {
-                                $new = join(',',@okips); 
-                            } else {
-                                $new = ''; 
-                            }
+                            $new = &check_exempt_addresses($new);
                         }
                         $loginhash{login}{loginvia}{$lonhost}{$item} = $new;
                     }
@@ -5563,6 +6181,85 @@ sub modify_login {
             $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
         }
     }
+
+    my (%currheadtagurls,%currexempt,@newhosts,%newheadtagurls,%possexempt);
+    if (ref($domconfig{'login'}) eq 'HASH') {
+        if (ref($domconfig{'login'}{'headtag'}) eq 'HASH') {
+            foreach my $lonhost (keys(%{$domconfig{'login'}{'headtag'}})) {
+                if ($domservers{$lonhost}) {
+                    if (ref($domconfig{'login'}{'headtag'}{$lonhost}) eq 'HASH') {
+                        $currheadtagurls{$lonhost} = $domconfig{'login'}{'headtag'}{$lonhost}{'url'};
+                        $currexempt{$lonhost} = $domconfig{'login'}{'headtag'}{$lonhost}{'exempt'}
+                    }
+                }
+            }
+        }
+    }
+    my @delheadtagurls = &Apache::loncommon::get_env_multiple('form.loginheadtag_del');
+    foreach my $lonhost (sort(keys(%domservers))) {
+        if (grep(/^\Q$lonhost\E$/,@delheadtagurls)) {
+            $changes{'headtag'}{$lonhost} = 1;
+        } else {
+            if ($env{'form.loginheadtagexempt_'.$lonhost}) {
+                $possexempt{$lonhost} = &check_exempt_addresses($env{'form.loginheadtagexempt_'.$lonhost});
+            }
+            if ($env{'form.loginheadtag_'.$lonhost.'.filename'}) {
+                push(@newhosts,$lonhost);
+            } elsif ($currheadtagurls{$lonhost}) {
+                $loginhash{'login'}{'headtag'}{$lonhost}{'url'} = $currheadtagurls{$lonhost};
+                if ($currexempt{$lonhost}) {
+                    if ((!exists($possexempt{$lonhost})) || ($possexempt{$lonhost} ne $currexempt{$lonhost})) {
+                        $changes{'headtag'}{$lonhost} = 1;
+                    }
+                } elsif ($possexempt{$lonhost}) {
+                    $changes{'headtag'}{$lonhost} = 1;
+                }
+                if ($possexempt{$lonhost}) {
+                    $loginhash{'login'}{'headtag'}{$lonhost}{'exempt'} = $possexempt{$lonhost};
+                }
+            }
+        }
+    }
+    if (@newhosts) {
+        my $error;
+        my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm);
+        if ($configuserok eq 'ok') {
+            if ($switchserver) {
+                $error = &mt("Upload of custom markup is not permitted to this server: [_1]",$switchserver);
+            } elsif ($author_ok eq 'ok') {
+                foreach my $lonhost (@newhosts) {
+                    my $formelem = 'loginheadtag_'.$lonhost;
+                    (my $result,$newheadtagurls{$lonhost}) = &publishlogo($r,'upload',$formelem,$dom,$confname,
+                                                                          "login/headtag/$lonhost",'','',
+                                                                          $env{'form.loginheadtag_'.$lonhost.'.filename'});
+                    if ($result eq 'ok') {
+                        $loginhash{'login'}{'headtag'}{$lonhost}{'url'} = $newheadtagurls{$lonhost};
+                        $changes{'headtag'}{$lonhost} = 1;
+                        if ($possexempt{$lonhost}) {
+                            $loginhash{'login'}{'headtag'}{$lonhost}{'exempt'} = $possexempt{$lonhost};
+                        }
+                    } else {
+                        my $puberror = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",
+                                           $newheadtagurls{$lonhost},$result);
+                        $errors .= '<li><span class="LC_error">'.$puberror.'</span></li>';
+                        if ((grep(/^\Q$lonhost\E$/,keys(%currheadtagurls))) &&
+                            (!grep(/^\Q$lonhost\E$/,@delheadtagurls))) {
+                            $loginhash{'login'}{'headtag'}{$lonhost} = $currheadtagurls{$lonhost};
+                        }
+                    }
+                }
+            } else {
+                $error = &mt("Upload of custom markup file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2].  Error was: [_3].",$confname,$dom,$author_ok);
+            }
+        } else {
+            $error = &mt("Upload of custom markup file(s) failed because a Domain Configuration user ([_1]) could not be created in domain: [_2].  Error was: [_3].",$confname,$dom,$configuserok);
+        }
+        if ($error) {
+            &Apache::lonnet::logthis($error);
+            $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+        }
+    }
+
     &process_captcha('login',\%changes,$loginhash{'login'},$domconfig{'login'});
 
     my $defaulthelpfile = '/adm/loginproblems.html';
@@ -5663,6 +6360,25 @@ sub modify_login {
                             }
                         }
                     }
+                } elsif ($item eq 'headtag') {
+                    if (ref($changes{$item}) eq 'HASH') {
+                        foreach my $lonhost (sort(keys(%{$changes{$item}}))) {
+                            if (grep(/^\Q$lonhost\E$/,@delheadtagurls)) {
+                                $resulttext .= '<li>'.&mt('custom markup file removed for [_1]',$domservers{$lonhost}).'</li>';
+                            } elsif (ref($loginhash{'login'}{'headtag'}{$lonhost}) eq 'HASH') {
+                                $resulttext .= '<li><a href="'.
+                                               "javascript:void(open('$loginhash{'login'}{'headtag'}{$lonhost}{'url'}?inhibitmenu=yes','Custom_HeadTag',
+                                               'menubar=0,toolbar=1,scrollbars=1,width=600,height=500,resizable=yes'))".
+                                               '">'.&mt('custom markup').'</a> '.&mt('(for [_1])',$servers{$lonhost}).' ';
+                                if ($possexempt{$lonhost}) {
+                                    $resulttext .= &mt('not included for client IP(s): [_1]',$possexempt{$lonhost});
+                                } else {
+                                    $resulttext .= &mt('included for any client IP');
+                                }
+                                $resulttext .= '</li>';
+                            }
+                        }
+                    }
                 } elsif ($item eq 'captcha') {
                     if (ref($loginhash{'login'}) eq 'HASH') {
                         my $chgtxt;
@@ -5694,11 +6410,18 @@ sub modify_login {
                         if (!$privkey) {
                             $chgtxt .= '<li>'.&mt('Private key deleted').'</li>';
                         } else {
-                            $chgtxt .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>';
+                            $chgtxt .= '<li>'.&mt('Private key set to [_1]',$privkey).'</li>';
                         }
                         $chgtxt .= '</ul>';
                         $resulttext .= '<li>'.$chgtxt.'</li>';
                     }
+                } elsif ($item eq 'recaptchaversion') {
+                    if (ref($loginhash{'login'}) eq 'HASH') {
+                        if ($loginhash{'login'}{'captcha'} eq 'recaptcha') {
+                            $resulttext .= '<li>'.&mt('ReCAPTCHA for helpdesk form set to version [_1]',$loginhash{'login'}{'recaptchaversion'}).
+                                           '</li>';
+                        }
+                    }
                 } else {
                     $resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>';
                 }
@@ -5718,6 +6441,27 @@ sub modify_login {
     return $resulttext;
 }
 
+sub check_exempt_addresses {
+    my ($iplist) = @_;
+    $iplist =~ s/^\s+//;
+    $iplist =~ s/\s+$//;
+    my @poss_ips = split(/\s*[,:]\s*/,$iplist);
+    my (@okips,$new);
+    foreach my $ip (@poss_ips) {
+        if ($ip =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) {
+            if (($1 <= 255) && ($2 <= 255) && ($3 <= 255) && ($4 <= 255)) {
+                push(@okips,$ip);
+            }
+        }
+    }
+    if (@okips > 0) {
+        $new = join(',',@okips);
+    } else {
+        $new = '';
+    }
+    return $new;
+}
+
 sub color_font_choices {
     my %choices =
         &Apache::lonlocal::texthash (
@@ -6519,29 +7263,35 @@ sub modify_quotas {
                 $confhash{'uniquecode'}{$type} = 1;
             }
         }
-        my ($newbook,@allpos);
+        my (%newbook,%allpos);
         if ($context eq 'requestcourses') {
-            if ($env{'form.addbook'}) {
-                if (($env{'form.addbook_cnum'} =~ /^$match_courseid$/) &&
-                    ($env{'form.addbook_cdom'} =~ /^$match_domain$/)) {
-                    if (&Apache::lonnet::homeserver($env{'form.addbook_cnum'},
-                                                    $env{'form.addbook_cdom'}) eq 'no_host') {
-                        $errors .= '<li><span class="LC_error">'.&mt('Invalid LON-CAPA course for textbook').
-                                   '</span></li>';
-                    } else {
-                        $newbook = $env{'form.addbook_cdom'}.'_'.$env{'form.addbook_cnum'};
-                        my $position = $env{'form.addbook_pos'};
-                        $position =~ s/\D+//g;
-                        if ($position ne '') {
-                            $allpos[$position] = $newbook;
+            foreach my $type ('textbooks','templates') {
+                @{$allpos{$type}} = (); 
+                my $invalid;
+                if ($type eq 'textbooks') {
+                    $invalid = &mt('Invalid LON-CAPA course for textbook');
+                } else {
+                    $invalid = &mt('Invalid LON-CAPA course for template');
+                }
+                if ($env{'form.'.$type.'_addbook'}) {
+                    if (($env{'form.'.$type.'_addbook_cnum'} =~ /^$match_courseid$/) &&
+                        ($env{'form.'.$type.'_addbook_cdom'} =~ /^$match_domain$/)) {
+                        if (&Apache::lonnet::homeserver($env{'form.'.$type.'_addbook_cnum'},
+                                                        $env{'form.'.$type.'_addbook_cdom'}) eq 'no_host') {
+                            $errors .= '<li><span class="LC_error">'.$invalid.'</span></li>';
+                        } else {
+                            $newbook{$type} = $env{'form.'.$type.'_addbook_cdom'}.'_'.$env{'form.'.$type.'_addbook_cnum'};
+                            my $position = $env{'form.'.$type.'_addbook_pos'};
+                            $position =~ s/\D+//g;
+                            if ($position ne '') {
+                                $allpos{$type}[$position] = $newbook{$type};
+                            }
                         }
+                    } else {
+                        $errors .= '<li><span class="LC_error">'.$invalid.'</span></li>';
                     }
-                } else {
-                    $errors .= '<li><span class="LC_error">'.&mt('Invalid LON-CAPA course for textbook').
-                               '</span></li>';
                 }
-            }
-
+            } 
         }
         if (ref($domconfig{$action}) eq 'HASH') {
             if (ref($domconfig{$action}{'notify'}) eq 'HASH') {
@@ -6574,56 +7324,61 @@ sub modify_quotas {
                 $changes{'uniquecode'} = 1;
             }
             if ($context eq 'requestcourses') {
-                if (ref($domconfig{$action}{'textbooks'}) eq 'HASH') {
-                    my %deletions;
-                    my @todelete = &Apache::loncommon::get_env_multiple('form.book_del');
-                    if (@todelete) {
-                        map { $deletions{$_} = 1; } @todelete;
-                    }
-                    my %imgdeletions;
-                    my @todeleteimages = &Apache::loncommon::get_env_multiple('form.book_image_del');
-                    if (@todeleteimages) {
-                        map { $imgdeletions{$_} = 1; } @todeleteimages;
-                    }
-                    my $maxnum = $env{'form.book_maxnum'};
-                    for (my $i=0; $i<=$maxnum; $i++) {
-                        my $key = $env{'form.book_id_'.$i};
-                        if (ref($domconfig{$action}{'textbooks'}{$key}) eq 'HASH') {
-                            if ($deletions{$key}) {
-                                if ($domconfig{$action}{'textbooks'}{$key}{'image'}) {
-                                    #FIXME need to obsolete item in RES space
+                foreach my $type ('textbooks','templates') {
+                    if (ref($domconfig{$action}{$type}) eq 'HASH') {
+                        my %deletions;
+                        my @todelete = &Apache::loncommon::get_env_multiple('form.'.$type.'_del');
+                        if (@todelete) {
+                            map { $deletions{$_} = 1; } @todelete;
+                        }
+                        my %imgdeletions;
+                        my @todeleteimages = &Apache::loncommon::get_env_multiple('form.'.$type.'_image_del');
+                        if (@todeleteimages) {
+                            map { $imgdeletions{$_} = 1; } @todeleteimages;
+                        }
+                        my $maxnum = $env{'form.'.$type.'_maxnum'};
+                        for (my $i=0; $i<=$maxnum; $i++) {
+                            my $itemid = $env{'form.'.$type.'_id_'.$i};
+                            my ($key) = ($itemid =~ /^\Q$type\E_(\w+)$/); 
+                            if (ref($domconfig{$action}{$type}{$key}) eq 'HASH') {
+                                if ($deletions{$key}) {
+                                    if ($domconfig{$action}{$type}{$key}{'image'}) {
+                                        #FIXME need to obsolete item in RES space
+                                    }
+                                    next;
+                                } else {
+                                    my $newpos = $env{'form.'.$itemid};
+                                    $newpos =~ s/\D+//g;
+                                    foreach my $item ('subject','title','publisher','author') {
+                                        next if ((($item eq 'author') || ($item eq 'publisher')) &&
+                                                 ($type eq 'templates'));
+                                        $confhash{$type}{$key}{$item} = $env{'form.'.$type.'_'.$item.'_'.$i};
+                                        if ($domconfig{$action}{$type}{$key}{$item} ne $confhash{$type}{$key}{$item}) {
+                                            $changes{$type}{$key} = 1;
+                                        }
+                                    }
+                                    $allpos{$type}[$newpos] = $key;
                                 }
-                                next;
-                            } else {
-                                my $newpos = $env{'form.'.$key};
-                                $newpos =~ s/\D+//g;
-                                foreach my $item ('subject','title','author') {
-                                    $confhash{'textbooks'}{$key}{$item} = $env{'form.book_'.$item.'_'.$i};
-                                    if ($domconfig{$action}{'textbooks'}{$key}{$item} ne $confhash{'textbooks'}{$key}{$item}) {
-                                        $changes{'textbooks'}{$key} = 1;
+                                if ($imgdeletions{$key}) {
+                                    $changes{$type}{$key} = 1;
+                                    #FIXME need to obsolete item in RES space
+                                } elsif ($env{'form.'.$type.'_image_'.$i.'.filename'}) {
+                                    my ($cdom,$cnum) = split(/_/,$key);
+                                    my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,$type.'_image_'.$i,
+                                                                                  $cdom,$cnum,$type,$configuserok,
+                                                                                  $switchserver,$author_ok);
+                                    if ($imgurl) {
+                                        $confhash{$type}{$key}{'image'} = $imgurl;
+                                        $changes{$type}{$key} = 1; 
                                     }
+                                    if ($error) {
+                                        &Apache::lonnet::logthis($error);
+                                        $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+                                    } 
+                                } elsif ($domconfig{$action}{$type}{$key}{'image'}) {
+                                    $confhash{$type}{$key}{'image'} = 
+                                        $domconfig{$action}{$type}{$key}{'image'};
                                 }
-                                $allpos[$newpos] = $key;
-                            }
-                            if ($imgdeletions{$key}) {
-                                $changes{'textbooks'}{$key} = 1;
-                                #FIXME need to obsolete item in RES space
-                            } elsif ($env{'form.book_image_'.$i.'.filename'}) {
-                                my ($cdom,$cnum) = split(/_/,$key);
-                                my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,'book_image_'.$i,
-                                                                              $cdom,$cnum,$configuserok,
-                                                                              $switchserver,$author_ok);
-                                if ($imgurl) {
-                                    $confhash{'textbooks'}{$key}{'image'} = $imgurl;
-                                    $changes{'textbooks'}{$key} = 1; 
-                                }
-                                if ($error) {
-                                    &Apache::lonnet::logthis($error);
-                                    $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
-                                } 
-                            } elsif ($domconfig{$action}{'textbooks'}{$key}{'image'}) {
-                                $confhash{'textbooks'}{$key}{'image'} = 
-                                    $domconfig{$action}{'textbooks'}{$key}{'image'};
                             }
                         }
                     }
@@ -6638,43 +7393,49 @@ sub modify_quotas {
             }
         }
         if ($context eq 'requestcourses') {
-            if ($newbook) {
-                $changes{'textbooks'}{$newbook} = 1;
-                foreach my $item ('subject','title','author') {
-                    $env{'form.addbook_'.$item} =~ s/(`)/'/g;
-                    if ($env{'form.addbook_'.$item}) {
-                        $confhash{'textbooks'}{$newbook}{$item} = $env{'form.addbook_'.$item};
-                    }
-                }
-                if ($env{'form.addbook_image.filename'} ne '') {
-                    my ($cdom,$cnum) = split(/_/,$newbook);
-                    my ($imageurl,$error) =
-                        &process_textbook_image($r,$dom,$confname,'addbook_image',$cdom,$cnum,$configuserok,
-                                                $switchserver,$author_ok);
-                    if ($imageurl) {
-                        $confhash{'textbooks'}{$newbook}{'image'} = $imageurl;
-                    }
-                    if ($error) {
-                        &Apache::lonnet::logthis($error);
-                        $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+            foreach my $type ('textbooks','templates') {
+                if ($newbook{$type}) {
+                    $changes{$type}{$newbook{$type}} = 1;
+                    foreach my $item ('subject','title','publisher','author') {
+                        next if ((($item eq 'author') || ($item eq 'publisher')) &&
+                                 ($type eq 'template'));
+                        $env{'form.'.$type.'_addbook_'.$item} =~ s/(`)/'/g;
+                        if ($env{'form.'.$type.'_addbook_'.$item}) {
+                            $confhash{$type}{$newbook{$type}}{$item} = $env{'form.'.$type.'_addbook_'.$item};
+                        }
+                    }
+                    if ($type eq 'textbooks') {
+                        if ($env{'form.'.$type.'_addbook_image.filename'} ne '') {
+                            my ($cdom,$cnum) = split(/_/,$newbook{$type});
+                            my ($imageurl,$error) =
+                                &process_textbook_image($r,$dom,$confname,$type.'_addbook_image',$cdom,$cnum,$type,
+                                                        $configuserok,$switchserver,$author_ok);
+                            if ($imageurl) {
+                                $confhash{$type}{$newbook{$type}}{'image'} = $imageurl;
+                            }
+                            if ($error) {
+                                &Apache::lonnet::logthis($error);
+                                $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+                            }
+                        }
                     }
                 }
-            }
-            if (@allpos > 0) {
-                my $idx = 0;
-                foreach my $item (@allpos) {
-                    if ($item ne '') {
-                        $confhash{'textbooks'}{$item}{'order'} = $idx;
-                        if (ref($domconfig{$action}) eq 'HASH') {
-                            if (ref($domconfig{$action}{'textbooks'}) eq 'HASH') {
-                                if (ref($domconfig{$action}{'textbooks'}{$item}) eq 'HASH') {
-                                    if ($domconfig{$action}{'textbooks'}{$item}{'order'} ne $idx) {
-                                        $changes{'textbooks'}{$item} = 1;
+                if (@{$allpos{$type}} > 0) {
+                    my $idx = 0;
+                    foreach my $item (@{$allpos{$type}}) {
+                        if ($item ne '') {
+                            $confhash{$type}{$item}{'order'} = $idx;
+                            if (ref($domconfig{$action}) eq 'HASH') {
+                                if (ref($domconfig{$action}{$type}) eq 'HASH') {
+                                    if (ref($domconfig{$action}{$type}{$item}) eq 'HASH') {
+                                        if ($domconfig{$action}{$type}{$item}{'order'} ne $idx) {
+                                            $changes{$type}{$item} = 1;
+                                        }
                                     }
                                 }
                             }
+                            $idx ++;
                         }
-                        $idx ++;
                     }
                 }
             }
@@ -6686,10 +7447,14 @@ sub modify_quotas {
                         if (@{$confhash{'validation'}{$item}} > 0) {
                             @{$confhash{'validation'}{$item}} = sort(@{$confhash{'validation'}{$item}});
                         }
-                        if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
-                            if (ref($domconfig{'requestcourses'}{'validation'}{$item}) eq 'ARRAY') {
-                                @changed = &Apache::loncommon::compare_arrays($confhash{'validation'}{$item},
-                                                                              $domconfig{'requestcourses'}{'validation'}{$item});
+                        if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+                            if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                                if (ref($domconfig{'requestcourses'}{'validation'}{$item}) eq 'ARRAY') {
+                                    @changed = &Apache::loncommon::compare_arrays($confhash{'validation'}{$item},
+                                                                                  $domconfig{'requestcourses'}{'validation'}{$item});
+                                } else {
+                                    @changed = @{$confhash{'validation'}{$item}};
+                                }
                             } else {
                                 @changed = @{$confhash{'validation'}{$item}};
                             }
@@ -6710,9 +7475,15 @@ sub modify_quotas {
                                 $env{'form.requestcourses_validation_'.$item} =~ s/[\n\r\f]+/\s/gs;
                             }
                         }
-                        if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
-                            if ($domconfig{'requestcourses'}{'validation'}{$item} ne $confhash{'validation'}{$item}) {
-                                $changes{'validation'}{$item} = $confhash{'validation'}{$item};
+                        if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+                            if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                                if ($domconfig{'requestcourses'}{'validation'}{$item} ne $confhash{'validation'}{$item}) {
+                                    $changes{'validation'}{$item} = $confhash{'validation'}{$item};
+                                }
+                            } else {
+                                if ($confhash{'validation'}{$item} ne '') {
+                                    $changes{'validation'}{$item} = $confhash{'validation'}{$item};
+                                }
                             }
                         } else {
                             if ($confhash{'validation'}{$item} ne '') {
@@ -6730,14 +7501,18 @@ sub modify_quotas {
                 }
             }
             if (ref($confhash{'validation'}) eq 'HASH') {
-                if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
-                    if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
-                        unless ($confhash{'validation'}{'dc'} eq $domconfig{'requestcourses'}{'validation'}{'dc'}) {
-                            if ($confhash{'validation'}{'dc'} eq '') {
-                                $changes{'validation'}{'dc'} = &mt('None');
-                            } else {
-                                $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
+                if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+                    if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                        if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
+                            unless ($confhash{'validation'}{'dc'} eq $domconfig{'requestcourses'}{'validation'}{'dc'}) {
+                                if ($confhash{'validation'}{'dc'} eq '') {
+                                    $changes{'validation'}{'dc'} = &mt('None');
+                                } else {
+                                    $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
+                                }
                             }
+                        } elsif ($confhash{'validation'}{'dc'} ne '') {
+                            $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
                         }
                     } elsif ($confhash{'validation'}{'dc'} ne '') {
                         $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
@@ -6745,9 +7520,13 @@ sub modify_quotas {
                 } elsif ($confhash{'validation'}{'dc'} ne '') {
                     $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
                 }
-            } elsif (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
-                if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
-                    $changes{'validation'}{'dc'} = &mt('None');
+            } else {
+                if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+                    if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                        if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
+                            $changes{'validation'}{'dc'} = &mt('None');
+                        }
+                    }
                 }
             }
         }
@@ -6891,7 +7670,7 @@ sub modify_quotas {
         $domdefaults{'requestauthor'} = \%confhash;
     } else {
         foreach my $key (keys(%confhash)) {
-            unless (($context eq 'requestcourses') && ($key eq 'textbooks')) {
+            unless (($context eq 'requestcourses') && (($key eq 'textbooks') || ($key eq 'templates'))) {
                 $domdefaults{$key} = $confhash{$key};
             }
         }
@@ -7043,27 +7822,33 @@ sub modify_quotas {
                                        '</li>';
                     }
                 }
-                if (ref($changes{'textbooks'}) eq 'HASH') {
-                    $resulttext .= '<li>'.&mt('Available textbooks updated').'<ul>';
-                    foreach my $key (sort(keys(%{$changes{'textbooks'}}))) {
-                        my %coursehash = &Apache::lonnet::coursedescription($key);
-                        my $coursetitle = $coursehash{'description'};
-                        my $position = $confhash{'textbooks'}{$key}{'order'} + 1;
-                        $resulttext .= '<li>';
-                        foreach my $item ('subject','title','author') {
-                            my $name = $item.':';
-                            $name =~ s/^(\w)/\U$1/;
-                            $resulttext .= &mt($name).' '.$confhash{'textbooks'}{$key}{$item}.'<br />';
-                        }
-                        $resulttext .= ' '.&mt('Order: [_1]',$position).'<br />';
-                        if ($confhash{'textbooks'}{$key}{'image'}) {
-                            $resulttext .= ' '.&mt('Image: [_1]',
-                                               '<img src="'.$confhash{'textbooks'}{$key}{'image'}.'"'.
-                                               ' alt="Textbook cover" />').'<br />';
+                foreach my $type ('textbooks','templates') {
+                    if (ref($changes{$type}) eq 'HASH') {
+                        $resulttext .= '<li>'.&mt("Available $type updated").'<ul>';
+                        foreach my $key (sort(keys(%{$changes{$type}}))) {
+                            my %coursehash = &Apache::lonnet::coursedescription($key);
+                            my $coursetitle = $coursehash{'description'};
+                            my $position = $confhash{$type}{$key}{'order'} + 1;
+                            $resulttext .= '<li>';
+                            foreach my $item ('subject','title','publisher','author') {
+                                next if ((($item eq 'author') || ($item eq 'publisher')) &&
+                                         ($type eq 'templates'));
+                                my $name = $item.':';
+                                $name =~ s/^(\w)/\U$1/;
+                                $resulttext .= &mt($name).' '.$confhash{$type}{$key}{$item}.'<br />';
+                            }
+                            $resulttext .= ' '.&mt('Order: [_1]',$position).'<br />';
+                            if ($type eq 'textbooks') {
+                                if ($confhash{$type}{$key}{'image'}) {
+                                    $resulttext .= ' '.&mt('Image: [_1]',
+                                                   '<img src="'.$confhash{$type}{$key}{'image'}.'"'.
+                                                   ' alt="Textbook cover" />').'<br />';
+                                }
+                            }
+                            $resulttext .= ' '.&mt('LON-CAPA Course: [_1]',$coursetitle).'</li>';
                         }
-                        $resulttext .= ' '.&mt('LON-CAPA Course: [_1]',$coursetitle).'</li>';
+                        $resulttext .= '</ul></li>';
                     }
-                    $resulttext .= '</ul></li>';
                 }
                 if (ref($changes{'validation'}) eq 'HASH') {
                     if ((ref($validationitemsref) eq 'ARRAY') && (ref($validationnamesref) eq 'HASH')) {
@@ -7111,7 +7896,7 @@ sub modify_quotas {
 }
 
 sub process_textbook_image {
-    my ($r,$dom,$confname,$caller,$cdom,$cnum,$configuserok,$switchserver,$author_ok) = @_;
+    my ($r,$dom,$confname,$caller,$cdom,$cnum,$type,$configuserok,$switchserver,$author_ok) = @_;
     my $filename = $env{'form.'.$caller.'.filename'};
     my ($error,$url);
     my ($width,$height) = (50,50);
@@ -7122,7 +7907,7 @@ sub process_textbook_image {
         } elsif ($author_ok eq 'ok') {
             my ($result,$imageurl) =
                 &publishlogo($r,'upload',$caller,$dom,$confname,
-                             "textbooks/$dom/$cnum/cover",$width,$height);
+                             "$type/$dom/$cnum/cover",$width,$height);
             if ($result eq 'ok') {
                 $url = $imageurl;
             } else {
@@ -7149,7 +7934,8 @@ sub modify_autoenroll {
     my $autorun = &Apache::lonnet::auto_run(undef,$dom),
     my %title = ( run => 'Auto-enrollment active',
                   sender => 'Sender for notification messages',
-                  coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)');
+                  coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)',
+                  failsafe => 'Failsafe for no drops if institutional data missing for a section');
     my @offon = ('off','on');
     my $sender_uname = $env{'form.sender_uname'};
     my $sender_domain = $env{'form.sender_domain'};
@@ -7159,11 +7945,17 @@ sub modify_autoenroll {
         $sender_domain = '';
     }
     my $coowners = $env{'form.autoassign_coowners'};
+    my $failsafe = $env{'form.autoenroll_failsafe'};
+    $failsafe =~ s{^\s+|\s+$}{}g;
+    if ($failsafe =~ /\D/) {
+        undef($failsafe);
+    }
     my %autoenrollhash =  (
                        autoenroll => { 'run' => $env{'form.autoenroll_run'},
                                        'sender_uname' => $sender_uname,
                                        'sender_domain' => $sender_domain,
                                        'co-owners' => $coowners,
+                                       'autofailsafe' => $failsafe,
                                 }
                      );
     my $putresult = &Apache::lonnet::put_dom('configuration',\%autoenrollhash,
@@ -7190,7 +7982,10 @@ sub modify_autoenroll {
             }
         } elsif ($coowners) {
             $changes{'coowners'} = 1;
-        }      
+        }
+        if ($currautoenroll{'autofailsafe'} ne $failsafe) {
+            $changes{'autofailsafe'} = 1;
+        }
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made:').'<ul>';
             if ($changes{'run'}) {
@@ -7210,6 +8005,17 @@ sub modify_autoenroll {
                     $lastactref->{'domainconfig'} = 1;
                 }
             }
+            if ($changes{'autofailsafe'}) {
+                if ($failsafe ne '') {
+                    $resulttext .= '<li>'.&mt("$title{'failsafe'} set to [_1]",$failsafe).'</li>';
+                } else {
+                    $resulttext .= '<li>'.&mt("$title{'failsafe'} deleted");
+                }
+                &Apache::lonnet::get_domain_defaults($dom,1);
+                if (ref($lastactref) eq 'HASH') {
+                    $lastactref->{'domdefaults'} = 1;
+                }
+            }
             $resulttext .= '</ul>';
         } else {
             $resulttext = &mt('No changes made to auto-enrollment settings');
@@ -7837,7 +8643,8 @@ sub modify_usercreation {
                 if (ref($domconfig{'usercreation'}{$key}) eq 'HASH') {
                     foreach my $item (keys(%{$domconfig{'usercreation'}{$key}})) {
                         if (($item eq 'selfcreate') || ($item eq 'statustocreate') ||
-                            ($item eq 'captcha') || ($item eq 'recaptchakeys')) {
+                            ($item eq 'captcha') || ($item eq 'recaptchakeys') ||
+                            ($item eq 'recaptchaversion')) {
                             $save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
                         } else {
                             $curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
@@ -8061,7 +8868,9 @@ sub modify_selfcreation {
                     foreach my $item (keys(%{$domconfig{'usercreation'}{$key}})) {
                         if (($item eq 'selfcreate') || ($item eq 'statustocreate') ||
                             ($item eq 'captcha') || ($item eq 'recaptchakeys') || 
-                            ($item eq 'emailusername') || ($item eq 'notify')) {
+                            ($item eq 'recaptchaversion') ||
+                            ($item eq 'emailusername') || ($item eq 'notify') ||
+                            ($item eq 'selfcreateprocessing') || ($item eq 'shibenv')) {
                             $curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
                         } else {
                             $save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
@@ -8092,22 +8901,38 @@ sub modify_selfcreation {
     @{$cancreate{'selfcreate'}} = ();
     %{$cancreate{'emailusername'}} = ();
     @{$cancreate{'statustocreate'}} = ();
+    %{$cancreate{'selfcreateprocessing'}} = ();
+    %{$cancreate{'shibenv'}} = ();
     my %selfcreatetypes = (
                              sso   => 'users authenticated by institutional single sign on',
                              login => 'users authenticated by institutional log-in',
-                             email => 'users who provide a valid e-mail address for use as username (automatic creation)',
-                             emailapproval => 'users who provide a valid e-mail address for use as username (queued for Domain Coordinator review)',
+                             email => 'users who provide a valid e-mail address for use as username',
                           );
 #
 # Populate $cancreate{'selfcreate'} array reference with types of user, for which self-creation of user accounts
 # is permitted.
 #
+
+    my @statuses;
+    if (ref($domconfig{'inststatus'}) eq 'HASH') {
+        if (ref($domconfig{'inststatus'}{'inststatusguest'}) eq 'ARRAY') {
+            @statuses = @{$domconfig{'inststatus'}{'inststatusguest'}};
+        }
+    }
+    push(@statuses,'default');
+
     foreach my $item ('login','sso','email') {
         if ($item eq 'email') {
-            if ($env{'form.cancreate_email'} eq 'email') {
+            if ($env{'form.cancreate_email'}) {
                 push(@{$cancreate{'selfcreate'}},'email');
-            } elsif ($env{'form.cancreate_email'} eq 'emailapproval') {
-                push(@{$cancreate{'selfcreate'}},'emailapproval');
+                push(@contexts,'selfcreateprocessing');
+                foreach my $type (@statuses) {
+                    if ($type eq 'default') {
+                        $cancreate{'selfcreateprocessing'}{$type} = $env{'form.cancreate_emailprocess'};
+                    } else { 
+                        $cancreate{'selfcreateprocessing'}{$type} = $env{'form.cancreate_emailprocess_'.$type};
+                    }
+                }
             }
         } else {
             if ($env{'form.cancreate_'.$item}) {
@@ -8121,7 +8946,8 @@ sub modify_selfcreation {
 # Populate $cancreate{'emailusername'}{$type} hash ref with information fields (if new user will provide data
 # value set to one), if self-creation with e-mail address permitted, where $type is user type: faculty, staff, student etc.
 #
-    if (($env{'form.cancreate_email'} eq 'email') || ($env{'form.cancreate_email'} eq 'emailapproval')) {
+
+    if ($env{'form.cancreate_email'}) {
         push(@contexts,'emailusername');
         if (ref($types) eq 'ARRAY') {
             foreach my $type (@{$types}) {
@@ -8181,7 +9007,7 @@ sub modify_selfcreation {
         }
     }
 #  
-# Check if domain default is set appropriately, if selef-creation of accounts is to be available for
+# Check if domain default is set appropriately, if self-creation of accounts is to be available for
 # institutional log-in.
 #
     if (grep(/^login$/,@{$cancreate{'selfcreate'}})) {
@@ -8194,6 +9020,7 @@ sub modify_selfcreation {
     }
     my @fields = ('lastname','firstname','middlename','generation',
                   'permanentemail','id');
+    my @shibfields = (@fields,'inststatus');
     my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
 #
 # Where usernames may created for institutional log-in and/or institutional single sign on:
@@ -8238,6 +9065,27 @@ sub modify_selfcreation {
                 }
             }
         }
+        foreach my $field (@shibfields) {
+            if ($env{'form.shibenv_'.$field} ne '') {
+                $cancreate{'shibenv'}{$field} = $env{'form.shibenv_'.$field};
+            }
+        }
+        if (ref($curr_usercreation{'cancreate'}) eq 'HASH') {
+            if (ref($curr_usercreation{'cancreate'}{'shibenv'}) eq 'HASH') {
+                foreach my $field (@shibfields) {
+                    if ($env{'form.shibenv_'.$field} ne $curr_usercreation{'cancreate'}{'shibenv'}{$field}) {
+                        push(@{$changes{'cancreate'}},'shibenv');
+                    }
+                }
+            } else {
+                foreach my $field (@shibfields) {
+                    if ($env{'form.shibenv_'.$field}) {
+                        push(@{$changes{'cancreate'}},'shibenv');
+                        last;
+                    }
+                }
+            }
+        }
     }
     foreach my $item (@contexts) {
         if (ref($curr_usercreation{'cancreate'}{$item}) eq 'ARRAY') {
@@ -8270,6 +9118,12 @@ sub modify_selfcreation {
                                 }
                             }
                         }
+                    } elsif ($item eq 'selfcreateprocessing') {
+                        if ($cancreate{$item}{$curr} ne $curr_usercreation{'cancreate'}{$item}{$curr}) {
+                            if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                push(@{$changes{'cancreate'}},$item);
+                            }
+                        }
                     } else {
                         if (!$cancreate{$item}{$curr}) {
                             if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
@@ -8293,6 +9147,12 @@ sub modify_selfcreation {
                                 }
                             }
                         }
+                    } elsif ($item eq 'selfcreateprocessing') {
+                        if ($cancreate{$item}{$field} ne $curr_usercreation{'cancreate'}{$item}{$field}) {
+                            if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                push(@{$changes{'cancreate'}},$item);
+                            }
+                        }
                     } else {
                         if (!$curr_usercreation{'cancreate'}{$item}{$field}) {
                             if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
@@ -8338,13 +9198,20 @@ sub modify_selfcreation {
 #
     $save_usercreate{'cancreate'}{'captcha'} = $savecaptcha{'captcha'};
     $save_usercreate{'cancreate'}{'recaptchakeys'} = $savecaptcha{'recaptchakeys'};
+    $save_usercreate{'cancreate'}{'recaptchaversion'} = $savecaptcha{'recaptchaversion'};
     $save_usercreate{'cancreate'}{'selfcreate'} = $cancreate{'selfcreate'};
     if (ref($cancreate{'notify'}) eq 'HASH') {
         $save_usercreate{'cancreate'}{'notify'} = $cancreate{'notify'};
     }
+    if (ref($cancreate{'selfcreateprocessing'}) eq 'HASH') {
+        $save_usercreate{'cancreate'}{'selfcreateprocessing'} = $cancreate{'selfcreateprocessing'};
+    }
     if (ref($cancreate{'statustocreate'}) eq 'ARRAY') {
         $save_usercreate{'cancreate'}{'statustocreate'} = $cancreate{'statustocreate'};
     }
+    if (ref($cancreate{'shibenv'}) eq 'HASH') {
+        $save_usercreate{'cancreate'}{'shibenv'} = $cancreate{'shibenv'};
+    }
     $save_usercreate{'cancreate'}{'emailusername'} = $cancreate{'emailusername'};
     $save_usercreate{'emailrule'} = \@email_rule;
 
@@ -8387,6 +9254,22 @@ sub modify_selfcreation {
                                 }
                             }
                         }
+                    } elsif ($type eq 'shibenv') {
+                        if (keys(%{$cancreate{$type}}) == 0) {
+                            $chgtext .= &mt('Shibboleth-autheticated user does not use environment variables to set user information'); 
+                        } else {
+                            $chgtext .= &mt('Shibboleth-autheticated user information set from environment variables, as follows:').
+                                        '<ul>';
+                            foreach my $field (@shibfields) {
+                                next if ($cancreate{$type}{$field} eq '');
+                                if ($field eq 'inststatus') {
+                                    $chgtext .= '<li>'.&mt('Institutional status').' -- '.$cancreate{$type}{$field}.'</li>';
+                                } else {
+                                    $chgtext .= '<li>'.$fieldtitles{$field}.' -- '.$cancreate{$type}{$field}.'</li>';
+                                }
+                            }
+                            $chgtext .= '</ul>';
+                        }  
                     } elsif ($type eq 'statustocreate') {
                         if ((ref($cancreate{'selfcreate'}) eq 'ARRAY') &&
                             (ref($cancreate{'statustocreate'}) eq 'ARRAY')) {
@@ -8428,6 +9311,26 @@ sub modify_selfcreation {
                                 }
                             }
                         }
+                    } elsif ($type eq 'selfcreateprocessing') {
+                        my %choices = &Apache::lonlocal::texthash (
+                                                                    automatic => 'Automatic approval',
+                                                                    approval  => 'Queued for approval',
+                                                                  );
+                        if (@statuses > 1) {
+                            $chgtext .= &mt('Processing of requests to create account with e-mail address as username set as follows:'). 
+                                        '<ul>';
+                           foreach my $type (@statuses) {
+                               if ($type eq 'default') {
+                                   $chgtext .= '<li>'.$othertitle.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$type}}.'</li>';
+                               } else {
+                                   $chgtext .= '<li>'.$usertypes->{$type}.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$type}}.'</li>';
+                               }
+                           }
+                           $chgtext .= '</ul>';
+                        } else {
+                           $chgtext .= &mt('Processing of requests to create account with e-mail address as username set to: "[_1]"',
+                                         $choices{$cancreate{'selfcreateprocessing'}{'default'}});
+                        }
                     } elsif ($type eq 'captcha') {
                         if ($savecaptcha{$type} eq 'notused') {
                             $chgtext .= &mt('No CAPTCHA validation in use for self-creation screen.');
@@ -8457,23 +9360,29 @@ sub modify_selfcreation {
                             $chgtext .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>';
                         }
                         $chgtext .= '</ul>';
+                    } elsif ($type eq 'recaptchaversion') {
+                        if ($savecaptcha{'captcha'} eq 'recaptcha') {
+                            $chgtext .= &mt('ReCAPTCHA set to version [_1]',$savecaptcha{$type});
+                        }
                     } elsif ($type eq 'emailusername') {
                         if (ref($cancreate{'emailusername'}) eq 'HASH') {
                             if (ref($types) eq 'ARRAY') {
                                 foreach my $type (@{$types}) {
                                     if (ref($cancreate{'emailusername'}{$type}) eq 'HASH') {
                                         if (keys(%{$cancreate{'emailusername'}{$type}}) > 0) {
-                                            $chgtext .= &mt('When self-creating account with e-mail as username, the following information will be provided by [_1]:',$usertypes->{$type}).
+                                            $chgtext .= &mt('When self-creating account with e-mail as username, the following information will be provided by [_1]:',"'$usertypes->{$type}'").
                                                     '<ul>';
                                             foreach my $field (@{$infofields}) {
                                                 if ($cancreate{'emailusername'}{$type}{$field}) {
                                                     $chgtext .= '<li>'.$infotitles->{$field}.'</li>';
                                                 }
                                             }
+                                            $chgtext .= '</ul>';
+                                        } else {
+                                            $chgtext .= &mt('When self creating account with e-mail as username, no information besides e-mail address will be provided by [_1].',"'$usertypes->{$type}'").'<br />';
                                         }
-                                        $chgtext .= '</ul>';
                                     } else {
-                                        $chgtext .= &mt('When self creating account with e-mail as username, no information besides e-mail address will be provided by [_1].',$usertypes->{$type}).'<br />';
+                                        $chgtext .= &mt('When self creating account with e-mail as username, no information besides e-mail address will be provided by [_1].',"'$usertypes->{$type}'").'<br />';
                                     }
                                 }
                             }
@@ -8575,16 +9484,22 @@ sub process_captcha {
             $changes->{'captcha'} = 1;
         }
     }
-    my ($newpub,$newpriv,$currpub,$currpriv);
+    my ($newpub,$newpriv,$currpub,$currpriv,$newversion,$currversion);
     if ($newsettings->{'captcha'} eq 'recaptcha') {
         $newpub = $env{'form.'.$container.'_recaptchapub'};
         $newpriv = $env{'form.'.$container.'_recaptchapriv'};
-        $newpub =~ s/\W//g;
-        $newpriv =~ s/\W//g;
+        $newpub =~ s/[^\w\-]//g;
+        $newpriv =~ s/[^\w\-]//g;
         $newsettings->{'recaptchakeys'} = {
                                              public  => $newpub,
                                              private => $newpriv,
                                           };
+        $newversion = $env{'form.'.$container.'_recaptchaversion'};
+        $newversion =~ s/\D//g;
+        if ($newversion ne '2') {
+            $newversion = 1;
+        }
+        $newsettings->{'recaptchaversion'} = $newversion;
     }
     if (ref($current->{'recaptchakeys'}) eq 'HASH') {
         $currpub = $current->{'recaptchakeys'}{'public'};
@@ -8596,6 +9511,23 @@ sub process_captcha {
                                               }
         }
     }
+    if ($current->{'captcha'} eq 'recaptcha') {
+        $currversion = $current->{'recaptchaversion'};
+        if ($currversion ne '2') {
+            $currversion = 1;
+        }
+    }
+    if ($currversion ne $newversion) {
+        if ($container eq 'cancreate') {
+            if (ref($changes->{'cancreate'}) eq 'ARRAY') {
+                push(@{$changes->{'cancreate'}},'recaptchaversion');
+            } elsif (!defined($changes->{'cancreate'})) {
+                $changes->{'cancreate'} = ['recaptchaversion'];
+            }
+        } else {
+            $changes->{'recaptchaversion'} = 1;
+        }
+    }
     if (($newpub ne $currpub) || ($newpriv ne $currpriv)) {
         if ($container eq 'cancreate') {
             if (ref($changes->{'cancreate'}) eq 'ARRAY') {
@@ -8771,6 +9703,103 @@ sub modify_defaults {
                          defaults => \%newvalues,
                         );
     my $title = &defaults_titles();
+
+    my $currinststatus;
+    if (ref($domconfig{'inststatus'}) eq 'HASH') {
+        $currinststatus = $domconfig{'inststatus'};
+    } else {
+        my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+        $currinststatus = {
+                             inststatustypes => $usertypes,
+                             inststatusorder => $types,
+                             inststatusguest => [],
+                          };
+    }
+    my @todelete = &Apache::loncommon::get_env_multiple('form.inststatus_delete');
+    my @allpos;
+    my %guests;
+    my %alltypes;
+    my ($currtitles,$currguests,$currorder);
+    if (ref($currinststatus) eq 'HASH') {
+        if (ref($currinststatus->{'inststatusorder'}) eq 'ARRAY') {
+            foreach my $type (@{$currinststatus->{'inststatusorder'}}) {
+                if (ref($currinststatus->{inststatustypes}) eq 'HASH') {
+                    if ($currinststatus->{inststatustypes}->{$type} ne '') {
+                        $currtitles .= $currinststatus->{inststatustypes}->{$type}.',';
+                    }
+                }
+                unless (grep(/^\Q$type\E$/,@todelete)) { 
+                    my $position = $env{'form.inststatus_pos_'.$type};
+                    $position =~ s/\D+//g;
+                    $allpos[$position] = $type;
+                    $alltypes{$type} = $env{'form.inststatus_title_'.$type};
+                    $alltypes{$type} =~ s/`//g;
+                    if ($env{'form.inststatus_guest_'.$type}) {
+                        $guests{$type} = 1;
+                    }
+                }
+            }
+            if (ref($currinststatus->{'inststatusguest'}) eq 'ARRAY') {
+                $currguests = join(',',@{$currinststatus->{'inststatusguest'}});
+            }
+            $currorder = join(',',@{$currinststatus->{'inststatusorder'}});
+            $currtitles =~ s/,$//;
+        }
+    }
+    if ($env{'form.addinststatus'}) {
+        my $newtype = $env{'form.addinststatus'};
+        $newtype =~ s/\W//g;
+        unless (exists($alltypes{$newtype})) {
+            if ($env{'form.addinststatus_guest'}) {
+                $guests{$newtype} = 1;
+            }
+            $alltypes{$newtype} = $env{'form.addinststatus_title'};
+            $alltypes{$newtype} =~ s/`//g; 
+            my $position = $env{'form.addinststatus_pos'};
+            $position =~ s/\D+//g;
+            if ($position ne '') {
+                $allpos[$position] = $newtype;
+            }
+        }
+    }
+    my (@orderedstatus,@orderedguests);
+    foreach my $type (@allpos) {
+        unless (($type eq '') || (grep(/^\Q$type\E$/,@orderedstatus))) {
+            push(@orderedstatus,$type);
+            if ($guests{$type}) {
+                push(@orderedguests,$type);
+            }
+        }
+    }
+    foreach my $type (keys(%alltypes)) {
+        unless (grep(/^\Q$type\E$/,@orderedstatus)) {
+            delete($alltypes{$type});
+        }
+    }
+    $defaults_hash{'inststatus'} = {
+                                     inststatustypes => \%alltypes,
+                                     inststatusorder => \@orderedstatus,
+                                     inststatusguest => \@orderedguests,
+                                   };
+    if (ref($defaults_hash{'inststatus'}) eq 'HASH') {
+        foreach my $item ('inststatustypes','inststatusorder','inststatusguest') {
+            $domdefaults{$item} = $defaults_hash{'inststatus'}{$item};
+        }
+    }
+    if ($currorder ne join(',',@orderedstatus)) {
+        $changes{'inststatus'}{'inststatusorder'} = 1;
+    }
+    if ($currguests ne join(',',@orderedguests)) {
+        $changes{'inststatus'}{'inststatusguest'} = 1;
+    }
+    my $newtitles;
+    foreach my $item (@orderedstatus) {
+        $newtitles .= $alltypes{$item}.',';
+    }
+    $newtitles =~ s/,$//;
+    if ($currtitles ne $newtitles) {
+        $changes{'inststatus'}{'inststatustypes'} = 1;
+    }
     my $putresult = &Apache::lonnet::put_dom('configuration',\%defaults_hash,
                                              $dom);
     if ($putresult eq 'ok') {
@@ -8779,21 +9808,47 @@ sub modify_defaults {
             my $version = &Apache::lonnet::get_server_loncaparev($dom);
             my $mailmsgtext = "Changes made to domain settings in a LON-CAPA installation - domain: $dom (running version: $version) - dns_domain.tab needs to be updated with the following changes, to support legacy 2.4, 2.5 and 2.6 versions of LON-CAPA.\n\n";
             foreach my $item (sort(keys(%changes))) {
-                my $value = $env{'form.'.$item};
-                if ($value eq '') {
-                    $value = &mt('none');
-                } elsif ($item eq 'auth_def') {
-                    my %authnames = &authtype_names();
-                    my %shortauth = (
-                             internal => 'int',
-                             krb4 => 'krb4',
-                             krb5 => 'krb5',
-                             localauth  => 'loc',
-                    );
-                    $value = $authnames{$shortauth{$value}};
+                if ($item eq 'inststatus') {
+                    if (ref($changes{'inststatus'}) eq 'HASH') {
+                        if (($changes{'inststatus'}{'inststatustypes'}) || $changes{'inststatus'}{'inststatusorder'}) {
+                            $resulttext .= '<li>'.&mt('Institutional user status types set to:').' ';
+                            foreach my $type (@orderedstatus) { 
+                                $resulttext .= $alltypes{$type}.', ';
+                            }
+                            $resulttext =~ s/, $//;
+                            $resulttext .= '</li>';
+                        }
+                        if ($changes{'inststatus'}{'inststatusguest'}) {
+                            $resulttext .= '<li>'; 
+                            if (@orderedguests) {
+                                $resulttext .= &mt('Types assignable to "non-institutional" usernames set to:').' ';
+                                foreach my $type (@orderedguests) {
+                                    $resulttext .= $alltypes{$type}.', ';
+                                }
+                                $resulttext =~ s/, $//;
+                            } else {
+                                $resulttext .= &mt('Types assignable to "non-institutional" usernames set to none.');
+                            }
+                            $resulttext .= '</li>';
+                        }
+                    }
+                } else {
+                    my $value = $env{'form.'.$item};
+                    if ($value eq '') {
+                        $value = &mt('none');
+                    } elsif ($item eq 'auth_def') {
+                        my %authnames = &authtype_names();
+                        my %shortauth = (
+                                          internal   => 'int',
+                                          krb4       => 'krb4',
+                                          krb5       => 'krb5',
+                                          localauth  => 'loc',
+                        );
+                        $value = $authnames{$shortauth{$value}};
+                    }
+                    $resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$item},$value).'</li>';
+                    $mailmsgtext .= "$title->{$item} set to $value\n";  
                 }
-                $resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$item},$value).'</li>';
-                $mailmsgtext .= "$title->{$item} set to $value\n";  
             }
             $resulttext .= '</ul>';
             $mailmsgtext .= "\n";
@@ -8915,10 +9970,12 @@ sub modify_scantron {
 }
 
 sub modify_coursecategories {
-    my ($dom,%domconfig) = @_;
+    my ($dom,$lastactref,%domconfig) = @_;
     my ($resulttext,%deletions,%reorderings,%needreordering,%adds,%changes,$errors,
         $cathash);
     my @deletecategory = &Apache::loncommon::get_env_multiple('form.deletecategory');
+    my @catitems = ('unauth','auth');
+    my @cattypes = ('std','domonly','codesrch','none');
     if (ref($domconfig{'coursecategories'}) eq 'HASH') {
         $cathash = $domconfig{'coursecategories'}{'cats'};
         if ($domconfig{'coursecategories'}{'togglecats'} ne $env{'form.togglecats'}) {
@@ -8937,6 +9994,14 @@ sub modify_coursecategories {
             $changes{'categorizecomm'} = 1;
             $domconfig{'coursecategories'}{'categorizecomm'} = $env{'form.categorizecomm'};
         }
+        foreach my $item (@catitems) {
+            if (grep(/^\Q$env{'form.coursecat_'.$item}\E$/,@cattypes)) {
+                if ($domconfig{'coursecategories'}{$item} ne $env{'form.coursecat_'.$item}) {
+                    $changes{$item} = 1;
+                    $domconfig{'coursecategories'}{$item} = $env{'form.coursecat_'.$item};
+                }
+            }
+        }
     } else {
         $changes{'togglecats'} = 1;
         $changes{'categorize'} = 1;
@@ -8948,6 +10013,14 @@ sub modify_coursecategories {
                                              togglecatscomm => $env{'form.togglecatscomm'},
                                              categorizecomm => $env{'form.categorizecomm'},
                                          };
+        foreach my $item (@catitems) {
+            if ($env{'form.coursecat_'.$item} ne 'std') {
+                $changes{$item} = 1;
+            }
+            if (grep(/^\Q$env{'form.coursecat_'.$item}\E$/,@cattypes)) {
+                $domconfig{'coursecategories'}{$item} = $env{'form.coursecat_'.$item};
+            }
+        }
     }
     if (ref($cathash) eq 'HASH') {
         if (($domconfig{'coursecategories'}{'cats'}{'instcode::0'} ne '')  && ($env{'form.instcode'} == 0)) {
@@ -9070,6 +10143,10 @@ sub modify_coursecategories {
                          dom  => 'set in Domain ("Modify Course/Community")',
                          crs  => 'set in Course ("Course Configuration")',
                          comm => 'set in Community ("Community Configuration")',
+                         none     => 'No catalog',
+                         std      => 'Standard catalog',
+                         domonly  => 'Domain-only catalog',
+                         codesrch => 'Code search form',
                         );
             $resulttext = &mt('Changes made:').'<ul>';
             if ($changes{'togglecats'}) {
@@ -9084,6 +10161,12 @@ sub modify_coursecategories {
             if ($changes{'categorizecomm'}) {
                 $resulttext .= '<li>'.&mt("$title{'categorizecomm'} $level{$env{'form.categorizecomm'}}").'</li>';
             }
+            if ($changes{'unauth'}) {
+                $resulttext .= '<li>'.&mt('Catalog type for unauthenticated users set to "'.$level{$env{'form.coursecat_unauth'}}.'"').'</li>';
+            }
+            if ($changes{'auth'}) {
+                $resulttext .= '<li>'.&mt('Catalog type for authenticated users set to "'.$level{$env{'form.coursecat_auth'}}.'"').'</li>';
+            }
             if ((keys(%deletions) > 0) || (keys(%reorderings) > 0) || (keys(%adds) > 0)) {
                 my $cathash;
                 if (ref($domconfig{'coursecategories'}) eq 'HASH') {
@@ -9128,6 +10211,20 @@ sub modify_coursecategories {
                 }
             }
             $resulttext .= '</ul>';
+            if ($changes{'unauth'} || $changes{'auth'}) {
+                my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+                if ($changes{'auth'}) {
+                    $domdefaults{'catauth'} = $domconfig{'coursecategories'}{'auth'};
+                }
+                if ($changes{'unauth'}) {
+                    $domdefaults{'catunauth'} = $domconfig{'coursecategories'}{'unauth'};
+                }
+                my $cachetime = 24*60*60;
+                &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
+                if (ref($lastactref) eq 'HASH') {
+                    $lastactref->{'domdefaults'} = 1;
+                }
+            }
         } else {
             $resulttext = '<span class="LC_error">'.
                           &mt('An error occurred: [_1]',$putresult).'</span>';
@@ -9322,14 +10419,20 @@ sub modify_helpsettings {
 sub modify_coursedefaults {
     my ($dom,$lastactref,%domconfig) = @_;
     my ($resulttext,$errors,%changes,%defaultshash);
-    my %defaultchecked = ('canuse_pdfforms' => 'off');
-    my @toggles = ('canuse_pdfforms');
+    my %defaultchecked = (
+                           'uselcmath'       => 'on',
+                           'usejsme'         => 'on'
+                         );
+    my @toggles = ('uselcmath','usejsme');
     my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial',
-                   'uploadquota_community','uploadquota_textbook');
+                   'uploadquota_community','uploadquota_textbook','mysqltables_official',
+                   'mysqltables_unofficial','mysqltables_community','mysqltables_textbook');
     my @types = ('official','unofficial','community','textbook');
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
                            uploadquota          => 500,
+                           postsubmit           => 60,
+                           mysqltables          => 172800,
                          );
 
     $defaultshash{'coursedefaults'} = {};
@@ -9370,12 +10473,12 @@ sub modify_coursedefaults {
                 }
                 $defaultshash{'coursedefaults'}{$item} = $newdef;
             } else {
-                my ($type) = ($item =~ /^\Quploadquota_\E(\w+)$/);
-                if (ref($domconfig{'coursedefaults'}{'uploadquota'}) eq 'HASH') {
-                    $currdef = $domconfig{'coursedefaults'}{'uploadquota'}{$type};
+                my ($setting,$type) = ($item =~ /^(uploadquota|mysqltables)_(\w+)$/);
+                if (ref($domconfig{'coursedefaults'}{$setting}) eq 'HASH') {
+                    $currdef = $domconfig{'coursedefaults'}{$setting}{$type};
                 }
                 $newdef =~ s/[^\w.\-]//g;
-                $defaultshash{'coursedefaults'}{'uploadquota'}{$type} = $newdef;
+                $defaultshash{'coursedefaults'}{$setting}{$type} = $newdef;
             }
             if ($currdef ne $newdef) {
                 my $staticdef;
@@ -9383,34 +10486,125 @@ sub modify_coursedefaults {
                     unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) {
                         $changes{$item} = 1;
                     }
-                } else {
-                    unless (($currdef eq '') && ($newdef == $staticdefaults{'uploadquota'})) {
-                        $changes{'uploadquota'} = 1;
+                } elsif ($item =~ /^(uploadquota|mysqltables)_/) {
+                    my $setting = $1;
+                    unless (($currdef eq '') && ($newdef == $staticdefaults{$setting})) {
+                        $changes{$setting} = 1;
                     }
                 }
             }
         }
-
-        my $officialcreds = $env{'form.official_credits'};
-        $officialcreds =~ s/[^\d.]+//g;
-        my $unofficialcreds = $env{'form.unofficial_credits'};
-        $unofficialcreds =~ s/[^\d.]+//g;
-        my $textbookcreds = $env{'form.textbook_credits'};
-        $textbookcreds =~ s/[^\d.]+//g;
-        if (ref($domconfig{'coursedefaults'}{'coursecredits'} ne 'HASH') &&
-                ($env{'form.coursecredits'} eq '1')) {
-                $changes{'coursecredits'} = 1;
+        my $currclone = $domconfig{'coursedefaults'}{'canclone'};
+        my @currclonecode;
+        if (ref($currclone) eq 'HASH') {
+            if (ref($currclone->{'instcode'}) eq 'ARRAY') {
+                @currclonecode = @{$currclone->{'instcode'}};
+            }
+        }
+        my $newclone;
+        if ($env{'form.canclone'} =~ /^(none|domain|instcode)$/) {
+            $newclone = $env{'form.canclone'};
+        }
+        if ($newclone eq 'instcode') {
+            my @newcodes = &Apache::loncommon::get_env_multiple('form.clonecode');
+            my (%codedefaults,@code_order,@clonecode);
+            &Apache::lonnet::auto_instcode_defaults($dom,\%codedefaults,
+                                                    \@code_order);
+            foreach my $item (@code_order) {
+                if (grep(/^\Q$item\E$/,@newcodes)) {
+                    push(@clonecode,$item);
+                }
+            }
+            if (@clonecode) {
+                $defaultshash{'coursedefaults'}{'canclone'} = { $newclone => \@clonecode };
+                my @diffs = &Apache::loncommon::compare_arrays(\@currclonecode,\@clonecode);
+                if (@diffs) {
+                    $changes{'canclone'} = 1;
+                }
+            } else {
+                $newclone eq '';
+            }
+        } elsif ($newclone ne '') {
+            $defaultshash{'coursedefaults'}{'canclone'} = $newclone;
+        }
+        if ($newclone ne $currclone) {
+            $changes{'canclone'} = 1;
+        }
+        my %credits;
+        foreach my $type (@types) {
+            unless ($type eq 'community') {
+                $credits{$type} = $env{'form.'.$type.'_credits'};
+                $credits{$type} =~ s/[^\d.]+//g;
+            }
+        }
+        if ((ref($domconfig{'coursedefaults'}{'coursecredits'}) ne 'HASH') &&
+            ($env{'form.coursecredits'} eq '1')) {
+            $changes{'coursecredits'} = 1;
+            foreach my $type (keys(%credits)) {
+                $defaultshash{'coursedefaults'}{'coursecredits'}{$type} = $credits{$type};
+            }
         } else {
-            if (($domconfig{'coursedefaults'}{'coursecredits'}{'official'} ne $officialcreds)  ||
-                ($domconfig{'coursedefaults'}{'coursecredits'}{'unofficial'} ne $unofficialcreds) ||
-                ($domconfig{'coursedefaults'}{'coursecredits'}{'textbook'} ne $textbookcreds)) {
-                $changes{'coursecredits'} = 1;
+            if ($env{'form.coursecredits'} eq '1') {
+                foreach my $type (@types) {
+                    unless ($type eq 'community') {
+                        if ($domconfig{'coursedefaults'}{'coursecredits'}{$type} ne $credits{$type}) {
+                            $changes{'coursecredits'} = 1;
+                        }
+                        $defaultshash{'coursedefaults'}{'coursecredits'}{$type} = $credits{$type};
+                    }
+                }
+            } elsif (ref($domconfig{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
+                foreach my $type (@types) {
+                    unless ($type eq 'community') {
+                        if ($domconfig{'coursedefaults'}{'coursecredits'}{$type}) {
+                            $changes{'coursecredits'} = 1;
+                            last;
+                        }
+                    }
+                }
             }
         }
-        $defaultshash{'coursedefaults'}{'coursecredits'} = {
-            official   => $officialcreds,
-            unofficial => $unofficialcreds,
-            textbook   => $textbookcreds,
+        if ($env{'form.postsubmit'} eq '1') {
+            $defaultshash{'coursedefaults'}{'postsubmit'}{'client'} = 'on';
+            my %currtimeout;
+            if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
+                if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'off') {
+                    $changes{'postsubmit'} = 1;
+                }
+                if (ref($domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') {
+                    %currtimeout = %{$domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}};
+                }
+            } else {
+                $changes{'postsubmit'} = 1;
+            }
+            foreach my $type (@types) {
+                my $timeout = $env{'form.'.$type.'_timeout'};
+                $timeout =~ s/\D//g;
+                if ($timeout == $staticdefaults{'postsubmit'}) {
+                    $timeout = '';
+                } elsif (($timeout eq '') || ($timeout =~ /^0+$/)) {
+                    $timeout = '0';
+                }
+                unless ($timeout eq '') {
+                    $defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}{$type} = $timeout;
+                }
+                if (exists($currtimeout{$type})) {
+                    if ($timeout ne $currtimeout{$type}) {
+                        $changes{'postsubmit'} = 1;
+                    }
+                } elsif ($timeout ne '') {
+                    $changes{'postsubmit'} = 1;
+                }
+            }
+        } else {
+            $defaultshash{'coursedefaults'}{'postsubmit'}{'client'} = 'off';
+            if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
+                if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'on') {
+                    $changes{'postsubmit'} = 1;
+                }
+            } else {
+                $changes{'postsubmit'} = 1;
+            }
         }
     }
     my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
@@ -9418,19 +10612,31 @@ sub modify_coursedefaults {
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
             my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
-            if (($changes{'canuse_pdfforms'}) || ($changes{'coursecredits'}) || 
-                ($changes{'uploadquota'})) { 
-                if ($changes{'canuse_pdfforms'}) {
-                    $domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'};
+            if (($changes{'uploadquota'}) || ($changes{'postsubmit'}) ||
+                ($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'}) ||
+                ($changes{'canclone'}) || ($changes{'mysqltables'})) {
+                foreach my $item ('uselcmath','usejsme') {
+                    if ($changes{$item}) {
+                        $domdefaults{$item}=$defaultshash{'coursedefaults'}{$item};
+                    }
                 }
                 if ($changes{'coursecredits'}) {
                     if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
-                        $domdefaults{'officialcredits'} =
-                            $defaultshash{'coursedefaults'}{'coursecredits'}{'official'};
-                        $domdefaults{'unofficialcredits'} =
-                            $defaultshash{'coursedefaults'}{'coursecredits'}{'unofficial'};
-                        $domdefaults{'textbookcredits'} =
-                            $domdefaults{'coursedefaults'}{'coursecredits'}{'textbook'};
+                        foreach my $type (keys(%{$defaultshash{'coursedefaults'}{'coursecredits'}})) {
+                            $domdefaults{$type.'credits'} =
+                                $defaultshash{'coursedefaults'}{'coursecredits'}{$type};
+                        }
+                    }
+                }
+                if ($changes{'postsubmit'}) {
+                    if (ref($defaultshash{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
+                        $domdefaults{'postsubmit'} = $defaultshash{'coursedefaults'}{'postsubmit'}{'client'};
+                        if (ref($defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') {
+                            foreach my $type (keys(%{$defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}})) {
+                                $domdefaults{$type.'postsubtimeout'} =
+                                    $defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}{$type};
+                            }
+                        }
                     }
                 }
                 if ($changes{'uploadquota'}) {
@@ -9440,6 +10646,18 @@ sub modify_coursedefaults {
                         }
                     }
                 }
+                if ($changes{'canclone'}) {
+                    if (ref($defaultshash{'coursedefaults'}{'canclone'}) eq 'HASH') {
+                        if (ref($defaultshash{'coursedefaults'}{'canclone'}{'instcode'}) eq 'ARRAY') {
+                            my @clonecodes = @{$defaultshash{'coursedefaults'}{'canclone'}{'instcode'}};
+                            if (@clonecodes) {
+                                $domdefaults{'canclone'} = join('+',@clonecodes);
+                            }
+                        }
+                    } else {
+                        $domdefaults{'canclone'}=$defaultshash{'coursedefaults'}{'canclone'};
+                    }
+                }
                 my $cachetime = 24*60*60;
                 &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
                 if (ref($lastactref) eq 'HASH') {
@@ -9448,11 +10666,17 @@ sub modify_coursedefaults {
             }
             $resulttext = &mt('Changes made:').'<ul>';
             foreach my $item (sort(keys(%changes))) {
-                if ($item eq 'canuse_pdfforms') {
+                if ($item eq 'uselcmath') {
                     if ($env{'form.'.$item} eq '1') {
-                        $resulttext .= '<li>'.&mt("Course/Community users can create/upload PDF forms set to 'on'").'</li>';
+                        $resulttext .= '<li>'.&mt('Math preview uses LON-CAPA previewer (javascript), if supported by browser.').'</li>';
                     } else {
-                        $resulttext .= '<li>'.&mt('Course/Community users can create/upload PDF forms set to "off"').'</li>';
+                        $resulttext .= '<li>'.&mt('Math preview uses DragMath (Java), if supported by client OS.').'</li>';
+                    }
+                } elsif ($item eq 'usejsme') {
+                    if ($env{'form.'.$item} eq '1') {
+                        $resulttext .= '<li>'.&mt('Molecule editor uses JSME (HTML5), if supported by browser.').'</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('Molecule editor uses JME (Java), if supported by client OS.').'</li>';
                     }
                 } elsif ($item eq 'anonsurvey_threshold') {
                     $resulttext .= '<li>'.&mt('Responder count required for display of anonymous survey submissions set to [_1].',$defaultshash{'coursedefaults'}{'anonsurvey_threshold'}).'</li>';
@@ -9469,6 +10693,54 @@ sub modify_coursedefaults {
                     } else {
                         $resulttext .= '<li>'.&mt('Default quota for content uploaded via Course Editor remains default: [_1] MB',$staticdefaults{'uploadquota'}).'</li>';
                     }
+                } elsif ($item eq 'mysqltables') {
+                    if (ref($defaultshash{'coursedefaults'}{'mysqltables'}) eq 'HASH') {
+                        $resulttext .= '<li>'.&mt('Lifetime of "Temporary" MySQL tables (student performance data) on homeserver').'<ul>'.
+                                       '<li>'.&mt('Official courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'official'}.'</b>').'</li>'.
+                                       '<li>'.&mt('Unofficial courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'unofficial'}.'</b>').'</li>'.
+                                       '<li>'.&mt('Textbook courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'textbook'}.'</b>').'</li>'.
+                                       '<li>'.&mt('Communities: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'community'}.'</b>').'</li>'.
+                                       '</ul>'.
+                                       '</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('Lifetime of "Temporary" MySQL tables (student performance data) on homeserver remains default: [_1] s',$staticdefaults{'uploadquota'}).'</li>';
+                    }
+                } elsif ($item eq 'postsubmit') {
+                    if ($domdefaults{'postsubmit'} eq 'off') {
+                        $resulttext .= '<li>'.&mt('Submit button(s) remain enabled on page after student makes submission.');
+                    } else {
+                        $resulttext .= '<li>'.&mt('Submit button(s) disabled on page after student makes submission').'; ';
+                        if (ref($defaultshash{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
+                            $resulttext .= &mt('durations:').'<ul>';
+                            foreach my $type (@types) {
+                                $resulttext .= '<li>';
+                                my $timeout;
+                                if (ref($defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') {
+                                    $timeout = $defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}{$type};
+                                }
+                                my $display;
+                                if ($timeout eq '0') {
+                                    $display = &mt('unlimited');
+                                } elsif ($timeout eq '') {
+                                    $display = &mt('[quant,_1,second] (default)',$staticdefaults{'postsubmit'});
+                                } else {
+                                    $display = &mt('[quant,_1,second]',$timeout);
+                                }
+                                if ($type eq 'community') {
+                                    $resulttext .= &mt('Communities');
+                                } elsif ($type eq 'official') {
+                                    $resulttext .= &mt('Official courses');
+                                } elsif ($type eq 'unofficial') {
+                                    $resulttext .= &mt('Unofficial courses');
+                                } elsif ($type eq 'textbook') {
+                                    $resulttext .= &mt('Textbook courses');
+                                }
+                                $resulttext .= ' -- '.$display.'</li>';
+                            }
+                            $resulttext .= '</ul>';
+                        }
+                        $resulttext .= '</li>';
+                    }
                 } elsif ($item eq 'coursecredits') {
                     if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
                         if (($domdefaults{'officialcredits'} eq '') &&
@@ -9486,6 +10758,17 @@ sub modify_coursedefaults {
                     } else {
                         $resulttext .= '<li>'.&mt('Student credits not in use for courses in this domain').'</li>';
                     }
+                } elsif ($item eq 'canclone') {
+                    if (ref($defaultshash{'coursedefaults'}{'canclone'}) eq 'HASH') {
+                        if (ref($defaultshash{'coursedefaults'}{'canclone'}{'instcode'}) eq 'ARRAY') {
+                            my $clonecodes = join(' '.&mt('and').' ',@{$defaultshash{'coursedefaults'}{'canclone'}{'instcode'}});
+                            $resulttext .= '<li>'.&mt('By default, official courses can be cloned from existing courses with the same: [_1]','<b>'.$clonecodes.'</b>').'</li>';
+                        }
+                    } elsif ($defaultshash{'coursedefaults'}{'canclone'} eq 'domain') {
+                        $resulttext .= '<li>'.&mt('By default, a course requester can clone any course from his/her domain.').'</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('By default, only course owner and coordinators may clone a course.').'</li>';
+                    }
                 }
             }
             $resulttext .= '</ul>';
@@ -9904,7 +11187,23 @@ sub modify_usersessions {
             $changes{'spares'}{$lonhost} = \%spareschg;
         }
     }
-
+    $defaultshash{'usersessions'}{'offloadnow'} = {};
+    my @offloadnow = &Apache::loncommon::get_env_multiple('form.offloadnow');
+    my @okoffload;
+    if (@offloadnow) {
+        foreach my $server (@offloadnow) {
+            if (&Apache::lonnet::hostname($server) ne '') {
+                unless (grep(/^\Q$server\E$/,@okoffload)) {
+                    push(@okoffload,$server);
+                }
+            }
+        }
+        if (@okoffload) {
+            foreach my $lonhost (@okoffload) {
+                $defaultshash{'usersessions'}{'offloadnow'}{$lonhost} = 1;
+            }
+        }
+    }
     if (ref($domconfig{'usersessions'}) eq 'HASH') {
         if (ref($domconfig{'usersessions'}{'spares'}) eq 'HASH') {
             if (ref($changes{'spares'}) eq 'HASH') {
@@ -9915,8 +11214,27 @@ sub modify_usersessions {
         } else {
             $savespares = 1;
         }
+        if (ref($domconfig{'usersessions'}{'offloadnow'}) eq 'HASH') {
+            foreach my $lonhost (keys(%{$domconfig{'usersessions'}{'offloadnow'}})) {
+                unless ($defaultshash{'usersessions'}{'offloadnow'}{$lonhost}) {
+                    $changes{'offloadnow'} = 1;
+                    last;
+                }
+            }
+            unless ($changes{'offloadnow'}) {
+                foreach my $lonhost (keys(%{$defaultshash{'usersessions'}{'offloadnow'}})) {
+                    unless ($domconfig{'usersessions'}{'offloadnow'}{$lonhost}) {
+                        $changes{'offloadnow'} = 1;
+                        last;
+                    }
+                }
+            }
+        } elsif (@okoffload) {
+            $changes{'offloadnow'} = 1;
+        }
+    } elsif (@okoffload) {
+        $changes{'offloadnow'} = 1;
     }
-
     my $nochgmsg = &mt('No changes made to settings for user session hosting/offloading.');
     if ((keys(%changes) > 0) || ($savespares)) {
         my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
@@ -9929,6 +11247,9 @@ sub modify_usersessions {
                 if (ref($defaultshash{'usersessions'}{'hosted'}) eq 'HASH') {
                     $domdefaults{'hostedsessions'} = $defaultshash{'usersessions'}{'hosted'};
                 }
+                if (ref($defaultshash{'usersessions'}{'offloadnow'}) eq 'HASH') {
+                    $domdefaults{'offloadnow'} = $defaultshash{'usersessions'}{'offloadnow'};
+                }
             }
             my $cachetime = 24*60*60;
             &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
@@ -9997,6 +11318,21 @@ sub modify_usersessions {
                         $resulttext .= '</ul>';
                     }
                 }
+                if ($changes{'offloadnow'}) {
+                    if (ref($defaultshash{'usersessions'}{'offloadnow'}) eq 'HASH') {
+                        if (keys(%{$defaultshash{'usersessions'}{'offloadnow'}}) > 0) {
+                            $resulttext .= '<li>'.&mt('Switch active users on next access, for server(s):').'<ul>';
+                            foreach my $lonhost (sort(keys(%{$defaultshash{'usersessions'}{'offloadnow'}}))) {
+                                $resulttext .= '<li>'.$lonhost.'</li>';
+                            }
+                            $resulttext .= '</ul>';
+                        } else {
+                            $resulttext .= '<li>'.&mt('No servers now set to switch active users on next access.');
+                        }
+                    } else {
+                        $resulttext .= '<li>'.&mt('No servers now set to switch active users on next access.').'</li>';
+                    }
+                }
                 $resulttext .= '</ul>';
             } else {
                 $resulttext = $nochgmsg;
@@ -10018,6 +11354,7 @@ sub modify_loadbalancing {
     my ($othertitle,$usertypes,$types) =
         &Apache::loncommon::sorted_inst_types($dom);
     my %servers = &Apache::lonnet::internet_dom_servers($dom);
+    my %libraryservers = &Apache::lonnet::get_servers($dom,'library');
     my @sparestypes = ('primary','default');
     my %typetitles = &sparestype_titles();
     my $resulttext;
@@ -10109,7 +11446,10 @@ sub modify_loadbalancing {
                     $rule = $env{'form.loadbalancing_rules_'.$i.'_'.$type};
                 }
                 if ($rule eq 'specific') {
-                    $rule = $env{'form.loadbalancing_singleserver_'.$i.'_'.$type};
+                    my $specifiedhost = $env{'form.loadbalancing_singleserver_'.$i.'_'.$type};
+                    if (exists($servers{$specifiedhost})) {
+                        $rule = $specifiedhost;
+                    }
                 }
                 $defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type} = $rule;
                 if (ref($currrules{$balancer}) eq 'HASH') {
@@ -10131,20 +11471,22 @@ sub modify_loadbalancing {
                                                  \%defaultshash,$dom);
         if ($putresult eq 'ok') {
             if (keys(%changes) > 0) {
+                my %toupdate;
                 if (ref($changes{'delete'}) eq 'ARRAY') {
                     foreach my $balancer (sort(@{$changes{'delete'}})) {
                         $resulttext .= '<li>'.&mt('Load Balancing discontinued for: [_1]',$balancer).'</li>';
-                        my $cachekey = &escape('loadbalancing').':'.&escape($dom);
-                        &Apache::lonnet::remote_devalidate_cache($balancer,[$cachekey]);
+                        $toupdate{$balancer} = 1;
                     }
                 }
                 if (ref($changes{'add'}) eq 'ARRAY') {
                     foreach my $balancer (sort(@{$changes{'add'}})) {
                         $resulttext .= '<li>'.&mt('Load Balancing enabled for: [_1]',$balancer);
+                        $toupdate{$balancer} = 1;
                     }
                 }
                 if (ref($changes{'curr'}) eq 'HASH') {
                     foreach my $balancer (sort(keys(%{$changes{'curr'}}))) {
+                        $toupdate{$balancer} = 1;
                         if (ref($changes{'curr'}{$balancer}) eq 'HASH') {
                             if ($changes{'curr'}{$balancer}{'targets'}) {
                                 my %offloadstr;
@@ -10181,8 +11523,38 @@ sub modify_loadbalancing {
                                         if ($rule eq '') {
                                             $balancetext =  $ruletitles{'default'};
                                         } elsif (($rule eq 'homeserver') || ($rule eq 'externalbalancer') ||
-                                                 ($rule eq 'balancer') || ($rule eq 'offloadedto')) {
-                                            $balancetext =  $ruletitles{$rule};
+                                                 ($type eq '_LC_ipchange') || ($type eq '_LC_ipchangesso')) {
+                                            if (($type eq '_LC_ipchange') || ($type eq '_LC_ipchangesso')) {
+                                                foreach my $sparetype (@sparestypes) {
+                                                    if (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}) eq 'ARRAY') {
+                                                        map { $toupdate{$_} = 1; } (@{$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}});
+                                                    }
+                                                }
+                                                foreach my $item (@{$alltypes}) {
+                                                    next if ($item =~  /^_LC_ipchange/);
+                                                    my $hasrule = $defaultshash{'loadbalancing'}{$balancer}{'rules'}{$item};
+                                                    if ($hasrule eq 'homeserver') {
+                                                        map { $toupdate{$_} = 1; } (keys(%libraryservers));
+                                                    } else {
+                                                        unless (($hasrule eq 'default') || ($hasrule eq 'none') || ($hasrule eq 'externalbalancer')) {
+                                                            if ($servers{$hasrule}) {
+                                                                $toupdate{$hasrule} = 1;
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                                if (($rule eq 'balancer') || ($rule eq 'offloadedto')) {
+                                                    $balancetext =  $ruletitles{$rule};
+                                                } else {
+                                                    my $receiver = $defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type};
+                                                    $balancetext = $ruletitles{'particular'}.' '.$receiver;
+                                                    if ($receiver) {
+                                                        $toupdate{$receiver};
+                                                    }
+                                                }
+                                            } else {
+                                                $balancetext =  $ruletitles{$rule};
+                                            }
                                         } else {
                                             $balancetext = &mt('offload to [_1]',$defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type});
                                         }
@@ -10191,8 +11563,25 @@ sub modify_loadbalancing {
                                 }
                             }
                         }
-                        my $cachekey = &escape('loadbalancing').':'.&escape($dom);
-                        &Apache::lonnet::remote_devalidate_cache($balancer,[$cachekey]);
+                        if (keys(%toupdate)) {
+                            my %thismachine;
+                            my $updatedhere;
+                            my $cachetime = 60*60*24;
+                            map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
+                            foreach my $lonhost (keys(%toupdate)) {
+                                if ($thismachine{$lonhost}) {
+                                    unless ($updatedhere) {
+                                        &Apache::lonnet::do_cache_new('loadbalancing',$dom,
+                                                                      $defaultshash{'loadbalancing'},
+                                                                      $cachetime);
+                                        $updatedhere = 1;
+                                    }
+                                } else {
+                                    my $cachekey = &escape('loadbalancing').':'.&escape($dom);
+                                    &Apache::lonnet::remote_devalidate_cache($lonhost,[$cachekey]);
+                                }
+                            }
+                        }
                     }
                 }
                 if ($resulttext ne '') {
@@ -10333,7 +11722,7 @@ sub active_dc_picker {
         my ($dcname,$dcdom) = split(':',$domcoord[0]);
         my $user = &Apache::loncommon::plainname($dcname,$dcdom);
         if ($inputtype eq 'radio') {
-            $table .= '<input type="hidden" name="'.$name.'" value="'.$domcoord[0].'" />'.$user;
+            $table = '<input type="hidden" name="'.$name.'" value="'.$domcoord[0].'" />'.$user;
             if ($user ne $dcname.':'.$dcdom) {
                 $table .=  ' ('.$dcname.':'.$dcdom.')';
             }
@@ -10342,9 +11731,9 @@ sub active_dc_picker {
             if (exists($currhash{$domcoord[0]})) {
                 $check = ' checked="checked"';
             }
-            $table .= '<span class="LC_nobreak"><label>'.
-                      '<input type="checkbox" name="'.$name.'" '.
-                      'value="'.$domcoord[0].'"'.$check.' />'.$user;
+            $table = '<span class="LC_nobreak"><label>'.
+                     '<input type="checkbox" name="'.$name.'" '.
+                     'value="'.$domcoord[0].'"'.$check.' />'.$user;
             if ($user ne $dcname.':'.$dcdom) {
                 $table .=  ' ('.$dcname.':'.$dcdom.')';
             }
@@ -10834,6 +12223,8 @@ function updateCaptcha(caller,context) {
     var pubitem;
     var privtext;
     var pubtext;
+    var versionitem;
+    var versiontext;
     if (document.getElementById(context+'_recaptchapub')) {
         pubitem = document.getElementById(context+'_recaptchapub');
     } else {
@@ -10854,6 +12245,16 @@ function updateCaptcha(caller,context) {
     } else {
         return;
     }
+    if (document.getElementById(context+'_recaptchaversion')) {
+        versionitem = document.getElementById(context+'_recaptchaversion');
+    } else {
+        return;
+    }
+    if (document.getElementById(context+'_recaptchavertxt')) {
+        versiontext = document.getElementById(context+'_recaptchavertxt');
+    } else {
+        return;
+    }
     if (caller.checked) {
         if (caller.value == 'recaptcha') {
             pubitem.type = 'text';
@@ -10862,11 +12263,16 @@ function updateCaptcha(caller,context) {
             privitem.size = '40';
             pubtext.innerHTML = "$lt{'pub'}";
             privtext.innerHTML = "$lt{'priv'}";
+            versionitem.type = 'text';
+            versionitem.size = '3';
+            versiontext.innerHTML = "$lt{'ver'}";
         } else {
             pubitem.type = 'hidden';
             privitem.type = 'hidden';
+            versionitem.type = 'hidden';
             pubtext.innerHTML = '';
             privtext.innerHTML = '';
+            versiontext.innerHTML = '';
         }
     }
     return;
@@ -10879,27 +12285,39 @@ END
 
 }
 
-sub credits_js {
+sub toggle_display_js {
     return <<"END";
 
 <script type="text/javascript">
 // <![CDATA[
 
-function toggleCredits(domForm) {
-    if (document.getElementById('credits')) {
-        creditsitem = document.getElementById('credits');
-        var creditsLength = domForm.coursecredits.length;
-        if (creditsLength) {
+function toggleDisplay(domForm,caller) {
+    if (document.getElementById(caller)) {
+        var divitem = document.getElementById(caller);
+        var optionsElement = domForm.coursecredits;
+        var checkval = 1;
+        var dispval = 'block';
+        if (caller == 'emailoptions') {
+            optionsElement = domForm.cancreate_email; 
+        }
+        if (caller == 'studentsubmission') {
+            optionsElement = domForm.postsubmit;
+        }
+        if (caller == 'cloneinstcode') {
+            optionsElement = domForm.canclone;
+            checkval = 'instcode';
+        }
+        if (optionsElement.length) {
             var currval;
-            for (var i=0; i<creditsLength; i++) {
-                if (domForm.coursecredits[i].checked) {
-                   currval = domForm.coursecredits[i].value;
+            for (var i=0; i<optionsElement.length; i++) {
+                if (optionsElement[i].checked) {
+                   currval = optionsElement[i].value;
                 }
             }
-            if (currval == 1) {
-                creditsitem.style.display = 'block';
+            if (currval == checkval) {
+                divitem.style.display = dispval;
             } else {
-                creditsitem.style.display = 'none';
+                divitem.style.display = 'none';
             }
         }
     }
@@ -10920,6 +12338,7 @@ sub captcha_phrases {
                  original  => 'original (CAPTCHA)',
                  recaptcha => 'successor (ReCAPTCHA)',
                  notused   => 'unused',
+                 ver => 'ReCAPTCHA version (1 or 2)',
     );
 }
 
@@ -10930,7 +12349,7 @@ sub devalidate_remote_domconfs {
     my %thismachine;
     map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
     my @posscached = ('domainconfig','domdefaults');
-    if (keys(%servers) > 1) {
+    if (keys(%servers)) {
         foreach my $server (keys(%servers)) {
             next if ($thismachine{$server});
             my @cached;