--- loncom/interface/domainprefs.pm	2016/10/24 22:37:24	1.160.6.74
+++ loncom/interface/domainprefs.pm	2014/04/28 01:48:04	1.238
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.74 2016/10/24 22:37:24 raeburn Exp $
+# $Id: domainprefs.pm,v 1.238 2014/04/28 01:48:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -220,8 +220,8 @@ sub handler {
                        'autoupdate','autocreate','directorysrch','contacts',
                        'usercreation','selfcreation','usermodification','scantron',
                        'requestcourses','requestauthor','coursecategories',
-                       'serverstatuses','helpsettings','coursedefaults',
-                       'selfenrollment','usersessions');
+                       'serverstatuses','helpsettings',
+                       'coursedefaults','selfenrollment','usersessions');
     my %existing;
     if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
         %existing = %{$domconfig{'loadbalancing'}};
@@ -250,8 +250,6 @@ 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,
@@ -304,11 +302,9 @@ sub handler {
                      modify => \&modify_autocreate,
                   },
         'directorysrch' => 
-                  { text => 'Directory searches',
+                  { text => 'Institutional directory searches',
                     help => 'Domain_Configuration_InstDirectory_Search',
-                    header => [{col1 => 'Institutional Directory Setting',
-                                col2 => 'Value',},
-                               {col1 => 'LON-CAPA Directory Setting',
+                    header => [{col1 => 'Setting',
                                 col2 => 'Value',}],
                     print => \&print_directorysrch,
                     modify => \&modify_directorysrch,
@@ -373,8 +369,6 @@ sub handler {
                               col2 => 'Value'},
                              {col1 => 'Available textbooks',
                               col2 => ''},
-                             {col1 => 'Available templates',
-                              col2 => ''},
                              {col1 => 'Validation (not official courses)',
                               col2 => 'Value'},],
                   print => \&print_quotas,
@@ -414,12 +408,10 @@ sub handler {
                   modify => \&modify_serverstatuses,
                  },
         'helpsettings' =>
-                 {text   => 'Support settings',
+                 {text   => 'Help page settings',
                   help   => 'Domain_Configuration_Help_Settings',
-                  header => [{col1 => 'Help Page Settings (logged-in users)',
-                              col2 => 'Value'},
-                             {col1 => 'Helpdesk Roles',
-                              col2 => 'Settings'},],
+                  header => [{col1 => 'Help Settings (logged-in users)',
+                              col2 => 'Value'}],
                   print  => \&print_helpsettings,
                   modify => \&modify_helpsettings,
                  },
@@ -445,6 +437,14 @@ sub handler {
                   print => \&print_selfenrollment,
                   modify => \&modify_selfenrollment,
                  },
+        'privacy' => 
+                 {text   => 'User Privacy',
+                  help   => 'Domain_Configuration_User_Privacy',
+                  header => [{col1 => 'Setting',
+                              col2 => 'Value',}],
+                  print => \&print_privacy,
+                  modify => \&modify_privacy,
+                 },
         'usersessions' =>
                  {text  => 'User session hosting/offloading',
                   help  => 'Domain_Configuration_User_Sessions',
@@ -477,8 +477,6 @@ 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,
@@ -624,7 +622,7 @@ sub process_changes {
     } elsif ($action eq 'scantron') {
         $output = &modify_scantron($r,$dom,$confname,$lastactref,%domconfig);
     } elsif ($action eq 'coursecategories') {
-        $output = &modify_coursecategories($dom,$lastactref,%domconfig);
+        $output = &modify_coursecategories($dom,%domconfig);
     } elsif ($action eq 'serverstatuses') {
         $output = &modify_serverstatuses($dom,%domconfig);
     } elsif ($action eq 'requestcourses') {
@@ -653,22 +651,6 @@ sub print_config_box {
         $output = &coursecategories_javascript($settings);
     } elsif ($action eq 'defaults') {
         $output = &defaults_javascript($settings); 
-    } elsif ($action eq 'helpsettings') {
-        my (%privs,%levelscurrent);
-        my %full=();
-        my %levels=(
-                     course => {},
-                     domain => {},
-                     system => {},
-                   );
-        my $context = 'domain';
-        my $crstype = 'Course';
-        my $formname = 'display';
-        &Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent);
-        my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype);
-        $output =
-            &Apache::lonuserutils::custom_roledefs_js($context,$crstype,$formname,\%full,
-                                                      \@templateroles);
     }
     $output .=
          '<table class="LC_nested_outer">
@@ -686,8 +668,7 @@ sub print_config_box {
         my $colspan = '';
         my $rightcolspan = '';
         if (($action eq 'rolecolors') || ($action eq 'defaults') ||
-            ($action eq 'directorysrch') ||
-            (($action eq 'login') && ($numheaders < 4))) {
+            (($action eq 'login') && ($numheaders < 3))) {
             $colspan = ' colspan="2"';
         }
         if ($action eq 'usersessions') {
@@ -704,13 +685,12 @@ sub print_config_box {
         $rowtotal ++;
         if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') ||
             ($action eq 'usermodification') || ($action eq 'defaults') || ($action eq 'coursedefaults') ||
-            ($action eq 'selfenrollment') || ($action eq 'usersessions') || ($action eq 'directorysrch') ||
-            ($action eq 'helpsettings')) {
+            ($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 == 4) {
+            if ($numheaders == 3) {
                 $colspan = ' colspan="2"';
                 $output .= &print_login('service',$dom,$confname,$phase,$settings,\$rowtotal);
             } else {
@@ -760,11 +740,10 @@ sub print_config_box {
             }
             $rowtotal ++;
         } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') ||
-                 ($action eq 'defaults') || ($action eq 'directorysrch') ||
-                 ($action eq 'helpsettings')) {
+                  ($action eq 'defaults')) {
             $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'login') {
-            if ($numheaders == 4) {
+            if ($numheaders == 3) {
                 $output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).'
            </table>
           </td>
@@ -780,31 +759,9 @@ 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);
-            $rowtotal ++;
-            $output .= &print_studentcode($settings,\$rowtotal).'
+            $output .= &print_requestmail($dom,$action,$settings,\$rowtotal).
+                       &print_studentcode($settings,\$rowtotal).'
            </table>
           </td>
          </tr>
@@ -814,18 +771,7 @@ 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>'.
-                       &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).'
+                       &print_textbookcourses($dom,$settings,\$rowtotal).'
             </table>
            </td>
           </tr>
@@ -833,13 +779,12 @@ 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'}->[4]->{'col1'}).'</td>
-              <td class="LC_right_item" valign="top">'.&mt($item->{'header'}->[4]->{'col2'}).'</td>
+              <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>
              </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>
@@ -874,7 +819,7 @@ sub print_config_box {
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">';
-        if ($action eq 'login') {
+        if (($action eq 'login') || ($action eq 'directorysrch')) {
             $output .= '  
               <td class="LC_left_item" colspan="2">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';
         } elsif ($action eq 'serverstatuses') {
@@ -918,12 +863,13 @@ sub print_config_box {
         $rowtotal ++;
         if ($action eq 'quotas') {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
-        } elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || 
-                 ($action eq 'contacts') || ($action eq 'serverstatuses') ||
-                 ($action eq 'loadbalancing')) {
+        } elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || ($action eq 'directorysrch') ||
+                 ($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);
+        } elsif ($action eq 'helpsettings') {
+            $output .= &print_helpsettings($dom,$confname,$settings,\$rowtotal);
         }
     }
     $output .= '
@@ -1220,57 +1166,6 @@ 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;
 }
@@ -1304,9 +1199,6 @@ sub login_choices {
             link          => "Link",
             alink         => "Active link",
             vlink         => "Visited link",
-            headtag       => "Custom markup",
-            action        => "Action",
-            current       => "Current",
         );
     return %choices;
 }
@@ -2169,6 +2061,7 @@ sub print_requestmail {
         $datatable .= &mt('There are no active Domain Coordinators');
     }
     $datatable .='</td></tr>';
+    $$rowtotal += $rows;
     return $datatable;
 }
 
@@ -2177,11 +2070,9 @@ sub print_studentcode {
     my $rownum = 0; 
     my ($output,%current);
     my @crstypes = ('official','unofficial','community','textbook');
-    if (ref($settings) eq 'HASH') {
-        if (ref($settings->{'uniquecode'}) eq 'HASH') {
-            foreach my $type (@crstypes) {
-                $current{$type} = $settings->{'uniquecode'}{$type};
-            }
+    if (ref($settings->{'uniquecode'}) eq 'HASH') {
+        foreach my $type (@crstypes) {
+            $current{$type} = $settings->{'uniquecode'}{$type};
         }
     }
     $output .= '<tr>'.
@@ -2202,14 +2093,14 @@ sub print_studentcode {
 }
 
 sub print_textbookcourses {
-    my ($dom,$type,$settings,$rowtotal) = @_;
+    my ($dom,$settings,$rowtotal) = @_;
     my $rownum = 0;
     my $css_class;
     my $itemcount = 1;
     my $maxnum = 0;
     my $bookshash;
     if (ref($settings) eq 'HASH') {
-        $bookshash = $settings->{$type};
+        $bookshash = $settings->{'textbooks'};
     }
     my %ordered;
     if (ref($bookshash) eq 'HASH') {
@@ -2222,8 +2113,8 @@ sub print_textbookcourses {
     }
     my $confname = $dom.'-domainconfig';
     my $switchserver = &check_switchserver($dom,$confname);
-    my $maxnum = scalar(keys(%ordered));
-    my $datatable;
+    $maxnum = scalar(keys(%ordered));
+    my $datatable = &textbookcourses_javascript(\%ordered);
     if (keys(%ordered)) {
         my @items = sort { $a <=> $b } keys(%ordered);
         for (my $i=0; $i<@items; $i++) {
@@ -2231,24 +2122,21 @@ sub print_textbookcourses {
             my $key = $ordered{$items[$i]};
             my %coursehash=&Apache::lonnet::coursedescription($key);
             my $coursetitle = $coursehash{'description'};
-            my ($subject,$title,$author,$publisher,$image,$imgsrc,$cdom,$cnum);
+            my ($subject,$title,$author,$image,$imgsrc,$cdom,$cnum);
             if (ref($bookshash->{$key}) eq 'HASH') {
                 $subject = $bookshash->{$key}->{'subject'};
                 $title = $bookshash->{$key}->{'title'};
-                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').'" />';
-                    }
+                $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,'."'$type".'_'."$key','$type'".');"';
+            my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'$key'".');"';
             $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
-                         .'<select name="'.$type.'_'.$key.'"'.$chgstr.'>';
+                         .'<select name="'.$key.'"'.$chgstr.'>';
             for (my $k=0; $k<=$maxnum; $k++) {
                 my $vpos = $k+1;
                 my $selstr;
@@ -2258,43 +2146,39 @@ sub print_textbookcourses {
                 $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
             }
             $datatable .= '</select>'.('&nbsp;'x2).
-                '<label><input type="checkbox" name="'.$type.'_del" value="'.$key.'" />'.
+                '<label><input type="checkbox" name="book_del" value="'.$key.'" />'.
                 &mt('Delete?').'</label></span></td>'.
                 '<td colspan="2">'.
-                '<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="'.$type.'_subject_'.$i.'" value="'.$subject.'" /></span> '.
+                '<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="'.$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="" />';
-                }
+                '<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="book_title_'.$i.'" value="'.$title.'" /></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;';
             }
-            $datatable .= '<input type="hidden" name="'.$type.'_id_'.$i.'" value="'.$type.'_'.$key.'" /></span> '.
+            if ($switchserver) {
+                $datatable .= &mt('Upload to library server: [_1]',$switchserver);
+            } else {
+                $datatable .= '<input type="file" name="book_image_'.$i.'" value="" />';
+            }
+            $datatable .= '<input type="hidden" name="book_id_'.$i.'" value="'.$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,'."'$type"."_addbook_pos','$type'".');"';
+    my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'addbook_pos'".');"';
     $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n".
-                  '<input type="hidden" name="'.$type.'_maxnum" value="'.$maxnum.'" />'."\n".
-                  '<select name="'.$type.'_addbook_pos"'.$chgstr.'>';
+                  '<input type="hidden" name="book_maxnum" value="'.$maxnum.'" />'."\n".
+                  '<select name="addbook_pos"'.$chgstr.'>';
     for (my $k=0; $k<$maxnum+1; $k++) {
         my $vpos = $k+1;
         my $selstr;
@@ -2304,30 +2188,26 @@ sub print_textbookcourses {
         $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
     }
     $datatable .= '</select>&nbsp;'."\n".
-                  '<input type="checkbox" name="'.$type.'_addbook" value="1" />'.&mt('Add').'</td>'."\n".
+                  '<input type="checkbox" name="addbook" value="1" />'.&mt('Add').'</td>'."\n".
                   '<td colspan="2">'.
-                  '<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="'.$type.'_addbook_subject" value="" /></span> '."\n".
+                  '<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="'.$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="" />';
-        }
+                  '<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".
+                  ('&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="" />';
     }
     $datatable .= '</span>'."\n".
                   '<span class="LC_nobreak">'.&mt('LON-CAPA course:').'&nbsp;'.
-                  &Apache::loncommon::select_dom_form($env{'request.role.domain'},$type.'_addbook_cdom').
-                  '<input type="text" size="25" name="'.$type.'_addbook_cnum" value="" />'.
+                  &Apache::loncommon::select_dom_form($env{'request.role.domain'},'addbook_cdom').
+                  '<input type="text" size="25" name="addbook_cnum" value="" />'.
                   &Apache::loncommon::selectcourse_link
-                      ('display',$type.'_addbook_cnum',$type.'_addbook_cdom',undef,undef,undef,'Course');
+                      ('display','addbook_cnum','addbook_cdom',undef,undef,undef,'Course');
                   '</span></td>'."\n".
                   '</tr>'."\n";
     $itemcount ++;
@@ -2335,43 +2215,23 @@ sub print_textbookcourses {
 }
 
 sub textbookcourses_javascript {
-    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 ($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 $jstext = '    var textbooks = Array('."'".join("','",@jsarray)."'".');'."\n";
     return <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
-function reorderBooks(form,item,caller) {
+function reorderBooks(form,item) {
     var changedVal;
-$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'};
-    }
+$jstext 
+    var newpos = 'addbook_pos';
     var current = new Array;
+    var maxh = 1 + $num;
     var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value;
     if (item == newpos) {
         changedVal = newitemVal;
@@ -2379,25 +2239,12 @@ $jstext{'templates'};
         changedVal = form.elements[item].options[form.elements[item].selectedIndex].value;
         current[newitemVal] = newpos;
     }
-    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;
-                }
+    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;
             }
         }
     }
@@ -2430,7 +2277,7 @@ ENDSCRIPT
 sub print_autoenroll {
     my ($dom,$settings,$rowtotal) = @_;
     my $autorun = &Apache::lonnet::auto_run(undef,$dom),
-    my ($defdom,$runon,$runoff,$coownerson,$coownersoff,$failsafe);
+    my ($defdom,$runon,$runoff,$coownerson,$coownersoff);
     if (ref($settings) eq 'HASH') {
         if (exists($settings->{'run'})) {
             if ($settings->{'run'} eq '0') {
@@ -2464,9 +2311,6 @@ 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" ';
@@ -2502,12 +2346,8 @@ 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><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;
+                  '</tr>';
+    $$rowtotal += 3;
     return $datatable;
 }
 
@@ -2622,163 +2462,127 @@ 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 .= &mt('Course creation processed as: (choose Dom. Coord.)').
-                      '</td><td class="LC_left_item">';
+        $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>';
     } else {
-        $datatable .= &mt('Course creation processed as:').
-                      '</td><td class="LC_right_item">';
+        $datatable .= $dctable.'</td></tr>';
     }
-    $datatable .= $dctable.'</td></tr>';
     $$rowtotal += $rows;
     return $datatable;
 }
 
 sub print_directorysrch {
-    my ($position,$dom,$settings,$rowtotal) = @_;
-    my $datatable;
-    if ($position eq 'top') {
-        my $instsrchon = ' ';
-        my $instsrchoff = ' checked="checked" ';
-        my ($exacton,$containson,$beginson);
-        my $instlocalon = ' ';
-        my $instlocaloff = ' checked="checked" ';
-        if (ref($settings) eq 'HASH') {
-            if ($settings->{'available'} eq '1') {
-                $instsrchon = $instsrchoff;
-                $instsrchoff = ' ';
-            }
-            if ($settings->{'localonly'} eq '1') {
-                $instlocalon = $instlocaloff;
-                $instlocaloff = ' ';
-            }
-            if (ref($settings->{'searchtypes'}) eq 'ARRAY') {
-                foreach my $type (@{$settings->{'searchtypes'}}) {
-                    if ($type eq 'exact') {
-                        $exacton = ' checked="checked" ';
-                    } elsif ($type eq 'contains') {
-                        $containson = ' checked="checked" ';
-                    } elsif ($type eq 'begins') {
-                        $beginson = ' checked="checked" ';
-                    }
-                }
-            } else {
-                if ($settings->{'searchtypes'} eq 'exact') {
-                    $exacton = ' checked="checked" ';
-                } elsif ($settings->{'searchtypes'} eq 'contains') {
-                    $containson = ' checked="checked" ';
-                } elsif ($settings->{'searchtypes'} eq 'specify') {
+    my ($dom,$settings,$rowtotal) = @_;
+    my $srchon = ' ';
+    my $srchoff = ' checked="checked" ';
+    my ($exacton,$containson,$beginson);
+    my $localon = ' ';
+    my $localoff = ' checked="checked" ';
+    if (ref($settings) eq 'HASH') {
+        if ($settings->{'available'} eq '1') {
+            $srchon = $srchoff;
+            $srchoff = ' ';
+        }
+        if ($settings->{'localonly'} eq '1') {
+            $localon = $localoff;
+            $localoff = ' ';
+        }
+        if (ref($settings->{'searchtypes'}) eq 'ARRAY') {
+            foreach my $type (@{$settings->{'searchtypes'}}) {
+                if ($type eq 'exact') {
                     $exacton = ' checked="checked" ';
+                } elsif ($type eq 'contains') {
                     $containson = ' checked="checked" ';
+                } elsif ($type eq 'begins') {
+                    $beginson = ' checked="checked" ';
                 }
             }
-        }
-        my ($searchtitles,$titleorder) = &sorted_searchtitles();
-        my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-
-        my $numinrow = 4;
-        my $cansrchrow = 0;
-        $datatable='<tr class="LC_odd_row">'.
-                   '<td colspan="2"><span class ="LC_nobreak">'.&mt('Institutional directory search available?').'</span></td>'.
-                   '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
-                   '<input type="radio" name="dirsrch_available"'.
-                   $instsrchon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
-                   '<label><input type="radio" name="dirsrch_available"'.
-                   $instsrchoff.' value="0" />'.&mt('No').'</label></span></td>'.
-                   '</tr><tr>'.
-                   '<td colspan="2"><span class ="LC_nobreak">'.&mt('Other domains can search institution?').'</span></td>'.
-                   '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
-                   '<input type="radio" name="dirsrch_instlocalonly"'.
-                   $instlocaloff.' value="0" />'.&mt('Yes').'</label>&nbsp;'.
-                   '<label><input type="radio" name="dirsrch_instlocalonly"'.
-                   $instlocalon.' value="1" />'.&mt('No').'</label></span></td>'.
-                   '</tr>';
-        $$rowtotal += 2;
-        if (ref($usertypes) eq 'HASH') {
-            if (keys(%{$usertypes}) > 0) {
-                $datatable .= &insttypes_row($settings,$types,$usertypes,$dom,
-                                             $numinrow,$othertitle,'cansearch');
-                $cansrchrow = 1;
+        } else {
+            if ($settings->{'searchtypes'} eq 'exact') {
+                $exacton = ' checked="checked" ';
+            } elsif ($settings->{'searchtypes'} eq 'contains') {
+                $containson = ' checked="checked" ';
+            } elsif ($settings->{'searchtypes'} eq 'specify') {
+                $exacton = ' checked="checked" ';
+                $containson = ' checked="checked" ';
             }
         }
-        if ($cansrchrow) {
-            $$rowtotal ++;
-            $datatable .= '<tr>';
-        } else {
-            $datatable .= '<tr class="LC_odd_row">';
+    }
+    my ($searchtitles,$titleorder) = &sorted_searchtitles();
+    my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+
+    my $numinrow = 4;
+    my $cansrchrow = 0;
+    my $datatable='<tr class="LC_odd_row">'.
+                  '<td colspan="2"><span class ="LC_nobreak">'.&mt('Directory search available?').'</span></td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                  '<input type="radio" name="dirsrch_available"'.
+                  $srchon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                  '<label><input type="radio" name="dirsrch_available"'.
+                  $srchoff.' value="0" />'.&mt('No').'</label></span></td>'.
+                  '</tr><tr>'.
+                  '<td colspan="2"><span class ="LC_nobreak">'.&mt('Other domains can search?').'</span></td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                  '<input type="radio" name="dirsrch_localonly"'.
+                  $localoff.' value="0" />'.&mt('Yes').'</label>&nbsp;'.
+                  '<label><input type="radio" name="dirsrch_localonly"'.
+                  $localon.' value="1" />'.&mt('No').'</label></span></td>'.
+                  '</tr>';
+    $$rowtotal += 2;
+    if (ref($usertypes) eq 'HASH') {
+        if (keys(%{$usertypes}) > 0) {
+            $datatable .= &insttypes_row($settings,$types,$usertypes,$dom,
+                                         $numinrow,$othertitle,'cansearch');
+            $cansrchrow = 1;
         }
-        $datatable .= '<td><span class ="LC_nobreak">'.&mt('Supported search methods').
-                      '</span></td><td class="LC_left_item" colspan="2"><table><tr>';
-        foreach my $title (@{$titleorder}) {
-            if (defined($searchtitles->{$title})) {
-                my $check = ' ';
-                if (ref($settings) eq 'HASH') {
-                    if (ref($settings->{'searchby'}) eq 'ARRAY') {
-                        if (grep(/^\Q$title\E$/,@{$settings->{'searchby'}})) {
-                            $check = ' checked="checked" ';
-                        }
+    }
+    if ($cansrchrow) {
+        $$rowtotal ++;
+        $datatable .= '<tr>';
+    } else {
+        $datatable .= '<tr class="LC_odd_row">';
+    }
+    $datatable .= '<td><span class ="LC_nobreak">'.&mt('Supported search methods').
+                  '</span></td><td class="LC_left_item" colspan="2"><table><tr>';
+    foreach my $title (@{$titleorder}) {
+        if (defined($searchtitles->{$title})) {
+            my $check = ' ';
+            if (ref($settings) eq 'HASH') {
+                if (ref($settings->{'searchby'}) eq 'ARRAY') {
+                    if (grep(/^\Q$title\E$/,@{$settings->{'searchby'}})) {
+                        $check = ' checked="checked" ';
                     }
                 }
-                $datatable .= '<td class="LC_left_item">'.
-                              '<span class="LC_nobreak"><label>'.
-                              '<input type="checkbox" name="searchby" '.
-                              'value="'.$title.'"'.$check.'/>'.
-                              $searchtitles->{$title}.'</label></span></td>';
             }
+            $datatable .= '<td class="LC_left_item">'.
+                          '<span class="LC_nobreak"><label>'.
+                          '<input type="checkbox" name="searchby" '.
+                          'value="'.$title.'"'.$check.'/>'.
+                          $searchtitles->{$title}.'</label></span></td>';
         }
-        $datatable .= '</tr></table></td></tr>';
-        $$rowtotal ++;
-        if ($cansrchrow) {
-            $datatable .= '<tr class="LC_odd_row">';
-        } else {
-            $datatable .= '<tr>';
-        }
-        $datatable .= '<td><span class ="LC_nobreak">'.&mt('Search latitude').'</span></td>'.   
-                      '<td class="LC_left_item" colspan="2">'.
-                      '<span class="LC_nobreak"><label>'.
-                      '<input type="checkbox" name="searchtypes" '.
-                      $exacton.' value="exact" />'.&mt('Exact match').
-                      '</label>&nbsp;'.
-                      '<label><input type="checkbox" name="searchtypes" '.
-                      $beginson.' value="begins" />'.&mt('Begins with').
-                      '</label>&nbsp;'.
-                      '<label><input type="checkbox" name="searchtypes" '.
-                      $containson.' value="contains" />'.&mt('Contains').
-                      '</label></span></td></tr>';
-        $$rowtotal ++;
+    }
+    $datatable .= '</tr></table></td></tr>';
+    $$rowtotal ++;
+    if ($cansrchrow) {
+        $datatable .= '<tr class="LC_odd_row">';
     } else {
-        my $domsrchon = ' checked="checked" ';
-        my $domsrchoff = ' ';
-        my $domlocalon = ' ';
-        my $domlocaloff = ' checked="checked" ';
-        if (ref($settings) eq 'HASH') {
-            if ($settings->{'lclocalonly'} eq '1') {
-                $domlocalon = $domlocaloff;
-                $domlocaloff = ' ';
-            }
-            if ($settings->{'lcavailable'} eq '0') {
-                $domsrchoff = $domsrchon;
-                $domsrchon = ' ';
-            }
-        }
-        $datatable='<tr class="LC_odd_row">'.
-                      '<td colspan="2"><span class ="LC_nobreak">'.&mt('LON-CAPA directory search available?').'</span></td>'.
-                      '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
-                      '<input type="radio" name="dirsrch_domavailable"'.
-                      $domsrchon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
-                      '<label><input type="radio" name="dirsrch_domavailable"'.
-                      $domsrchoff.' value="0" />'.&mt('No').'</label></span></td>'.
-                      '</tr><tr>'.
-                      '<td colspan="2"><span class ="LC_nobreak">'.&mt('Other domains can search LON-CAPA domain?').'</span></td>'.
-                      '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
-                      '<input type="radio" name="dirsrch_domlocalonly"'.
-                      $domlocaloff.' value="0" />'.&mt('Yes').'</label>&nbsp;'.
-                      '<label><input type="radio" name="dirsrch_domlocalonly"'.
-                      $domlocalon.' value="1" />'.&mt('No').'</label></span></td>'.
-                      '</tr>';
-        $$rowtotal += 2;
+        $datatable .= '<tr>';
     }
+    $datatable .= '<td><span class ="LC_nobreak">'.&mt('Search latitude').'</span></td>'.   
+                  '<td class="LC_left_item" colspan="2">'.
+                  '<span class="LC_nobreak"><label>'.
+                  '<input type="checkbox" name="searchtypes" '.
+                  $exacton.' value="exact" />'.&mt('Exact match').
+                  '</label>&nbsp;'.
+                  '<label><input type="checkbox" name="searchtypes" '.
+                  $beginson.' value="begins" />'.&mt('Begins with').
+                  '</label>&nbsp;'.
+                  '<label><input type="checkbox" name="searchtypes" '.
+                  $containson.' value="contains" />'.&mt('Contains').
+                  '</label></span></td></tr>';
+    $$rowtotal ++;
     return $datatable;
 }
 
@@ -2882,98 +2686,24 @@ sub print_contacts {
 }
 
 sub print_helpsettings {
-    my ($position,$dom,$settings,$rowtotal) = @_;
-    my $confname = $dom.'-domainconfig';
+    my ($dom,$confname,$settings,$rowtotal) = @_;
     my ($datatable,$itemcount);
-    if ($position eq 'top') {
-        $itemcount = 1;
-        my (%choices,%defaultchecked,@toggles);
-        $choices{'submitbugs'} = &mt('Display link to: [_1]?',
-                                     &Apache::loncommon::modal_link('http://bugs.loncapa.org',
-                                     &mt('LON-CAPA bug tracker'),600,500));
-        %defaultchecked = ('submitbugs' => 'on');
-        @toggles = ('submitbugs');
-        ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
-                                                     \%choices,$itemcount);
-        $$rowtotal ++;
-    } else {
-        my $css_class;
-        my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_');
-        my %customroles;
-        foreach my $key (keys(%existing)) {
-            if ($key=~/^rolesdef\_(\w+)$/) {
-                my $rolename = $1;
-                my %privs;
-                ($privs{'system'},$privs{'domain'},$privs{'course'}) = split(/\_/,$existing{$key});
-                $customroles{$rolename} = \%privs;
-            }
-        }
-        my $count = 0;
-        my $context = 'domprefs';
-        my $crstype = 'Course';
-        foreach my $role (sort(keys(%customroles))) {
-            my $prefix = 'custhelp'.$count;
-            my %full=();
-            my %levels= (
-                         course => {},
-                         domain => {},
-                         system => {},
-                        );
-            my %levelscurrent=(
-                               course => {},
-                               domain => {},
-                               system => {},
-                              );
-            &Apache::lonuserutils::custom_role_privs($customroles{$role},\%full,\%levels,\%levelscurrent);
-            my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype);
-            $css_class = $itemcount%2?' class="LC_odd_row"':'';
-            $datatable .= '<tr '.$css_class.'><td><label>'.
-                          '<input type="checkbox" name="modifycusthelp" value="'.$count.'" />'.
-                          '<input type="hidden" name="custhelprole'.$count.'" value="'.$role.'" />'.
-                          &mt('Modify').'</label></td>'.
-                          '<td>'.&mt('Existing helpdesk role:').'&nbsp;'.
-                          '<b>'.$role.'</b><br />'.
-                          &Apache::lonuserutils::custom_role_header($context,$crstype,
-                                                                    \@templateroles,$prefix).
-                          &Apache::lonuserutils::custom_role_table($crstype,\%full,\%levels,
-                                                                   \%levelscurrent,$prefix).
-                          '<br /></td>';
-            $count ++;
-            $itemcount ++;
-        }
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        my $newcust = 'custhelp'.$count;
-        my (%privs,%levelscurrent);
-        my %full=();
-        my %levels= (
-                     course => {},
-                     domain => {},
-                     system => {},
-                    );
-        &Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent);
-        my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype);
-        $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak"><label>'.
-                      '<input type="checkbox" name="newcusthelp" value="'.$count.'" />'. &mt('Add').
-                      '</label></span></td>'.
-                      '<td><span class="LC_nobreak">'.
-                      '<b>'.&mt('Name of new helpdesk role:').'</b>&nbsp;'.
-                      '<input type="text" size="20" name="newcusthelpname" value="" />'.
-                      '</span><br />'.
-                      &Apache::lonuserutils::custom_role_header($context,$crstype,
-                                                                \@templateroles,$newcust).
-                      &Apache::lonuserutils::custom_role_table('Course',\%full,\%levels,
-                                                               \%levelscurrent,$newcust).
-                      '<br /><br />'.
-                      '</td></tr>';
-        $count ++;
-        $$rowtotal += $count;
-    }
+    $itemcount = 1;
+    my (%choices,%defaultchecked,@toggles);
+    $choices{'submitbugs'} = &mt('Display link to: [_1]?',
+                                 &Apache::loncommon::modal_link('http://bugs.loncapa.org',
+                                 &mt('LON-CAPA bug tracker'),600,500));
+    %defaultchecked = ('submitbugs' => 'on');
+    @toggles = ('submitbugs',);
+
+    ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
+                                                 \%choices,$itemcount);
     return $datatable;
 }
 
 sub radiobutton_prefs {
     my ($settings,$toggles,$defaultchecked,$choices,$itemcount,$onclick,
-        $additional,$align) = @_;
+        $additional) = @_;
     return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') &&
                    (ref($choices) eq 'HASH'));
 
@@ -3007,14 +2737,8 @@ sub radiobutton_prefs {
         $datatable .=
             '<tr'.$css_class.'><td valign="top">'.
             '<span class="LC_nobreak">'.$choices->{$item}.
-            '</span></td>';
-        if ($align eq 'left') {
-            $datatable .= '<td class="LC_left_item">';
-        } else {
-            $datatable .= '<td class="LC_right_item">';
-        }
-        $datatable .=
-            '<span class="LC_nobreak">'.
+            '</span></td>'.
+            '<td class="LC_right_item"><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.'" '.
@@ -3032,106 +2756,25 @@ 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 = (
-                            'uselcmath'       => 'on',
-                            'usejsme'         => 'on',
-                            'canclone'        => 'none',
-                          );
-        @toggles = ('uselcmath','usejsme');
+        %defaultchecked = ('canuse_pdfforms' => 'off');
+        @toggles = ('canuse_pdfforms');
         ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
-                                                     \%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 ++;
+                                                 \%choices,$itemcount);
     } else {
         $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
-        my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout,%currmysql);
+        my ($currdefresponder,$def_official_credits,$def_unofficial_credits,$def_textbook_credits,
+            %curruploadquota);
         my $currusecredits = 0;
-        my $postsubmitclient = 1;
         my @types = ('official','unofficial','community','textbook');
         if (ref($settings) eq 'HASH') {
             $currdefresponder = $settings->{'anonsurvey_threshold'};
@@ -3141,51 +2784,14 @@ sub print_coursedefaults {
                 }
             }
             if (ref($settings->{'coursecredits'}) eq 'HASH') {
-                foreach my $type (@types) {
-                    next if ($type eq 'community');
-                    $defcredits{$type} = $settings->{'coursecredits'}->{$type};
-                    if ($defcredits{$type} ne '') {
-                        $currusecredits = 1;
-                    }
+                $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;
                 }
             }
-            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'};
@@ -3225,14 +2831,21 @@ sub print_coursedefaults {
             $display = 'block';
         }
         my $additional = '<div id="credits" style="display: '.$display.'">'.
-                         '<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";
+                         '<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";
         %defaultchecked = ('coursecredits' => 'off');
         @toggles = ('coursecredits');
         my $current = {
@@ -3240,46 +2853,9 @@ sub print_coursedefaults {
                       };
         (my $table,$itemcount) =
             &radiobutton_prefs($current,\@toggles,\%defaultchecked,
-                               \%choices,$itemcount,$onclick,$additional,'left');
+                               \%choices,$itemcount,$onclick,$additional);
         $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;
@@ -3484,24 +3060,21 @@ sub print_validation_rows {
     }
     if ($caller eq 'requestcourses') {
         my %currhash;
-        if (ref($settings) eq 'HASH') {
-            if (ref($settings->{'validation'}) eq 'HASH') {
-                if ($settings->{'validation'}{'dc'} ne '') {
-                    $currhash{$settings->{'validation'}{'dc'}} = 1;
-                }
+        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 .= &mt('Course creation processed as: (choose Dom. Coord.)');
+            $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>';
         } else {
-            $datatable .=  &mt('Course creation processed as: ');
+            $datatable .= $dctable.'</td></tr>';
         }
-        $datatable .= '</td><td class="LC_left_item">'.$dctable.'</td></tr>';
         $itemcount ++;
     }
     if (ref($rowtotal)) {
@@ -3524,13 +3097,7 @@ sub print_usersessions {
     if ($position eq 'top') {
         if (keys(%serverhomes) > 1) {
             my %spareid = &current_offloads_to($dom,$settings,\%servers);
-            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);
+            $datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$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.');
@@ -3780,7 +3347,7 @@ sub current_offloads_to {
 }
 
 sub spares_row {
-    my ($dom,$servers,$spareid,$serverhomes,$altids,$curroffloadnow,$rowtotal) = @_;
+    my ($dom,$servers,$spareid,$serverhomes,$altids,$rowtotal) = @_;
     my $css_class;
     my $numinrow = 4;
     my $itemcount = 1;
@@ -3800,21 +3367,12 @@ 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>').'</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>'.
+                              ,'<b>'.$server.'</b>').
                           "\n";
             my (%current,%canselect);
             my @choices = 
@@ -4038,10 +3596,9 @@ sub print_loadbalancing {
                     $disabled = ' disabled="disabled"';
                 }
                 $targettable .=
-                    '<td><span class="LC_nobreak"><label>'.
-                    '<input type="checkbox" name="loadbalancing_target_'.$balnum.'_'.$sparetype.'"'.
+                    '<td><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></span></td>';
+                    '</span></label></td>';
                 my $rem = $i%($numinrow);
                 if ($rem == 0) {
                     if (($i > 0) && ($i < $numspares-1)) {
@@ -4131,7 +3688,7 @@ sub loadbalancing_rules {
             if (ref($currrules) eq 'HASH') {
                 $current = $currrules->{$type};
             }
-            if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) {
+            if (($type eq '_LC_external') || ($type eq '_LC_internetdom') || ($type eq '_LC_ipchange')) {
                 if ($dom ne &Apache::lonnet::host_domain($lonhost)) {
                     $current = '';
                 }
@@ -4183,7 +3740,7 @@ sub loadbalance_rule_row {
     my @rulenames;
     my %ruletitles = &offloadtype_text();
     if (($type eq '_LC_ipchangesso') || ($type eq '_LC_ipchange')) {
-        @rulenames = ('balancer','offloadedto','specific');
+        @rulenames = ('balancer','offloadedto');
     } else {
         @rulenames = ('default','homeserver');
         if ($type eq '_LC_external') {
@@ -4194,7 +3751,7 @@ sub loadbalance_rule_row {
         push(@rulenames,'none');
     }
     my $style = $targets_div_style;
-    if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) {
+    if (($type eq '_LC_external') || ($type eq '_LC_internetdom') || ($type eq '_LC_ipchange')) {
         $style = $homedom_div_style;
     }
     my $space;
@@ -4245,13 +3802,8 @@ 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;';
-        if (($rulenames[$i] eq 'specific') && ($type =~ /^_LC_ipchange/)) {
-            $output .= $ruletitles{'particular'};
-        } else {
-            $output .= $ruletitles{$rulenames[$i]};
-        }
-        $output .= '</label>'.$extra.'</span><br />'."\n";
+                   ')"'.$checked.' />&nbsp;'.$ruletitles{$rulenames[$i]}.
+                   '</label>'.$extra.'</span><br />'."\n";
     }
     $output .= '</div></td></tr>'."\n";
     return $output;
@@ -4266,7 +3818,6 @@ 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;
 }
@@ -4530,45 +4081,6 @@ 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);
@@ -4579,7 +4091,7 @@ sub print_selfcreation {
             foreach my $status (@{$types}) {
                 $datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'},
                                                        $numinrow,$$rowtotal,$usertypes);
-                $$rowtotal ++;
+            $$rowtotal ++;
             }
         }
     } else {
@@ -4625,8 +4137,8 @@ sub print_selfcreation {
         $additional .= '</div>'."\n";
 
         ($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
-                                                     \%choices,$$rowtotal,$onclick,$additional);
-        $$rowtotal ++;
+                                                     \%choices,$itemcount,$onclick,$additional);
+        $$rowtotal += $itemcount;
         $datatable .= &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal);
         $$rowtotal ++;
         my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
@@ -4707,8 +4219,7 @@ sub email_as_username {
 
 sub captcha_choice {
     my ($context,$settings,$itemcount) = @_;
-    my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext,
-        $vertext,$currver); 
+    my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext);
     my %lt = &captcha_phrases();
     $keyentry = 'hidden';
     if ($context eq 'cancreate') {
@@ -4726,11 +4237,6 @@ 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'};
@@ -4764,11 +4270,7 @@ 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><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".
+               $currpriv.'" size="40" /></span></td></tr></table>'."\n".
                '</td></tr>';
     return $output;
 }
@@ -4951,8 +4453,11 @@ sub print_defaults {
                 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);
+                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') {
@@ -5021,7 +4526,7 @@ sub print_defaults {
                     $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
                 }
                 $datatable .= '</select>&nbsp;'.&mt('Internal ID:').
-                              '<input type="text" size="10" name="addinststatus" value="" />'.
+                              '<input type="text" size="10" name="addinststatus" value="" /></span>'.
                               '&nbsp;'.&mt('(new)').
                               '</span></td><td class="LC_left_item"><span class="LC_nobreak">'.
                               &mt('Name displayed:').
@@ -5558,19 +5063,19 @@ sub serverstatus_pages {
     return ('userstatus','lonstatus','loncron','server-status','codeversions',
             'checksums','clusterstatus','metadata_keywords','metadata_harvest',
             'takeoffline','takeonline','showenv','toggledebug','ping','domconf',
-            'uniquecodes','diskusage','coursecatalog');
+            'uniquecodes','diskusage');
 }
 
 sub defaults_javascript {
     my ($settings) = @_;
-    return unless (ref($settings) eq 'HASH');
+    my ($output,$jstext); 
     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'}})."'".');';  
+        $jstext = '    var inststatuses = Array('."'".join("','",@{$settings->{'inststatusorder'}})."'".');';  
         return <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
@@ -5648,10 +5153,7 @@ sub coursecategories_javascript {
     }
     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);
+    my $choose_again = '\\n'.&mt('Please use a different name for the new top level category.'); 
     $output = <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
@@ -6166,7 +5668,6 @@ 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)) {
@@ -6209,7 +5710,22 @@ sub modify_login {
                             $changes{'loginvia'}{$lonhost} = 1;
                         }
                         if ($item eq 'exempt') {
-                            $new = &check_exempt_addresses($new);
+                            $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 = ''; 
+                            }
                         }
                         $loginhash{login}{loginvia}{$lonhost}{$item} = $new;
                     }
@@ -6321,85 +5837,6 @@ 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';
@@ -6500,25 +5937,6 @@ 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;
@@ -6550,18 +5968,11 @@ sub modify_login {
                         if (!$privkey) {
                             $chgtxt .= '<li>'.&mt('Private key deleted').'</li>';
                         } else {
-                            $chgtxt .= '<li>'.&mt('Private key set to [_1]',$privkey).'</li>';
+                            $chgtxt .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</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>';
                 }
@@ -6581,27 +5992,6 @@ 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 (
@@ -7403,35 +6793,29 @@ sub modify_quotas {
                 $confhash{'uniquecode'}{$type} = 1;
             }
         }
-        my (%newbook,%allpos);
+        my ($newbook,@allpos);
         if ($context eq 'requestcourses') {
-            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};
-                            }
+            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;
                         }
-                    } 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') {
@@ -7464,61 +6848,56 @@ sub modify_quotas {
                 $changes{'uniquecode'} = 1;
             }
             if ($context eq 'requestcourses') {
-                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;
-                                }
-                                if ($imgdeletions{$key}) {
-                                    $changes{$type}{$key} = 1;
+                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
-                                } 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; 
+                                }
+                                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 ($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'};
                             }
                         }
                     }
@@ -7533,49 +6912,43 @@ sub modify_quotas {
             }
         }
         if ($context eq 'requestcourses') {
-            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 ($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>';
                     }
                 }
-                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;
-                                        }
+            }
+            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;
                                     }
                                 }
                             }
-                            $idx ++;
                         }
+                        $idx ++;
                     }
                 }
             }
