--- loncom/interface/domainprefs.pm	2016/08/07 00:28:39	1.160.6.68
+++ loncom/interface/domainprefs.pm	2013/08/07 14:41:39	1.201
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.68 2016/08/07 00:28:39 raeburn Exp $
+# $Id: domainprefs.pm,v 1.201 2013/08/07 14:41:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,7 +86,7 @@ $dom,$settings,$rowtotal,$action.
 
 $dom is the domain, $settings is a reference to a hash of current settings for
 the current context, $rowtotal is a reference to the scalar used to record the 
-number of rows displayed on the page, and $action is the context (quotas, 
+number of rows displayed on the page, and $action is the context (quotas,  
 requestcourses or requestauthor).
 
 The print_quotas routine was orginally created to display/store information
@@ -95,7 +95,7 @@ institutional affiliation in the domain
 but is now also used to manage availability of user tools: 
 i.e., blogs, aboutme page, and portfolios, and the course request tool,
 used by course owners to request creation of a course, and to display/store
-default quota sizes for Authoring Spaces.
+default quota sizes for authoring spaces.
 
 Outputs: 1
 
@@ -103,8 +103,8 @@ $datatable  - HTML containing form eleme
 
 In the case of course requests, radio buttons are displayed for each institutional
 affiliate type (and also default, and _LC_adv) for each of the course types 
-(official, unofficial, community, and textbook).  In each case the radio buttons 
-allow the selection of one of four values:
+(official, unofficial and community).  In each case the radio buttons allow the 
+selection of one of four values:
 
 0, approval, validate, autolimit=N (where N is blank, or a positive integer).
 which have the following effects:
@@ -164,8 +164,6 @@ use Apache::lonhtmlcommon();
 use Apache::lonlocal;
 use Apache::lonmsg();
 use Apache::lonconfigsettings;
-use Apache::lonuserutils();
-use Apache::loncoursequeueadmin();
 use LONCAPA qw(:DEFAULT :match);
 use LONCAPA::Enrollment;
 use LONCAPA::lonauthcgi();
@@ -213,15 +211,15 @@ sub handler {
                 'quotas','autoenroll','autoupdate','autocreate',
                 'directorysrch','usercreation','usermodification',
                 'contacts','defaults','scantron','coursecategories',
-                'serverstatuses','requestcourses','coursedefaults',
-                'usersessions','loadbalancing','requestauthor',
-                'selfenrollment','inststatus'],$dom);
+                'serverstatuses','requestcourses','helpsettings',
+                'coursedefaults','usersessions','loadbalancing',
+                'requestauthor'],$dom);
     my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
                        'autoupdate','autocreate','directorysrch','contacts',
-                       'usercreation','selfcreation','usermodification','scantron',
+                       'usercreation','usermodification','scantron',
                        'requestcourses','requestauthor','coursecategories',
-                       'serverstatuses','coursedefaults','selfenrollment',
-                       'usersessions');
+                       'serverstatuses','helpsettings',
+                       'coursedefaults','usersessions');
     my %existing;
     if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
         %existing = %{$domconfig{'loadbalancing'}};
@@ -241,8 +239,6 @@ sub handler {
                                  col2 => '',},
                                 {col1 => 'Administrator Settings',
                                  col2 => '',}],
-                      print => \&print_rolecolors,
-                      modify => \&modify_rolecolors,
                     },
         'login' =>
                     { text => 'Log-in page options',
@@ -250,38 +246,26 @@ sub handler {
                       header => [{col1 => 'Log-in Page Items',
                                   col2 => '',},
                                  {col1 => 'Log-in Help',
-                                  col2 => 'Value'},
-                                 {col1 => 'Custom HTML in document head',
                                   col2 => 'Value'}],
-                      print => \&print_login,
-                      modify => \&modify_login,
                     },
         'defaults' => 
-                    { text => 'Default authentication/language/timezone/portal/types',
+                    { text => 'Default authentication/language/timezone/portal',
                       help => 'Domain_Configuration_LangTZAuth',
                       header => [{col1 => 'Setting',
-                                  col2 => 'Value'},
-                                 {col1 => 'Institutional user types',
-                                  col2 => 'Assignable to e-mail usernames'}],
-                      print => \&print_defaults,
-                      modify => \&modify_defaults,
+                                  col2 => 'Value'}],
                     },
         'quotas' => 
                     { text => 'Blogs, personal web pages, webDAV/quotas, portfolios',
                       help => 'Domain_Configuration_Quotas',
                       header => [{col1 => 'User affiliation',
                                   col2 => 'Available tools',
-                                  col3 => 'Quotas, MB; (Authoring requires role)',}],
-                      print => \&print_quotas,
-                      modify => \&modify_quotas,
+                                  col3 => 'Quotas, Mb; (Authoring requires role)',}],
                     },
         'autoenroll' =>
                    { text => 'Auto-enrollment settings',
                      help => 'Domain_Configuration_Auto_Enrollment',
                      header => [{col1 => 'Configuration setting',
                                  col2 => 'Value(s)'}],
-                     print => \&print_autoenroll,
-                     modify => \&modify_autoenroll,
                    },
         'autoupdate' => 
                    { text => 'Auto-update settings',
@@ -291,34 +275,27 @@ sub handler {
                                 {col1 => 'Setting',
                                  col2 => 'Affiliation'},
                                 {col1 => 'User population',
-                                 col2 => 'Updatable user data'}],
-                     print => \&print_autoupdate,
-                     modify => \&modify_autoupdate,
+                                 col2 => 'Updateable user data'}],
                   },
         'autocreate' => 
                   { text => 'Auto-course creation settings',
                      help => 'Domain_Configuration_Auto_Creation',
                      header => [{col1 => 'Configuration Setting',
                                  col2 => 'Value',}],
-                     print => \&print_autocreate,
-                     modify => \&modify_autocreate,
                   },
         'directorysrch' => 
                   { text => 'Institutional directory searches',
                     help => 'Domain_Configuration_InstDirectory_Search',
                     header => [{col1 => 'Setting',
                                 col2 => 'Value',}],
-                    print => \&print_directorysrch,
-                    modify => \&modify_directorysrch,
                   },
         'contacts' =>
                   { text => 'Contact Information',
                     help => 'Domain_Configuration_Contact_Info',
                     header => [{col1 => 'Setting',
                                 col2 => 'Value',}],
-                    print => \&print_contacts,
-                    modify => \&modify_contacts,
                   },
+
         'usercreation' => 
                   { text => 'User creation',
                     help => 'Domain_Configuration_User_Creation',
@@ -328,30 +305,16 @@ sub handler {
                                 col2 => 'Usernames which may be created',},
                                {col1 => 'Context',
                                 col2 => 'Assignable authentication types'}],
-                    print => \&print_usercreation,
-                    modify => \&modify_usercreation,
-                  },
-        'selfcreation' => 
-                  { text => 'Users self-creating accounts',
-                    help => 'Domain_Configuration_Self_Creation', 
-                    header => [{col1 => 'Self-creation with institutional username',
-                                col2 => 'Enabled?'},
-                               {col1 => 'Institutional user type (login/SSO self-creation)',
-                                col2 => 'Information user can enter'},
-                               {col1 => 'Self-creation with e-mail as username',
-                                col2 => 'Settings'}],
-                    print => \&print_selfcreation,
-                    modify => \&modify_selfcreation,
                   },
         'usermodification' =>
                   { text => 'User modification',
                     help => 'Domain_Configuration_User_Modification',
                     header => [{col1 => 'Target user has role',
-                                col2 => 'User information updatable in author context'},
+                                col2 => 'User information updateable in author context'},
                                {col1 => 'Target user has role',
-                                col2 => 'User information updatable in course context'}],
-                    print => \&print_usermodification,
-                    modify => \&modify_usermodification,
+                                col2 => 'User information updateable in course context'},
+                               {col1 => "Status of user",
+                                col2 => 'Information settable when self-creating account (if directory data blank)'}],
                   },
         'scantron' =>
                   { text => 'Bubblesheet format file',
@@ -359,8 +322,6 @@ sub handler {
                     header => [ {col1 => 'Item',
                                  col2 => '',
                               }],
-                    print => \&print_scantron,
-                    modify => \&modify_scantron,
                   },
         'requestcourses' => 
                  {text => 'Request creation of courses',
@@ -368,38 +329,24 @@ sub handler {
                   header => [{col1 => 'User affiliation',
                               col2 => 'Availability/Processing of requests',},
                              {col1 => 'Setting',
-                              col2 => 'Value'},
-                             {col1 => 'Available textbooks',
-                              col2 => ''},
-                             {col1 => 'Available templates',
-                              col2 => ''},
-                             {col1 => 'Validation (not official courses)',
-                              col2 => 'Value'},],
-                  print => \&print_quotas,
-                  modify => \&modify_quotas,
+                              col2 => 'Value'}],
                  },
         'requestauthor' =>
-                 {text => 'Request Authoring Space',
+                 {text => 'Request authoring space',
                   help => 'Domain_Configuration_Request_Author',
                   header => [{col1 => 'User affiliation',
                               col2 => 'Availability/Processing of requests',},
                              {col1 => 'Setting',
                               col2 => 'Value'}],
-                  print => \&print_quotas,
-                  modify => \&modify_quotas,
                  },
         'coursecategories' =>
                   { text => 'Cataloging of courses/communities',
                     help => 'Domain_Configuration_Cataloging_Courses',
-                    header => [{col1 => 'Catalog type/availability',
-                                col2 => '',},
-                               {col1 => 'Category settings for standard catalog',
+                    header => [{col1 => 'Category settings',
                                 col2 => '',},
                                {col1 => 'Categories',
                                 col2 => '',
                                }],
-                    print => \&print_coursecategories,
-                    modify => \&modify_coursecategories,
                   },
         'serverstatuses' =>
                  {text   => 'Access to server status pages',
@@ -408,8 +355,12 @@ sub handler {
                               col2 => 'Other named users',
                               col3 => 'Specific IPs',
                             }],
-                  print => \&print_serverstatuses,
-                  modify => \&modify_serverstatuses,
+                 },
+        'helpsettings' =>
+                 {text   => 'Help page settings',
+                  help   => 'Domain_Configuration_Help_Settings',
+                  header => [{col1 => 'Help Settings (logged-in users)',
+                              col2 => 'Value'}],
                  },
         'coursedefaults' => 
                  {text => 'Course/Community defaults',
@@ -418,20 +369,12 @@ sub handler {
                               col2 => 'Value',},
                              {col1 => 'Defaults which can be overridden for each course by a DC',
                               col2 => 'Value',},],
-                  print => \&print_coursedefaults,
-                  modify => \&modify_coursedefaults,
                  },
-        'selfenrollment' => 
-                 {text   => 'Self-enrollment in Course/Community',
-                  help   => 'Domain_Configuration_Selfenrollment',
-                  header => [{col1 => 'Configuration Rights',
-                              col2 => 'Configured by Course Personnel or Domain Coordinator?'},
-                             {col1 => 'Defaults',
-                              col2 => 'Value'},
-                             {col1 => 'Self-enrollment validation (optional)',
-                              col2 => 'Value'},],
-                  print => \&print_selfenrollment,
-                  modify => \&modify_selfenrollment,
+        'privacy' => 
+                 {text   => 'User Privacy',
+                  help   => 'Domain_Configuration_User_Privacy',
+                  header => [{col1 => 'Setting',
+                              col2 => 'Value',}],
                  },
         'usersessions' =>
                  {text  => 'User session hosting/offloading',
@@ -442,8 +385,6 @@ sub handler {
                               col2 => 'Rules'},
                              {col1 => "Hosting domain's own users elsewhere",
                               col2 => 'Rules'}],
-                  print => \&print_usersessions,
-                  modify => \&modify_usersessions,
                  },
          'loadbalancing' =>
                  {text  => 'Dedicated Load Balancer(s)',
@@ -453,8 +394,6 @@ sub handler {
                               col3 => 'User affiliation',
                               col4 => 'Overrides'},
                             ],
-                  print => \&print_loadbalancing,
-                  modify => \&modify_loadbalancing,
                  },
     );
     if (keys(%servers) > 1) {
@@ -465,11 +404,7 @@ 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,
                            };
     }
 
@@ -481,15 +416,10 @@ sub handler {
     my $confname = $dom.'-domainconfig';
 
     if ($phase eq 'process') {
-        my $result = &Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,
-                                                              \%prefs,\%domconfig,$confname,\@roles);
-        if ((ref($result) eq 'HASH') && (keys(%{$result}))) {
-            $r->rflush();
-            &devalidate_remote_domconfs($dom,$result);
-        }
+        &Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,\@roles);
     } elsif ($phase eq 'display') {
         my $js = &recaptcha_js().
-                 &toggle_display_js();
+                 &credits_js();
         if ((keys(%servers) > 1) || (keys(%existing) > 0)) {
             my ($othertitle,$usertypes,$types) =
                 &Apache::loncommon::sorted_inst_types($dom);
@@ -499,16 +429,6 @@ sub handler {
                    &common_domprefs_js().
                    &Apache::loncommon::javascript_array_indexof();
         }
-        if (grep(/^requestcourses$/,@actions)) {
-            my $javascript_validations;
-            my $coursebrowserjs=&Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'}); 
-            $js .= <<END;
-<script type="text/javascript">
-$javascript_validations
-</script>
-$coursebrowserjs
-END
-        }
         &Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,$js);
     } else {
 # check if domconfig user exists for the domain.
@@ -518,7 +438,7 @@ END
         unless ($configuserok eq 'ok') {
             &Apache::lonconfigsettings::print_header($r,$phase,$context);
             $r->print(&mt('The domain configuration user "[_1]" has yet to be created.',
-                          $confname).
+                           $confname).
                       '<br />'
             );
             if ($switchserver) {
@@ -578,21 +498,21 @@ END
 }
 
 sub process_changes {
-    my ($r,$dom,$confname,$action,$roles,$values,$lastactref) = @_;
+    my ($r,$dom,$confname,$action,$roles,$values) = @_;
     my %domconfig;
     if (ref($values) eq 'HASH') {
         %domconfig = %{$values};
     }
     my $output;
     if ($action eq 'login') {
-        $output = &modify_login($r,$dom,$confname,$lastactref,%domconfig);
+        $output = &modify_login($r,$dom,$confname,%domconfig);
     } elsif ($action eq 'rolecolors') {
         $output = &modify_rolecolors($r,$dom,$confname,$roles,
-                                     $lastactref,%domconfig);
+                                     %domconfig);
     } elsif ($action eq 'quotas') {
-        $output = &modify_quotas($r,$dom,$action,$lastactref,%domconfig);
+        $output = &modify_quotas($dom,$action,%domconfig);
     } elsif ($action eq 'autoenroll') {
-        $output = &modify_autoenroll($dom,$lastactref,%domconfig);
+        $output = &modify_autoenroll($dom,%domconfig);
     } elsif ($action eq 'autoupdate') {
         $output = &modify_autoupdate($dom,%domconfig);
     } elsif ($action eq 'autocreate') {
@@ -601,30 +521,28 @@ sub process_changes {
         $output = &modify_directorysrch($dom,%domconfig);
     } elsif ($action eq 'usercreation') {
         $output = &modify_usercreation($dom,%domconfig);
-    } elsif ($action eq 'selfcreation') {
-        $output = &modify_selfcreation($dom,%domconfig);
     } elsif ($action eq 'usermodification') {
         $output = &modify_usermodification($dom,%domconfig);
     } elsif ($action eq 'contacts') {
-        $output = &modify_contacts($dom,$lastactref,%domconfig);
+        $output = &modify_contacts($dom,%domconfig);
     } elsif ($action eq 'defaults') {
-        $output = &modify_defaults($dom,$lastactref,%domconfig);
+        $output = &modify_defaults($dom,$r);
     } elsif ($action eq 'scantron') {
-        $output = &modify_scantron($r,$dom,$confname,$lastactref,%domconfig);
+        $output = &modify_scantron($r,$dom,$confname,%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') {
-        $output = &modify_quotas($r,$dom,$action,$lastactref,%domconfig);
+        $output = &modify_quotas($dom,$action,%domconfig);
     } elsif ($action eq 'requestauthor') {
-        $output = &modify_quotas($r,$dom,$action,$lastactref,%domconfig);
+        $output = &modify_quotas($dom,$action,%domconfig);
+    } elsif ($action eq 'helpsettings') {
+        $output = &modify_helpsettings($r,$dom,$confname,%domconfig);
     } elsif ($action eq 'coursedefaults') {
-        $output = &modify_coursedefaults($dom,$lastactref,%domconfig);
-    } elsif ($action eq 'selfenrollment') {
-        $output = &modify_selfenrollment($dom,$lastactref,%domconfig)
+        $output = &modify_coursedefaults($dom,%domconfig);
     } elsif ($action eq 'usersessions') {
-        $output = &modify_usersessions($dom,$lastactref,%domconfig);
+        $output = &modify_usersessions($dom,%domconfig);
     } elsif ($action eq 'loadbalancing') {
         $output = &modify_loadbalancing($dom,%domconfig);
     }
@@ -637,10 +555,8 @@ sub print_config_box {
     my $output;
     if ($action eq 'coursecategories') {
         $output = &coursecategories_javascript($settings);
-    } elsif ($action eq 'defaults') {
-        $output = &defaults_javascript($settings); 
     }
-    $output .=
+    $output .= 
          '<table class="LC_nested_outer">
           <tr>
            <th align="left" valign="middle"><span class="LC_nobreak">'.
@@ -655,8 +571,8 @@ sub print_config_box {
     if ($numheaders > 1) {
         my $colspan = '';
         my $rightcolspan = '';
-        if (($action eq 'rolecolors') || ($action eq 'defaults') ||
-            (($action eq 'login') && ($numheaders < 4))) {
+        if (($action eq 'rolecolors') || ($action eq 'coursecategories') || 
+            (($action eq 'login') && ($numheaders < 3))) {
             $colspan = ' colspan="2"';
         }
         if ($action eq 'usersessions') {
@@ -671,23 +587,31 @@ sub print_config_box {
               <td class="LC_right_item"'.$rightcolspan.'>'.&mt($item->{'header'}->[0]->{'col2'}).'</td>
              </tr>';
         $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')) {
-            $output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal);
+        if ($action eq 'autoupdate') {
+            $output .= &print_autoupdate('top',$dom,$settings,\$rowtotal);
+        } elsif ($action eq 'usercreation') {
+            $output .= &print_usercreation('top',$dom,$settings,\$rowtotal);
+        } elsif ($action eq 'usermodification') {
+            $output .= &print_usermodification('top',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'coursecategories') {
-            $output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal);
+            $output .= &print_coursecategories('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 {
                 $output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal);
             }
-        } elsif (($action eq 'requestcourses') || ($action eq 'requestauthor')) {
+        } elsif ($action eq 'requestcourses') {
+            $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
+        } elsif ($action eq 'requestauthor') {
             $output .= &print_quotas($dom,$settings,\$rowtotal,$action);
+        } elsif ($action eq 'usersessions') {
+            $output .= &print_usersessions('top',$dom,$settings,\$rowtotal); 
         } elsif ($action eq 'rolecolors') {
             $output .= &print_rolecolors($phase,'student',$dom,$confname,$settings,\$rowtotal);
+        } elsif ($action eq 'coursedefaults') {
+            $output .= &print_coursedefaults('top',$dom,$settings,\$rowtotal);
         }
         $output .= '
            </table>
@@ -697,20 +621,13 @@ sub print_config_box {
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
-              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[1]->{'col1'}).'</td>
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[1]->{'col1'}).'</td>';
+        $output .= '
               <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[1]->{'col2'}).'</td>
              </tr>';
             $rowtotal ++;
-        if (($action eq 'autoupdate') || ($action eq 'usercreation') ||
-            ($action eq 'selfcreation') || ($action eq 'selfenrollment') ||
-            ($action eq 'usersessions') || ($action eq 'coursecategories')) {
-            if ($action eq 'coursecategories') {
-                $output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal);
-                $colspan = ' colspan="2"';
-            } else {
-                $output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal);
-            }
-            $output .= '
+        if ($action eq 'autoupdate') {
+            $output .= &print_autoupdate('middle',$dom,$settings,\$rowtotal).'
            </table>
           </td>
          </tr>
@@ -719,20 +636,11 @@ sub print_config_box {
             <table class="LC_nested">
              <tr class="LC_info_row">
               <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
-              <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>
-             </tr>'."\n";
-            if ($action eq 'coursecategories') {
-                $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
-            } else {
-                $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
-            }
+              <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>      </tr>'.
+            &print_autoupdate('bottom',$dom,$settings,\$rowtotal);
             $rowtotal ++;
-        } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') ||
-                  ($action eq 'defaults')) {
-            $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
-        } elsif ($action eq 'login') {
-            if ($numheaders == 4) {
-                $output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).'
+        } elsif ($action eq 'usercreation') {
+            $output .= &print_usercreation('middle',$dom,$settings,\$rowtotal).'
            </table>
           </td>
          </tr>
@@ -741,37 +649,27 @@ sub print_config_box {
             <table class="LC_nested">
              <tr class="LC_info_row">
               <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
-              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col2'}).'</td></tr>'.
-                       &print_login('help',$dom,$confname,$phase,$settings,\$rowtotal);
-                $rowtotal ++;
-            } else {
-                $output .= &print_login('help',$dom,$confname,$phase,$settings,\$rowtotal);
-            }
-            $output .= '
+              <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>             </tr>'.
+            &print_usercreation('bottom',$dom,$settings,\$rowtotal);
+            $rowtotal ++;
+        } elsif ($action eq 'usermodification') {
+            $output .= &print_usermodification('middle',$dom,$settings,\$rowtotal).'
            </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 .= '
+             <tr class="LC_info_row">
               <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);
+              <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>      </tr>'.
+                       &print_usermodification('bottom',$dom,$settings,\$rowtotal);
             $rowtotal ++;
-            $output .= &print_studentcode($settings,\$rowtotal).'
+        } elsif ($action eq 'coursecategories') {
+            $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
+        } elsif ($action eq 'login') {
+            if ($numheaders == 3) {
+                $output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).'
            </table>
           </td>
          </tr>
@@ -780,33 +678,31 @@ sub print_config_box {
             <table class="LC_nested">
              <tr class="LC_info_row">
               <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
-              <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td> </tr>'.
-                       &textbookcourses_javascript($settings).
-                       &print_textbookcourses($dom,'textbooks',$settings,\$rowtotal).'
-            </table>
-           </td>
-          </tr>
+              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col2'}).'</td>      </tr>'.
+                       &print_login('help',$dom,$confname,$phase,$settings,\$rowtotal);
+                $rowtotal ++;
+            } else {
+                $output .= &print_login('help',$dom,$confname,$phase,$settings,\$rowtotal);
+            }
+        } elsif ($action eq 'requestcourses') {
+            $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
+        } elsif ($action eq 'requestauthor') {
+            $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
+        } elsif ($action eq 'usersessions') {
+            $output .= &print_usersessions('middle',$dom,$settings,\$rowtotal).'
+           </table>
+          </td>
+         </tr>
          <tr>
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
-              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
-              <td class="LC_right_item">'.&mt($item->{'header'}->[3]->{'col2'}).'</td> </tr>'.
-                       &print_textbookcourses($dom,'templates',$settings,\$rowtotal).'
-            </table>
-           </td>
-          </tr>
-          <tr>
-           <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>
-             </tr>'.
-            &print_validation_rows('requestcourses',$dom,$settings,\$rowtotal);
-        } elsif ($action eq 'requestauthor') {
-            $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
+              <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>      </tr>'.
+                       &print_usersessions('bottom',$dom,$settings,\$rowtotal);
             $rowtotal ++;
+        } elsif ($action eq 'coursedefaults') {
+            $output .= &print_coursedefaults('bottom',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'rolecolors') {
             $output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).'
            </table>
@@ -885,13 +781,24 @@ 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 'directorysrch') ||
-                 ($action eq 'contacts') || ($action eq 'serverstatuses') || ($action eq 'loadbalancing')) {
-            $output .= $item->{'print'}->($dom,$settings,\$rowtotal);
+        } elsif ($action eq 'autoenroll') {
+            $output .= &print_autoenroll($dom,$settings,\$rowtotal);
+        } elsif ($action eq 'autocreate') {
+            $output .= &print_autocreate($dom,$settings,\$rowtotal);
+        } elsif ($action eq 'directorysrch') {
+            $output .= &print_directorysrch($dom,$settings,\$rowtotal);
+        } elsif ($action eq 'contacts') {
+            $output .= &print_contacts($dom,$settings,\$rowtotal);
+        } elsif ($action eq 'defaults') {
+            $output .= &print_defaults($dom,\$rowtotal);
         } elsif ($action eq 'scantron') {
             $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
+        } elsif ($action eq 'serverstatuses') {
+            $output .= &print_serverstatuses($dom,$settings,\$rowtotal);
         } elsif ($action eq 'helpsettings') {
             $output .= &print_helpsettings($dom,$confname,$settings,\$rowtotal);
+        } elsif ($action eq 'loadbalancing') {
+            $output .= &print_loadbalancing($dom,$settings,\$rowtotal);
         }
     }
     $output .= '
@@ -1188,57 +1095,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;
 }
@@ -1272,9 +1128,6 @@ sub login_choices {
             link          => "Link",
             alink         => "Active link",
             vlink         => "Visited link",
-            headtag       => "Custom markup",
-            action        => "Action",
-            current       => "Current",
         );
     return %choices;
 }