@@ -7587,14 +6960,10 @@ sub modify_quotas {
                         if (@{$confhash{'validation'}{$item}} > 0) {
                             @{$confhash{'validation'}{$item}} = sort(@{$confhash{'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}};
-                                }
+                        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}};
                             }
@@ -7615,15 +6984,9 @@ sub modify_quotas {
                                 $env{'form.requestcourses_validation_'.$item} =~ s/[\n\r\f]+/\s/gs;
                             }
                         }
-                        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};
-                                }
+                        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 '') {
@@ -7641,18 +7004,14 @@ sub modify_quotas {
                 }
             }
             if (ref($confhash{'validation'}) eq 'HASH') {
-                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'};
-                                }
+                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'};
@@ -7660,13 +7019,9 @@ sub modify_quotas {
                 } elsif ($confhash{'validation'}{'dc'} ne '') {
                     $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'};
                 }
-            } else {
-                if (ref($domconfig{'requestcourses'}) eq 'HASH') {
-                    if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
-                        if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
-                            $changes{'validation'}{'dc'} = &mt('None');
-                        }
-                    }
+            } elsif (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
+                if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
+                    $changes{'validation'}{'dc'} = &mt('None');
                 }
             }
         }
@@ -7810,7 +7165,7 @@ sub modify_quotas {
         $domdefaults{'requestauthor'} = \%confhash;
     } else {
         foreach my $key (keys(%confhash)) {
-            unless (($context eq 'requestcourses') && (($key eq 'textbooks') || ($key eq 'templates'))) {
+            unless (($context eq 'requestcourses') && ($key eq 'textbooks')) {
                 $domdefaults{$key} = $confhash{$key};
             }
         }
@@ -7962,33 +7317,27 @@ sub modify_quotas {
                                        '</li>';
                     }
                 }
-                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>';
+                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 />';
                         }
-                        $resulttext .= '</ul></li>';
+                        $resulttext .= ' '.&mt('LON-CAPA Course: [_1]',$coursetitle).'</li>';
                     }
+                    $resulttext .= '</ul></li>';
                 }
                 if (ref($changes{'validation'}) eq 'HASH') {
                     if ((ref($validationitemsref) eq 'ARRAY') && (ref($validationnamesref) eq 'HASH')) {
@@ -8036,7 +7385,7 @@ sub modify_quotas {
 }
 
 sub process_textbook_image {
-    my ($r,$dom,$confname,$caller,$cdom,$cnum,$type,$configuserok,$switchserver,$author_ok) = @_;
+    my ($r,$dom,$confname,$caller,$cdom,$cnum,$configuserok,$switchserver,$author_ok) = @_;
     my $filename = $env{'form.'.$caller.'.filename'};
     my ($error,$url);
     my ($width,$height) = (50,50);
@@ -8047,7 +7396,7 @@ sub process_textbook_image {
         } elsif ($author_ok eq 'ok') {
             my ($result,$imageurl) =
                 &publishlogo($r,'upload',$caller,$dom,$confname,
-                             "$type/$dom/$cnum/cover",$width,$height);
+                             "textbooks/$dom/$cnum/cover",$width,$height);
             if ($result eq 'ok') {
                 $url = $imageurl;
             } else {
@@ -8074,8 +7423,7 @@ 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)',
-                  failsafe => 'Failsafe for no drops if institutional data missing for a section');
+                  coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)');
     my @offon = ('off','on');
     my $sender_uname = $env{'form.sender_uname'};
     my $sender_domain = $env{'form.sender_domain'};
@@ -8085,17 +7433,11 @@ 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,
@@ -8122,10 +7464,7 @@ 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'}) {
@@ -8145,17 +7484,6 @@ 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');
@@ -8436,10 +7764,8 @@ sub modify_directorysrch {
             $currdirsrch{$key} = $domconfig{'directorysrch'}{$key};
         }
     }