@@ -1352,8 +1205,8 @@ sub print_rolecolors {
 
 sub role_defaults {
     my ($role,$bgs,$links,$images,$logintext) = @_;
-    my %defaults;
-    unless ((ref($bgs) eq 'ARRAY') && (ref($links) eq 'ARRAY') && (ref($images) eq 'ARRAY')) {
+    my %defaults; 
+    unless ((ref($bgs) eq 'ARRAY') && (ref($links) eq 'ARRAY') && (ref($images) eq 'ARRAY')) { 
         return %defaults;
     }
     my %defaultdesign = %Apache::loncommon::defaultdesign;
@@ -1404,7 +1257,7 @@ sub display_color_options {
 
     $datatable .= '<td><span class="LC_nobreak">'.
                   '<input type="text" class="colorchooser" size="10" name="'.$role.'_font"'.
-                  ' value="'.$current_color.'" />&nbsp;'.
+                  ' value="'.$current_color.'" />&nbsp;'. 
                   '&nbsp;</td></tr>';
     unless ($role eq 'login') { 
         $datatable .= '<tr'.$css_class.'>'.
@@ -1414,7 +1267,7 @@ sub display_color_options {
         } else {
             $datatable .= '<td>&nbsp;</td>';
         }
-	$current_color = $designs->{'fontmenu'} ?
+	$current_color = $designs->{'fontmenu'} ? 
 	    $designs->{'fontmenu'} : $defaults->{'fontmenu'};
         $datatable .= '<td><span class="LC_nobreak">'.
                       '<input class="colorchooser" type="text" size="10" name="'
@@ -1576,8 +1429,9 @@ sub display_color_options {
     $datatable .= '<td class="LC_right_item">'.
                   '<table border="0"><tr>';
     foreach my $item (@{$links}) {
-	my $color = $designs->{'links'}{$item} ? $designs->{'links'}{$item} : $defaults->{'links'}{$item};
+	my $color = $designs->{'link'}{$item} ? $designs->{'link'}{$item} : $defaults->{'links'}{$item};
         $datatable .= '<td align="center">'.$choices->{$item}."\n";
+
         if ($designs->{'links'}{$item}) {
             $datatable.='&nbsp;';
         }
@@ -1642,6 +1496,7 @@ sub login_text_colors {
         my $color = $designs->{'logintext'}{$item} ? $designs->{'logintext'}{$item} : $defaults->{'logintext'}{$item};
         $color_menu .= '<br /><input type="text" class="colorchooser" size="8" name="'.$role.'_'.$item.'" value="'.$color.
                       '" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>';
+
     }
     $color_menu .= '</tr></table><br />';
     return $color_menu;
@@ -1692,14 +1547,14 @@ sub print_quotas {
     my $typecount = 0;
     my ($css_class,%titles);
     if ($context eq 'requestcourses') {
-        @usertools = ('official','unofficial','community','textbook');
+        @usertools = ('official','unofficial','community');
         @options =('norequest','approval','validate','autolimit');
         %validations = &Apache::lonnet::auto_courserequest_checks($dom);
         %titles = &courserequest_titles();
     } elsif ($context eq 'requestauthor') {
         @usertools = ('author');
         @options = ('norequest','approval','automatic');
-        %titles = &authorrequest_titles();
+        %titles = &authorrequest_titles(); 
     } else {
         @usertools = ('aboutme','blog','webdav','portfolio');
         %titles = &tool_titles();
@@ -2106,299 +1961,42 @@ sub print_quotas {
 
 sub print_requestmail {
     my ($dom,$action,$settings,$rowtotal) = @_;
-    my ($now,$datatable,%currapp);
+    my ($now,$datatable,%currapp,$rows);
     $now = time;
     if (ref($settings) eq 'HASH') {
         if (ref($settings->{'notify'}) eq 'HASH') {
             if ($settings->{'notify'}{'approval'} ne '') {
-                map {$currapp{$_}=1;} split(/,/,$settings->{'notify'}{'approval'});
+               map {$currapp{$_}=1;} split(/,/,$settings->{'notify'}{'approval'});
             }
         }
     }
     my $numinrow = 2;
-    my $css_class;
-    $css_class = ($$rowtotal%2? ' class="LC_odd_row"':'');
+    my $css_class = 'class="LC_odd_row"';
     my $text;
     if ($action eq 'requestcourses') {
         $text = &mt('Receive notification of course requests requiring approval');
-    } elsif ($action eq 'requestauthor') {
-        $text = &mt('Receive notification of Authoring Space requests requiring approval');
     } else {
-       $text = &mt('Receive notification of queued requests for self-created user accounts requiring approval');
+        $text = &mt('Receive notification of authoring space requests requiring approval')
     }
-    $datatable = '<tr'.$css_class.'>'.
+    $datatable = '<tr '.$css_class.'>'.
                  ' <td>'.$text.'</td>'.
                  ' <td class="LC_left_item">';
     my ($numdc,$table,$rows) = &active_dc_picker($dom,$numinrow,'checkbox',
-                                                 $action.'notifyapproval',%currapp);
+                                                 'reqapprovalnotify',%currapp);
     if ($numdc > 0) {
         $datatable .= $table;
     } else {
         $datatable .= &mt('There are no active Domain Coordinators');
     }
     $datatable .='</td></tr>';
+    $$rowtotal += $rows;
     return $datatable;
 }
 
-sub print_studentcode {
-    my ($settings,$rowtotal) = @_;
-    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};
-            }
-        }
-    }
-    $output .= '<tr>'.
-               '<td class="LC_left_item">'.&mt('Generate unique six character code as course identifier?').'</td>'.
-               '<td class="LC_left_item">';
-    foreach my $type (@crstypes) {
-        my $check = ' ';
-        if ($current{$type}) {
-            $check = ' checked="checked" ';
-        }
-        $output .= '<span class="LC_nobreak"><label>'.
-                   '<input type="checkbox" name="uniquecode" value="'.$type.'"'.$check.'/>'.
-                   &mt($type).'</label></span>'.('&nbsp;'x2).' ';
-    }
-    $output .= '</td></tr>';
-    $$rowtotal ++;
-    return $output;
-}
-
-sub print_textbookcourses {
-    my ($dom,$type,$settings,$rowtotal) = @_;
-    my $rownum = 0;
-    my $css_class;
-    my $itemcount = 1;
-    my $maxnum = 0;
-    my $bookshash;
-    if (ref($settings) eq 'HASH') {
-        $bookshash = $settings->{$type};
-    }
-    my %ordered;
-    if (ref($bookshash) eq 'HASH') {
-        foreach my $item (keys(%{$bookshash})) {
-            if (ref($bookshash->{$item}) eq 'HASH') {
-                my $num = $bookshash->{$item}{'order'};
-                $ordered{$num} = $item;
-            }
-        }
-    }
-    my $confname = $dom.'-domainconfig';
-    my $switchserver = &check_switchserver($dom,$confname);
-    my $maxnum = scalar(keys(%ordered));
-    my $datatable;
-    if (keys(%ordered)) {
-        my @items = sort { $a <=> $b } keys(%ordered);
-        for (my $i=0; $i<@items; $i++) {
-            $css_class = $itemcount%2?' class="LC_odd_row"':'';
-            my $key = $ordered{$items[$i]};
-            my %coursehash=&Apache::lonnet::coursedescription($key);
-            my $coursetitle = $coursehash{'description'};
-            my ($subject,$title,$author,$publisher,$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').'" />';
-                    }
-                }
-            }
-            my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'$type".'_'."$key','$type'".');"';
-            $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
-                         .'<select name="'.$type.'_'.$key.'"'.$chgstr.'>';
-            for (my $k=0; $k<=$maxnum; $k++) {
-                my $vpos = $k+1;
-                my $selstr;
-                if ($k == $i) {
-                    $selstr = ' selected="selected" ';
-                }
-                $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
-            }
-            $datatable .= '</select>'.('&nbsp;'x2).
-                '<label><input type="checkbox" name="'.$type.'_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> '.
-                ('&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="" />';
-                }
-            }
-            $datatable .= '<input type="hidden" name="'.$type.'_id_'.$i.'" value="'.$type.'_'.$key.'" /></span> '.
-                          '<span class="LC_nobreak">'.&mt('LON-CAPA course:').'&nbsp;'.
-                          $coursetitle.'</span></td></tr>'."\n";
-            $itemcount ++;
-        }
-    }
-    $css_class = $itemcount%2?' class="LC_odd_row"':'';
-    my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'$type"."_addbook_pos','$type'".');"';
-    $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.'>';
-    for (my $k=0; $k<$maxnum+1; $k++) {
-        my $vpos = $k+1;
-        my $selstr;
-        if ($k == $maxnum) {
-            $selstr = ' selected="selected" ';
-        }
-        $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
-    }
-    $datatable .= '</select>&nbsp;'."\n".
-                  '<input type="checkbox" name="'.$type.'_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".
-                  ('&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="" />';
-        }
-    }
-    $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::selectcourse_link
-                      ('display',$type.'_addbook_cnum',$type.'_addbook_cdom',undef,undef,undef,'Course');
-                  '</span></td>'."\n".
-                  '</tr>'."\n";
-    $itemcount ++;
-    return $datatable;
-}
-
-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";
-    }
-    return <<"ENDSCRIPT";
-<script type="text/javascript">
-// <![CDATA[
-function reorderBooks(form,item,caller) {
-    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'};
-    }
-    var current = new Array;
-    var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value;
-    if (item == newpos) {
-        changedVal = newitemVal;
-    } else {
-        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;
-                }
-            }
-        }
-    }
-    var oldVal;
-    for (var j=0; j<maxh; j++) {
-        if (current[j] == undefined) {
-            oldVal = j;
-        }
-    }
-    if (oldVal < changedVal) {
-        for (var k=oldVal+1; k<=changedVal ; k++) {
-           var elementName = current[k];
-           form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex - 1;
-        }
-    } else {
-        for (var k=changedVal; k<oldVal; k++) {
-            var elementName = current[k];
-            form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex + 1;
-        }
-    }
-    return;
-}
-
-// ]]>
-</script>
-
-ENDSCRIPT
-}
-
 sub 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') {
@@ -2432,9 +2030,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" ';
@@ -2470,12 +2065,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;
 }
 
@@ -2563,7 +2154,7 @@ sub print_autocreate {
                 }
             }
         }
-        if ($settings->{'xmldc'} ne '') {
+        if ($settings->{'xmldc'} ne '') { 
             $currhash{$settings->{'xmldc'}} = 1;
         }
     } else {
@@ -2590,15 +2181,13 @@ 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;
 }
@@ -2722,7 +2311,7 @@ sub print_contacts {
     my @contacts = ('adminemail','supportemail');
     my (%checked,%to,%otheremails,%bccemails);
     my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail',
-                    'requestsmail','updatesmail','idconflictsmail');
+                    'requestsmail','updatesmail');
     foreach my $type (@mailings) {
         $otheremails{$type} = '';
     }
@@ -2759,21 +2348,21 @@ sub print_contacts {
         $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" '; 
         $checked{'requestsmail'}{'adminemail'} = ' checked="checked" ';
         $checked{'updatesmail'}{'adminemail'} = ' checked="checked" ';
-        $checked{'idconflictsmail'}{'adminemail'} = ' checked="checked" ';
     }
     my ($titles,$short_titles) = &contact_titles();
     my $rownum = 0;
     my $css_class;
     foreach my $item (@contacts) {
+        $rownum ++;
         $css_class = $rownum%2?' class="LC_odd_row"':'';
         $datatable .= '<tr'.$css_class.'>'. 
                   '<td><span class="LC_nobreak">'.$titles->{$item}.
                   '</span></td><td class="LC_right_item">'.
                   '<input type="text" name="'.$item.'" value="'.
                   $to{$item}.'" /></td></tr>';
-        $rownum ++;
     }
     foreach my $type (@mailings) {
+        $rownum ++;
         $css_class = $rownum%2?' class="LC_odd_row"':'';
         $datatable .= '<tr'.$css_class.'>'.
                       '<td><span class="LC_nobreak">'.
@@ -2796,21 +2385,7 @@ sub print_contacts {
                           'value="'.$bccemails{$type}.'"  />';
         }
         $datatable .= '</td></tr>'."\n";
-        $rownum ++;
     }
-    my %choices;
-    $choices{'reporterrors'} = &mt('E-mail error reports to [_1]',
-                                   &Apache::loncommon::modal_link('http://loncapa.org/core.html',
-                                   &mt('LON-CAPA core group - MSU'),600,500));
-    $choices{'reportupdates'} = &mt('E-mail record of completed LON-CAPA updates to [_1]',
-                                    &Apache::loncommon::modal_link('http://loncapa.org/core.html',
-                                    &mt('LON-CAPA core group - MSU'),600,500));
-    my @toggles = ('reporterrors','reportupdates');
-    my %defaultchecked = ('reporterrors'  => 'on',
-                          'reportupdates' => 'on');
-    (my $reports,$rownum) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
-                                               \%choices,$rownum);
-    $datatable .= $reports;
     $$rowtotal += $rownum;
     return $datatable;
 }
@@ -2833,7 +2408,7 @@ sub print_helpsettings {
 
 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'));
 
@@ -2867,14 +2442,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.'" '.
@@ -2892,105 +2461,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)",
     );
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
                            uploadquota          => 500,
-                           postsubmit           => 60,
                          );
     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);
+        my ($currdefresponder,$def_official_credits,$def_unofficial_credits,%curruploadquota);
         my $currusecredits = 0;