-    my %title = ( available => 'Institutional directory search available',
-                  localonly => 'Other domains can search institution',
-                  lcavailable => 'LON-CAPA directory search available',
-                  lclocalonly => 'Other domains can search LON-CAPA domain',
+    my %title = ( available => 'Directory search available',
+                  localonly => 'Other domains can search',
                   searchby => 'Search types',
                   searchtypes => 'Search latitude');
     my @offon = ('off','on');
@@ -8513,9 +7839,7 @@ sub modify_directorysrch {
     my %dirsrch_hash =  (
             directorysrch => { available => $env{'form.dirsrch_available'},
                                cansearch => \@cansearch,
-                               localonly => $env{'form.dirsrch_instlocalonly'},
-                               lclocalonly => $env{'form.dirsrch_domlocalonly'},
-                               lcavailable => $env{'form.dirsrch_domavailable'},
+                               localonly => $env{'form.dirsrch_localonly'},
                                searchby => \@searchby,
                                searchtypes => \@searchtypes,
                              }
@@ -8532,47 +7856,24 @@ sub modify_directorysrch {
                 $changes{'available'} = 1;
             }
         }
-        if (exists($currdirsrch{'lcavailable'})) {
-             if ($currdirsrch{'lcavailable'} ne $env{'form.dirsrch_domavailable'}) {
-                 $changes{'lcavailable'} = 1;
-             }
-        } else {
-            if ($env{'form.dirsrch_lcavailable'} eq '1') {
-                $changes{'lcavailable'} = 1;
-            }
-        }
         if (exists($currdirsrch{'localonly'})) {
-            if ($currdirsrch{'localonly'} ne $env{'form.dirsrch_instlocalonly'}) {
-                $changes{'localonly'} = 1;
-            }
+             if ($currdirsrch{'localonly'} ne $env{'form.dirsrch_localonly'}) {
+                 $changes{'localonly'} = 1;
+             }
         } else {
-            if ($env{'form.dirsrch_instlocalonly'} eq '1') {
+            if ($env{'form.dirsrch_localonly'} eq '1') {
                 $changes{'localonly'} = 1;
             }
         }
-        if (exists($currdirsrch{'lclocalonly'})) {
-            if ($currdirsrch{'lclocalonly'} ne $env{'form.dirsrch_domlocalonly'}) {
-                $changes{'lclocalonly'} = 1;
-            }
-        } else {
-            if ($env{'form.dirsrch_domlocalonly'} eq '1') {
-                $changes{'lclocalonly'} = 1;
-            }
-        }
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made:').'<ul>';
             if ($changes{'available'}) {
                 $resulttext .= '<li>'.&mt("$title{'available'} set to: $offon[$env{'form.dirsrch_available'}]").'</li>';
             }
-            if ($changes{'lcavailable'}) {
-                $resulttext .= '<li>'.&mt("$title{'lcavailable'} set to: $offon[$env{'form.dirsrch_domavailable'}]").'</li>';
-            }
             if ($changes{'localonly'}) {
-                $resulttext .= '<li>'.&mt("$title{'localonly'} set to: $otherdoms[$env{'form.dirsrch_instlocalonly'}]").'</li>';
-            }
-            if ($changes{'lclocalonly'}) {
-                $resulttext .= '<li>'.&mt("$title{'lclocalonly'} set to: $otherdoms[$env{'form.dirsrch_domlocalonly'}]").'</li>';
+                $resulttext .= '<li>'.&mt("$title{'localonly'} set to: $otherdoms[$env{'form.dirsrch_localonly'}]").'</li>';
             }
+
             if (ref($changes{'cansearch'}) eq 'ARRAY') {
                 my $chgtext;
                 if (ref($usertypes) eq 'HASH') {
@@ -8623,7 +7924,7 @@ sub modify_directorysrch {
             }
             $resulttext .= '</ul>';
         } else {
-            $resulttext = &mt('No changes made to directory search settings');
+            $resulttext = &mt('No changes made to institution directory search settings');
         }
     } else {
         $resulttext = '<span class="LC_error">'.
@@ -8810,8 +8111,7 @@ 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 'recaptchaversion')) {
+                            ($item eq 'captcha') || ($item eq 'recaptchakeys')) {
                             $save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
                         } else {
                             $curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
@@ -9035,9 +8335,8 @@ 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 'recaptchaversion') ||
                             ($item eq 'emailusername') || ($item eq 'notify') ||
-                            ($item eq 'selfcreateprocessing') || ($item eq 'shibenv')) {
+                            ($item eq 'selfcreateprocessing')) {
                             $curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
                         } else {
                             $save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
@@ -9069,7 +8368,6 @@ sub modify_selfcreation {
     %{$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',
@@ -9114,7 +8412,7 @@ sub modify_selfcreation {
 # 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'}) {
+    if ($env{'form.cancreate_email'} eq 'email') {
         push(@contexts,'emailusername');
         if (ref($types) eq 'ARRAY') {
             foreach my $type (@{$types}) {
@@ -9187,7 +8485,6 @@ 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:
@@ -9232,27 +8529,6 @@ 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') {
@@ -9365,7 +8641,6 @@ 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'};
@@ -9376,9 +8651,6 @@ sub modify_selfcreation {
     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;
 
@@ -9421,22 +8693,6 @@ 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')) {
@@ -9527,29 +8783,23 @@ 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 />';
                                     }
                                 }
                             }
@@ -9651,22 +8901,16 @@ sub process_captcha {
             $changes->{'captcha'} = 1;
         }
     }
-    my ($newpub,$newpriv,$currpub,$currpriv,$newversion,$currversion);
+    my ($newpub,$newpriv,$currpub,$currpriv);
     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'};
@@ -9678,23 +8922,6 @@ 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') {
@@ -10137,7 +9364,7 @@ sub modify_scantron {
 }
 
 sub modify_coursecategories {
-    my ($dom,$lastactref,%domconfig) = @_;
+    my ($dom,%domconfig) = @_;
     my ($resulttext,%deletions,%reorderings,%needreordering,%adds,%changes,$errors,
         $cathash);
     my @deletecategory = &Apache::loncommon::get_env_multiple('form.deletecategory');
@@ -10378,20 +9605,6 @@ 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>';
@@ -10532,76 +9745,30 @@ sub modify_helpsettings {
     my %defaultchecked = ('submitbugs' => 'on');
     my @offon = ('off','on');
     my @toggles = ('submitbugs');
-    my %current = ('submitbugs' => '');
     if (ref($domconfig{'helpsettings'}) eq 'HASH') {
-        %current = %{$domconfig{'helpsettings'}};
-    }
-    foreach my $item (@toggles) {
-        if ($defaultchecked{$item} eq 'on') { 
-            if ($current{$item} eq '') {
-                if ($env{'form.'.$item} eq '0') {
-                    $changes{$item} = 1;
-                }
-            } elsif ($current{$item} ne $env{'form.'.$item}) {
-                $changes{$item} = 1;
-            }
-        } elsif ($defaultchecked{$item} eq 'off') {
-            if ($current{$item} eq '') {
-                if ($env{'form.'.$item} eq '1') {
+        foreach my $item (@toggles) {
+            if ($defaultchecked{$item} eq 'on') { 
+                if ($domconfig{'helpsettings'}{$item} eq '') {
+                    if ($env{'form.'.$item} eq '0') {
+                        $changes{$item} = 1;
+                    }
+                } elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) {
                     $changes{$item} = 1;
                 }
-            } elsif ($current{$item} ne $env{'form.'.$item}) {
-                $changes{$item} = 1;
-            }
-        }
-        if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) {
-            $helphash{'helpsettings'}{$item} = $env{'form.'.$item};
-        }
-    }
-
-    my @modify = &Apache::loncommon::get_env_multiple('form.modifycusthelp');
-    my $confname = $dom.'-domainconfig';
-    my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_');
-    if (@modify) {
-        foreach my $num (@modify) {
-            my $rolename = $env{'form.custhelprole'.$num};
-            if ($rolename ne '') {
-                if (exists($existing{'rolesdef_'.$rolename})) {
-                    my $prefix = 'custhelp'.$num;
-                    my %newprivs = &Apache::lonuserutils::custom_role_update($rolename,$prefix);
-                    my %currprivs;
-                    ($currprivs{'s'},$currprivs{'d'},$currprivs{'c'}) =
-                        split(/\_/,$existing{'rolesdef_'.$rolename});
-                    foreach my $level ('c','d','s') {
-                        if ($newprivs{$level} ne $currprivs{$level}) {
-                            $changes{'customrole'}{$rolename} = 1;
-                            my $result = &Apache::lonnet::definerole($rolename,$newprivs{'s'},$newprivs{'d'},
-                                                                     $newprivs{'c'},$confname,$dom);
-                            last;
-                        }
+            } elsif ($defaultchecked{$item} eq 'off') {
+                if ($domconfig{'helpsettings'}{$item} eq '') {
+                    if ($env{'form.'.$item} eq '1') {
+                        $changes{$item} = 1;
                     }
+                } elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) {
+                    $changes{$item} = 1;
                 }
             }
-        }
-    }
-    if ($env{'form.newcusthelp'} ne '') {
-        my $prefix = 'custhelp'.$env{'form.newcusthelp'};
-        my $rolename = $env{'form.newcusthelpname'};
-        $rolename=~s/[^A-Za-z0-9]//gs;
-        if ($rolename ne '') {
-            unless(exists($existing{'rolesdef_'.$rolename})) {
-                my $errmsg;
-                my $result = &Apache::lonuserutils::store_custom_role($rolename,$prefix,
-                                                                      $confname,$dom);
-                if ($result eq 'ok') {
-                    $changes{'newcustomrole'} = $rolename;
-                } else {
-                    $errmsg = ': '.$result;
-                }
+            if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) {
+                $helphash{'helpsettings'}{$item} = $env{'form.'.$item};
             }
         }
     }
-
     my $putresult;
     if (keys(%changes) > 0) {
         $putresult = &Apache::lonnet::put_dom('configuration',\%helphash,$dom);
@@ -10612,16 +9779,6 @@ sub modify_helpsettings {
                     $resulttext .= '<li>'.&mt('Display link to: [_1] set to "'.$offon[$env{'form.'.$item}].'".',
                                               &Apache::loncommon::modal_link('http://bugs.loncapa.org',
                                               &mt('LON-CAPA bug tracker'),600,500)).'</li>';
-                } elsif ($item eq 'customrole') {
-                    if (ref($changes{'customrole'}) eq 'HASH') {
-                        foreach my $role (sort(keys(%{$changes{'customrole'}}))) {
-                            $resulttext .= '<li>'.&mt('Existing custom role modified: [_1]',
-                                                     $role).'</li>';
-                        }
-                    }
-                } elsif ($item eq 'newcustomrole') {
-                    $resulttext .= '<li>'.&mt('New custom role added: [_1]',
-                                              $changes{'newcustomrole'}).'</li>';
                 }
             }
             $resulttext .= '</ul>';
@@ -10642,20 +9799,14 @@ sub modify_helpsettings {
 sub modify_coursedefaults {
     my ($dom,$lastactref,%domconfig) = @_;
     my ($resulttext,$errors,%changes,%defaultshash);
-    my %defaultchecked = (
-                           'uselcmath'       => 'on',
-                           'usejsme'         => 'on'
-                         );
-    my @toggles = ('uselcmath','usejsme');
+    my %defaultchecked = ('canuse_pdfforms' => 'off');
+    my @toggles = ('canuse_pdfforms');
     my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial',
-                   'uploadquota_community','uploadquota_textbook','mysqltables_official',
-                   'mysqltables_unofficial','mysqltables_community','mysqltables_textbook');
+                   'uploadquota_community','uploadquota_textbook');
     my @types = ('official','unofficial','community','textbook');
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
                            uploadquota          => 500,
-                           postsubmit           => 60,
-                           mysqltables          => 172800,
                          );
 
     $defaultshash{'coursedefaults'} = {};
@@ -10696,12 +9847,12 @@ sub modify_coursedefaults {
                 }
                 $defaultshash{'coursedefaults'}{$item} = $newdef;
             } else {
-                my ($setting,$type) = ($item =~ /^(uploadquota|mysqltables)_(\w+)$/);
-                if (ref($domconfig{'coursedefaults'}{$setting}) eq 'HASH') {
-                    $currdef = $domconfig{'coursedefaults'}{$setting}{$type};
+                my ($type) = ($item =~ /^\Quploadquota_\E(\w+)$/);
+                if (ref($domconfig{'coursedefaults'}{'uploadquota'}) eq 'HASH') {
+                    $currdef = $domconfig{'coursedefaults'}{'uploadquota'}{$type};
                 }
                 $newdef =~ s/[^\w.\-]//g;
-                $defaultshash{'coursedefaults'}{$setting}{$type} = $newdef;
+                $defaultshash{'coursedefaults'}{'uploadquota'}{$type} = $newdef;
             }
             if ($currdef ne $newdef) {
                 my $staticdef;
@@ -10709,125 +9860,34 @@ sub modify_coursedefaults {
                     unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) {
                         $changes{$item} = 1;
                     }
-                } elsif ($item =~ /^(uploadquota|mysqltables)_/) {
-                    my $setting = $1;
-                    unless (($currdef eq '') && ($newdef == $staticdefaults{$setting})) {
-                        $changes{$setting} = 1;
+                } else {
+                    unless (($currdef eq '') && ($newdef == $staticdefaults{'uploadquota'})) {
+                        $changes{'uploadquota'} = 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};
-            }
+
+        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;
         } else {
-            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;
-                        }
-                    }
-                }
+            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.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;
-            }
+        $defaultshash{'coursedefaults'}{'coursecredits'} = {
+            official   => $officialcreds,
+            unofficial => $unofficialcreds,
+            textbook   => $textbookcreds,
         }
     }
     my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
@@ -10835,31 +9895,19 @@ sub modify_coursedefaults {
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
             my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
-            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{'canuse_pdfforms'}) || ($changes{'coursecredits'}) || 
+                ($changes{'uploadquota'})) { 
+                if ($changes{'canuse_pdfforms'}) {
+                    $domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'};
                 }
                 if ($changes{'coursecredits'}) {
                     if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
-                        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};
-                            }
-                        }
+                        $domdefaults{'officialcredits'} =
+                            $defaultshash{'coursedefaults'}{'coursecredits'}{'official'};
+                        $domdefaults{'unofficialcredits'} =
+                            $defaultshash{'coursedefaults'}{'coursecredits'}{'unofficial'};
+                        $domdefaults{'textbookcredits'} =
+                            $domdefaults{'coursedefaults'}{'coursecredits'}{'textbook'};
                     }
                 }
                 if ($changes{'uploadquota'}) {
@@ -10869,18 +9917,6 @@ 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') {
@@ -10889,17 +9925,11 @@ sub modify_coursedefaults {
             }
             $resulttext = &mt('Changes made:').'<ul>';
             foreach my $item (sort(keys(%changes))) {
-                if ($item eq 'uselcmath') {
-                    if ($env{'form.'.$item} eq '1') {
-                        $resulttext .= '<li>'.&mt('Math preview uses LON-CAPA previewer (javascript), if supported by browser.').'</li>';
-                    } else {
-                        $resulttext .= '<li>'.&mt('Math preview uses DragMath (Java), if supported by client OS.').'</li>';
-                    }
-                } elsif ($item eq 'usejsme') {
+                if ($item eq 'canuse_pdfforms') {
                     if ($env{'form.'.$item} eq '1') {
-                        $resulttext .= '<li>'.&mt('Molecule editor uses JSME (HTML5), if supported by browser.').'</li>';
+                        $resulttext .= '<li>'.&mt("Course/Community users can create/upload PDF forms set to 'on'").'</li>';
                     } else {
-                        $resulttext .= '<li>'.&mt('Molecule editor uses JME (Java), if supported by client OS.').'</li>';
+                        $resulttext .= '<li>'.&mt('Course/Community users can create/upload PDF forms set to "off"').'</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>';
@@ -10916,54 +9946,6 @@ 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 '') &&
@@ -10981,17 +9963,6 @@ 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>';
@@ -11410,23 +10381,7 @@ 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') {
@@ -11437,27 +10392,8 @@ 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,
@@ -11470,9 +10406,6 @@ 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);
@@ -11541,21 +10474,6 @@ 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;
@@ -11577,7 +10495,6 @@ 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;
@@ -11669,10 +10586,7 @@ sub modify_loadbalancing {
                     $rule = $env{'form.loadbalancing_rules_'.$i.'_'.$type};
                 }
                 if ($rule eq 'specific') {
-                    my $specifiedhost = $env{'form.loadbalancing_singleserver_'.$i.'_'.$type};
-                    if (exists($servers{$specifiedhost})) {
-                        $rule = $specifiedhost;
-                    }
+                    $rule = $env{'form.loadbalancing_singleserver_'.$i.'_'.$type};
                 }
                 $defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type} = $rule;
                 if (ref($currrules{$balancer}) eq 'HASH') {
@@ -11694,22 +10608,20 @@ 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>';
-                        $toupdate{$balancer} = 1;
+                        my $cachekey = &escape('loadbalancing').':'.&escape($dom);
+                        &Apache::lonnet::remote_devalidate_cache($balancer,[$cachekey]);
                     }
                 }
                 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;
@@ -11746,38 +10658,8 @@ sub modify_loadbalancing {
                                         if ($rule eq '') {
                                             $balancetext =  $ruletitles{'default'};
                                         } elsif (($rule eq 'homeserver') || ($rule eq 'externalbalancer') ||
-                                                 ($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};
-                                            }
+                                                 ($rule eq 'balancer') || ($rule eq 'offloadedto')) {
+                                            $balancetext =  $ruletitles{$rule};
                                         } else {
                                             $balancetext = &mt('offload to [_1]',$defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type});
                                         }
@@ -11786,25 +10668,8 @@ sub modify_loadbalancing {
                                 }
                             }
                         }
-                        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]);
-                                }
-                            }
-                        }
+                        my $cachekey = &escape('loadbalancing').':'.&escape($dom);
+                        &Apache::lonnet::remote_devalidate_cache($balancer,[$cachekey]);
                     }
                 }
                 if ($resulttext ne '') {
@@ -11945,7 +10810,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.')';
             }
@@ -11954,9 +10819,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.')';
             }
@@ -12446,8 +11311,6 @@ 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 {
@@ -12468,16 +11331,6 @@ 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';
@@ -12486,16 +11339,11 @@ 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;
@@ -12518,18 +11366,9 @@ 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<optionsElement.length; i++) {
@@ -12537,8 +11376,8 @@ function toggleDisplay(domForm,caller) {
                    currval = optionsElement[i].value;
                 }
             }
-            if (currval == checkval) {
-                divitem.style.display = dispval;
+            if (currval == 1) {
+                divitem.style.display = 'block';
             } else {
                 divitem.style.display = 'none';
             }
@@ -12561,7 +11400,6 @@ sub captcha_phrases {
                  original  => 'original (CAPTCHA)',
                  recaptcha => 'successor (ReCAPTCHA)',
                  notused   => 'unused',
-                 ver => 'ReCAPTCHA version (1 or 2)',
     );
 }
 
@@ -12572,7 +11410,7 @@ sub devalidate_remote_domconfs {
     my %thismachine;
     map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
     my @posscached = ('domainconfig','domdefaults');
-    if (keys(%servers)) {
+    if (keys(%servers) > 1) {
         foreach my $server (keys(%servers)) {
             next if ($thismachine{$server});
             my @cached;