-        my $postsubmitclient = 1;
-        my @types = ('official','unofficial','community','textbook');
+        my @types = ('official','unofficial','community');
         if (ref($settings) eq 'HASH') {
             $currdefresponder = $settings->{'anonsurvey_threshold'};
             if (ref($settings->{'uploadquota'}) eq 'HASH') {
@@ -2999,42 +2488,12 @@ 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'};
+                if (($def_official_credits ne '') || ($def_unofficial_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'};
-                }
-            }
-        } else {
-            foreach my $type (@types) {
-                $deftimeout{$type} = $staticdefaults{'postsubmit'};
-            }
         }
         if (!$currdefresponder) {
             $currdefresponder = $staticdefaults{'anonsurvey_threshold'};
@@ -3053,35 +2512,35 @@ sub print_coursedefaults {
                 '<td class="LC_right_item"><span class="LC_nobreak">'.
                 '<input type="text" name="anonsurvey_threshold"'.
                 ' value="'.$currdefresponder.'" size="5" /></span>'.
-                '</td></tr>'."\n";
-        $itemcount ++;
-        $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
-        $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.
-                      $choices{'uploadquota'}.
-                      '</span></td>'.
-                      '<td align="right" class="LC_right_item">'.
-                      '<table><tr>';
+                '</td></tr>'."\n".
+                '<tr><td><span class="LC_nobreak">'.
+                $choices{'uploadquota'}.
+                '</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="uploadquota_'.$type.'"'.
                            ' value="'.$curruploadquota{$type}.'" size="5" /></td>';
         }
         $datatable .= '</tr></table></td></tr>'."\n";
-        $itemcount ++;
-        my $onclick = "toggleDisplay(this.form,'credits');";
-        my $display = 'none';
+        $itemcount += 2;
+        my $onclick = 'toggleCredits(this.form);';
+        my $display = 'none';  
         if ($currusecredits) {
             $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></div>'."\n";
         %defaultchecked = ('coursecredits' => 'off');
         @toggles = ('coursecredits');
         my $current = {
@@ -3089,262 +2548,13 @@ 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');
-        my $current = {
-                        'postsubmit' => $postsubmitclient,
-                      };
-        ($table,$itemcount) =
-            &radiobutton_prefs($current,\@toggles,\%defaultchecked,
-                               \%choices,$itemcount,$onclick,$additional,'left');
-        $datatable .= $table;
-    }
-    $$rowtotal += $itemcount;
-    return $datatable;
-}
-
-sub print_selfenrollment {
-    my ($position,$dom,$settings,$rowtotal) = @_;
-    my ($css_class,$datatable);
-    my $itemcount = 1;
-    my @types = ('official','unofficial','community','textbook');
-    if (($position eq 'top') || ($position eq 'middle')) {
-        my ($rowsref,$titlesref) = &Apache::lonuserutils::get_selfenroll_titles();
-        my %descs = &Apache::lonuserutils::selfenroll_default_descs();
-        my @rows;
-        my $key;
-        if ($position eq 'top') {
-            $key = 'admin'; 
-            if (ref($rowsref) eq 'ARRAY') {
-                @rows = @{$rowsref};
-            }
-        } elsif ($position eq 'middle') {
-            $key = 'default';
-            @rows = ('types','registered','approval','limit');
-        }
-        foreach my $row (@rows) {
-            if (defined($titlesref->{$row})) {
-                $itemcount ++;
-                $css_class = $itemcount%2?' class="LC_odd_row"':'';
-                $datatable .= '<tr'.$css_class.'>'.
-                              '<td>'.$titlesref->{$row}.'</td>'.
-                              '<td class="LC_left_item">'.
-                              '<table><tr>';
-                my (%current,%currentcap);
-                if (ref($settings) eq 'HASH') {
-                    if (ref($settings->{$key}) eq 'HASH') {
-                        foreach my $type (@types) {
-                            if (ref($settings->{$key}->{$type}) eq 'HASH') {
-                                $current{$type} = $settings->{$key}->{$type}->{$row};
-                            }
-                            if (($row eq 'limit') && ($key eq 'default')) {
-                                if (ref($settings->{$key}->{$type}) eq 'HASH') {
-                                    $currentcap{$type} = $settings->{$key}->{$type}->{'cap'};
-                                }
-                            }
-                        }
-                    }
-                }
-                my %roles = (
-                             '0' => &Apache::lonnet::plaintext('dc'),
-                            ); 
-            
-                foreach my $type (@types) {
-                    unless (($row eq 'registered') && ($key eq 'default')) {
-                        $datatable .= '<th>'.&mt($type).'</th>';
-                    }
-                }
-                unless (($row eq 'registered') && ($key eq 'default')) {
-                    $datatable .= '</tr><tr>';
-                }
-                foreach my $type (@types) {
-                    if ($type eq 'community') {
-                        $roles{'1'} = &mt('Community personnel');
-                    } else {
-                        $roles{'1'} = &mt('Course personnel');
-                    }
-                    $datatable .= '<td style="vertical-align: top">';
-                    if ($position eq 'top') {
-                        my %checked;
-                        if ($current{$type} eq '0') {
-                            $checked{'0'} = ' checked="checked"';
-                        } else {
-                            $checked{'1'} = ' checked="checked"';
-                        }
-                        foreach my $role ('1','0') {
-                            $datatable .= '<span class="LC_nobreak"><label>'.
-                                          '<input type="radio" name="selfenrolladmin_'.$row.'_'.$type.'" '.
-                                          'value="'.$role.'"'.$checked{$role}.' />'.
-                                          $roles{$role}.'</label></span> ';
-                        }
-                    } else {
-                        if ($row eq 'types') {
-                            my %checked;
-                            if ($current{$type} =~ /^(all|dom)$/) {
-                                $checked{$1} = ' checked="checked"';
-                            } else {
-                                $checked{''} = ' checked="checked"';
-                            }
-                            foreach my $val ('','dom','all') {
-                                $datatable .= '<span class="LC_nobreak"><label>'.
-                                              '<input type ="radio" name="selfenrolldefault_'.$row.'_'.$type.'" '.
-                                              'value="'.$val.'"'.$checked{$val}.' />'.$descs{$row}{$val}.'</label></span> ';
-                            }
-                        } elsif ($row eq 'registered') {
-                            my %checked;
-                            if ($current{$type} eq '1') {
-                                $checked{'1'} = ' checked="checked"';
-                            } else {
-                                $checked{'0'} = ' checked="checked"';
-                            }
-                            foreach my $val ('0','1') {
-                                $datatable .= '<span class="LC_nobreak"><label>'.
-                                              '<input type ="radio" name="selfenrolldefault_'.$row.'_'.$type.'" '.
-                                              'value="'.$val.'"'.$checked{$val}.' />'.$descs{$row}{$val}.'</label></span> ';
-                            }
-                        } elsif ($row eq 'approval') {
-                            my %checked;
-                            if ($current{$type} =~ /^([12])$/) {
-                                $checked{$1} = ' checked="checked"';
-                            } else {
-                                $checked{'0'} = ' checked="checked"';
-                            }
-                            for my $val (0..2) {
-                                $datatable .= '<span class="LC_nobreak"><label>'.
-                                              '<input type="radio" name="selfenrolldefault_'.$row.'_'.$type.'" '.
-                                              'value="'.$val.'"'.$checked{$val}.' />'.$descs{$row}{$val}.'</label></span> ';
-                            }
-                        } elsif ($row eq 'limit') {
-                            my %checked;
-                            if ($current{$type} =~ /^(allstudents|selfenrolled)$/) {
-                                $checked{$1} = ' checked="checked"';
-                            } else {
-                                $checked{'none'} = ' checked="checked"';
-                            }
-                            my $cap;
-                            if ($currentcap{$type} =~ /^\d+$/) {
-                                $cap = $currentcap{$type};
-                            }
-                            foreach my $val ('none','allstudents','selfenrolled') {
-                                $datatable .= '<span class="LC_nobreak"><label>'.
-                                              '<input type="radio" name="selfenrolldefault_'.$row.'_'.$type.'" '.
-                                              'value="'.$val.'"'.$checked{$val}.' />'.$descs{$row}{$val}.'</label></span> ';
-                            }
-                            $datatable .= '<br />'.
-                                          '<span class="LC_nobreak">'.&mt('Maximum allowed: ').
-                                          '<input type="text" name="selfenrolldefault_cap_'.$type.'" size = "5" value="'.$cap.'" />'.
-                                          '</span>'; 
-                        }
-                    }
-                    $datatable .= '</td>';
-                }
-                $datatable .= '</tr>';
-            }
-            $datatable .= '</table></td></tr>';
-        }
-    } elsif ($position eq 'bottom') {
-        $datatable .= &print_validation_rows('selfenroll',$dom,$settings,\$itemcount);
     }
     $$rowtotal += $itemcount;
     return $datatable;
 }
 
-sub print_validation_rows {
-    my ($caller,$dom,$settings,$rowtotal) = @_;
-    my ($itemsref,$namesref,$fieldsref);
-    if ($caller eq 'selfenroll') { 
-        ($itemsref,$namesref,$fieldsref) = &Apache::lonuserutils::selfenroll_validation_types();
-    } elsif ($caller eq 'requestcourses') {
-        ($itemsref,$namesref,$fieldsref) = &Apache::loncoursequeueadmin::requestcourses_validation_types();
-    }
-    my %currvalidation;
-    if (ref($settings) eq 'HASH') {
-        if (ref($settings->{'validation'}) eq 'HASH') {
-            %currvalidation = %{$settings->{'validation'}};
-        }
-    }
-    my $datatable;
-    my $itemcount = 0;
-    foreach my $item (@{$itemsref}) {
-        my $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
-        $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.
-                      $namesref->{$item}.
-                      '</span></td>'.
-                      '<td class="LC_left_item">';
-        if (($item eq 'url') || ($item eq 'button')) {
-            $datatable .= '<span class="LC_nobreak">'.
-                          '<input type="text" name="'.$caller.'_validation_'.$item.'"'.
-                          ' value="'.$currvalidation{$item}.'" size="50" /></span>';
-        } elsif ($item eq 'fields') {
-            my @currfields;
-            if (ref($currvalidation{$item}) eq 'ARRAY') {
-                @currfields = @{$currvalidation{$item}};
-            }
-            foreach my $field (@{$fieldsref}) {
-                my $check = '';
-                if (grep(/^\Q$field\E$/,@currfields)) {
-                    $check = ' checked="checked"';
-                }
-                $datatable .= '<span class="LC_nobreak"><label>'.
-                              '<input type="checkbox" name="'.$caller.'_validation_fields"'.
-                              ' value="'.$field.'"'.$check.' />'.$field.
-                              '</label></span> ';
-            }
-        } elsif ($item eq 'markup') {
-            $datatable .= '<textarea name="'.$caller.'_validation_markup" cols="50" rows="5" wrap="soft">'.
-                           $currvalidation{$item}.
-                              '</textarea>';
-        }
-        $datatable .= '</td></tr>'."\n";
-        if (ref($rowtotal)) {
-            $itemcount ++;
-        }
-    }
-    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;
-                }
-            }
-        }
-        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.)');
-        } else {
-            $datatable .=  &mt('Course creation processed as: ');
-        }
-        $datatable .= '</td><td class="LC_left_item">'.$dctable.'</td></tr>';
-        $itemcount ++;
-    }
-    if (ref($rowtotal)) {
-        $$rowtotal += $itemcount;
-    }
-    return $datatable;
-}
-
 sub print_usersessions {
     my ($position,$dom,$settings,$rowtotal) = @_;
     my ($css_class,$datatable,%checked,%choices);
@@ -3359,13 +2569,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.');
@@ -3615,7 +2819,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;
@@ -3635,21 +2839,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 = 
@@ -3786,7 +2981,7 @@ sub print_loadbalancing {
     }
     my ($othertitle,$usertypes,$types) =
         &Apache::loncommon::sorted_inst_types($dom);
-    my $rownum = 8;
+    my $rownum = 6;
     if (ref($types) eq 'ARRAY') {
         $rownum += scalar(@{$types});
     }
@@ -3817,7 +3012,7 @@ sub print_loadbalancing {
                       '<td rowspan="'.$rownum.'" valign="top">'.
                       '<p>';
         if ($lonhost eq '') {
-            $datatable .= '<span class="LC_nobreak">';
+            $datatable .= '<span class="LC_nobreak">'; 
             if (keys(%currbalancer) > 0) {
                 $datatable .= &mt('Add balancer:');
             } else {
@@ -3833,7 +3028,7 @@ sub print_loadbalancing {
                 next if ($currbalancer{$server});
                 $datatable .= '<option value="'.$server.'">'.$server.'</option>'."\n";
             }
-            $datatable .=
+            $datatable .= 
                 '</select>'."\n".
                 '<input type="hidden" name="loadbalancing_prevlonhost_'.$balnum.'" id="loadbalancing_prevlonhost_'.$balnum.'" value="" />&nbsp;</span>'."\n";
         } else {
@@ -3872,11 +3067,10 @@ sub print_loadbalancing {
                 if (exists($currbalancer{$spares[$i]})) {
                     $disabled = ' disabled="disabled"';
                 }
-                $targettable .=
-                    '<td><span class="LC_nobreak"><label>'.
-                    '<input type="checkbox" name="loadbalancing_target_'.$balnum.'_'.$sparetype.'"'.
+                $targettable .= 
+                    '<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)) {
@@ -3957,7 +3151,7 @@ sub loadbalancing_rules {
         $css_class,$balnum,$islast) = @_;
     my $output;
     my $num = 0;
-    my ($alltypes,$othertypes,$titles) =
+    my ($alltypes,$othertypes,$titles) = 
         &loadbalancing_titles($dom,$intdom,$usertypes,$types);
     if ((ref($alltypes) eq 'ARRAY') && (ref($titles) eq 'HASH'))  {
         foreach my $type (@{$alltypes}) {
@@ -3987,10 +3181,8 @@ sub loadbalancing_titles {
            '_LC_author'      => &mt('Users from [_1] with author role',$dom),
            '_LC_internetdom' => &mt('Users not from [_1], but from [_2]',$dom,$intdom),
            '_LC_external'    => &mt('Users not from [_1]',$intdom),
-           '_LC_ipchangesso' => &mt('SSO users from [_1], with IP mismatch',$dom),
-           '_LC_ipchange'    => &mt('Non-SSO users with IP mismatch'),
                      );
-    my @alltypes = ('_LC_adv','_LC_author','_LC_internetdom','_LC_external','_LC_ipchangesso','_LC_ipchange');
+    my @alltypes = ('_LC_adv','_LC_author','_LC_internetdom','_LC_external');
     if (ref($types) eq 'ARRAY') {
         unshift(@alltypes,@{$types},'default');
     }
@@ -4015,19 +3207,14 @@ sub loadbalancing_titles {
 sub loadbalance_rule_row {
     my ($type,$title,$current,$servers,$currbalancer,$lonhost,$dom,
         $targets_div_style,$homedom_div_style,$css_class,$balnum,$num,$islast) = @_;
-    my @rulenames;
+    my @rulenames = ('default','homeserver');
     my %ruletitles = &offloadtype_text();
-    if (($type eq '_LC_ipchangesso') || ($type eq '_LC_ipchange')) {
-        @rulenames = ('balancer','offloadedto','specific');
+    if ($type eq '_LC_external') {
+        push(@rulenames,'externalbalancer');
     } else {
-        @rulenames = ('default','homeserver');
-        if ($type eq '_LC_external') {
-            push(@rulenames,'externalbalancer');
-        } else {
-            push(@rulenames,'specific');
-        }
-        push(@rulenames,'none');
+        push(@rulenames,'specific');
     }
+    push(@rulenames,'none');
     my $style = $targets_div_style;
     if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) {
         $style = $homedom_div_style;
@@ -4036,7 +3223,7 @@ sub loadbalance_rule_row {
     if ($islast && $num == 1) {
         $space = '<div display="inline-block">&nbsp;</div>';
     }
-    my $output =
+    my $output = 
         '<tr class="'.$css_class.'" id="balanceruletr_'.$balnum.'_'.$num.'"><td valign="top">'.$space.
         '<div id="balanceruletitle_'.$balnum.'_'.$type.'" style="'.$style.'">'.$title.'</div></td>'."\n".
         '<td valaign="top">'.$space.
@@ -4056,7 +3243,7 @@ sub loadbalance_rule_row {
                 unless ($checked) {
                     $default = ' selected="selected"';
                 }
-                $extra =
+                $extra = 
                     ':&nbsp;<select name="loadbalancing_singleserver_'.$balnum.'_'.$type.
                     '" id="loadbalancing_singleserver_'.$balnum.'_'.$type.
                     '" onchange="singleServerToggle('."'$balnum','$type'".')">'."\n".
@@ -4080,13 +3267,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;
@@ -4099,9 +3281,6 @@ sub offloadtype_text {
            'externalbalancer' => "Offloads to Load Balancer in user's domain",
            'specific'         => 'Offloads to specific server',
            '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;
 }
@@ -4124,7 +3303,6 @@ sub contact_titles {
                    'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)',
                    'requestsmail' => 'E-mail from course requests requiring approval',
                    'updatesmail'  => 'E-mail from nightly check of LON-CAPA module integrity/updates',
-                   'idconflictsmail' => 'E-mail from bi-nightly check for multiple users sharing same student/employee ID',
                  );
     my %short_titles = &Apache::lonlocal::texthash (
                            adminemail   => 'Admin E-mail address',
@@ -4142,7 +3320,6 @@ sub tool_titles {
                      official   => 'Official courses (with institutional codes)',
                      unofficial => 'Unofficial courses',
                      community  => 'Communities',
-                     textbook   => 'Textbook courses',
                  );
     return %titles;
 }
@@ -4152,7 +3329,6 @@ sub courserequest_titles {
                                    official   => 'Official',
                                    unofficial => 'Unofficial',
                                    community  => 'Communities',
-                                   textbook   => 'Textbook',
                                    norequest  => 'Not allowed',
                                    approval   => 'Approval by Dom. Coord.',
                                    validate   => 'With validation',
@@ -4169,7 +3345,7 @@ sub authorrequest_titles {
                                    automatic  => 'Automatic approval',
                  );
     return %titles;
-}
+} 
 
 sub courserequest_conditions {
     my %conditions = &Apache::lonlocal::texthash (
@@ -4205,22 +3381,42 @@ sub print_usercreation {
                 $rowcount ++;
             }
         }
+        my ($emailrules,$emailruleorder) = 
+            &Apache::lonnet::inst_userrules($dom,'email');
+        if (ref($emailrules) eq 'HASH') {
+            if (keys(%{$emailrules}) > 0) {
+                $datatable .= &user_formats_row('email',$settings,$emailrules,
+                                                $emailruleorder,$numinrow,$rowcount);
+                $$rowtotal ++;
+                $rowcount ++;
+            }
+        }
         if ($rowcount == 0) {
             $datatable .= '<tr><td colspan="2">'.&mt('No format rules have been defined for usernames or IDs in this domain.').'</td></tr>';  
             $$rowtotal ++;
             $rowcount ++;
         }
     } elsif ($position eq 'middle') {
-        my @creators = ('author','course','requestcrs');
+        my @creators = ('author','course','requestcrs','selfcreate');
         my ($rules,$ruleorder) =
             &Apache::lonnet::inst_userrules($dom,'username');
         my %lt = &usercreation_types();
         my %checked;
+        my @selfcreate; 
         if (ref($settings) eq 'HASH') {
             if (ref($settings->{'cancreate'}) eq 'HASH') {
                 foreach my $item (@creators) {
                     $checked{$item} = $settings->{'cancreate'}{$item};
                 }
+                if (ref($settings->{'cancreate'}{'selfcreate'}) eq 'ARRAY') {
+                    @selfcreate = @{$settings->{'cancreate'}{'selfcreate'}};
+                } elsif ($settings->{'cancreate'}{'selfcreate'} ne '') {
+                    if ($settings->{'cancreate'}{'selfcreate'} eq 'any') {
+                        @selfcreate = ('email','login','sso');
+                    } elsif ($settings->{'cancreate'}{'selfcreate'} ne 'none') {
+                        @selfcreate = ($settings->{'cancreate'}{'selfcreate'});
+                    }
+                }
             } elsif (ref($settings->{'cancreate'}) eq 'ARRAY') {
                 foreach my $item (@creators) {
                     if (grep(/^\Q$item\E$/,@{$settings->{'cancreate'}})) {
@@ -4232,8 +3428,10 @@ sub print_usercreation {
         my $rownum = 0;
         foreach my $item (@creators) {
             $rownum ++;
-            if ($checked{$item} eq '') {
-                $checked{$item} = 'any';
+            if ($item ne 'selfcreate') {  
+                if ($checked{$item} eq '') {
+                    $checked{$item} = 'any';
+                }
             }
             my $css_class;
             if ($rownum%2) {
@@ -4244,18 +3442,30 @@ sub print_usercreation {
             $datatable .= '<tr'.$css_class.'>'.
                          '<td><span class="LC_nobreak">'.$lt{$item}.
                          '</span></td><td align="right">';
-            my @options = ('any');
-            if (ref($rules) eq 'HASH') {
-                if (keys(%{$rules}) > 0) {
-                    push(@options,('official','unofficial'));
+            my @options;
+            if ($item eq 'selfcreate') {
+                push(@options,('email','login','sso'));
+            } else {
+                @options = ('any');
+                if (ref($rules) eq 'HASH') {
+                    if (keys(%{$rules}) > 0) {
+                        push(@options,('official','unofficial'));
+                    }
                 }
+                push(@options,'none');
             }
-            push(@options,'none');
             foreach my $option (@options) {
                 my $type = 'radio';
                 my $check = ' ';
-                if ($checked{$item} eq $option) {
-                    $check = ' checked="checked" ';
+                if ($item eq 'selfcreate') {
+                    $type = 'checkbox';
+                    if (grep(/^\Q$option\E$/,@selfcreate)) {
+                        $check = ' checked="checked" ';
+                    }
+                } else {
+                    if ($checked{$item} eq $option) {
+                        $check = ' checked="checked" ';
+                    }
                 } 
                 $datatable .= '<span class="LC_nobreak"><label>'.
                               '<input type="'.$type.'" name="can_createuser_'.
@@ -4264,6 +3474,22 @@ sub print_usercreation {
             }
             $datatable .= '</td></tr>';
         }
+        my ($othertitle,$usertypes,$types) =
+            &Apache::loncommon::sorted_inst_types($dom);
+        my $createsettings;
+        if (ref($settings) eq 'HASH') {
+            $createsettings = $settings->{cancreate};
+        }
+        if (ref($usertypes) eq 'HASH') {
+            if (keys(%{$usertypes}) > 0) {
+                $datatable .= &insttypes_row($createsettings,$types,$usertypes,
+                                             $dom,$numinrow,$othertitle,
+                                             'statustocreate');
+                $$rowtotal ++;
+                $rownum ++;
+            }
+        }
+        $datatable .= &captcha_choice('cancreate',$createsettings,$rownum);
     } else {
         my @contexts = ('author','course','domain');
         my @authtypes = ('int','krb4','krb5','loc');
@@ -4315,238 +3541,13 @@ sub print_usercreation {
     return $datatable;
 }
 
-sub print_selfcreation {
-    my ($position,$dom,$settings,$rowtotal) = @_;
-    my (@selfcreate,$createsettings,$processing,$datatable);
-    if (ref($settings) eq 'HASH') {
-        if (ref($settings->{'cancreate'}) eq 'HASH') {
-            $createsettings = $settings->{'cancreate'};
-            if (ref($createsettings) eq 'HASH') {
-                if (ref($createsettings->{'selfcreate'}) eq 'ARRAY') {
-                    @selfcreate = @{$createsettings->{'selfcreate'}};
-                } elsif ($createsettings->{'selfcreate'} ne '') {
-                    if ($settings->{'cancreate'}{'selfcreate'} eq 'any') {
-                        @selfcreate = ('email','login','sso');
-                    } elsif ($createsettings->{'selfcreate'} ne 'none') {
-                        @selfcreate = ($createsettings->{'selfcreate'});
-                    }
-                }
-                if (ref($createsettings->{'selfcreateprocessing'}) eq 'HASH') {
-                    $processing = $createsettings->{'selfcreateprocessing'};
-                }
-            }
-        }
-    }
-    my %radiohash;
-    my $numinrow = 4;
-    map { $radiohash{'cancreate_'.$_} = 1; } @selfcreate;
-    if ($position eq 'top') {
-        my %choices = &Apache::lonlocal::texthash (
-                                                      cancreate_login      => 'Institutional Login',
-                                                      cancreate_sso        => 'Institutional Single Sign On',
-                                                  );
-        my @toggles = sort(keys(%choices));
-        my %defaultchecked = (
-                               'cancreate_login' => 'off',
-                               'cancreate_sso'   => 'off',
-                             );
-        my ($onclick,$itemcount);
-        ($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
-                                                     \%choices,$itemcount,$onclick);
-        $$rowtotal += $itemcount;
-        
-        my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-
-        if (ref($usertypes) eq 'HASH') {
-            if (keys(%{$usertypes}) > 0) {
-                $datatable .= &insttypes_row($createsettings,$types,$usertypes,
-                                             $dom,$numinrow,$othertitle,
-                                             'statustocreate',$$rowtotal);
-                $$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);
-        $usertypes->{'default'} = $othertitle;
-        if (ref($types) eq 'ARRAY') {
-            push(@{$types},'default');
-            $usertypes->{'default'} = $othertitle;
-            foreach my $status (@{$types}) {
-                $datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'},
-                                                       $numinrow,$$rowtotal,$usertypes);
-                $$rowtotal ++;
-            }
-        }
-    } else {
-        my %choices = &Apache::lonlocal::texthash (
-                                                      cancreate_email => 'E-mail address as username',
-                                                  );
-        my @toggles = sort(keys(%choices));
-        my %defaultchecked = (
-                               'cancreate_email' => 'off',
-                             );
-        my $itemcount = 0;
-        my $display = 'none';
-        if (grep(/^\Qemail\E$/,@selfcreate)) {
-            $display = 'block';
-        }
-        my $onclick = "toggleDisplay(this.form,'emailoptions');";
-        my $additional = '<div id="emailoptions" style="display: '.$display.'">';
-        my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
-        my $usertypes = {};
-        my $order = [];
-        if ((ref($domdefaults{'inststatustypes'}) eq 'HASH') && (ref($domdefaults{'inststatusguest'}) eq 'ARRAY')) {
-            $usertypes = $domdefaults{'inststatustypes'};
-            $order = $domdefaults{'inststatusguest'};
-        }
-        if (ref($order) eq 'ARRAY') {
-            push(@{$order},'default');
-            if (@{$order} > 1) {
-                $usertypes->{'default'} = &mt('Other users');
-                $additional .= '<table><tr>';
-                foreach my $status (@{$order}) {
-                    $additional .= '<th>'.$usertypes->{$status}.'</th>';
-                }
-                $additional .= '</tr><tr>';
-                foreach my $status (@{$order}) {
-                    $additional .= '<td>'.&email_as_username($rowtotal,$processing,$status).'</td>';
-                }
-                $additional .= '</tr></table>';
-            } else {
-                $usertypes->{'default'} = &mt('All users');
-                $additional .= &email_as_username($rowtotal,$processing);
-            }
-        }
-        $additional .= '</div>'."\n";
-
-        ($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
-                                                     \%choices,$$rowtotal,$onclick,$additional);
-        $$rowtotal ++;
-        $datatable .= &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal);
-        $$rowtotal ++;
-        my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
-        $numinrow = 1;
-        if (ref($order) eq 'ARRAY') {
-            foreach my $status (@{$order}) {
-                $datatable .= &modifiable_userdata_row('cancreate','emailusername_'.$status,$settings,
-                                                       $numinrow,$$rowtotal,$usertypes,$infofields,$infotitles);
-                $$rowtotal ++;
-            }
-        }
-        my ($emailrules,$emailruleorder) =
-            &Apache::lonnet::inst_userrules($dom,'email');
-        if (ref($emailrules) eq 'HASH') {
-            if (keys(%{$emailrules}) > 0) {
-                $datatable .= &user_formats_row('email',$settings,$emailrules,
-                                                $emailruleorder,$numinrow,$$rowtotal);
-                $$rowtotal ++;
-            }
-        }
-        $datatable .= &captcha_choice('cancreate',$createsettings,$$rowtotal);
-    }
-    return $datatable;
-}
-
-sub email_as_username {
-    my ($rowtotal,$processing,$type) = @_;
-    my %choices =
-        &Apache::lonlocal::texthash (
-                                      automatic => 'Automatic approval',
-                                      approval  => 'Queued for approval',
-                                    );
-    my $output;
-    foreach my $option ('automatic','approval') {
-        my $checked;
-        if (ref($processing) eq 'HASH') {
-            if ($type eq '') {   
-                if (!exists($processing->{'default'})) {
-                    if ($option eq 'automatic') {
-                        $checked = ' checked="checked"';
-                    }
-                } else {
-                    if ($processing->{'default'} eq $option) {
-                        $checked = ' checked="checked"';
-                    }
-                }
-            } else {
-                if (!exists($processing->{$type})) {
-                    if ($option eq 'automatic') {
-                        $checked = ' checked="checked"';
-                    }
-                } else {
-                    if ($processing->{$type} eq $option) {
-                        $checked = ' checked="checked"';
-                    }
-                }
-            }
-        } elsif ($option eq 'automatic') {
-            $checked = ' checked="checked"'; 
-        }
-        my $name = 'cancreate_emailprocess';
-        if (($type ne '') && ($type ne 'default')) {
-            $name .= '_'.$type;
-        }
-        $output .= '<span class="LC_nobreak"><label>'.
-                   '<input type="radio" name="'.$name.'"'.
-                   $checked.' value="'.$option.'" />'.
-                   $choices{$option}.'</label></span>';
-        if ($type eq '') {
-            $output .= '&nbsp;';
-        } else {
-            $output .= '<br />';
-        }
-    }
-    $$rowtotal ++;
-    return $output;
-}
-
 sub captcha_choice {
     my ($context,$settings,$itemcount) = @_;
     my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext);
     my %lt = &captcha_phrases();
     $keyentry = 'hidden';
     if ($context eq 'cancreate') {
-        $rowname = &mt('CAPTCHA validation');
+        $rowname = &mt('CAPTCHA validation (e-mail as username)');
     } elsif ($context eq 'login') {
         $rowname =  &mt('"Contact helpdesk" CAPTCHA validation');
     }
@@ -4583,9 +3584,9 @@ sub captcha_choice {
 #
 # Note: If reCAPTCHA is to be used for LON-CAPA servers in a domain, a domain coordinator should visit:
 # https://www.google.com/recaptcha and generate a Public and Private key. For domains with multiple
-# servers a single key pair will be used for all servers, so the internet domain (e.g., yourcollege.edu)
+# servers a single key pair will be used for all servers, so the internet domain (e.g., yourcollege.edu) 
 # specified for use with the key should be broad enough to accommodate all servers in the LON-CAPA domain.
-#
+#  
     $output .= '</td></tr>'."\n".
                '<tr><td>'."\n".
                '<span class="LC_nobreak"><span id="'.$context.'_recaptchapubtxt">'.$pubtext.'</span>&nbsp;'."\n".
@@ -4660,26 +3661,18 @@ sub usercreation_types {
                     author     => 'When adding a co-author',
                     course     => 'When adding a user to a course',
                     requestcrs => 'When requesting a course',
+                    selfcreate => 'User creates own account', 
                     any        => 'Any',
                     official   => 'Institutional only ',
                     unofficial => 'Non-institutional only',
+                    email      => 'E-mail address',
+                    login      => 'Institutional Login',
+                    sso        => 'SSO', 
                     none       => 'None',
     );
     return %lt;
 }
 
-sub selfcreation_types {
-    my %lt = &Apache::lonlocal::texthash (
-                    selfcreate => 'User creates own account',
-                    any        => 'Any',
-                    official   => 'Institutional only ',
-                    unofficial => 'Non-institutional only',
-                    email      => 'E-mail address',
-                    login      => 'Institutional Login',
-                    sso        => 'SSO',
-             );
-}
-
 sub authtype_names {
     my %lt = &Apache::lonlocal::texthash(
                       int    => 'Internal',
@@ -4712,7 +3705,7 @@ sub print_usermodification {
             $$rowtotal ++;
             $rowcount ++;
         }
-    } elsif ($position eq 'bottom') {
+    } elsif ($position eq 'middle') {
         $context = 'course';
         $rowcount = 0;
         foreach my $role ('st','ep','ta','in','cr') {
@@ -4721,145 +3714,81 @@ sub print_usermodification {
             $$rowtotal ++;
             $rowcount ++;
         }
+    } elsif ($position eq 'bottom') {
+        $context = 'selfcreate';
+        my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+        $usertypes->{'default'} = $othertitle;
+        if (ref($types) eq 'ARRAY') {
+            push(@{$types},'default');
+            $usertypes->{'default'} = $othertitle;
+            foreach my $status (@{$types}) {
+                $datatable .= &modifiable_userdata_row($context,$status,$settings,
+                                                       $numinrow,$rowcount,$usertypes);
+                $$rowtotal ++;
+                $rowcount ++;
+            }
+        }
     }
     return $datatable;
 }
 
 sub print_defaults {
-    my ($position,$dom,$settings,$rowtotal) = @_;
+    my ($dom,$rowtotal) = @_;
+    my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',
+                 'datelocale_def','portal_def');
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+    my $titles = &defaults_titles($dom);
     my $rownum = 0;
     my ($datatable,$css_class);
-    if ($position eq 'top') {
-        my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',
-                     'datelocale_def','portal_def');
-        my %defaults;
-        if (ref($settings) eq 'HASH') {
-            %defaults = %{$settings};
+    foreach my $item (@items) {
+        if ($rownum%2) {
+            $css_class = '';
         } else {
-            my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
-            foreach my $item (@items) {
-                $defaults{$item} = $domdefaults{$item};
-            }
+            $css_class = ' class="LC_odd_row" ';
         }
-        my $titles = &defaults_titles($dom);
-        foreach my $item (@items) {
-            if ($rownum%2) {
-                $css_class = '';
-            } else {
-                $css_class = ' class="LC_odd_row" ';
-            }
-            $datatable .= '<tr'.$css_class.'>'.
-                          '<td><span class="LC_nobreak">'.$titles->{$item}.
-                          '</span></td><td class="LC_right_item" colspan="3">';
-            if ($item eq 'auth_def') {
-                my @authtypes = ('internal','krb4','krb5','localauth');
-                my %shortauth = (
-                                 internal => 'int',
-                                 krb4 => 'krb4',
-                                 krb5 => 'krb5',
-                                 localauth  => 'loc'
-                                );
-                my %authnames = &authtype_names();
-                foreach my $auth (@authtypes) {
-                    my $checked = ' ';
-                    if ($defaults{$item} eq $auth) {
-                        $checked = ' checked="checked" ';
-                    }
-                    $datatable .= '<label><input type="radio" name="'.$item.
-                                  '" value="'.$auth.'"'.$checked.'/>'.
-                                  $authnames{$shortauth{$auth}}.'</label>&nbsp;&nbsp;';
-                }
-            } elsif ($item eq 'timezone_def') {
-                my $includeempty = 1;
-                $datatable .= &Apache::loncommon::select_timezone($item,$defaults{$item},undef,$includeempty);
-            } elsif ($item eq 'datelocale_def') {
-                my $includeempty = 1;
-                $datatable .= &Apache::loncommon::select_datelocale($item,$defaults{$item},undef,$includeempty);
-            } elsif ($item eq 'lang_def') {
-                my $includeempty = 1;
-                $datatable .= &Apache::loncommon::select_language($item,$defaults{$item},$includeempty);
-            } else {
-                my $size;
-                if ($item eq 'portal_def') {
-                    $size = ' size="25"';
-                }
-                $datatable .= '<input type="text" name="'.$item.'" value="'.
-                              $defaults{$item}.'"'.$size.' />';
+        $datatable .= '<tr'.$css_class.'>'.
+                  '<td><span class="LC_nobreak">'.$titles->{$item}.
+                  '</span></td><td class="LC_right_item">';
+        if ($item eq 'auth_def') {
+            my @authtypes = ('internal','krb4','krb5','localauth');
+            my %shortauth = (
+                             internal => 'int',
+                             krb4 => 'krb4',
+                             krb5 => 'krb5',
+                             localauth  => 'loc'
+                           );
+            my %authnames = &authtype_names();
+            foreach my $auth (@authtypes) {
+                my $checked = ' ';
+                if ($domdefaults{$item} eq $auth) {
+                    $checked = ' checked="checked" ';
+                }
+                $datatable .= '<label><input type="radio" name="'.$item.
+                              '" value="'.$auth.'"'.$checked.'/>'.
+                              $authnames{$shortauth{$auth}}.'</label>&nbsp;&nbsp;';
             }
-            $datatable .= '</td></tr>';
-            $rownum ++;
-        }
-    } else {
-        my (%defaults);
-        if (ref($settings) eq 'HASH') {
-            if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH') &&
-                (ref($settings->{'inststatusguest'}) eq 'ARRAY')) {
-                my $maxnum = @{$settings->{'inststatusorder'}};
-                for (my $i=0; $i<$maxnum; $i++) {
-                    $css_class = $rownum%2?' class="LC_odd_row"':'';
-                    my $item = $settings->{'inststatusorder'}->[$i];
-                    my $title = $settings->{'inststatustypes'}->{$item};
-                    my $guestok;
-                    if (grep(/^\Q$item\E$/,@{$settings->{'inststatusguest'}})) {
-                        $guestok = 1;
-                    }
-                    my $chgstr = ' onchange="javascript:reorderTypes(this.form,'."'$item'".');"';
-                    $datatable .= '<tr'.$css_class.'>'.
-                                  '<td><span class="LC_nobreak">'.
-                                  '<select name="inststatus_pos_'.$item.'"'.$chgstr.'>';
-                    for (my $k=0; $k<=$maxnum; $k++) {
-                        my $vpos = $k+1;
-                        my $selstr;
-                        if ($k == $i) {
-                            $selstr = ' selected="selected" ';
-                        }
-                        $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
-                    }
-                    my ($checkedon,$checkedoff);
-                    $checkedoff = ' checked="checked"';
-                    if ($guestok) {
-                        $checkedon = $checkedoff;
-                        $checkedoff = ''; 
-                    }
-                    $datatable .= '</select>&nbsp;'.&mt('Internal ID:').'&nbsp;<b>'.$item.'</b>&nbsp;'.
-                                  '<input type="checkbox" name="inststatus_delete" value="'.$item.'" />'.
-                                  &mt('delete').'</span></td>'.
-                                  '<td class="LC_left_item"><span class="LC_nobreak">'.&mt('Name displayed:').
-                                  '<input type="text" size="20" name="inststatus_title_'.$item.'" value="'.$title.'" />'.
-                                  '</span></td>'.
-                                  '<td class="LC_right_item"><span class="LC_nobreak">'.
-                                  '<label><input type="radio" value="1" name="inststatus_guest_'.$item.'"'.$checkedon.' />'.
-                                  &mt('Yes').'</label>'.('&nbsp;'x2).
-                                  '<label><input type="radio" value="0" name="inststatus_guest_'.$item.'"'.$checkedoff.' />'.
-                                  &mt('No').'</label></span></td></tr>';
-                }
-                $css_class = $rownum%2?' class="LC_odd_row"':'';
-                my $chgstr = ' onchange="javascript:reorderTypes(this.form,'."'addinststatus_pos'".');"';
-                $datatable .= '<tr '.$css_class.'>'.
-                              '<td><span class="LC_nobreak"><select name="addinststatus_pos"'.$chgstr.'>';
-                for (my $k=0; $k<=$maxnum; $k++) {
-                    my $vpos = $k+1;
-                    my $selstr;
-                    if ($k == $maxnum) {
-                        $selstr = ' selected="selected" ';
-                    }
-                    $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
-                }
-                $datatable .= '</select>&nbsp;'.&mt('Internal ID:').
-                              '<input type="text" size="10" name="addinststatus" value="" />'.
-                              '&nbsp;'.&mt('(new)').
-                              '</span></td><td class="LC_left_item"><span class="LC_nobreak">'.
-                              &mt('Name displayed:').
-                              '<input type="text" size="20" name="addinststatus_title" value="" /></span></td>'.
-                              '<td class="LC_right_item"><span class="LC_nobreak">'.
-                              '<label><input type="radio" value="1" name="addinststatus_guest" />'.
-                              &mt('Yes').'</label>'.('&nbsp;'x2).
-                              '<label><input type="radio" value="0" name="addinststatus_guest" />'.
-                              &mt('No').'</label></span></td></tr>';
-                              '</tr>'."\n";
-                $rownum ++;
+        } elsif ($item eq 'timezone_def') {
+            my $includeempty = 1;
+            $datatable .= &Apache::loncommon::select_timezone($item,$domdefaults{$item},undef,$includeempty);
+        } elsif ($item eq 'datelocale_def') {
+            my $includeempty = 1;
+            $datatable .= &Apache::loncommon::select_datelocale($item,$domdefaults{$item},undef,$includeempty);
+        } elsif ($item eq 'lang_def') {
+            my %langchoices = &get_languages_hash();
+            $langchoices{''} = 'No language preference';
+            %langchoices = &Apache::lonlocal::texthash(%langchoices);
+            $datatable .= &Apache::loncommon::select_form($domdefaults{$item},$item,
+                                                          \%langchoices);
+        } else {
+            my $size;
+            if ($item eq 'portal_def') {
+                $size = ' size="25"';
             }
+            $datatable .= '<input type="text" name="'.$item.'" value="'.
+                          $domdefaults{$item}.'"'.$size.' />';
         }
+        $datatable .= '</td></tr>';
+        $rownum ++;
     }
     $$rowtotal += $rownum;
     return $datatable;
@@ -5076,49 +4005,6 @@ sub print_coursecategories {
     my ($position,$dom,$hdritem,$settings,$rowtotal) = @_;
     my $datatable;
     if ($position eq 'top') {
-        my (%checked);
-        my @catitems = ('unauth','auth');
-        my @cattypes = ('std','domonly','codesrch','none');
-        $checked{'unauth'} = 'std';
-        $checked{'auth'} = 'std';
-        if (ref($settings) eq 'HASH') {
-            foreach my $type (@cattypes) {
-                if ($type eq $settings->{'unauth'}) {
-                    $checked{'unauth'} = $type;
-                }
-                if ($type eq $settings->{'auth'}) {
-                    $checked{'auth'} = $type;
-                }
-            }
-        }
-        my %lt = &Apache::lonlocal::texthash (
-                                               unauth   => 'Catalog type for unauthenticated users',
-                                               auth     => 'Catalog type for authenticated users',
-                                               none     => 'No catalog',
-                                               std      => 'Standard catalog',
-                                               domonly  => 'Domain-only catalog',
-                                               codesrch => "Code search form",
-                                             );
-       my $itemcount = 0;
-       foreach my $item (@catitems) {
-           my $css_class = $itemcount%2? ' class="LC_odd_row"':'';
-           $datatable .= '<tr '.$css_class.'>'.
-                         '<td>'.$lt{$item}.'</td>'.
-                         '<td class="LC_right_item"><span class="LC_nobreak">';
-           foreach my $type (@cattypes) {
-               my $ischecked;
-               if ($checked{$item} eq $type) {
-                   $ischecked=' checked="checked"';
-               }
-               $datatable .= '<label>'.
-                             '<input type="radio" name="coursecat_'.$item.'" value="'.$type.'"'.$ischecked.
-                             ' />'.$lt{$type}.'</label>&nbsp;';
-           }
-           $datatable .= '</td></tr>';
-           $itemcount ++;
-        }
-        $$rowtotal += $itemcount;
-    } elsif ($position eq 'middle') {
         my $toggle_cats_crs = ' ';
         my $toggle_cats_dom = ' checked="checked" ';
         my $can_cat_crs = ' ';
@@ -5236,7 +4122,7 @@ sub print_coursecategories {
                             }
                             $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
                         }
-                        $datatable .= '</select></span></td><td>';
+                        $datatable .= '</select></td><td>';
                         if ($parent eq 'instcode' || $parent eq 'communities') {
                             $datatable .=  '<span class="LC_nobreak">'
                                            .$default_names{$parent}.'</span>';
@@ -5266,8 +4152,7 @@ sub print_coursecategories {
                             $datatable .= '</td>';
                         } else {
                             $datatable .= $parent
-                                          .'&nbsp;<span class="LC_nobreak"><label>'
-                                          .'<input type="checkbox" name="deletecategory" '
+                                          .'&nbsp;<label><input type="checkbox" name="deletecategory" '
                                           .'value="'.$item.'" />'.&mt('Delete').'</label></span></td>';
                         }
                         my $depth = 1;
@@ -5325,7 +4210,7 @@ sub print_coursecategories {
                 $datatable .= &initialize_categories($itemcount);
             }
         } else {
-            $datatable .= '<td class="LC_right_item">'.$hdritem->{'header'}->[1]->{'col2'}.'</td>'
+            $datatable .= '<td class="LC_right_item">'.$hdritem->{'header'}->[0]->{'col2'}.'</td>'
                           .&initialize_categories($itemcount);
         }
         $$rowtotal += $itemcount;
@@ -5382,71 +4267,7 @@ sub print_serverstatuses {
 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');
-}
-
-sub defaults_javascript {
-    my ($settings) = @_;
-    return unless (ref($settings) eq 'HASH');
-    if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) {
-        my $maxnum = scalar(@{$settings->{'inststatusorder'}});
-        if ($maxnum eq '') {
-            $maxnum = 0;
-        }
-        $maxnum ++;
-        my $jstext = '    var inststatuses = Array('."'".join("','",@{$settings->{'inststatusorder'}})."'".');';  
-        return <<"ENDSCRIPT";
-<script type="text/javascript">
-// <![CDATA[
-function reorderTypes(form,caller) {
-    var changedVal;
-$jstext 
-    var newpos = 'addinststatus_pos';
-    var current = new Array;
-    var maxh = $maxnum;
-    var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value;
-    var oldVal;
-    if (caller == newpos) {
-        changedVal = newitemVal;
-    } else {
-        var curritem = 'inststatus_pos_'+caller;
-        changedVal = form.elements[curritem].options[form.elements[curritem].selectedIndex].value;
-        current[newitemVal] = newpos;
-    }
-    for (var i=0; i<inststatuses.length; i++) {
-        if (inststatuses[i] != caller) {
-            var elementName = 'inststatus_pos_'+inststatuses[i];
-            if (form.elements[elementName]) {
-                var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value;
-                current[currVal] = elementName;
-            }
-        }
-    }
-    for (var j=0; j<maxh; j++) {
-        if (current[j] == undefined) {
-            oldVal = j;
-        }
-    }
-    if (oldVal < changedVal) {
-        for (var k=oldVal+1; k<=changedVal ; k++) {
-           var elementName = current[k];
-           form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex - 1;
-        }
-    } else {
-        for (var k=changedVal; k<oldVal; k++) {
-            var elementName = current[k];
-            form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex + 1;
-        }
-    }
-    return;
-}
-
-// ]]>
-</script>
-
-ENDSCRIPT
-    }
+            'takeoffline','takeonline','showenv','toggledebug','ping','domconf');
 }
 
 sub coursecategories_javascript {
@@ -5471,12 +4292,9 @@ sub coursecategories_javascript {
         $jstext  = '    var categories = Array(1);'."\n".
                    '    categories[0] = Array("instcode_pos");'."\n"; 
     }
-    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 $instcode_reserved = &mt('The name: "instcode" is a reserved category');
+    my $communities_reserved = &mt('The name: "communities" is a reserved category');
+    my $choose_again = '\\n'.&mt('Please use a different name for the new top level category'); 
     $output = <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
@@ -5484,6 +4302,7 @@ function reorderCats(form,parent,item,id
     var changedVal;
 $jstext
     var newpos = 'addcategory_pos';
+    var current = new Array;
     if (parent == '') {
         var has_instcode = 0;
         var maxtop = categories[idx].length;
@@ -5605,7 +4424,7 @@ sub build_category_rows {
             if (ref($cats->[$depth]{$parent}) eq 'ARRAY') {
                 my $numchildren = @{$cats->[$depth]{$parent}};
                 my $css_class = $itemcount%2?' class="LC_odd_row"':'';
-                $text .= '<td><table class="LC_data_table">';
+                $text .= '<td><table class="LC_datatable">';
                 my ($idxnum,$parent_name,$parent_item);
                 my $higher = $depth - 1;
                 if ($higher == 0) {
@@ -5679,22 +4498,9 @@ sub build_category_rows {
 }
 
 sub modifiable_userdata_row {
-    my ($context,$item,$settings,$numinrow,$rowcount,$usertypes,$fieldsref,$titlesref) = @_;
-    my ($role,$rolename,$statustype);
-    $role = $item;
-    if ($context eq 'cancreate') {
-        if ($item =~ /^emailusername_(.+)$/) {
-            $statustype = $1;
-            $role = 'emailusername';
-            if (ref($usertypes) eq 'HASH') {
-                if ($usertypes->{$statustype}) {
-                    $rolename = &mt('Data provided by [_1]',$usertypes->{$statustype});
-                } else {
-                    $rolename = &mt('Data provided by user');
-                }
-            }
-        }
-    } elsif ($context eq 'selfcreate') {
+    my ($context,$role,$settings,$numinrow,$rowcount,$usertypes) = @_;
+    my $rolename;
+    if ($context eq 'selfcreate') {
         if (ref($usertypes) eq 'HASH') {
             $rolename = $usertypes->{$role};
         } else {
@@ -5707,18 +4513,9 @@ sub modifiable_userdata_row {
             $rolename = &Apache::lonnet::plaintext($role);
         }
     }
-    my (@fields,%fieldtitles);
-    if (ref($fieldsref) eq 'ARRAY') {
-        @fields = @{$fieldsref};
-    } else {
-        @fields = ('lastname','firstname','middlename','generation',
-                   'permanentemail','id');
-    }
-    if ((ref($titlesref) eq 'HASH')) {
-        %fieldtitles = %{$titlesref};
-    } else {
-        %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
-    }
+    my @fields = ('lastname','firstname','middlename','generation',
+                  'permanentemail','id');
+    my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
     my $output;
     my $css_class = $rowcount%2?' class="LC_odd_row"':'';
     $output = '<tr '.$css_class.'>'.
@@ -5729,33 +4526,14 @@ sub modifiable_userdata_row {
     if (ref($settings) eq 'HASH') {
         if (ref($settings->{$context}) eq 'HASH') {
             if (ref($settings->{$context}->{$role}) eq 'HASH') {
-                my $hashref = $settings->{$context}->{$role};
-                if ($role eq 'emailusername') {
-                    if ($statustype) {
-                        if (ref($settings->{$context}->{$role}->{$statustype}) eq 'HASH') {
-                            $hashref = $settings->{$context}->{$role}->{$statustype};
-                            if (ref($hashref) eq 'HASH') { 
-                                foreach my $field (@fields) {
-                                    if ($hashref->{$field}) {
-                                        $checks{$field} = $hashref->{$field};
-                                    }
-                                }
-                            }
-                        }
-                    }
-                } else {
-                    if (ref($hashref) eq 'HASH') {
-                        foreach my $field (@fields) {
-                            if ($hashref->{$field}) {
-                                $checks{$field} = ' checked="checked" ';
-                            }
-                        }
+                foreach my $field (@fields) {
+                    if ($settings->{$context}->{$role}->{$field}) {
+                        $checks{$field} = ' checked="checked" ';
                     }
                 }
             }
         }
     }
-     
     for (my $i=0; $i<@fields; $i++) {
         my $rem = $i%($numinrow);
         if ($rem == 0) {
@@ -5765,40 +4543,20 @@ sub modifiable_userdata_row {
             $output .= '<tr>';
         }
         my $check = ' ';
-        unless ($role eq 'emailusername') {
-            if (exists($checks{$fields[$i]})) {
-                $check = $checks{$fields[$i]}
-            } else {
-                if ($role eq 'st') {
-                    if (ref($settings) ne 'HASH') {
-                        $check = ' checked="checked" '; 
-                    }
+        if (exists($checks{$fields[$i]})) {
+            $check = $checks{$fields[$i]}
+        } else {
+            if ($role eq 'st') {
+                if (ref($settings) ne 'HASH') {
+                    $check = ' checked="checked" '; 
                 }
             }
         }
         $output .= '<td class="LC_left_item">'.
-                   '<span class="LC_nobreak">';
-        if ($role eq 'emailusername') {
-            unless ($checks{$fields[$i]} =~ /^(required|optional)$/) {
-                $checks{$fields[$i]} = 'omit';
-            }
-            foreach my $option ('required','optional','omit') {
-                my $checked='';
-                if ($checks{$fields[$i]} eq $option) {
-                    $checked='checked="checked" ';
-                }
-                $output .= '<label>'.
-                           '<input type="radio" name="canmodify_'.$item.'_'.$fields[$i].'" value="'.$option.'" '.$checked.'/>'.
-                           &mt($option).'</label>'.('&nbsp;' x2);
-            }
-            $output .= '<i>'.$fieldtitles{$fields[$i]}.'</i>';
-        } else {
-            $output .= '<label>'.
-                       '<input type="checkbox" name="canmodify_'.$role.'" '.
-                       'value="'.$fields[$i].'"'.$check.'/>'.$fieldtitles{$fields[$i]}.
-                       '</label>';
-        }
-        $output .= '</span></td>';
+                   '<span class="LC_nobreak"><label>'.
+                   '<input type="checkbox" name="canmodify_'.$role.'" '.
+                   'value="'.$fields[$i].'"'.$check.'/>'.$fieldtitles{$fields[$i]}.
+                   '</label></span></td>';
         $rem = @fields%($numinrow);
     }
     my $colsleft = $numinrow - $rem;
@@ -5813,7 +4571,7 @@ sub modifiable_userdata_row {
 }
 
 sub insttypes_row {
-    my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle,$context,$rownum) = @_;
+    my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle,$context) = @_;
     my %lt = &Apache::lonlocal::texthash (
                       cansearch => 'Users allowed to search',
                       statustocreate => 'Institutional affiliation(s) able to create own account (login/SSO)',
@@ -5827,13 +4585,9 @@ sub insttypes_row {
     if ($context eq 'statustocreate') {
         $class = 'LC_right_item';
     }
-    my $css_class = ' class="LC_odd_row"';
-    if ($rownum ne '') { 
-        $css_class = ($rownum%2? ' class="LC_odd_row"':'');
-    }
-    my $output = '<tr'.$css_class.'>'.
-                 '<td>'.$lt{$context}.$showdom.
-                 '</td><td class="'.$class.'" colspan="2"><table>';
+    my $output =  '<tr class="LC_odd_row">'.
+                  '<td>'.$lt{$context}.$showdom.
+                  '</td><td class="'.$class.'" colspan="2"><table>';
     my $rem;
     if (ref($types) eq 'ARRAY') {
         for (my $i=0; $i<@{$types}; $i++) {
@@ -5962,7 +4716,7 @@ sub usertype_update_row {
 }
 
 sub modify_login {
-    my ($r,$dom,$confname,$lastactref,%domconfig) = @_;
+    my ($r,$dom,$confname,%domconfig) = @_;
     my ($resulttext,$errors,$colchgtext,%changes,%colchanges,%newfile,%newurl,
         %curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon);
     %title = ( coursecatalog => 'Display course catalog',
@@ -5991,7 +4745,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)) {
@@ -6034,7 +4787,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;
                     }
@@ -6128,7 +4896,7 @@ sub modify_login {
                     } else {
                         my $puberror = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$newfile{$lang},$result);
                         $errors .= '<li><span class="LC_error">'.$puberror.'</span></li>';
-                        if ((grep(/^\Q$lang\E$/,@currlangs)) &&
+                        if ((grep(/^\Q$lang\E$/,@currlangs)) && 
                             (!grep(/^\Q$lang\E$/,@delurls))) {
 
                             $loginhash{'login'}{'helpurl'}{$lang} = $domconfig{'login'}{'helpurl'}{$lang};
@@ -6146,85 +4914,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';
@@ -6265,9 +4954,6 @@ sub modify_login {
         }
         if (keys(%changes) > 0 || $colchgtext) {
             &Apache::loncommon::devalidate_domconfig_cache($dom);
-            if (ref($lastactref) eq 'HASH') {
-                $lastactref->{'domainconfig'} = 1;
-            }
             $resulttext = &mt('Changes made:').'<ul>';
             foreach my $item (sort(keys(%changes))) {
                 if ($item eq 'loginvia') {
@@ -6325,28 +5011,9 @@ 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;
+                        my $chgtxt; 
                         if ($loginhash{'login'}{$item} eq 'notused') {
                             $chgtxt .= &mt('No CAPTCHA validation in use for helpdesk form.');
                         } else {
@@ -6375,7 +5042,7 @@ 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>';
@@ -6399,27 +5066,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 (
@@ -6440,7 +5086,7 @@ sub color_font_choices {
 }
 
 sub modify_rolecolors {
-    my ($r,$dom,$confname,$roles,$lastactref,%domconfig) = @_;
+    my ($r,$dom,$confname,$roles,%domconfig) = @_;
     my ($resulttext,%rolehash);
     $rolehash{'rolecolors'} = {};
     if (ref($domconfig{'rolecolors'}) ne 'HASH') {
@@ -6455,9 +5101,6 @@ sub modify_rolecolors {
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
             &Apache::loncommon::devalidate_domconfig_cache($dom);
-            if (ref($lastactref) eq 'HASH') {
-                $lastactref->{'domainconfig'} = 1;
-            }
             $resulttext = &display_colorchgs($dom,\%changes,$roles,
                                              $rolehash{'rolecolors'});
         } else {
@@ -6504,38 +5147,22 @@ sub modify_colors {
         }
         if ($role eq 'login') {
             foreach my $item (@logintext) {
-                $env{'form.'.$role.'_'.$item} = lc($env{'form.'.$role.'_'.$item});
-                if ($env{'form.'.$role.'_'.$item} =~ /^\w+/) {
-                    $env{'form.'.$role.'_'.$item} = '#'.$env{'form.'.$role.'_'.$item};
-                }
-                unless ($env{'form.'.$role.'_'.$item} eq lc($defaults{'logintext'}{$item})) {
+                unless ($env{'form.'.$role.'_'.$item} eq  $defaults{'logintext'}{$item}) {
                     $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
                 }
             }
         } else {
-            $env{'form.'.$role.'_fontmenu'} = lc($env{'form.'.$role.'_fontmenu'});
-            if ($env{'form.'.$role.'_fontmenu'} =~ /^\w+/) {
-                $env{'form.'.$role.'_fontmenu'} = '#'.$env{'form.'.$role.'_fontmenu'};
-            }
-            unless($env{'form.'.$role.'_fontmenu'} eq lc($defaults{'fontmenu'})) {
+            unless($env{'form.'.$role.'_fontmenu'} eq $defaults{'fontmenu'}) {
                 $confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'};
             }
         }
         foreach my $item (@bgs) {
-            $env{'form.'.$role.'_'.$item} = lc($env{'form.'.$role.'_'.$item});
-            if ($env{'form.'.$role.'_'.$item} =~ /^\w+/) {
-                $env{'form.'.$role.'_'.$item} = '#'.$env{'form.'.$role.'_'.$item};
-            }
-            unless ($env{'form.'.$role.'_'.$item} eq lc($defaults{'bgs'}{$item})) {
+            unless ($env{'form.'.$role.'_'.$item} eq $defaults{'bgs'}{$item} ) {
                 $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
             }
         }
         foreach my $item (@links) {
-            $env{'form.'.$role.'_'.$item} = lc($env{'form.'.$role.'_'.$item});
-            if ($env{'form.'.$role.'_'.$item} =~ /^\w+/) {
-                $env{'form.'.$role.'_'.$item} = '#'.$env{'form.'.$role.'_'.$item};
-            }
-            unless ($env{'form.'.$role.'_'.$item} eq lc($defaults{'links'}{$item})) {
+            unless ($env{'form.'.$role.'_'.$item} eq  $defaults{'links'}{$item}) {
                 $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
             }
         }
@@ -6885,7 +5512,7 @@ sub publishlogo {
 # See if there is anything left
     unless ($fname) { return ('error: no uploaded file'); }
     $fname="$subdir/$fname";
-    my $docroot=$r->dir_config('lonDocRoot');
+    my $docroot=$r->dir_config('lonDocRoot'); 
     my $filepath="$docroot/priv";
     my $relpath = "$dom/$confname";
     my ($fnamepath,$file,$fetchthumb);
@@ -6905,7 +5532,7 @@ sub publishlogo {
     if ($file=~/\.(\w+)$/ &&
         (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
         $output = 
-            &mt('Invalid file extension ([_1]) - reserved for internal use.',$1); 
+            &mt('Invalid file extension ([_1]) - reserved for LONCAPA use.',$1); 
     } elsif ($file=~/\.(\w+)$/ &&
         !defined(&Apache::loncommon::fileembstyle($1))) {
         $output = &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1);
@@ -7154,28 +5781,21 @@ sub check_switchserver {
 }
 
 sub modify_quotas {
-    my ($r,$dom,$action,$lastactref,%domconfig) = @_;
+    my ($dom,$action,%domconfig) = @_;
     my ($context,@usertools,@options,%validations,%titles,%confhash,%toolshash,
-        %limithash,$toolregexp,%conditions,$resulttext,%changes,$confname,$configuserok,
-        $author_ok,$switchserver,$errors,$validationitemsref,$validationnamesref,
-        $validationfieldsref);
+        %limithash,$toolregexp,%conditions,$resulttext,%changes);
     if ($action eq 'quotas') {
         $context = 'tools'; 
     } else {
         $context = $action;
     }
     if ($context eq 'requestcourses') {
-        @usertools = ('official','unofficial','community','textbook');
+        @usertools = ('official','unofficial','community');
         @options =('norequest','approval','validate','autolimit');
         %validations = &Apache::lonnet::auto_courserequest_checks($dom);
         %titles = &courserequest_titles();
         $toolregexp = join('|',@usertools);
         %conditions = &courserequest_conditions();
-        $confname = $dom.'-domainconfig';
-        my $servadm = $r->dir_config('lonAdmEMail');
-        ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm);
-        ($validationitemsref,$validationnamesref,$validationfieldsref) = 
-            &Apache::loncoursequeueadmin::requestcourses_validation_types();
     } elsif ($context eq 'requestauthor') {
         @usertools = ('author');
         %titles = &authorrequest_titles();
@@ -7183,7 +5803,7 @@ sub modify_quotas {
         @usertools = ('aboutme','blog','webdav','portfolio');
         %titles = &tool_titles();
     }
-    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
     my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
     foreach my $key (keys(%env)) {
         if ($context eq 'requestcourses') {
@@ -7211,46 +5831,9 @@ sub modify_quotas {
         }
     }
     if (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
-        my @approvalnotify = &Apache::loncommon::get_env_multiple('form.'.$context.'notifyapproval');
+        my @approvalnotify = &Apache::loncommon::get_env_multiple('form.reqapprovalnotify');
         @approvalnotify = sort(@approvalnotify);
         $confhash{'notify'}{'approval'} = join(',',@approvalnotify);
-        my @crstypes = ('official','unofficial','community','textbook');
-        my @hasuniquecode = &Apache::loncommon::get_env_multiple('form.uniquecode');
-        foreach my $type (@hasuniquecode) {
-            if (grep(/^\Q$type\E$/,@crstypes)) {
-                $confhash{'uniquecode'}{$type} = 1;
-            }
-        }
-        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};
-                            }
-                        }
-                    } else {
-                        $errors .= '<li><span class="LC_error">'.$invalid.'</span></li>';
-                    }
-                }
-            } 
-        }
         if (ref($domconfig{$action}) eq 'HASH') {
             if (ref($domconfig{$action}{'notify'}) eq 'HASH') {
                 if ($domconfig{$action}{'notify'}{'approval'} ne $confhash{'notify'}{'approval'}) {
@@ -7261,232 +5844,10 @@ sub modify_quotas {
                     $changes{'notify'}{'approval'} = 1;
                 }
             }
-            if (ref($domconfig{$action}{'uniquecode'}) eq 'HASH') {
-                if (ref($confhash{'uniquecode'}) eq 'HASH') {
-                    foreach my $crstype (keys(%{$domconfig{$action}{'uniquecode'}})) {
-                        unless ($confhash{'uniquecode'}{$crstype}) {
-                            $changes{'uniquecode'} = 1;
-                        }
-                    }
-                    unless ($changes{'uniquecode'}) {
-                        foreach my $crstype (keys(%{$confhash{'uniquecode'}})) {
-                            unless ($domconfig{$action}{'uniquecode'}{$crstype}) {
-                                $changes{'uniquecode'} = 1;
-                            }
-                        }
-                    }
-               } else {
-                   $changes{'uniquecode'} = 1;
-               }
-            } elsif (ref($confhash{'uniquecode'}) eq 'HASH') {
-                $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;
-                                    #FIXME need to obsolete item in RES space
-                                } elsif ($env{'form.'.$type.'_image_'.$i.'.filename'}) {
-                                    my ($cdom,$cnum) = split(/_/,$key);
-                                    my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,$type.'_image_'.$i,
-                                                                                  $cdom,$cnum,$type,$configuserok,
-                                                                                  $switchserver,$author_ok);
-                                    if ($imgurl) {
-                                        $confhash{$type}{$key}{'image'} = $imgurl;
-                                        $changes{$type}{$key} = 1; 
-                                    }
-                                    if ($error) {
-                                        &Apache::lonnet::logthis($error);
-                                        $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
-                                    } 
-                                } elsif ($domconfig{$action}{$type}{$key}{'image'}) {
-                                    $confhash{$type}{$key}{'image'} = 
-                                        $domconfig{$action}{$type}{$key}{'image'};
-                                }
-                            }
-                        }
-                    }
-                }
-            }
         } else {
             if ($confhash{'notify'}{'approval'}) {
                 $changes{'notify'}{'approval'} = 1;
             }
-            if (ref($confhash{'uniquecode'} eq 'HASH')) {
-                $changes{'uniquecode'} = 1;
-            }
-        }
-        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 (@{$allpos{$type}} > 0) {
-                    my $idx = 0;
-                    foreach my $item (@{$allpos{$type}}) {
-                        if ($item ne '') {
-                            $confhash{$type}{$item}{'order'} = $idx;
-                            if (ref($domconfig{$action}) eq 'HASH') {
-                                if (ref($domconfig{$action}{$type}) eq 'HASH') {
-                                    if (ref($domconfig{$action}{$type}{$item}) eq 'HASH') {
-                                        if ($domconfig{$action}{$type}{$item}{'order'} ne $idx) {
-                                            $changes{$type}{$item} = 1;
-                                        }
-                                    }
-                                }
-                            }
-                            $idx ++;
-                        }
-                    }
-                }
-            }
-            if (ref($validationitemsref) eq 'ARRAY') {
-                foreach my $item (@{$validationitemsref}) {
-                    if ($item eq 'fields') {
-                        my @changed;
-                        @{$confhash{'validation'}{$item}} = &Apache::loncommon::get_env_multiple('form.requestcourses_validation_'.$item);
-                        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}};
-                                }
-                            } else {
-                                @changed = @{$confhash{'validation'}{$item}};
-                            }
-                        } else {
-                            @changed = @{$confhash{'validation'}{$item}};
-                        }
-                        if (@changed) {
-                            if ($confhash{'validation'}{$item}) {
-                                $changes{'validation'}{$item} = join(', ',@{$confhash{'validation'}{$item}});
-                            } else {
-                                $changes{'validation'}{$item} = &mt('None');
-                            }
-                        }
-                    } else {
-                        $confhash{'validation'}{$item} = $env{'form.requestcourses_validation_'.$item};
-                        if ($item eq 'markup') {
-                            if ($env{'form.requestcourses_validation_'.$item}) {
-                                $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};
-                                }
-                            }
-                        } else {
-                            if ($confhash{'validation'}{$item} ne '') {
-                                $changes{'validation'}{$item} = $confhash{'validation'}{$item};
-                            }
-                        }
-                    }
-                }
-            }
-            if ($env{'form.validationdc'}) {
-                my $newval = $env{'form.validationdc'};
-                my %domcoords = &get_active_dcs($dom);
-                if (exists($domcoords{$newval})) {
-                    $confhash{'validation'}{'dc'} = $newval;
-                }
-            }
-            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'};
-                                }
-                            }
-                        } elsif ($confhash{'validation'}{'dc'} ne '') {
-                            $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'};
-                }
-            } else {
-                if (ref($domconfig{'requestcourses'}) eq 'HASH') {
-                    if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') {
-                        if ($domconfig{'requestcourses'}{'validation'}{'dc'}) {
-                            $changes{'validation'}{'dc'} = &mt('None');
-                        }
-                    }
-                }
-            }
         }
     } else {
         $confhash{'defaultquota'}{'default'} = $env{'form.defaultquota'};
@@ -7628,9 +5989,7 @@ sub modify_quotas {
         $domdefaults{'requestauthor'} = \%confhash;
     } else {
         foreach my $key (keys(%confhash)) {
-            unless (($context eq 'requestcourses') && (($key eq 'textbooks') || ($key eq 'templates'))) {
-                $domdefaults{$key} = $confhash{$key};
-            }
+            $domdefaults{$key} = $confhash{$key};
         }
     }
 
@@ -7643,11 +6002,9 @@ sub modify_quotas {
         if (keys(%changes) > 0) {
             my $cachetime = 24*60*60;
             &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
-            if (ref($lastactref) eq 'HASH') {
-                $lastactref->{'domdefaults'} = 1;
-            }
+
             $resulttext = &mt('Changes made:').'<ul>';
-            unless (($context eq 'requestcourses') ||
+            unless (($context eq 'requestcourses') || 
                     ($context eq 'requestauthor')) {
                 if (ref($changes{'defaultquota'}) eq 'HASH') {
                     $resulttext .= '<li>'.&mt('Portfolio default quotas').'<ul>';
@@ -7657,20 +6014,20 @@ sub modify_quotas {
                             if ($type eq 'default') {
                                 $typetitle = $othertitle;
                             }
-                            $resulttext .= '<li>'.&mt('[_1] set to [_2] MB',$typetitle,$confhash{'defaultquota'}{$type}).'</li>';
+                            $resulttext .= '<li>'.&mt('[_1] set to [_2] Mb',$typetitle,$confhash{'defaultquota'}{$type}).'</li>';
                         }
                     }
                     $resulttext .= '</ul></li>';
                 }
                 if (ref($changes{'authorquota'}) eq 'HASH') {
-                    $resulttext .= '<li>'.&mt('Authoring Space default quotas').'<ul>';
+                    $resulttext .= '<li>'.&mt('Authoring space default quotas').'<ul>';
                     foreach my $type (@{$types},'default') {
                         if (defined($changes{'authorquota'}{$type})) {
                             my $typetitle = $usertypes->{$type};
                             if ($type eq 'default') {
                                 $typetitle = $othertitle;
                             }
-                            $resulttext .= '<li>'.&mt('[_1] set to [_2] MB',$typetitle,$confhash{'authorquota'}{$type}).'</li>';
+                            $resulttext .= '<li>'.&mt('[_1] set to [_2] Mb',$typetitle,$confhash{'authorquota'}{$type}).'</li>';
                         }
                     }
                     $resulttext .= '</ul></li>';
@@ -7681,7 +6038,7 @@ sub modify_quotas {
                 my (%haschgs,%inconf);
                 if ($context eq 'requestauthor') {
                     %haschgs = %changes;
-                    %inconf = %confhash;
+                    %inconf = %confhash; 
                 } else {
                     if (ref($changes{$item}) eq 'HASH') {
                         %haschgs = %{$changes{$item}};
@@ -7695,7 +6052,7 @@ sub modify_quotas {
                         &Apache::lonnet::usertools_access($env{'user.name'},
                                                           $env{'user.domain'},
                                                           $item,'reload',$context);
-                    if (($context eq 'requestcourses') ||
+                    if (($context eq 'requestcourses') || 
                         ($context eq 'requestauthor')) {
                         if ($env{'environment.canrequest.'.$item} ne $newacc) {
                             $newenv{'environment.canrequest.'.$item} = $newacc;
@@ -7767,68 +6124,6 @@ sub modify_quotas {
                     }
                 }
             }
-            if ($action eq 'requestcourses') {
-                my @offon = ('off','on');
-                if ($changes{'uniquecode'}) {
-                    if (ref($confhash{'uniquecode'}) eq 'HASH') {
-                        my $codestr = join(' ',map{ &mt($_); } sort(keys(%{$confhash{'uniquecode'}})));
-                        $resulttext .= '<li>'.
-                                       &mt('Generation of six character code as course identifier for distribution to students set to on for: [_1].','<b>'.$codestr.'</b>').
-                                       '</li>';
-                    } else {
-                        $resulttext .= '<li>'.&mt('Generation of six character code as course identifier for distribution to students set to off.').
-                                       '</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>';
-                        }
-                        $resulttext .= '</ul></li>';
-                    }
-                }
-                if (ref($changes{'validation'}) eq 'HASH') {
-                    if ((ref($validationitemsref) eq 'ARRAY') && (ref($validationnamesref) eq 'HASH')) {
-                        $resulttext .= '<li>'.&mt('Validation of courses/communities updated').'<ul>';
-                        foreach my $item (@{$validationitemsref}) {
-                            if (exists($changes{'validation'}{$item})) {
-                                if ($item eq 'markup') {
-                                    $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$validationnamesref->{$item},
-                                                              '<br /><pre>'.$changes{'validation'}{$item}.'</pre>').'</li>';
-                                } else {
-                                    $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$validationnamesref->{$item},
-                                                              '<b>'.$changes{'validation'}{$item}.'</b>').'</li>';
-                                }
-                            }
-                        }
-                        if (exists($changes{'validation'}{'dc'})) {
-                            $resulttext .= '<li>'.&mt('Validated course requests identified as processed by: [_1]',
-                                                     '<b>'.$changes{'validation'}{'dc'}.'</b>').'</li>';
-                        }
-                    }
-                }
-            }
             $resulttext .= '</ul>';
             if (keys(%newenv)) {
                 &Apache::lonnet::appenv(\%newenv);
@@ -7846,42 +6141,11 @@ sub modify_quotas {
         $resulttext = '<span class="LC_error">'.
 	    &mt('An error occurred: [_1]',$putresult).'</span>';
     }
-    if ($errors) {
-        $resulttext .= '<p>'.&mt('The following errors occurred when modifying Textbook settings.').
-                       '<ul>'.$errors.'</ul></p>';
-    }
     return $resulttext;
 }
 
-sub process_textbook_image {
-    my ($r,$dom,$confname,$caller,$cdom,$cnum,$type,$configuserok,$switchserver,$author_ok) = @_;
-    my $filename = $env{'form.'.$caller.'.filename'};
-    my ($error,$url);
-    my ($width,$height) = (50,50);
-    if ($configuserok eq 'ok') {
-        if ($switchserver) {
-            $error = &mt('Upload of textbook image is not permitted to this server: [_1]',
-                         $switchserver);
-        } elsif ($author_ok eq 'ok') {
-            my ($result,$imageurl) =
-                &publishlogo($r,'upload',$caller,$dom,$confname,
-                             "$type/$dom/$cnum/cover",$width,$height);
-            if ($result eq 'ok') {
-                $url = $imageurl;
-            } else {
-                $error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$filename,$result);
-            }
-        } else {
-            $error = &mt("Upload of [_1] failed because an author role could not be assigned to a Domain Configuration user ([_2]) in domain: [_3].  Error was: [_4].",$filename,$confname,$dom,$author_ok);
-        }
-    } else {
-        $error = &mt("Upload of [_1] failed because a Domain Configuration user ([_2]) could not be created in domain: [_3].  Error was: [_4].",$filename,$confname,$dom,$configuserok);
-    }
-    return ($url,$error);
-}
-
 sub modify_autoenroll {
-    my ($dom,$lastactref,%domconfig) = @_;
+    my ($dom,%domconfig) = @_;
     my ($resulttext,%changes);
     my %currautoenroll;
     if (ref($domconfig{'autoenroll'}) eq 'HASH') {
@@ -7892,8 +6156,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'};
@@ -7903,17 +6166,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,
@@ -7940,10 +6197,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'}) {
@@ -7959,20 +6213,6 @@ sub modify_autoenroll {
             if ($changes{'coowners'}) {
                 $resulttext .= '<li>'.&mt("$title{'coowners'} set to $offon[$env{'form.autoassign_coowners'}]").'</li>';
                 &Apache::loncommon::devalidate_domconfig_cache($dom);
-                if (ref($lastactref) eq 'HASH') {
-                    $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 {
@@ -8378,7 +6618,7 @@ sub modify_directorysrch {
                         } else {
                             $chgtext =~ s/\; $//;
                         }
-                        $resulttext .=
+                        $resulttext .= 
                             '<li>'.
                             &mt("Users from domain '[_1]' permitted to search the institutional directory set to: [_2]",
                                 '<span class="LC_cusr_emph">'.$dom.'</span>',$chgtext).
@@ -8424,7 +6664,7 @@ sub modify_directorysrch {
 }
 
 sub modify_contacts {
-    my ($dom,$lastactref,%domconfig) = @_;
+    my ($dom,%domconfig) = @_;
     my ($resulttext,%currsetting,%newsetting,%changes,%contacts_hash);
     if (ref($domconfig{'contacts'}) eq 'HASH') {
         foreach my $key (keys(%{$domconfig{'contacts'}})) {
@@ -8434,8 +6674,7 @@ sub modify_contacts {
     my (%others,%to,%bcc);
     my @contacts = ('supportemail','adminemail');
     my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail',
-                    'requestsmail','updatesmail','idconflictsmail');
-    my @toggles = ('reporterrors','reportupdates');
+                    'requestsmail','updatesmail');
     foreach my $type (@mailings) {
         @{$newsetting{$type}} = 
             &Apache::loncommon::get_env_multiple('form.'.$type);
@@ -8457,11 +6696,6 @@ sub modify_contacts {
         $to{$item} = $env{'form.'.$item};
         $contacts_hash{'contacts'}{$item} = $to{$item};
     }
-    foreach my $item (@toggles) {
-        if ($env{'form.'.$item} =~ /^(0|1)$/) {
-            $contacts_hash{'contacts'}{$item} = $env{'form.'.$item};
-        }
-    }
     if (keys(%currsetting) > 0) {
         foreach my $item (@contacts) {
             if ($to{$item} ne $currsetting{$item}) {
@@ -8500,7 +6734,7 @@ sub modify_contacts {
         foreach my $item (@contacts) {
            if ($to{$item} ne $default{$item}) {
               $changes{$item} = 1;
-           }
+           } 
         }
         foreach my $type (@mailings) {
             if ((@{$newsetting{$type}} != 1) || ($newsetting{$type}[0] ne $default{$type})) {
@@ -8517,22 +6751,10 @@ sub modify_contacts {
             }
         }
     }
-    foreach my $item (@toggles) {
-        if (($env{'form.'.$item} == 1) && ($currsetting{$item} == 0)) {
-            $changes{$item} = 1;
-        } elsif ((!$env{'form.'.$item}) &&
-                 (($currsetting{$item} eq '') || ($currsetting{$item} == 1))) {
-            $changes{$item} = 1;
-        }
-    }
     my $putresult = &Apache::lonnet::put_dom('configuration',\%contacts_hash,
                                              $dom);
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
-            &Apache::loncommon::devalidate_domconfig_cache($dom);
-            if (ref($lastactref) eq 'HASH') {
-                $lastactref->{'domainconfig'} = 1;
-            }
             my ($titles,$short_titles)  = &contact_titles();
             $resulttext = &mt('Changes made:').'<ul>';
             foreach my $item (@contacts) {
@@ -8563,23 +6785,6 @@ sub modify_contacts {
                     $resulttext .= '</li>';
                 }
             }
-            my @offon = ('off','on');
-            if ($changes{'reporterrors'}) {
-                $resulttext .= '<li>'.
-                               &mt('E-mail error reports to [_1] set to "'.
-                                   $offon[$env{'form.reporterrors'}].'".',
-                                   &Apache::loncommon::modal_link('http://loncapa.org/core.html',
-                                       &mt('LON-CAPA core group - MSU'),600,500)).
-                               '</li>';
-            }
-            if ($changes{'reportupdates'}) {
-                $resulttext .= '<li>'.
-                                &mt('E-mail record of completed LON-CAPA updates to [_1] set to "'.
-                                    $offon[$env{'form.reportupdates'}].'".',
-                                    &Apache::loncommon::modal_link('http://loncapa.org/core.html',
-                                        &mt('LON-CAPA core group - MSU'),600,500)).
-                                '</li>';
-            }
             $resulttext .= '</ul>';
         } else {
             $resulttext = &mt('No changes made to contact information');
@@ -8593,38 +6798,106 @@ sub modify_contacts {
 
 sub modify_usercreation {
     my ($dom,%domconfig) = @_;
-    my ($resulttext,%curr_usercreation,%changes,%authallowed,%cancreate,%save_usercreate);
+    my ($resulttext,%curr_usercreation,%changes,%authallowed,%cancreate);
     my $warningmsg;
     if (ref($domconfig{'usercreation'}) eq 'HASH') {
         foreach my $key (keys(%{$domconfig{'usercreation'}})) {
-            if ($key eq 'cancreate') {
-                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')) {
-                            $save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
-                        } else {
-                            $curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
-                        }
-                    }
-                }
-            } elsif ($key eq 'email_rule') {
-                $save_usercreate{$key} = $domconfig{'usercreation'}{$key};
-            } else {
-                $curr_usercreation{$key} = $domconfig{'usercreation'}{$key};
-            }
+            $curr_usercreation{$key} = $domconfig{'usercreation'}{$key};
         }
     }
     my @username_rule = &Apache::loncommon::get_env_multiple('form.username_rule');
     my @id_rule = &Apache::loncommon::get_env_multiple('form.id_rule');
-    my @contexts = ('author','course','requestcrs');
+    my @email_rule = &Apache::loncommon::get_env_multiple('form.email_rule');
+    my @contexts = ('author','course','requestcrs','selfcreate');
     foreach my $item(@contexts) {
-        $cancreate{$item} = $env{'form.can_createuser_'.$item};
+        if ($item eq 'selfcreate') {
+            @{$cancreate{$item}} = &Apache::loncommon::get_env_multiple('form.can_createuser_'.$item);
+            my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+            if (!((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth'))) {
+                if (ref($cancreate{$item}) eq 'ARRAY') { 
+                    if (grep(/^login$/,@{$cancreate{$item}})) {
+                        $warningmsg = &mt('Although account creation has been set to be available for institutional logins, currently default authentication in this domain has not been set to support this.').' '.&mt('You need to set the default authentication type to Kerberos 4 or 5 (with a Kerberos domain specified), or to Local authentication, if the localauth module has been customized in your domain to authenticate institutional logins.');   
+                    }
+                }
+            }
+        } else {
+            $cancreate{$item} = $env{'form.can_createuser_'.$item};
+        }
+    }
+    my ($othertitle,$usertypes,$types) = 
+        &Apache::loncommon::sorted_inst_types($dom);
+    if (ref($types) eq 'ARRAY') {
+        if (@{$types} > 0) {
+            @{$cancreate{'statustocreate'}} = 
+                &Apache::loncommon::get_env_multiple('form.statustocreate');
+        } else {
+            @{$cancreate{'statustocreate'}} = ();
+        }
+        push(@contexts,'statustocreate');
     }
+    &process_captcha('cancreate',\%changes,\%cancreate,\%curr_usercreation);
     if (ref($curr_usercreation{'cancreate'}) eq 'HASH') {
         foreach my $item (@contexts) {
-            if ($curr_usercreation{'cancreate'}{$item} ne $cancreate{$item}) {
-                push(@{$changes{'cancreate'}},$item);
+            if (($item eq 'selfcreate') || ($item eq 'statustocreate')) {
+                if (ref($curr_usercreation{'cancreate'}{$item}) eq 'ARRAY') {
+                    foreach my $curr (@{$curr_usercreation{'cancreate'}{$item}}) {
+                        if (ref($cancreate{$item}) eq 'ARRAY') {
+                            if (!grep(/^$curr$/,@{$cancreate{$item}})) {
+                                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                    push(@{$changes{'cancreate'}},$item);
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    if ($curr_usercreation{'cancreate'}{$item} eq '') {
+                        if (@{$cancreate{$item}} > 0) {
+                            if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                push(@{$changes{'cancreate'}},$item);
+                            }
+                        }
+                    } else {
+                        if ($curr_usercreation{'cancreate'}{$item} eq 'any') {
+                            if (@{$cancreate{$item}} < 3) {
+                                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                    push(@{$changes{'cancreate'}},$item);
+                                }
+                            }
+                        } elsif ($curr_usercreation{'cancreate'}{$item} eq 'none') {
+                            if (@{$cancreate{$item}} > 0) {
+                                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                    push(@{$changes{'cancreate'}},$item);
+                                }
+                            }
+                        } elsif (!grep(/^$curr_usercreation{'cancreate'}{$item}$/,@{$cancreate{$item}})) {
+                            if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                push(@{$changes{'cancreate'}},$item);
+                            }
+                        }
+                    }
+                }
+                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                    foreach my $type (@{$cancreate{$item}}) {
+                        if (ref($curr_usercreation{'cancreate'}{$item}) eq 'ARRAY') {
+                            if (!grep(/^$type$/,@{$curr_usercreation{'cancreate'}{$item}})) {
+                                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                    push(@{$changes{'cancreate'}},$item);
+                                }
+                            }
+                        } elsif (($curr_usercreation{'cancreate'}{$item} ne 'any') &&
+                                 ($curr_usercreation{'cancreate'}{$item} ne 'none')) {
+                            if ($curr_usercreation{'cancreate'}{$item} ne $type) {
+                                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                    push(@{$changes{'cancreate'}},$item);
+                                }
+                            }
+                        }
+                    }
+                }
+            } else {
+                if ($curr_usercreation{'cancreate'}{$item} ne $cancreate{$item}) {
+                    push(@{$changes{'cancreate'}},$item);
+                }
             }
         }
     } elsif (ref($curr_usercreation{'cancreate'}) eq 'ARRAY') {
@@ -8675,6 +6948,21 @@ sub modify_usercreation {
         push(@{$changes{'id_rule'}},@id_rule);
     }
 
+    if (ref($curr_usercreation{'email_rule'}) eq 'ARRAY') {
+        foreach my $type (@{$curr_usercreation{'email_rule'}}) {
+            if (!grep(/^\Q$type\E$/,@email_rule)) {
+                push(@{$changes{'email_rule'}},$type);
+            }
+        }
+        foreach my $type (@email_rule) {
+            if (!grep(/^\Q$type\E$/,@{$curr_usercreation{'email_rule'}})) {
+                push(@{$changes{'email_rule'}},$type);
+            }
+        }
+    } else {
+        push(@{$changes{'email_rule'}},@email_rule);
+    }
+
     my @authen_contexts = ('author','course','domain');
     my @authtypes = ('int','krb4','krb5','loc');
     my %authhash;
@@ -8705,493 +6993,39 @@ sub modify_usercreation {
         }
     }
 
-    $save_usercreate{'cancreate'}{'course'} = $cancreate{'course'}; 
-    $save_usercreate{'cancreate'}{'author'} = $cancreate{'author'};
-    $save_usercreate{'cancreate'}{'requestcrs'} = $cancreate{'requestcrs'};
-    $save_usercreate{'id_rule'} = \@id_rule;
-    $save_usercreate{'username_rule'} = \@username_rule,
-    $save_usercreate{'authtypes'} = \%authhash;
-
     my %usercreation_hash =  (
-        usercreation     => \%save_usercreate,
-    );
+            usercreation => {
+                              cancreate     => \%cancreate,
+                              username_rule => \@username_rule,
+                              id_rule       => \@id_rule,
+                              email_rule    => \@email_rule,
+                              authtypes     => \%authhash,
+                            }
+            );
 
     my $putresult = &Apache::lonnet::put_dom('configuration',\%usercreation_hash,
                                              $dom);
 
-    if ($putresult eq 'ok') {
-        if (keys(%changes) > 0) {
-            $resulttext = &mt('Changes made:').'<ul>';
-            if (ref($changes{'cancreate'}) eq 'ARRAY') {
-                my %lt = &usercreation_types();
-                foreach my $type (@{$changes{'cancreate'}}) {
-                    my $chgtext = $lt{$type}.', ';
-                    if ($cancreate{$type} eq 'none') {
-                        $chgtext .= &mt('creation of new users is not permitted, except by a Domain Coordinator.');
-                    } elsif ($cancreate{$type} eq 'any') {
-                        $chgtext .= &mt('creation of new users is permitted for both institutional and non-institutional usernames.');
-                    } elsif ($cancreate{$type} eq 'official') {
-                        $chgtext .= &mt('creation of new users is only permitted for institutional usernames.');
-                    } elsif ($cancreate{$type} eq 'unofficial') {
-                        $chgtext .= &mt('creation of new users is only permitted for non-institutional usernames.');
-                    }
-                    $resulttext .= '<li>'.$chgtext.'</li>';
-                }
-            }
-            if (ref($changes{'username_rule'}) eq 'ARRAY') {
-                my ($rules,$ruleorder) = 
-                    &Apache::lonnet::inst_userrules($dom,'username');
-                my $chgtext = '<ul>';
-                foreach my $type (@username_rule) {
-                    if (ref($rules->{$type}) eq 'HASH') {
-                        $chgtext .= '<li>'.$rules->{$type}{'name'}.'</li>';
-                    }
-                }
-                $chgtext .= '</ul>';
-                if (@username_rule > 0) {
-                    $resulttext .= '<li>'.&mt('Usernames with the following formats are restricted to verified users in the institutional directory: ').$chgtext.'</li>';     
-                } else {
-                    $resulttext .= '<li>'.&mt('There are now no username formats restricted to verified users in the institutional directory.').'</li>'; 
-                }
-            }
-            if (ref($changes{'id_rule'}) eq 'ARRAY') {
-                my ($idrules,$idruleorder) = 
-                    &Apache::lonnet::inst_userrules($dom,'id');
-                my $chgtext = '<ul>';
-                foreach my $type (@id_rule) {
-                    if (ref($idrules->{$type}) eq 'HASH') {
-                        $chgtext .= '<li>'.$idrules->{$type}{'name'}.'</li>';
-                    }
-                }
-                $chgtext .= '</ul>';
-                if (@id_rule > 0) {
-                    $resulttext .= '<li>'.&mt('IDs with the following formats are restricted to verified users in the institutional directory: ').$chgtext.'</li>';
-                } else {
-                    $resulttext .= '<li>'.&mt('There are now no ID formats restricted to verified users in the institutional directory.').'</li>';
-                }
-            }
-            my %authname = &authtype_names();
-            my %context_title = &context_names();
-            if (ref($changes{'authtypes'}) eq 'ARRAY') {
-                my $chgtext = '<ul>';
-                foreach my $type (@{$changes{'authtypes'}}) {
-                    my @allowed;
-                    $chgtext .= '<li><span class="LC_cusr_emph">'.$context_title{$type}.'</span> - '.&mt('assignable authentication types: ');
-                    foreach my $auth (@authtypes) {
-                        if ($authhash{$type}{$auth}) {
-                            push(@allowed,$authname{$auth});
-                        }
-                    }
-                    if (@allowed > 0) {
-                        $chgtext .= join(', ',@allowed).'</li>';
-                    } else {
-                        $chgtext .= &mt('none').'</li>';
-                    }
-                }
-                $chgtext .= '</ul>';
-                $resulttext .= '<li>'.&mt('Authentication types available for assignment to new users').'<br />'.$chgtext;
-                $resulttext .= '</li>';
-            }
-            $resulttext .= '</ul>';
-        } else {
-            $resulttext = &mt('No changes made to user creation settings');
-        }
-    } else {
-        $resulttext = '<span class="LC_error">'.
-            &mt('An error occurred: [_1]',$putresult).'</span>';
-    }
-    if ($warningmsg ne '') {
-        $resulttext .= '<br /><span class="LC_warning">'.$warningmsg.'</span><br />';
-    }
-    return $resulttext;
-}
-
-sub modify_selfcreation {
-    my ($dom,%domconfig) = @_;
-    my ($resulttext,$warningmsg,%curr_usercreation,%curr_usermodify,%changes,%cancreate);
-    my (%save_usercreate,%save_usermodify);
-    my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-    if (ref($types) eq 'ARRAY') {
-        $usertypes->{'default'} = $othertitle;
-        push(@{$types},'default');
-    }
-#
-# Retrieve current domain configuration for self-creation of usernames from $domconfig{'usercreation'}.
-#
-    if (ref($domconfig{'usercreation'}) eq 'HASH') {
-        foreach my $key (keys(%{$domconfig{'usercreation'}})) {
-            if ($key eq 'cancreate') {
-                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 'emailusername') || ($item eq 'notify') ||
-                            ($item eq 'selfcreateprocessing') || ($item eq 'shibenv')) {
-                            $curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
-                        } else {
-                            $save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
-                        }
-                    }
-                }
-            } elsif ($key eq 'email_rule') {
-                $curr_usercreation{$key} = $domconfig{'usercreation'}{$key};
-            } else {
-                $save_usercreate{$key} = $domconfig{'usercreation'}{$key};
-            }
-        }
-    }
-#
-# Retrieve current domain configuration for self-creation of usernames from $domconfig{'usermodification'}.
-#
-    if (ref($domconfig{'usermodification'}) eq 'HASH') {
-        foreach my $key (keys(%{$domconfig{'usermodification'}})) {
-            if ($key eq 'selfcreate') {
-                $curr_usermodify{$key} = $domconfig{'usermodification'}{$key};
-            } else {
-                $save_usermodify{$key} = $domconfig{'usermodification'}{$key};
-            }
-        }
-    }
-
-    my @contexts = ('selfcreate');
-    @{$cancreate{'selfcreate'}} = ();
-    %{$cancreate{'emailusername'}} = ();
-    @{$cancreate{'statustocreate'}} = ();
-    %{$cancreate{'selfcreateprocessing'}} = ();
-    %{$cancreate{'shibenv'}} = ();
     my %selfcreatetypes = (
                              sso   => 'users authenticated by institutional single sign on',
                              login => 'users authenticated by institutional log-in',
-                             email => 'users who provide a valid e-mail address for use as username',
+                             email => 'users who provide a valid e-mail address for use as the username',
                           );
-#
-# Populate $cancreate{'selfcreate'} array reference with types of user, for which self-creation of user accounts
-# is permitted.
-#
-
-    my @statuses;
-    if (ref($domconfig{'inststatus'}) eq 'HASH') {
-        if (ref($domconfig{'inststatus'}{'inststatusguest'}) eq 'ARRAY') {
-            @statuses = @{$domconfig{'inststatus'}{'inststatusguest'}};
-        }
-    }
-    push(@statuses,'default');
-
-    foreach my $item ('login','sso','email') {
-        if ($item eq 'email') {
-            if ($env{'form.cancreate_email'}) {
-                push(@{$cancreate{'selfcreate'}},'email');
-                push(@contexts,'selfcreateprocessing');
-                foreach my $type (@statuses) {
-                    if ($type eq 'default') {
-                        $cancreate{'selfcreateprocessing'}{$type} = $env{'form.cancreate_emailprocess'};
-                    } else { 
-                        $cancreate{'selfcreateprocessing'}{$type} = $env{'form.cancreate_emailprocess_'.$type};
-                    }
-                }
-            }
-        } else {
-            if ($env{'form.cancreate_'.$item}) {
-                push(@{$cancreate{'selfcreate'}},$item);
-            }
-        }
-    }
-    my (@email_rule,%userinfo,%savecaptcha);
-    my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
-#
-# Populate $cancreate{'emailusername'}{$type} hash ref with information fields (if new user will provide data
-# value set to one), if self-creation with e-mail address permitted, where $type is user type: faculty, staff, student etc.
-#
-
-    if ($env{'form.cancreate_email'}) {
-        push(@contexts,'emailusername');
-        if (ref($types) eq 'ARRAY') {
-            foreach my $type (@{$types}) {
-                if (ref($infofields) eq 'ARRAY') {
-                    foreach my $field (@{$infofields}) {
-                        if ($env{'form.canmodify_emailusername_'.$type.'_'.$field} =~ /^(required|optional)$/) {
-                            $cancreate{'emailusername'}{$type}{$field} = $1;
-                        }
-                    }
-                }
-            }
-        }
-#
-# Populate $cancreate{'notify'} hash ref with names of Domain Coordinators who are to be notified of
-# queued requests for self-creation of account using e-mail address as username
-#
-
-        my @approvalnotify = &Apache::loncommon::get_env_multiple('form.selfcreationnotifyapproval');
-        @approvalnotify = sort(@approvalnotify);
-        $cancreate{'notify'}{'approval'} = join(',',@approvalnotify);
-        if (ref($curr_usercreation{'cancreate'}) eq 'HASH') {
-            if (ref($curr_usercreation{'cancreate'}{'notify'}) eq 'HASH') {
-                if ($curr_usercreation{'cancreate'}{'notify'}{'approval'} ne $cancreate{'notify'}{'approval'}) {
-                    push(@{$changes{'cancreate'}},'notify');
-                }
-            } else {
-                if ($cancreate{'notify'}{'approval'}) {
-                    push(@{$changes{'cancreate'}},'notify');
-                }
-            }
-        } elsif ($cancreate{'notify'}{'approval'}) {
-            push(@{$changes{'cancreate'}},'notify');
-        }
-
-#
-# Retrieve rules (if any) governing types of e-mail address which may be used as a username
-#
-        @email_rule = &Apache::loncommon::get_env_multiple('form.email_rule');
-        &process_captcha('cancreate',\%changes,\%savecaptcha,$curr_usercreation{'cancreate'});
-        if (ref($curr_usercreation{'email_rule'}) eq 'ARRAY') {
-            if (@{$curr_usercreation{'email_rule'}} > 0) {
-                foreach my $type (@{$curr_usercreation{'email_rule'}}) {
-                    if (!grep(/^\Q$type\E$/,@email_rule)) {
-                        push(@{$changes{'email_rule'}},$type);
-                    }
-                }
-            }
-            if (@email_rule > 0) {
-                foreach my $type (@email_rule) {
-                    if (!grep(/^\Q$type\E$/,@{$curr_usercreation{'email_rule'}})) {
-                        push(@{$changes{'email_rule'}},$type);
-                    }
-                }
-            }
-        } elsif (@email_rule > 0) {
-            push(@{$changes{'email_rule'}},@email_rule);
-        }
-    }
-#  
-# Check if domain default is set appropriately, if self-creation of accounts is to be available for
-# institutional log-in.
-#
-    if (grep(/^login$/,@{$cancreate{'selfcreate'}})) {
-        my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
-        if (!((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || 
-               ($domdefaults{'auth_def'} eq 'localauth'))) {
-            $warningmsg = &mt('Although account creation has been set to be available for institutional logins, currently default authentication in this domain has not been set to support this.').' '.
-                          &mt('You need to set the default authentication type to Kerberos 4 or 5 (with a Kerberos domain specified), or to Local authentication, if the localauth module has been customized in your domain to authenticate institutional logins.');
-        }
-    }
-    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:
-# (a) populate $cancreate{'statustocreate'} array reference with institutional status types who
-# may self-create accounts 
-# (b) populate $save_usermodify{'selfcreate'} hash reference with status types, and information fields
-# which the user may supply, if institutional data is unavailable.
-#
-    if (($env{'form.cancreate_login'}) || ($env{'form.cancreate_sso'})) {
-        if (ref($types) eq 'ARRAY') {
-            if (@{$types} > 1) {
-                @{$cancreate{'statustocreate'}} = &Apache::loncommon::get_env_multiple('form.statustocreate');
-                push(@contexts,'statustocreate');
-            } else {
-                undef($cancreate{'statustocreate'});
-            } 
-            foreach my $type (@{$types}) {
-                my @modifiable =  &Apache::loncommon::get_env_multiple('form.canmodify_'.$type);
-                foreach my $field (@fields) {
-                    if (grep(/^\Q$field\E$/,@modifiable)) {
-                        $save_usermodify{'selfcreate'}{$type}{$field} = 1;
-                    } else {
-                        $save_usermodify{'selfcreate'}{$type}{$field} = 0;
-                    }
-                }
-            }
-            if (ref($curr_usermodify{'selfcreate'}) eq 'HASH') {
-                foreach my $type (@{$types}) {
-                    if (ref($curr_usermodify{'selfcreate'}{$type}) eq 'HASH') {
-                        foreach my $field (@fields) {
-                            if ($save_usermodify{'selfcreate'}{$type}{$field} ne
-                                $curr_usermodify{'selfcreate'}{$type}{$field}) {
-                                push(@{$changes{'selfcreate'}},$type);
-                                last;
-                            }
-                        }
-                    }
-                }
-            } else {
-                foreach my $type (@{$types}) {
-                    push(@{$changes{'selfcreate'}},$type);
-                }
-            }
-        }
-        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') {
-            foreach my $curr (@{$curr_usercreation{'cancreate'}{$item}}) {
-                if (ref($cancreate{$item}) eq 'ARRAY') {
-                    if (!grep(/^$curr$/,@{$cancreate{$item}})) {
-                        if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
-                            push(@{$changes{'cancreate'}},$item);
-                        }
-                    }
-                }
-            }
-            if (ref($cancreate{$item}) eq 'ARRAY') {
-                foreach my $type (@{$cancreate{$item}}) {
-                    if (!grep(/^$type$/,@{$curr_usercreation{'cancreate'}{$item}})) {
-                        if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
-                            push(@{$changes{'cancreate'}},$item);
-                        }
-                    }
-                }
-            }
-        } elsif (ref($curr_usercreation{'cancreate'}{$item}) eq 'HASH') {
-            if (ref($cancreate{$item}) eq 'HASH') {
-                foreach my $curr (keys(%{$curr_usercreation{'cancreate'}{$item}})) {
-                    if (ref($curr_usercreation{'cancreate'}{$item}{$curr}) eq 'HASH') {
-                        foreach my $field (keys(%{$curr_usercreation{'cancreate'}{$item}{$curr}})) {
-                            unless ($curr_usercreation{'cancreate'}{$item}{$curr}{$field} eq $cancreate{$item}{$curr}{$field}) {
-                                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
-                                    push(@{$changes{'cancreate'}},$item);
-                                }
-                            }
-                        }
-                    } elsif ($item eq 'selfcreateprocessing') {
-                        if ($cancreate{$item}{$curr} ne $curr_usercreation{'cancreate'}{$item}{$curr}) {
-                            if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
-                                push(@{$changes{'cancreate'}},$item);
-                            }
-                        }
-                    } else {
-                        if (!$cancreate{$item}{$curr}) {
-                            if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
-                                push(@{$changes{'cancreate'}},$item);
-                            }
-                        }
-                    }
-                }
-                foreach my $field (keys(%{$cancreate{$item}})) {
-                    if (ref($cancreate{$item}{$field}) eq 'HASH') {
-                        foreach my $inner (keys(%{$cancreate{$item}{$field}})) {
-                            if (ref($curr_usercreation{'cancreate'}{$item}{$field}) eq 'HASH') {
-                                unless ($curr_usercreation{'cancreate'}{$item}{$field}{$inner} eq $cancreate{$item}{$field}{$inner}) {
-                                    if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
-                                        push(@{$changes{'cancreate'}},$item);
-                                    }
-                                }
-                            } else {
-                                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
-                                    push(@{$changes{'cancreate'}},$item);
-                                }
-                            }
-                        }
-                    } elsif ($item eq 'selfcreateprocessing') {
-                        if ($cancreate{$item}{$field} ne $curr_usercreation{'cancreate'}{$item}{$field}) {
-                            if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
-                                push(@{$changes{'cancreate'}},$item);
-                            }
-                        }
-                    } else {
-                        if (!$curr_usercreation{'cancreate'}{$item}{$field}) {
-                            if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
-                                push(@{$changes{'cancreate'}},$item);
-                            }
-                        }
-                    }
-                }
-            }
-        } elsif ($curr_usercreation{'cancreate'}{$item}) {
-            if (ref($cancreate{$item}) eq 'ARRAY') {
-                if (!grep(/^\Q$curr_usercreation{'cancreate'}{$item}\E$/,@{$cancreate{$item}})) {
-                    if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
-                        push(@{$changes{'cancreate'}},$item);
-                    }
-                }
-            } elsif (ref($cancreate{$item}) eq 'HASH') {
-                if (!$cancreate{$item}{$curr_usercreation{'cancreate'}{$item}}) {
-                    if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
-                        push(@{$changes{'cancreate'}},$item);
-                    }
-                }
-            }
-        } elsif ($item eq 'emailusername') {
-            if (ref($cancreate{$item}) eq 'HASH') {
-                foreach my $type (keys(%{$cancreate{$item}})) {
-                    if (ref($cancreate{$item}{$type}) eq 'HASH') {
-                        foreach my $field (keys(%{$cancreate{$item}{$type}})) {
-                            if ($cancreate{$item}{$type}{$field}) {
-                                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
-                                    push(@{$changes{'cancreate'}},$item);
-                                }
-                                last;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-#
-# Populate %save_usercreate hash with updates to self-creation configuration.
-#
-    $save_usercreate{'cancreate'}{'captcha'} = $savecaptcha{'captcha'};
-    $save_usercreate{'cancreate'}{'recaptchakeys'} = $savecaptcha{'recaptchakeys'};
-    $save_usercreate{'cancreate'}{'selfcreate'} = $cancreate{'selfcreate'};
-    if (ref($cancreate{'notify'}) eq 'HASH') {
-        $save_usercreate{'cancreate'}{'notify'} = $cancreate{'notify'};
-    }
-    if (ref($cancreate{'selfcreateprocessing'}) eq 'HASH') {
-        $save_usercreate{'cancreate'}{'selfcreateprocessing'} = $cancreate{'selfcreateprocessing'};
-    }
-    if (ref($cancreate{'statustocreate'}) eq 'ARRAY') {
-        $save_usercreate{'cancreate'}{'statustocreate'} = $cancreate{'statustocreate'};
-    }
-    if (ref($cancreate{'shibenv'}) eq 'HASH') {
-        $save_usercreate{'cancreate'}{'shibenv'} = $cancreate{'shibenv'};
-    }
-    $save_usercreate{'cancreate'}{'emailusername'} = $cancreate{'emailusername'};
-    $save_usercreate{'emailrule'} = \@email_rule;
-
-    my %userconfig_hash = (
-            usercreation     => \%save_usercreate,
-            usermodification => \%save_usermodify,
-    );
-    my $putresult = &Apache::lonnet::put_dom('configuration',\%userconfig_hash,
-                                             $dom);
-#
-# Accumulate details of changes to domain cofiguration for self-creation of usernames in $resulttext
-#
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made:').'<ul>';
             if (ref($changes{'cancreate'}) eq 'ARRAY') {
-                my %lt = &selfcreation_types();
+                my %lt = &usercreation_types();
                 foreach my $type (@{$changes{'cancreate'}}) {
                     my $chgtext;
+                    unless (($type eq 'statustocreate') || ($type eq 'captcha') || ($type eq 'recaptchakeys')) {
+                        $chgtext = $lt{$type}.', ';
+                    }
                     if ($type eq 'selfcreate') {
                         if (@{$cancreate{$type}} == 0) {
-                            $chgtext .= &mt('Self creation of a new user account is not permitted.');
+                            $chgtext .= &mt('creation of a new user account is not permitted.');
                         } else {
-                            $chgtext .= &mt('Self-creation of a new account is permitted for:').
-                                        '<ul>';
+                            $chgtext .= &mt('creation of a new account is permitted for:').'<ul>';
                             foreach my $case (@{$cancreate{$type}}) {
                                 $chgtext .= '<li>'.$selfcreatetypes{$case}.'</li>';
                             }
@@ -9200,43 +7034,22 @@ sub modify_selfcreation {
                                 if (grep(/^(login|sso)$/,@{$cancreate{$type}})) {
                                     if (ref($cancreate{'statustocreate'}) eq 'ARRAY') {
                                         if (@{$cancreate{'statustocreate'}} == 0) {
-                                            $chgtext .= '<br />'.
-                                                        '<span class="LC_warning">'.
-                                                        &mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts.").
-                                                        '</span>';
+                                            $chgtext .= '<br /><span class="LC_warning">'.&mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts.").'</span>';
                                         }
                                     }
                                 }
                             }
                         }
-                    } 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')) {
                             if (@{$cancreate{'selfcreate'}} > 0) {
                                 if (@{$cancreate{'statustocreate'}} == 0) {
+
                                     $chgtext .= &mt("Institutional affiliations permitted to create accounts set to 'None'.");
                                     if (!grep(/^email$/,@{$cancreate{'selfcreate'}})) {
-                                        $chgtext .= '<br />'.
-                                                    '<span class="LC_warning">'.
-                                                    &mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts.").
-                                                    '</span>';
-                                    }
+                                        $chgtext .= '<br /><span class="LC_warning">'.&mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts.").'</span>';
+                                    } 
                                 } elsif (ref($usertypes) eq 'HASH') {
                                     if (grep(/^(login|sso)$/,@{$cancreate{'selfcreate'}})) {
                                         $chgtext .= &mt('Creation of a new account for an institutional user is restricted to the following institutional affiliation(s):');
@@ -9253,9 +7066,7 @@ sub modify_selfcreation {
                                     }
                                     $chgtext .= '</ul>';
                                     if (!grep(/^(login|sso)$/,@{$cancreate{'selfcreate'}})) {
-                                        $chgtext .= '<br /><span class="LC_warning">'.
-                                                    &mt('However, users authenticated by institutional login/single sign on are not currently permitted to create accounts.').
-                                                    '</span>';
+                                        $chgtext .= '<br /><span class="LC_warning">'.&mt('However, users authenticated by institutional login/single sign on are not currently permitted to create accounts.').'</span>';
                                     }
                                 }
                             } else {
@@ -9266,42 +7077,22 @@ sub modify_selfcreation {
                                 }
                             }
                         }
-                    } elsif ($type eq 'selfcreateprocessing') {
-                        my %choices = &Apache::lonlocal::texthash (
-                                                                    automatic => 'Automatic approval',
-                                                                    approval  => 'Queued for approval',
-                                                                  );
-                        if (@statuses > 1) {
-                            $chgtext .= &mt('Processing of requests to create account with e-mail address as username set as follows:'). 
-                                        '<ul>';
-                           foreach my $type (@statuses) {
-                               if ($type eq 'default') {
-                                   $chgtext .= '<li>'.$othertitle.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$type}}.'</li>';
-                               } else {
-                                   $chgtext .= '<li>'.$usertypes->{$type}.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$type}}.'</li>';
-                               }
-                           }
-                           $chgtext .= '</ul>';
-                        } else {
-                           $chgtext .= &mt('Processing of requests to create account with e-mail address as username set to: "[_1]"',
-                                         $choices{$cancreate{'selfcreateprocessing'}{'default'}});
-                        }
                     } elsif ($type eq 'captcha') {
-                        if ($savecaptcha{$type} eq 'notused') {
+                        if ($cancreate{$type} eq 'notused') {
                             $chgtext .= &mt('No CAPTCHA validation in use for self-creation screen.');
                         } else {
                             my %captchas = &captcha_phrases();
-                            if ($captchas{$savecaptcha{$type}}) {
-                                $chgtext .= &mt("Validation for self-creation screen set to $captchas{$savecaptcha{$type}}.");
+                            if ($captchas{$cancreate{$type}}) {
+                                $chgtext .= &mt("Validation for self-creation screen set to $captchas{$cancreate{$type}}.");
                             } else {
-                                $chgtext .= &mt('Validation for self-creation screen set to unknown type.');
+                                $chgtext .= &mt('Validation for self-creation screen set to unknown type.'); 
                             }
                         }
                     } elsif ($type eq 'recaptchakeys') {
                         my ($privkey,$pubkey);
-                        if (ref($savecaptcha{$type}) eq 'HASH') {
-                            $pubkey = $savecaptcha{$type}{'public'};
-                            $privkey = $savecaptcha{$type}{'private'};
+                        if (ref($cancreate{$type}) eq 'HASH') {
+                            $pubkey = $cancreate{$type}{'public'};
+                            $privkey = $cancreate{$type}{'private'};
                         }
                         $chgtext .= &mt('ReCAPTCHA keys changes').'<ul>';
                         if (!$pubkey) {
@@ -9315,43 +7106,51 @@ sub modify_selfcreation {
                             $chgtext .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>';
                         }
                         $chgtext .= '</ul>';
-                    } 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}'").
-                                                    '<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 />';
-                                        }
-                                    } 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 />';
-                                    }
-                                }
-                            }
-                        }
-                    } elsif ($type eq 'notify') {
-                        $chgtext = &mt('No Domain Coordinators will receive notification of username requests requiring approval.');
-                        if (ref($changes{'cancreate'}) eq 'ARRAY') {
-                            if ((grep(/^notify$/,@{$changes{'cancreate'}})) && (ref($cancreate{'notify'}) eq 'HASH')) {
-                                if ($cancreate{'notify'}{'approval'}) {
-                                    $chgtext = &mt('Notification of username requests requiring approval will be sent to: ').$cancreate{'notify'}{'approval'};
-                                }
-                            }
+                    } else {
+                        if ($cancreate{$type} eq 'none') {
+                            $chgtext .= &mt('creation of new users is not permitted, except by a Domain Coordinator.');
+                        } elsif ($cancreate{$type} eq 'any') {
+                            $chgtext .= &mt('creation of new users is permitted for both institutional and non-institutional usernames.');
+                        } elsif ($cancreate{$type} eq 'official') {
+                            $chgtext .= &mt('creation of new users is only permitted for institutional usernames.');
+                        } elsif ($cancreate{$type} eq 'unofficial') {
+                            $chgtext .= &mt('creation of new users is only permitted for non-institutional usernames.');
                         }
                     }
-                    if ($chgtext) {
-                        $resulttext .= '<li>'.$chgtext.'</li>';
+                    $resulttext .= '<li>'.$chgtext.'</li>';
+                }
+            }
+            if (ref($changes{'username_rule'}) eq 'ARRAY') {
+                my ($rules,$ruleorder) = 
+                    &Apache::lonnet::inst_userrules($dom,'username');
+                my $chgtext = '<ul>';
+                foreach my $type (@username_rule) {
+                    if (ref($rules->{$type}) eq 'HASH') {
+                        $chgtext .= '<li>'.$rules->{$type}{'name'}.'</li>';
                     }
                 }
+                $chgtext .= '</ul>';
+                if (@username_rule > 0) {
+                    $resulttext .= '<li>'.&mt('Usernames with the following formats are restricted to verified users in the institutional directory: ').$chgtext.'</li>';     
+                } else {
+                    $resulttext .= '<li>'.&mt('There are now no username formats restricted to verified users in the institutional directory.').'</li>'; 
+                }
+            }
+            if (ref($changes{'id_rule'}) eq 'ARRAY') {
+                my ($idrules,$idruleorder) = 
+                    &Apache::lonnet::inst_userrules($dom,'id');
+                my $chgtext = '<ul>';
+                foreach my $type (@id_rule) {
+                    if (ref($idrules->{$type}) eq 'HASH') {
+                        $chgtext .= '<li>'.$idrules->{$type}{'name'}.'</li>';
+                    }
+                }
+                $chgtext .= '</ul>';
+                if (@id_rule > 0) {
+                    $resulttext .= '<li>'.&mt('IDs with the following formats are restricted to verified users in the institutional directory: ').$chgtext.'</li>';
+                } else {
+                    $resulttext .= '<li>'.&mt('There are now no ID formats restricted to verified users in the institutional directory.').'</li>';
+                }
             }
             if (ref($changes{'email_rule'}) eq 'ARRAY') {
                 my ($emailrules,$emailruleorder) =
@@ -9364,48 +7163,37 @@ sub modify_selfcreation {
                 }
                 $chgtext .= '</ul>';
                 if (@email_rule > 0) {
-                    $resulttext .= '<li>'.
-                                   &mt('Accounts may not be created by users self-enrolling with e-mail addresses of the following types: ').
-                                       $chgtext.
-                                   '</li>';
+                    $resulttext .= '<li>'.&mt('Accounts may not be created by users self-enrolling with e-mail addresses of the following types: ').$chgtext.'</li>';
                 } else {
-                    $resulttext .= '<li>'.
-                                   &mt('There are now no restrictions on e-mail addresses which may be used as a username when self-enrolling.').
-                                   '</li>';
+                    $resulttext .= '<li>'.&mt('There are now no restrictions on e-mail addresses which may be used as a username when self-enrolling.').'</li>';
                 }
             }
-            if (ref($changes{'selfcreate'}) eq 'ARRAY') {
-                $resulttext .= '<li>'.&mt('When self-creating institutional account:').'<ul>';
-                my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
-                foreach my $type (@{$changes{'selfcreate'}}) {
-                    my $typename = $type;
-                    if (ref($usertypes) eq 'HASH') {
-                        if ($usertypes->{$type} ne '') {
-                            $typename = $usertypes->{$type};
-                        }
-                    }
-                    my @modifiable;
-                    $resulttext .= '<li>'.
-                                    &mt('Self-creation of account by users with status: [_1]',
-                                        '<span class="LC_cusr_emph">'.$typename.'</span>').
-                                    ' - '.&mt('modifiable fields (if institutional data blank): ');
-                    foreach my $field (@fields) {
-                        if ($save_usermodify{'selfcreate'}{$type}{$field}) {
-                            push(@modifiable,'<b>'.$fieldtitles{$field}.'</b>');
+
+            my %authname = &authtype_names();
+            my %context_title = &context_names();
+            if (ref($changes{'authtypes'}) eq 'ARRAY') {
+                my $chgtext = '<ul>';
+                foreach my $type (@{$changes{'authtypes'}}) {
+                    my @allowed;
+                    $chgtext .= '<li><span class="LC_cusr_emph">'.$context_title{$type}.'</span> - '.&mt('assignable authentication types: ');
+                    foreach my $auth (@authtypes) {
+                        if ($authhash{$type}{$auth}) {
+                            push(@allowed,$authname{$auth});
                         }
                     }
-                    if (@modifiable > 0) {
-                        $resulttext .= join(', ',@modifiable);
+                    if (@allowed > 0) {
+                        $chgtext .= join(', ',@allowed).'</li>';
                     } else {
-                        $resulttext .= &mt('none');
+                        $chgtext .= &mt('none').'</li>';
                     }
-                    $resulttext .= '</li>';
                 }
-                $resulttext .= '</ul></li>';
+                $chgtext .= '</ul>';
+                $resulttext .= '<li>'.&mt('Authentication types available for assignment to new users').'<br />'.$chgtext;
+                $resulttext .= '</li>';
             }
             $resulttext .= '</ul>';
         } else {
-            $resulttext = &mt('No changes made to self-creation settings');
+            $resulttext = &mt('No changes made to user creation settings');
         }
     } else {
         $resulttext = '<span class="LC_error">'.
@@ -9425,7 +7213,7 @@ sub process_captcha {
         $newsettings->{'captcha'} = 'original';
     }
     if ($current->{'captcha'} ne $newsettings->{'captcha'}) {
-        if ($container eq 'cancreate') {
+        if ($container eq 'cancreate') { 
             if (ref($changes->{'cancreate'}) eq 'ARRAY') {
                 push(@{$changes->{'cancreate'}},'captcha');
             } elsif (!defined($changes->{'cancreate'})) {
@@ -9439,8 +7227,8 @@ sub process_captcha {
     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,
@@ -9464,7 +7252,7 @@ sub process_captcha {
                 $changes->{'cancreate'} = ['recaptchakeys'];
             }
         } else {
-            $changes->{'recaptchakeys'} = 1;
+            $changes->{'recaptchakeys'} = 1; 
         }
     }
     return;
@@ -9472,20 +7260,17 @@ sub process_captcha {
 
 sub modify_usermodification {
     my ($dom,%domconfig) = @_;
-    my ($resulttext,%curr_usermodification,%changes,%modifyhash);
+    my ($resulttext,%curr_usermodification,%changes);
     if (ref($domconfig{'usermodification'}) eq 'HASH') {
         foreach my $key (keys(%{$domconfig{'usermodification'}})) {
-            if ($key eq 'selfcreate') {
-                $modifyhash{$key} = $domconfig{'usermodification'}{$key};
-            } else {  
-                $curr_usermodification{$key} = $domconfig{'usermodification'}{$key};
-            }
+            $curr_usermodification{$key} = $domconfig{'usermodification'}{$key};
         }
     }
-    my @contexts = ('author','course');
+    my @contexts = ('author','course','selfcreate');
     my %context_title = (
                            author => 'In author context',
                            course => 'In course context',
+                           selfcreate => 'When self creating account', 
                         );
     my @fields = ('lastname','firstname','middlename','generation',
                   'permanentemail','id');
@@ -9493,7 +7278,14 @@ sub modify_usermodification {
                   author => ['ca','aa'],
                   course => ['st','ep','ta','in','cr'],
                 );
+    my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+    if (ref($types) eq 'ARRAY') {
+        push(@{$types},'default');
+        $usertypes->{'default'} = $othertitle;
+    }
+    $roles{'selfcreate'} = $types;  
     my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
+    my %modifyhash;
     foreach my $context (@contexts) {
         foreach my $role (@{$roles{$context}}) {
             my @modifiable =  &Apache::loncommon::get_env_multiple('form.canmodify_'.$role);
@@ -9539,13 +7331,26 @@ sub modify_usermodification {
                     if (ref($changes{$context}) eq 'ARRAY') {
                         foreach my $role (@{$changes{$context}}) {
                             my $rolename;
-                            if ($role eq 'cr') {
-                                $rolename = &mt('Custom');
+                            if ($context eq 'selfcreate') {
+                                $rolename = $role;
+                                if (ref($usertypes) eq 'HASH') {
+                                    if ($usertypes->{$role} ne '') {
+                                        $rolename = $usertypes->{$role};
+                                    }
+                                }
                             } else {
-                                $rolename = &Apache::lonnet::plaintext($role);
+                                if ($role eq 'cr') {
+                                    $rolename = &mt('Custom');
+                                } else {
+                                    $rolename = &Apache::lonnet::plaintext($role);
+                                }
                             }
                             my @modifiable;
-                            $resulttext .= '<li><span class="LC_cusr_emph">'.&mt('Target user with [_1] role',$rolename).'</span> - '.&mt('modifiable fields: ');
+                            if ($context eq 'selfcreate') {
+                                $resulttext .= '<li><span class="LC_cusr_emph">'.&mt('Self-creation of account by users with status: [_1]',$rolename).'</span> - '.&mt('modifiable fields (if institutional data blank): ');
+                            } else {
+                                $resulttext .= '<li><span class="LC_cusr_emph">'.&mt('Target user with [_1] role',$rolename).'</span> - '.&mt('modifiable fields: ');
+                            }
                             foreach my $field (@fields) {
                                 if ($modifyhash{$context}{$role}{$field}) {
                                     push(@modifiable,$fieldtitles{$field});
@@ -9574,9 +7379,9 @@ sub modify_usermodification {
 }
 
 sub modify_defaults {
-    my ($dom,$lastactref,%domconfig) = @_;
+    my ($dom,$r) = @_;
     my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors);
-    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
     my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def','portal_def');
     my @authtypes = ('internal','krb4','krb5','localauth');
     foreach my $item (@items) {
@@ -9631,172 +7436,37 @@ sub modify_defaults {
                          defaults => \%newvalues,
                         );
     my $title = &defaults_titles();
-
-    my $currinststatus;
-    if (ref($domconfig{'inststatus'}) eq 'HASH') {
-        $currinststatus = $domconfig{'inststatus'};
-    } else {
-        my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-        $currinststatus = {
-                             inststatustypes => $usertypes,
-                             inststatusorder => $types,
-                             inststatusguest => [],
-                          };
-    }
-    my @todelete = &Apache::loncommon::get_env_multiple('form.inststatus_delete');
-    my @allpos;
-    my %guests;
-    my %alltypes;
-    my ($currtitles,$currguests,$currorder);
-    if (ref($currinststatus) eq 'HASH') {
-        if (ref($currinststatus->{'inststatusorder'}) eq 'ARRAY') {
-            foreach my $type (@{$currinststatus->{'inststatusorder'}}) {
-                if (ref($currinststatus->{inststatustypes}) eq 'HASH') {
-                    if ($currinststatus->{inststatustypes}->{$type} ne '') {
-                        $currtitles .= $currinststatus->{inststatustypes}->{$type}.',';
-                    }
-                }
-                unless (grep(/^\Q$type\E$/,@todelete)) { 
-                    my $position = $env{'form.inststatus_pos_'.$type};
-                    $position =~ s/\D+//g;
-                    $allpos[$position] = $type;
-                    $alltypes{$type} = $env{'form.inststatus_title_'.$type};
-                    $alltypes{$type} =~ s/`//g;
-                    if ($env{'form.inststatus_guest_'.$type}) {
-                        $guests{$type} = 1;
-                    }
-                }
-            }
-            if (ref($currinststatus->{'inststatusguest'}) eq 'ARRAY') {
-                $currguests = join(',',@{$currinststatus->{'inststatusguest'}});
-            }
-            $currorder = join(',',@{$currinststatus->{'inststatusorder'}});
-            $currtitles =~ s/,$//;
-        }
-    }
-    if ($env{'form.addinststatus'}) {
-        my $newtype = $env{'form.addinststatus'};
-        $newtype =~ s/\W//g;
-        unless (exists($alltypes{$newtype})) {
-            if ($env{'form.addinststatus_guest'}) {
-                $guests{$newtype} = 1;
-            }
-            $alltypes{$newtype} = $env{'form.addinststatus_title'};
-            $alltypes{$newtype} =~ s/`//g; 
-            my $position = $env{'form.addinststatus_pos'};
-            $position =~ s/\D+//g;
-            if ($position ne '') {
-                $allpos[$position] = $newtype;
-            }
-        }
-    }
-    my (@orderedstatus,@orderedguests);
-    foreach my $type (@allpos) {
-        unless (($type eq '') || (grep(/^\Q$type\E$/,@orderedstatus))) {
-            push(@orderedstatus,$type);
-            if ($guests{$type}) {
-                push(@orderedguests,$type);
-            }
-        }
-    }
-    foreach my $type (keys(%alltypes)) {
-        unless (grep(/^\Q$type\E$/,@orderedstatus)) {
-            delete($alltypes{$type});
-        }
-    }
-    $defaults_hash{'inststatus'} = {
-                                     inststatustypes => \%alltypes,
-                                     inststatusorder => \@orderedstatus,
-                                     inststatusguest => \@orderedguests,
-                                   };
-    if (ref($defaults_hash{'inststatus'}) eq 'HASH') {
-        foreach my $item ('inststatustypes','inststatusorder','inststatusguest') {
-            $domdefaults{$item} = $defaults_hash{'inststatus'}{$item};
-        }
-    }
-    if ($currorder ne join(',',@orderedstatus)) {
-        $changes{'inststatus'}{'inststatusorder'} = 1;
-    }
-    if ($currguests ne join(',',@orderedguests)) {
-        $changes{'inststatus'}{'inststatusguest'} = 1;
-    }
-    my $newtitles;
-    foreach my $item (@orderedstatus) {
-        $newtitles .= $alltypes{$item}.',';
-    }
-    $newtitles =~ s/,$//;
-    if ($currtitles ne $newtitles) {
-        $changes{'inststatus'}{'inststatustypes'} = 1;
-    }
     my $putresult = &Apache::lonnet::put_dom('configuration',\%defaults_hash,
                                              $dom);
     if ($putresult eq 'ok') {
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made:').'<ul>';
-            my $version = &Apache::lonnet::get_server_loncaparev($dom);
+            my $version = $r->dir_config('lonVersion');
             my $mailmsgtext = "Changes made to domain settings in a LON-CAPA installation - domain: $dom (running version: $version) - dns_domain.tab needs to be updated with the following changes, to support legacy 2.4, 2.5 and 2.6 versions of LON-CAPA.\n\n";
             foreach my $item (sort(keys(%changes))) {
-                if ($item eq 'inststatus') {
-                    if (ref($changes{'inststatus'}) eq 'HASH') {
-                        if (($changes{'inststatus'}{'inststatustypes'}) || $changes{'inststatus'}{'inststatusorder'}) {
-                            $resulttext .= '<li>'.&mt('Institutional user status types set to:').' ';
-                            foreach my $type (@orderedstatus) { 
-                                $resulttext .= $alltypes{$type}.', ';
-                            }
-                            $resulttext =~ s/, $//;
-                            $resulttext .= '</li>';
-                        }
-                        if ($changes{'inststatus'}{'inststatusguest'}) {
-                            $resulttext .= '<li>'; 
-                            if (@orderedguests) {
-                                $resulttext .= &mt('Types assignable to "non-institutional" usernames set to:').' ';
-                                foreach my $type (@orderedguests) {
-                                    $resulttext .= $alltypes{$type}.', ';
-                                }
-                                $resulttext =~ s/, $//;
-                            } else {
-                                $resulttext .= &mt('Types assignable to "non-institutional" usernames set to none.');
-                            }
-                            $resulttext .= '</li>';
-                        }
-                    }
-                } else {
-                    my $value = $env{'form.'.$item};
-                    if ($value eq '') {
-                        $value = &mt('none');
-                    } elsif ($item eq 'auth_def') {
-                        my %authnames = &authtype_names();
-                        my %shortauth = (
-                                          internal   => 'int',
-                                          krb4       => 'krb4',
-                                          krb5       => 'krb5',
-                                          localauth  => 'loc',
-                        );
-                        $value = $authnames{$shortauth{$value}};
-                    }
-                    $resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$item},$value).'</li>';
-                    $mailmsgtext .= "$title->{$item} set to $value\n";  
+                my $value = $env{'form.'.$item};
+                if ($value eq '') {
+                    $value = &mt('none');
+                } elsif ($item eq 'auth_def') {
+                    my %authnames = &authtype_names();
+                    my %shortauth = (
+                             internal => 'int',
+                             krb4 => 'krb4',
+                             krb5 => 'krb5',
+                             localauth  => 'loc',
+                    );
+                    $value = $authnames{$shortauth{$value}};
                 }
+                $resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$item},$value).'</li>';
+                $mailmsgtext .= "$title->{$item} set to $value\n";  
             }
             $resulttext .= '</ul>';
             $mailmsgtext .= "\n";
             my $cachetime = 24*60*60;
             &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
-            if (ref($lastactref) eq 'HASH') {
-                $lastactref->{'domdefaults'} = 1;
-            }
             if ($changes{'auth_def'} || $changes{'auth_arg_def'} || $changes{'lang_def'} || $changes{'datelocale_def'}) {
-                my $notify = 1;
-                if (ref($domconfig{'contacts'}) eq 'HASH') {
-                    if ($domconfig{'contacts'}{'reportupdates'} == 0) {
-                        $notify = 0;
-                    }
-                }
-                if ($notify) {
-                    &Apache::lonmsg::sendemail('installrecord@loncapa.org',
-                                               "LON-CAPA Domain Settings Change - $dom",
-                                               $mailmsgtext);
-                }
+                my $sysmail = $r->dir_config('lonSysEMail');
+                &Apache::lonmsg::sendemail($sysmail,"LON-CAPA Domain Settings Change - $dom",$mailmsgtext);
             }
         } else {
             $resulttext = &mt('No changes made to default authentication/language/timezone settings');
@@ -9816,7 +7486,7 @@ sub modify_defaults {
 }
 
 sub modify_scantron {
-    my ($r,$dom,$confname,$lastactref,%domconfig) = @_;
+    my ($r,$dom,$confname,%domconfig) = @_;
     my ($resulttext,%confhash,%changes,$errors);
     my $custom = 'custom.tab';
     my $default = 'default.tab';
@@ -9877,9 +7547,6 @@ sub modify_scantron {
                 }
                 $resulttext .= '</ul>';
                 &Apache::loncommon::devalidate_domconfig_cache($dom);
-                if (ref($lastactref) eq 'HASH') {
-                    $lastactref->{'domainconfig'} = 1;
-                }
             } else {
                 $resulttext = &mt('No changes made to bubblesheet format file');
             }
@@ -9898,12 +7565,10 @@ 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');
-    my @catitems = ('unauth','auth');
-    my @cattypes = ('std','domonly','codesrch','none');
     if (ref($domconfig{'coursecategories'}) eq 'HASH') {
         $cathash = $domconfig{'coursecategories'}{'cats'};
         if ($domconfig{'coursecategories'}{'togglecats'} ne $env{'form.togglecats'}) {
@@ -9922,14 +7587,6 @@ sub modify_coursecategories {
             $changes{'categorizecomm'} = 1;
             $domconfig{'coursecategories'}{'categorizecomm'} = $env{'form.categorizecomm'};
         }
-        foreach my $item (@catitems) {
-            if (grep(/^\Q$env{'form.coursecat_'.$item}\E$/,@cattypes)) {
-                if ($domconfig{'coursecategories'}{$item} ne $env{'form.coursecat_'.$item}) {
-                    $changes{$item} = 1;
-                    $domconfig{'coursecategories'}{$item} = $env{'form.coursecat_'.$item};
-                }
-            }
-        }
     } else {
         $changes{'togglecats'} = 1;
         $changes{'categorize'} = 1;
@@ -9941,14 +7598,6 @@ sub modify_coursecategories {
                                              togglecatscomm => $env{'form.togglecatscomm'},
                                              categorizecomm => $env{'form.categorizecomm'},
                                          };
-        foreach my $item (@catitems) {
-            if ($env{'form.coursecat_'.$item} ne 'std') {
-                $changes{$item} = 1;
-            }
-            if (grep(/^\Q$env{'form.coursecat_'.$item}\E$/,@cattypes)) {
-                $domconfig{'coursecategories'}{$item} = $env{'form.coursecat_'.$item};
-            }
-        }
     }
     if (ref($cathash) eq 'HASH') {
         if (($domconfig{'coursecategories'}{'cats'}{'instcode::0'} ne '')  && ($env{'form.instcode'} == 0)) {
@@ -10071,10 +7720,6 @@ sub modify_coursecategories {
                          dom  => 'set in Domain ("Modify Course/Community")',
                          crs  => 'set in Course ("Course Configuration")',
                          comm => 'set in Community ("Community Configuration")',
-                         none     => 'No catalog',
-                         std      => 'Standard catalog',
-                         domonly  => 'Domain-only catalog',
-                         codesrch => 'Code search form',
                         );
             $resulttext = &mt('Changes made:').'<ul>';
             if ($changes{'togglecats'}) {
@@ -10089,12 +7734,6 @@ sub modify_coursecategories {
             if ($changes{'categorizecomm'}) {
                 $resulttext .= '<li>'.&mt("$title{'categorizecomm'} $level{$env{'form.categorizecomm'}}").'</li>';
             }
-            if ($changes{'unauth'}) {
-                $resulttext .= '<li>'.&mt('Catalog type for unauthenticated users set to "'.$level{$env{'form.coursecat_unauth'}}.'"').'</li>';
-            }
-            if ($changes{'auth'}) {
-                $resulttext .= '<li>'.&mt('Catalog type for authenticated users set to "'.$level{$env{'form.coursecat_auth'}}.'"').'</li>';
-            }
             if ((keys(%deletions) > 0) || (keys(%reorderings) > 0) || (keys(%adds) > 0)) {
                 my $cathash;
                 if (ref($domconfig{'coursecategories'}) eq 'HASH') {
@@ -10139,20 +7778,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>';
@@ -10312,7 +7937,7 @@ sub modify_helpsettings {
                     $changes{$item} = 1;
                 }
             }
-            if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) {
+            if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) { 
                 $helphash{'helpsettings'}{$item} = $env{'form.'.$item};
             }
         }
@@ -10345,20 +7970,16 @@ sub modify_helpsettings {
 }
 
 sub modify_coursedefaults {
-    my ($dom,$lastactref,%domconfig) = @_;
+    my ($dom,%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');
-    my @types = ('official','unofficial','community','textbook');
+                   'uploadquota_community');
+    my @types = ('official','unofficial','community');
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
                            uploadquota          => 500,
-                           postsubmit           => 60,
                          );
 
     $defaultshash{'coursedefaults'} = {};
@@ -10390,7 +8011,7 @@ sub modify_coursedefaults {
         }
         foreach my $item (@numbers) {
             my ($currdef,$newdef);
-            $newdef = $env{'form.'.$item};
+            my $newdef = $env{'form.'.$item};
             if ($item eq 'anonsurvey_threshold') {
                 $currdef = $domconfig{'coursedefaults'}{$item};
                 $newdef =~ s/\D//g;
@@ -10419,149 +8040,40 @@ sub modify_coursedefaults {
                 }
             }
         }
-        my $currclone = $domconfig{'coursedefaults'}{'canclone'};
-        my @currclonecode;
-        if (ref($currclone) eq 'HASH') {
-            if (ref($currclone->{'instcode'}) eq 'ARRAY') {
-                @currclonecode = @{$currclone->{'instcode'}};
-            }
-        }
-        my $newclone;
-        if ($env{'form.canclone'} =~ /^(none|domain|instcode)$/) {
-            $newclone = $env{'form.canclone'};
-        }
-        if ($newclone eq 'instcode') {
-            my @newcodes = &Apache::loncommon::get_env_multiple('form.clonecode');
-            my (%codedefaults,@code_order,@clonecode);
-            &Apache::lonnet::auto_instcode_defaults($dom,\%codedefaults,
-                                                    \@code_order);
-            foreach my $item (@code_order) {
-                if (grep(/^\Q$item\E$/,@newcodes)) {
-                    push(@clonecode,$item);
-                }
-            }
-            if (@clonecode) {
-                $defaultshash{'coursedefaults'}{'canclone'} = { $newclone => \@clonecode };
-                my @diffs = &Apache::loncommon::compare_arrays(\@currclonecode,\@clonecode);
-                if (@diffs) {
-                    $changes{'canclone'} = 1;
-                }
-            } else {
-                $newclone eq '';
-            }
-        } elsif ($newclone ne '') {
-            $defaultshash{'coursedefaults'}{'canclone'} = $newclone;
-        }
-        if ($newclone ne $currclone) {
-            $changes{'canclone'} = 1;
-        }
-        my %credits;
-        foreach my $type (@types) {
-            unless ($type eq 'community') {
-                $credits{$type} = $env{'form.'.$type.'_credits'};
-                $credits{$type} =~ s/[^\d.]+//g;
-            }
-        }
-        if ((ref($domconfig{'coursedefaults'}{'coursecredits'}) ne 'HASH') &&
-            ($env{'form.coursecredits'} eq '1')) {
-            $changes{'coursecredits'} = 1;
-            foreach my $type (keys(%credits)) {
-                $defaultshash{'coursedefaults'}{'coursecredits'}{$type} = $credits{$type};
-            }
-        } else {
-            if ($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 ($env{'form.postsubmit'} eq '1') {
-            $defaultshash{'coursedefaults'}{'postsubmit'}{'client'} = 'on';
-            my %currtimeout;
-            if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
-                if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'off') {
-                    $changes{'postsubmit'} = 1;
-                }
-                if (ref($domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') {
-                    %currtimeout = %{$domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}};
-                }
-            } else {
-                $changes{'postsubmit'} = 1;
-            }
-            foreach my $type (@types) {
-                my $timeout = $env{'form.'.$type.'_timeout'};
-                $timeout =~ s/\D//g;
-                if ($timeout == $staticdefaults{'postsubmit'}) {
-                    $timeout = '';
-                } elsif (($timeout eq '') || ($timeout =~ /^0+$/)) {
-                    $timeout = '0';
-                }
-                unless ($timeout eq '') {
-                    $defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}{$type} = $timeout;
-                }
-                if (exists($currtimeout{$type})) {
-                    if ($timeout ne $currtimeout{$type}) {
-                        $changes{'postsubmit'} = 1;
-                    }
-                } elsif ($timeout ne '') {
-                    $changes{'postsubmit'} = 1;
-                }
-            }
-        } else {
-            $defaultshash{'coursedefaults'}{'postsubmit'}{'client'} = 'off';
-            if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
-                if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'on') {
-                    $changes{'postsubmit'} = 1;
-                }
-            } else {
-                $changes{'postsubmit'} = 1;
-            }
+        my $officialcreds = $env{'form.official_credits'};
+        $officialcreds =~ s/^[^\d\.]//g;
+        my $unofficialcreds = $env{'form.unofficial_credits'};
+        $unofficialcreds =~ s/^[^\d\.]//g;
+        if (ref($domconfig{'coursedefaults'}{'coursecredits'} ne 'HASH') &&
+                ($env{'form.coursecredits'} eq '1')) {
+                $changes{'coursecredits'} = 1;
+        } else {
+            if (($domconfig{'coursedefaults'}{'coursecredits'}{'official'} ne $officialcreds)  ||
+                ($domconfig{'coursedefaults'}{'coursecredits'}{'unofficial'} ne $unofficialcreds)) {
+                $changes{'coursecredits'} = 1;
+            }
+        }
+        $defaultshash{'coursedefaults'}{'coursecredits'} = {
+            official   => $officialcreds,
+            unofficial => $unofficialcreds,
         }
     }
     my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
                                              $dom);
     if ($putresult eq 'ok') {
+        my %domdefaults;
         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'})) {
-                foreach my $item ('uselcmath','usejsme') {
-                    if ($changes{$item}) {
-                        $domdefaults{$item}=$defaultshash{'coursedefaults'}{$item};
-                    }
+            if (($changes{'canuse_pdfforms'}) || ($changes{'coursecredits'}) || ($changes{'uploadquota'})) {
+                %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
+                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'};
                     }
                 }
                 if ($changes{'uploadquota'}) {
@@ -10571,37 +8083,16 @@ 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') {
-                    $lastactref->{'domdefaults'} = 1;
-                }
             }
             $resulttext = &mt('Changes made:').'<ul>';
             foreach my $item (sort(keys(%changes))) {
-                if ($item eq 'uselcmath') {
+                if ($item eq 'canuse_pdfforms') {
                     if ($env{'form.'.$item} eq '1') {
-                        $resulttext .= '<li>'.&mt('Math preview uses LON-CAPA previewer (javascript), if supported by browser.').'</li>';
+                        $resulttext .= '<li>'.&mt("Course/Community users can create/upload PDF forms set to 'on'").'</li>';
                     } else {
-                        $resulttext .= '<li>'.&mt('Math preview uses DragMath (Java), if supported by client OS.').'</li>';
-                    }
-                } elsif ($item eq 'usejsme') {
-                    if ($env{'form.'.$item} eq '1') {
-                        $resulttext .= '<li>'.&mt('Molecule editor uses JSME (HTML5), if supported by browser.').'</li>';
-                    } else {
-                        $resulttext .= '<li>'.&mt('Molecule editor uses JME (Java), if supported by client OS.').'</li>';
+                        $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>';
@@ -10610,78 +8101,27 @@ sub modify_coursedefaults {
                         $resulttext .= '<li>'.&mt('Default quota for content uploaded to a course/community via Course Editor set as follows:').'<ul>'.
                                        '<li>'.&mt('Official courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'official'}.'</b>').'</li>'.
                                        '<li>'.&mt('Unofficial courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'unofficial'}.'</b>').'</li>'.
-                                       '<li>'.&mt('Textbook courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'textbook'}.'</b>').'</li>'.
-
                                        '<li>'.&mt('Communities: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'community'}.'</b>').'</li>'.
                                        '</ul>'.
                                        '</li>';
                     } else {
                         $resulttext .= '<li>'.&mt('Default quota for content uploaded via Course Editor remains default: [_1] MB',$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 '') &&
-                            ($domdefaults{'unofficialcredits'} eq '') &&
-                            ($domdefaults{'textbookcredits'} eq '')) {
+                            ($domdefaults{'unofficialcredits'} eq '')) {
                             $resulttext .= '<li>'.&mt('Student credits not in use for courses in this domain').'</li>';
                         } else {
                             $resulttext .= '<li>'.&mt('Student credits can be set per course by a Domain Coordinator, with the following defaults applying:').'<ul>'.
                                            '<li>'.&mt('Official courses: [_1]',$defaultshash{'coursedefaults'}{'coursecredits'}{'official'}).'</li>'.
                                            '<li>'.&mt('Unofficial courses: [_1]',$defaultshash{'coursedefaults'}{'coursecredits'}{'unofficial'}).'</li>'.
-                                           '<li>'.&mt('Textbook courses: [_1]',$defaultshash{'coursedefaults'}{'coursecredits'}{'textbook'}).'</li>'.
                                            '</ul>'.
                                            '</li>';
                         }
                     } 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>';
@@ -10695,247 +8135,8 @@ sub modify_coursedefaults {
     return $resulttext;
 }
 
-sub modify_selfenrollment {
-    my ($dom,$lastactref,%domconfig) = @_;
-    my ($resulttext,$errors,%changes,%selfenrollhash,%ordered);
-    my @types = ('official','unofficial','community','textbook');
-    my %titles = &tool_titles();
-    my %descs = &Apache::lonuserutils::selfenroll_default_descs();
-    ($ordered{'admin'},my $titlesref) = &Apache::lonuserutils::get_selfenroll_titles();
-    $ordered{'default'} = ['types','registered','approval','limit'];
-
-    my (%roles,%shown,%toplevel);
-    $roles{'0'} = &Apache::lonnet::plaintext('dc');
-
-    if (ref($domconfig{'selfenrollment'}) ne 'HASH') {
-        if ($domconfig{'selfenrollment'} eq '') {
-            $domconfig{'selfenrollment'} = {};
-        }
-    }
-    %toplevel = (
-                  admin      => 'Configuration Rights',
-                  default    => 'Default settings',
-                  validation => 'Validation of self-enrollment requests',
-                );
-    my ($itemsref,$namesref,$fieldsref) = &Apache::lonuserutils::selfenroll_validation_types();
-
-    if (ref($ordered{'admin'}) eq 'ARRAY') {
-        foreach my $item (@{$ordered{'admin'}}) {
-            foreach my $type (@types) {
-                if ($env{'form.selfenrolladmin_'.$item.'_'.$type}) {
-                    $selfenrollhash{'admin'}{$type}{$item} = 1;
-                } else {
-                    $selfenrollhash{'admin'}{$type}{$item} = 0;
-                }
-                if (ref($domconfig{'selfenrollment'}{'admin'}) eq 'HASH') {
-                    if (ref($domconfig{'selfenrollment'}{'admin'}{$type}) eq 'HASH') {
-                        if ($selfenrollhash{'admin'}{$type}{$item} ne
-                            $domconfig{'selfenrollment'}{'admin'}{$type}{$item})  {
-                            push(@{$changes{'admin'}{$type}},$item);
-                        }
-                    } else {
-                        if (!$selfenrollhash{'admin'}{$type}{$item}) {
-                            push(@{$changes{'admin'}{$type}},$item);
-                        }
-                    }
-                } elsif (!$selfenrollhash{'admin'}{$type}{$item}) {
-                    push(@{$changes{'admin'}{$type}},$item);
-                }
-            }
-        }
-    }
-
-    foreach my $item (@{$ordered{'default'}}) {
-        foreach my $type (@types) {
-            my $value = $env{'form.selfenrolldefault_'.$item.'_'.$type};
-            if ($item eq 'types') {
-                unless (($value eq 'all') || ($value eq 'dom')) {
-                    $value = '';
-                }
-            } elsif ($item eq 'registered') {
-                unless ($value eq '1') {
-                    $value = 0;
-                }
-            } elsif ($item eq 'approval') {
-                unless ($value =~ /^[012]$/) {
-                    $value = 0;
-                }
-            } else {
-                unless (($value eq 'allstudents') || ($value eq 'selfenrolled')) {
-                    $value = 'none';
-                }
-            }
-            $selfenrollhash{'default'}{$type}{$item} = $value;
-            if (ref($domconfig{'selfenrollment'}{'default'}) eq 'HASH') {
-                if (ref($domconfig{'selfenrollment'}{'default'}{$type}) eq 'HASH') {
-                    if ($selfenrollhash{'default'}{$type}{$item} ne
-                         $domconfig{'selfenrollment'}{'default'}{$type}{$item})  {
-                         push(@{$changes{'default'}{$type}},$item);
-                    }
-                } else {
-                    push(@{$changes{'default'}{$type}},$item);
-                }
-            } else {
-                push(@{$changes{'default'}{$type}},$item);
-            }
-            if ($item eq 'limit') {
-                if (($value eq 'allstudents') || ($value eq 'selfenrolled')) {
-                    $env{'form.selfenrolldefault_cap_'.$type} =~ s/\D//g;
-                    if ($env{'form.selfenrolldefault_cap_'.$type} ne '') {
-                        $selfenrollhash{'default'}{$type}{'cap'} = $env{'form.selfenrolldefault_cap_'.$type};
-                    }
-                } else {
-                    $selfenrollhash{'default'}{$type}{'cap'} = '';
-                }
-                if (ref($domconfig{'selfenrollment'}{'default'}{$type}) eq 'HASH') {
-                    if ($selfenrollhash{'default'}{$type}{'cap'} ne
-                         $domconfig{'selfenrollment'}{'admin'}{$type}{'cap'})  {
-                         push(@{$changes{'default'}{$type}},'cap');
-                    }
-                } elsif ($selfenrollhash{'default'}{$type}{'cap'} ne '') {
-                    push(@{$changes{'default'}{$type}},'cap');
-                }
-            }
-        }
-    }
-
-    foreach my $item (@{$itemsref}) {
-        if ($item eq 'fields') {
-            my @changed;
-            @{$selfenrollhash{'validation'}{$item}} = &Apache::loncommon::get_env_multiple('form.selfenroll_validation_'.$item);
-            if (@{$selfenrollhash{'validation'}{$item}} > 0) {
-                @{$selfenrollhash{'validation'}{$item}} = sort(@{$selfenrollhash{'validation'}{$item}});
-            }
-            if (ref($domconfig{'selfenrollment'}{'validation'}) eq 'HASH') {
-                if (ref($domconfig{'selfenrollment'}{'validation'}{$item}) eq 'ARRAY') {
-                    @changed = &Apache::loncommon::compare_arrays($selfenrollhash{'validation'}{$item},
-                                                                  $domconfig{'selfenrollment'}{'validation'}{$item});
-                } else {
-                    @changed = @{$selfenrollhash{'validation'}{$item}};
-                }
-            } else {
-                @changed = @{$selfenrollhash{'validation'}{$item}};
-            }
-            if (@changed) {
-                if ($selfenrollhash{'validation'}{$item}) { 
-                    $changes{'validation'}{$item} = join(', ',@{$selfenrollhash{'validation'}{$item}});
-                } else {
-                    $changes{'validation'}{$item} = &mt('None');
-                }
-            }
-        } else {
-            $selfenrollhash{'validation'}{$item} = $env{'form.selfenroll_validation_'.$item};
-            if ($item eq 'markup') {
-               if ($env{'form.selfenroll_validation_'.$item}) {
-                   $env{'form.selfenroll_validation_'.$item} =~ s/[\n\r\f]+/\s/gs;
-               }
-            }
-            if (ref($domconfig{'selfenrollment'}{'validation'}) eq 'HASH') {
-                if ($domconfig{'selfenrollment'}{'validation'}{$item} ne $selfenrollhash{'validation'}{$item}) {
-                    $changes{'validation'}{$item} = $selfenrollhash{'validation'}{$item};
-                }
-            }
-        }
-    }
-
-    my $putresult = &Apache::lonnet::put_dom('configuration',{'selfenrollment' => \%selfenrollhash},
-                                             $dom);
-    if ($putresult eq 'ok') {
-        if (keys(%changes) > 0) {
-            my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
-            $resulttext = &mt('Changes made:').'<ul>';
-            foreach my $key ('admin','default','validation') {
-                if (ref($changes{$key}) eq 'HASH') {
-                    $resulttext .= '<li>'.$toplevel{$key}.'<ul>';
-                    if ($key eq 'validation') {
-                        foreach my $item (@{$itemsref}) {
-                            if (exists($changes{$key}{$item})) {
-                                if ($item eq 'markup') {
-                                    $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$namesref->{$item},
-                                                              '<br /><pre>'.$changes{$key}{$item}.'</pre>').'</li>';
-                                } else {  
-                                    $resulttext .= '<li>'.&mt('[_1] set to: [_2]',$namesref->{$item},
-                                                              '<b>'.$changes{$key}{$item}.'</b>').'</li>';
-                                }
-                            }
-                        }
-                    } else {
-                        foreach my $type (@types) {
-                            if ($type eq 'community') {
-                                $roles{'1'} = &mt('Community personnel');
-                            } else {
-                                $roles{'1'} = &mt('Course personnel');
-                            }
-                            if (ref($changes{$key}{$type}) eq 'ARRAY') {
-                                if (ref($selfenrollhash{$key}{$type}) eq 'HASH') {
-                                    if ($key eq 'admin') {
-                                        my @mgrdc = ();
-                                        if (ref($ordered{$key}) eq 'ARRAY') {
-                                            foreach my $item (@{$ordered{'admin'}}) {
-                                                if (ref($selfenrollhash{$key}{$type}) eq 'HASH') { 
-                                                    if ($selfenrollhash{$key}{$type}{$item} eq '0') {
-                                                        push(@mgrdc,$item);
-                                                    }
-                                                }
-                                            }
-                                            if (@mgrdc) {
-                                                $domdefaults{$type.'selfenrolladmdc'} = join(',',@mgrdc);
-                                            } else {
-                                                delete($domdefaults{$type.'selfenrolladmdc'});
-                                            }
-                                        }
-                                    } else {
-                                        if (ref($ordered{$key}) eq 'ARRAY') {
-                                            foreach my $item (@{$ordered{$key}}) {
-                                                if (grep(/^\Q$item\E$/,@{$changes{$key}{$type}})) {
-                                                    $domdefaults{$type.'selfenroll'.$item} =
-                                                        $selfenrollhash{$key}{$type}{$item};
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                                $resulttext .= '<li>'.$titles{$type}.'<ul>';
-                                foreach my $item (@{$ordered{$key}}) {
-                                    if (grep(/^\Q$item\E$/,@{$changes{$key}{$type}})) {
-                                        $resulttext .= '<li>';
-                                        if ($key eq 'admin') {
-                                            $resulttext .= &mt('[_1] -- management by: [_2]',$titlesref->{$item},
-                                                               '<b>'.$roles{$selfenrollhash{'admin'}{$type}{$item}}.'</b>');
-                                        } else {
-                                            $resulttext .= &mt('[_1] set to: [_2]',$titlesref->{$item},
-                                                               '<b>'.$descs{$item}{$selfenrollhash{'default'}{$type}{$item}}.'</b>');
-                                        }
-                                        $resulttext .= '</li>';
-                                    }
-                                }
-                                $resulttext .= '</ul></li>';
-                            }
-                        }
-                        $resulttext .= '</ul></li>'; 
-                    }
-                }
-                if ((exists($changes{'admin'})) || (exists($changes{'default'}))) {
-                    my $cachetime = 24*60*60;
-                    &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
-                    if (ref($lastactref) eq 'HASH') {
-                        $lastactref->{'domdefaults'} = 1;
-                    }
-                }
-            }
-            $resulttext .= '</ul>';
-        } else {
-            $resulttext = &mt('No changes made to self-enrollment settings');
-        }
-    } else {
-        $resulttext = '<span class="LC_error">'.
-            &mt('An error occurred: [_1]',$putresult).'</span>';
-    }
-    return $resulttext;
-}
-
 sub modify_usersessions {
-    my ($dom,$lastactref,%domconfig) = @_;
+    my ($dom,%domconfig) = @_;
     my @hostingtypes = ('version','excludedomain','includedomain');
     my @offloadtypes = ('primary','default');
     my %types = (
@@ -10952,7 +8153,7 @@ sub modify_usersessions {
     foreach my $prefix (@prefixes) {
         $defaultshash{'usersessions'}{$prefix} = {};
     }
-    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
+    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
     my $resulttext;
     my %iphost = &Apache::lonnet::get_iphost();
     foreach my $prefix (@prefixes) {
@@ -11100,23 +8301,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') {
@@ -11127,27 +8312,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,
@@ -11160,15 +8326,9 @@ sub modify_usersessions {
                 if (ref($defaultshash{'usersessions'}{'hosted'}) eq 'HASH') {
                     $domdefaults{'hostedsessions'} = $defaultshash{'usersessions'}{'hosted'};
                 }
-                if (ref($defaultshash{'usersessions'}{'offloadnow'}) eq 'HASH') {
-                    $domdefaults{'offloadnow'} = $defaultshash{'usersessions'}{'offloadnow'};
-                }
             }
             my $cachetime = 24*60*60;
             &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
-            if (ref($lastactref) eq 'HASH') {
-                $lastactref->{'domdefaults'} = 1;
-            }
             if (keys(%changes) > 0) {
                 my %lt = &usersession_titles();
                 $resulttext = &mt('Changes made:').'<ul>';
@@ -11180,8 +8340,7 @@ sub modify_usersessions {
                                 foreach my $lonhost (sort(keys(%{$changes{$prefix}}))) {
                                     $resulttext .= '<li><b>'.$lonhost.'</b> ';
                                     my $lonhostdom = &Apache::lonnet::host_domain($lonhost);
-                                    my $cachekey = &escape('spares').':'.&escape($lonhostdom);
-                                    &Apache::lonnet::remote_devalidate_cache($lonhost,[$cachekey]);
+                                    &Apache::lonnet::remote_devalidate_cache($lonhost,'spares',$lonhostdom);
                                     if (ref($changes{$prefix}{$lonhost}) eq 'HASH') {
                                         foreach my $type (@{$types{$prefix}}) {
                                             if ($changes{$prefix}{$lonhost}{$type}) {
@@ -11231,21 +8390,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;
@@ -11267,7 +8411,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;
@@ -11287,7 +8430,7 @@ sub modify_loadbalancing {
         if ($balancer eq '') {
             next;
         }
-        if (!exists($servers{$balancer})) {
+        if (!exists($servers{$balancer})) { 
             if (exists($currbalancer{$balancer})) {
                 push(@{$changes{'delete'}},$balancer);
             }
@@ -11338,14 +8481,14 @@ sub modify_loadbalancing {
             }
         } else {
             if (ref($defaultshash{'loadbalancing'}{$balancer}) eq 'HASH') {
-                foreach my $sparetype (@sparestypes) {
+                foreach my $sparetype (@sparestypes) { 
                     if (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}) eq 'ARRAY') {
                         if (@{$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}} > 0) {
                             $changes{'curr'}{$balancer}{'targets'} = 1;
                         }
                     }
                 }
-            }
+            }  
         }
         my $ishomedom;
         if (&Apache::lonnet::host_domain($balancer) eq $dom) {
@@ -11354,15 +8497,12 @@ sub modify_loadbalancing {
         if (ref($alltypes) eq 'ARRAY') {
             foreach my $type (@{$alltypes}) {
                 my $rule;
-                unless ((($type eq '_LC_external') || ($type eq '_LC_internetdom')) &&
+                unless ((($type eq '_LC_external') || ($type eq '_LC_internetdom')) && 
                          (!$ishomedom)) {
                     $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') {
@@ -11382,24 +8522,22 @@ sub modify_loadbalancing {
         }
         my $putresult = &Apache::lonnet::put_dom('configuration',
                                                  \%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;
+                        &Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom);
                     }
                 }
                 if (ref($changes{'add'}) eq 'ARRAY') {
-                    foreach my $balancer (sort(@{$changes{'add'}})) {
+                    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;
@@ -11435,66 +8573,17 @@ sub modify_loadbalancing {
                                         my $balancetext;
                                         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};
-                                            }
+                                        } elsif (($rule eq 'homeserver') || ($rule eq 'externalbalancer')) {
+                                            $balancetext =  $ruletitles{$rule};
                                         } else {
                                             $balancetext = &mt('offload to [_1]',$defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type});
                                         }
-                                        $resulttext .= '<li>'.&mt('Load Balancer: [_1] -- balancing for [_2] set to - "[_3]"',$balancer,$titles->{$type},$balancetext).'</li>';
-                                    }
-                                }
-                            }
-                        }
-                        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;
+                                        $resulttext .= '<li>'.&mt('Load Balancer: [_1] -- balancing for [_2] set to - "[_3]"',$balancer,$titles->{$type},$balancetext).'</li>';     
                                     }
-                                } else {
-                                    my $cachekey = &escape('loadbalancing').':'.&escape($dom);
-                                    &Apache::lonnet::remote_devalidate_cache($lonhost,[$cachekey]);
                                 }
                             }
                         }
+                        &Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom);
                     }
                 }
                 if ($resulttext ne '') {
@@ -11572,7 +8661,7 @@ sub get_active_dcs {
 
 sub active_dc_picker {
     my ($dom,$numinrow,$inputtype,$name,%currhash) = @_;
-    my %domcoords = &get_active_dcs($dom);
+    my %domcoords = &get_active_dcs($dom); 
     my @domcoord = keys(%domcoords);
     if (keys(%currhash)) {
         foreach my $dc (keys(%currhash)) {
@@ -11582,7 +8671,7 @@ sub active_dc_picker {
         }
     }
     @domcoord = sort(@domcoord);
-    my $numdcs = scalar(@domcoord);
+    my $numdcs = scalar(@domcoord); 
     my $rows = 0;
     my $table;
     if ($numdcs > 1) {
@@ -11626,31 +8715,21 @@ sub active_dc_picker {
                       '<input type="'.$inputtype.'" name="'.$name.'"'.
                       ' value="'.$domcoord[$i].'"'.$check.' />'.$user;
             if ($user ne $dcname.':'.$dcdom) {
-                $table .=  ' ('.$dcname.':'.$dcdom.')';
+                $table .=  ' ('.$dcname.':'.$dcdom.')'.
+                           '</label></span></td>';
             }
-            $table .= '</label></span></td>';
         }
         $table .= '</tr></table>';
     } elsif ($numdcs == 1) {
-        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;
-            if ($user ne $dcname.':'.$dcdom) {
-                $table .=  ' ('.$dcname.':'.$dcdom.')';
-            }
+            $table .= '<input type="hidden" name="'.$name.'" value="'.$domcoord[0].'" />';
         } else {
             my $check;
             if (exists($currhash{$domcoord[0]})) {
                 $check = ' checked="checked"';
             }
-            $table = '<span class="LC_nobreak"><label>'.
-                     '<input type="checkbox" name="'.$name.'" '.
-                     'value="'.$domcoord[0].'"'.$check.' />'.$user;
-            if ($user ne $dcname.':'.$dcdom) {
-                $table .=  ' ('.$dcname.':'.$dcdom.')';
-            }
-            $table .= '</label></span>';
+            $table .= '<input type="checkbox" name="'.$name.'" '.
+                      'value="'.$domcoord[0].'"'.$check.' />';
             $rows ++;
         }
     }
@@ -11726,7 +8805,7 @@ sub lonbalance_targets_js {
     }
     &get_loadbalancers_config($servers,\%existing,\%currbalancer,
                               \%currtargets,\%currrules);
-    my $balancers = join("','",sort(keys(%currbalancer)));
+    my $balancers = join("','",sort(keys(%currbalancer))); 
     return <<"END";
 
 <script type="text/javascript">
@@ -11797,6 +8876,7 @@ function showSpares(balancer,ishomedom,b
             } else {
                 document.getElementById('balanceruletitle_'+balnum+'_'+insttypes[k]).style.display='none';
                 document.getElementById('balancerule_'+balnum+'_'+insttypes[k]).style.display='none';
+
             }
         } else {
             document.getElementById('balanceruletitle_'+balnum+'_'+insttypes[k]).style.display='block';
@@ -11808,11 +8888,12 @@ function showSpares(balancer,ishomedom,b
             var item = document.getElementById('loadbalancing_singleserver_'+balnum+'_'+insttypes[k]);
             item.options.length = 0;
             item.options[0] = new Option("","",true,true);
-            var idx = 0;
+            var idx = 0;  
             for (var m=0; m<alltargets.length; m++) {
                 if ((currBalancers.indexOf(alltargets[m]) == -1) && (alltargets[m] != balancer)) {
                     idx ++;
                     item.options[idx] = new Option(alltargets[m],alltargets[m],false,false);
+                    
                 }
             }
         }
@@ -12181,39 +9262,27 @@ END
 
 }
 
-sub toggle_display_js {
+sub credits_js {
     return <<"END";
 
 <script type="text/javascript">
 // <![CDATA[
 
-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) {
+function toggleCredits(domForm) {
+    if (document.getElementById('credits')) {
+        creditsitem = document.getElementById('credits');
+        var creditsLength = domForm.coursecredits.length;
+        if (creditsLength) {
             var currval;
-            for (var i=0; i<optionsElement.length; i++) {
-                if (optionsElement[i].checked) {
-                   currval = optionsElement[i].value;
+            for (var i=0; i<creditsLength; i++) {
+                if (domForm.coursecredits[i].checked) {
+                   currval = domForm.coursecredits[i].value;
                 }
             }
-            if (currval == checkval) {
-                divitem.style.display = dispval;
+            if (currval == 1) {
+                creditsitem.style.display = 'block';
             } else {
-                divitem.style.display = 'none';
+                creditsitem.style.display = 'none';
             }
         }
     }
@@ -12237,28 +9306,4 @@ sub captcha_phrases {
     );
 }
 
-sub devalidate_remote_domconfs {
-    my ($dom,$cachekeys) = @_;
-    return unless (ref($cachekeys) eq 'HASH');
-    my %servers = &Apache::lonnet::internet_dom_servers($dom);
-    my %thismachine;
-    map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
-    my @posscached = ('domainconfig','domdefaults');
-    if (keys(%servers)) {
-        foreach my $server (keys(%servers)) {
-            next if ($thismachine{$server});
-            my @cached;
-            foreach my $name (@posscached) {
-                if ($cachekeys->{$name}) {
-                    push(@cached,&escape($name).':'.&escape($dom));
-                }
-            }
-            if (@cached) {
-                &Apache::lonnet::remote_devalidate_cache($server,\@cached);
-            }
-        }
-    }
-    return;
-}
-
 1;