--- loncom/interface/domainprefs.pm	2020/01/15 16:55:18	1.160.6.102.2.1
+++ loncom/interface/domainprefs.pm	2013/07/09 00:17:22	1.198
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.102.2.1 2020/01/15 16:55:18 raeburn Exp $
+# $Id: domainprefs.pm,v 1.198 2013/07/09 00:17:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -19,8 +19,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with LON-CAPA; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA#
 # /home/httpd/html/adm/gpl.txt
 #
 # http://www.lon-capa.org/
@@ -87,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
@@ -96,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
 
@@ -104,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:
@@ -165,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();
@@ -216,27 +213,13 @@ sub handler {
                 'contacts','defaults','scantron','coursecategories',
                 'serverstatuses','requestcourses','helpsettings',
                 'coursedefaults','usersessions','loadbalancing',
-                'requestauthor','selfenrollment','inststatus',
-                'passwords','ltitools'],$dom);
-    if (ref($domconfig{'ltitools'}) eq 'HASH') {
-        my %encconfig =
-            &Apache::lonnet::get_dom('encconfig',['ltitools'],$dom);
-        if (ref($encconfig{'ltitools'}) eq 'HASH') {
-            foreach my $id (keys(%{$domconfig{'ltitools'}})) {
-                if (ref($domconfig{'ltitools'}{$id}) eq 'HASH') {
-                    foreach my $item ('key','secret') {
-                        $domconfig{'ltitools'}{$id}{$item} = $encconfig{'ltitools'}{$id}{$item};
-                    }
-                }
-            }
-        }
-    }
-    my @prefs_order = ('rolecolors','login','defaults','passwords','quotas','autoenroll',
+                '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','helpsettings','coursedefaults',
-                       'ltitools','selfenrollment','usersessions');
+                       'serverstatuses','helpsettings',
+                       'coursedefaults','usersessions');
     my %existing;
     if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
         %existing = %{$domconfig{'loadbalancing'}};
@@ -256,8 +239,6 @@ sub handler {
                                  col2 => '',},
                                 {col1 => 'Administrator Settings',
                                  col2 => '',}],
-                      print => \&print_rolecolors,
-                      modify => \&modify_rolecolors,
                     },
         'login' =>
                     { text => 'Log-in page options',
@@ -265,52 +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 => 'Name displayed'}],
-                      print => \&print_defaults,
-                      modify => \&modify_defaults,
-                    },
-        'passwords' =>
-                    { text => 'Passwords (Internal authentication)',
-                      help => 'Domain_Configuration_Passwords',
-                      header => [{col1 => 'Resetting Forgotten Password',
-                                  col2 => 'Settings'},
-                                 {col1 => 'Encryption of Stored Passwords (Internal Auth)',
-                                  col2 => 'Settings'},
-                                 {col1 => 'Rules for LON-CAPA Passwords',
-                                  col2 => 'Settings'},
-                                 {col1 => 'Course Owner Changing Student Passwords',
-                                  col2 => 'Settings'}],
-                      print => \&print_passwords,
-                      modify => \&modify_passwords,
+                                  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',
@@ -320,40 +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 => 'Directory searches',
+                  { text => 'Institutional directory searches',
                     help => 'Domain_Configuration_InstDirectory_Search',
-                    header => [{col1 => 'Institutional Directory Setting',
-                                col2 => 'Value',},
-                               {col1 => 'LON-CAPA Directory Setting',
+                    header => [{col1 => 'Setting',
                                 col2 => 'Value',}],
-                    print => \&print_directorysrch,
-                    modify => \&modify_directorysrch,
                   },
         'contacts' =>
-                  { text => 'E-mail addresses and helpform',
+                  { text => 'Contact Information',
                     help => 'Domain_Configuration_Contact_Info',
-                    header => [{col1 => 'Default e-mail addresses',
-                                col2 => 'Value',},
-                               {col1 => 'Recipient(s) for notifications',
-                                col2 => 'Value',},
-                               {col1 => 'Ask helpdesk form settings',
-                                col2 => 'Value',},],
-                    print => \&print_contacts,
-                    modify => \&modify_contacts,
+                    header => [{col1 => 'Setting',
+                                col2 => 'Value',}],
                   },
+
         'usercreation' => 
                   { text => 'User creation',
                     help => 'Domain_Configuration_User_Creation',
@@ -363,40 +305,23 @@ 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 verification',
-                                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',
+                  { text => 'Bubblesheet format file',
                     help => 'Domain_Configuration_Scantron_Format',
-                    header => [ {col1 => 'Bubblesheet format file',
-                                 col2 => ''},
-                                {col1 => 'Bubblesheet data upload formats',
-                                 col2 => 'Settings'}],
-                    print => \&print_scantron,
-                    modify => \&modify_scantron,
+                    header => [ {col1 => 'Item',
+                                 col2 => '',
+                              }],
                   },
         'requestcourses' => 
                  {text => 'Request creation of courses',
@@ -404,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',
@@ -444,18 +355,12 @@ sub handler {
                               col2 => 'Other named users',
                               col3 => 'Specific IPs',
                             }],
-                  print => \&print_serverstatuses,
-                  modify => \&modify_serverstatuses,
                  },
         'helpsettings' =>
-                 {text   => 'Support settings',
+                 {text   => 'Help page settings',
                   help   => 'Domain_Configuration_Help_Settings',
-                  header => [{col1 => 'Help Page Settings (logged-in users)',
-                              col2 => 'Value'},
-                             {col1 => 'Helpdesk Roles',
-                              col2 => 'Settings'},],
-                  print  => \&print_helpsettings,
-                  modify => \&modify_helpsettings,
+                  header => [{col1 => 'Help Settings (logged-in users)',
+                              col2 => 'Value'}],
                  },
         'coursedefaults' => 
                  {text => 'Course/Community defaults',
@@ -464,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',
@@ -488,10 +385,8 @@ sub handler {
                               col2 => 'Rules'},
                              {col1 => "Hosting domain's own users elsewhere",
                               col2 => 'Rules'}],
-                  print => \&print_usersessions,
-                  modify => \&modify_usersessions,
                  },
-        'loadbalancing' =>
+         'loadbalancing' =>
                  {text  => 'Dedicated Load Balancer(s)',
                   help  => 'Domain_Configuration_Load_Balancing',
                   header => [{col1 => 'Balancers',
@@ -499,16 +394,6 @@ sub handler {
                               col3 => 'User affiliation',
                               col4 => 'Overrides'},
                             ],
-                  print => \&print_loadbalancing,
-                  modify => \&modify_loadbalancing,
-                 },
-        'ltitools' =>
-                 {text => 'External Tools (LTI)',
-                  help => 'Domain_Configuration_LTI_Tools',
-                  header => [{col1 => 'Setting',
-                              col2 => 'Value',}],
-                  print => \&print_ltitools,
-                  modify => \&modify_ltitools,
                  },
     );
     if (keys(%servers) > 1) {
@@ -519,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,
                            };
     }
 
@@ -535,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);
@@ -553,25 +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
-        }
-        if (grep(/^selfcreation$/,@actions)) {
-            $js .= &selfcreate_javascript();
-        }
-        if (grep(/^contacts$/,@actions)) {
-            $js .= &contacts_javascript();
-        }
-        if (grep(/^scantron$/,@actions)) {
-            $js .= &scantron_javascript();
-        }
         &Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,$js);
     } else {
 # check if domconfig user exists for the domain.
@@ -581,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) {
@@ -641,61 +498,53 @@ 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') {
         $output = &modify_autocreate($dom,%domconfig);
     } elsif ($action eq 'directorysrch') {
-        $output = &modify_directorysrch($dom,$lastactref,%domconfig);
+        $output = &modify_directorysrch($dom,%domconfig);
     } elsif ($action eq 'usercreation') {
         $output = &modify_usercreation($dom,%domconfig);
-    } elsif ($action eq 'selfcreation') {
-        $output = &modify_selfcreation($dom,$lastactref,%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,$lastactref,%domconfig);
+        $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);
-    } elsif ($action eq 'passwords') {
-        $output = &modify_passwords($r,$dom,$confname,$lastactref,%domconfig);
-    } elsif ($action eq 'ltitools') {
-        $output = &modify_ltitools($r,$dom,$action,$lastactref,%domconfig);
     }
     return $output;
 }
@@ -706,28 +555,8 @@ sub print_config_box {
     my $output;
     if ($action eq 'coursecategories') {
         $output = &coursecategories_javascript($settings);
-    } elsif ($action eq 'defaults') {
-        $output = &defaults_javascript($settings); 
-    } elsif ($action eq 'passwords') {
-        $output = &passwords_javascript();
-    } elsif ($action eq 'helpsettings') {
-        my (%privs,%levelscurrent);
-        my %full=();
-        my %levels=(
-                     course => {},
-                     domain => {},
-                     system => {},
-                   );
-        my $context = 'domain';
-        my $crstype = 'Course';
-        my $formname = 'display';
-        &Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent);
-        my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype);
-        $output =
-            &Apache::lonuserutils::custom_roledefs_js($context,$crstype,$formname,\%full,
-                                                      \@templateroles);
     }
-    $output .=
+    $output .= 
          '<table class="LC_nested_outer">
           <tr>
            <th align="left" valign="middle"><span class="LC_nobreak">'.
@@ -742,9 +571,8 @@ sub print_config_box {
     if ($numheaders > 1) {
         my $colspan = '';
         my $rightcolspan = '';
-        if (($action eq 'rolecolors') || ($action eq 'defaults') ||
-            ($action eq 'directorysrch') ||
-            (($action eq 'login') && ($numheaders < 4))) {
+        if (($action eq 'rolecolors') || ($action eq 'coursecategories') || 
+            (($action eq 'login') && ($numheaders < 3))) {
             $colspan = ' colspan="2"';
         }
         if ($action eq 'usersessions') {
@@ -759,28 +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') || ($action eq 'directorysrch') ||
-            ($action eq 'helpsettings') || ($action eq 'contacts')) {
-            $output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal);
-        } elsif ($action eq 'passwords') {
-            $output .= $item->{'print'}->('top',$dom,$confname,$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);
-        } elsif ($action eq 'scantron') {
-            $output .= $item->{'print'}->($r,'top',$dom,$confname,$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>
@@ -790,23 +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') ||
-            ($action eq 'contacts') || ($action eq 'passwords')) {
-            if ($action eq 'coursecategories') {
-                $output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal);
-                $colspan = ' colspan="2"';
-            } elsif ($action eq 'passwords') {
-                $output .= $item->{'print'}->('middle',$dom,$confname,$settings,\$rowtotal);
-            } else {
-                $output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal);
-            }
-            $output .= '
+        if ($action eq 'autoupdate') {
+            $output .= &print_autoupdate('middle',$dom,$settings,\$rowtotal).'
            </table>
           </td>
          </tr>
@@ -815,39 +636,39 @@ 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);
-            } elsif ($action eq 'passwords') {
-                $output .= $item->{'print'}->('lower',$dom,$confname,$settings,\$rowtotal).'
-             </tr>
-            </table>
-           </td>
-          </tr>
-          <tr>
+              <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>      </tr>'.
+            &print_autoupdate('bottom',$dom,$settings,\$rowtotal);
+            $rowtotal ++;
+        } elsif ($action eq 'usercreation') {
+            $output .= &print_usercreation('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"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td></tr>'."\n".
-              $item->{'print'}->('bottom',$dom,$confname,$settings,\$rowtotal).'
-            </table>
+              <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_usercreation('bottom',$dom,$settings,\$rowtotal);
+            $rowtotal ++;
+        } elsif ($action eq 'usermodification') {
+            $output .= &print_usermodification('middle',$dom,$settings,\$rowtotal).'
+           </table>
           </td>
          </tr>
-         <tr>';
-            } else {
-                $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
-            }
+         <tr>
+           <td>
+            <table class="LC_nested">
+             <tr class="LC_info_row">
+              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
+              <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>      </tr>'.
+                       &print_usermodification('bottom',$dom,$settings,\$rowtotal);
             $rowtotal ++;
-        } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') ||
-                 ($action eq 'defaults') || ($action eq 'directorysrch') ||
-                 ($action eq 'helpsettings')) {
-            $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
-        } elsif ($action eq 'scantron') {
-            $output .= $item->{'print'}->($r,'bottom',$dom,$confname,$settings,\$rowtotal);
+        } elsif ($action eq 'coursecategories') {
+            $output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal);
         } elsif ($action eq 'login') {
-            if ($numheaders == 4) {
+            if ($numheaders == 3) {
                 $output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).'
            </table>
           </td>
@@ -857,37 +678,18 @@ 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>'.
+              <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 .= '
-           </table>
-          </td>
-         </tr>
-         <tr>
-           <td>
-            <table class="LC_nested">
-             <tr class="LC_info_row">';
-            if ($numheaders == 4) {
-                $output .= '
-              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
-              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td>
-             </tr>';
-            } else {
-                $output .= '
-              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
-              <td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col2'}).'</td>
-             </tr>';
-            }
-            $rowtotal ++;
-            $output .= &print_login('headtag',$dom,$confname,$phase,$settings,\$rowtotal);
         } elsif ($action eq 'requestcourses') {
             $output .= &print_requestmail($dom,$action,$settings,\$rowtotal);
-            $rowtotal ++;
-            $output .= &print_studentcode($settings,\$rowtotal).'
+        } 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>
@@ -896,33 +698,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>'.
-                       &textbookcourses_javascript($settings).
-                       &print_textbookcourses($dom,'textbooks',$settings,\$rowtotal).'
-            </table>
-           </td>
-          </tr>
-         <tr>
-           <td>
-            <table class="LC_nested">
-             <tr class="LC_info_row">
-              <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td>
-              <td class="LC_right_item">'.&mt($item->{'header'}->[3]->{'col2'}).'</td> </tr>'.
-                       &print_textbookcourses($dom,'templates',$settings,\$rowtotal).'
-            </table>
-           </td>
-          </tr>
-          <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_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>
@@ -957,7 +737,7 @@ sub print_config_box {
            <td>
             <table class="LC_nested">
              <tr class="LC_info_row">';
-        if ($action eq 'login') {
+        if (($action eq 'login') || ($action eq 'directorysrch')) {
             $output .= '  
               <td class="LC_left_item" colspan="2">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';
         } elsif ($action eq 'serverstatuses') {
@@ -1001,10 +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 'serverstatuses') || ($action eq 'loadbalancing') ||
-                 ($action eq 'ltitools')) {
-            $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 .= '
@@ -1301,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="text" name="loginheadtagexempt_'.$lonhost.'" value="'.$exempt.'" /></td></tr>';
-        }
-        $datatable .= '</table></td></tr>';
     }
     return $datatable;
 }
@@ -1385,9 +1128,6 @@ sub login_choices {
             link          => "Link",
             alink         => "Active link",
             vlink         => "Visited link",
-            headtag       => "Custom markup",
-            action        => "Action",
-            current       => "Current",
         );
     return %choices;
 }
@@ -1402,7 +1142,17 @@ sub print_rolecolors {
     my %designhash = &Apache::loncommon::get_domainconf($dom);
     my %defaultdesign = %Apache::loncommon::defaultdesign;
     my (%is_custom,%designs);
-    my %defaults = &role_defaults($role,\@bgs,\@links,\@images);
+    my %defaults = (
+                   img => $defaultdesign{$role.'.img'},
+                   font => $defaultdesign{$role.'.font'},
+		   fontmenu => $defaultdesign{$role.'.fontmenu'},
+                   );
+    foreach my $item (@bgs) {
+        $defaults{'bgs'}{$item} = $defaultdesign{$role.'.'.$item};
+    }
+    foreach my $item (@links) {
+        $defaults{'links'}{$item} = $defaultdesign{$role.'.'.$item};
+    }
     if (ref($settings) eq 'HASH') {
         if (ref($settings->{$role}) eq 'HASH') {
             if ($settings->{$role}->{'img'} ne '') {
@@ -1463,44 +1213,6 @@ sub print_rolecolors {
     return $datatable;
 }
 
-sub role_defaults {
-    my ($role,$bgs,$links,$images,$logintext) = @_;
-    my %defaults;
-    unless ((ref($bgs) eq 'ARRAY') && (ref($links) eq 'ARRAY') && (ref($images) eq 'ARRAY')) {
-        return %defaults;
-    }
-    my %defaultdesign = %Apache::loncommon::defaultdesign;
-    if ($role eq 'login') {
-        %defaults = (
-                       font => $defaultdesign{$role.'.font'},
-                    );
-        if (ref($logintext) eq 'ARRAY') {
-            foreach my $item (@{$logintext}) {
-                $defaults{'logintext'}{$item} = $defaultdesign{$role.'.'.$item};
-            }
-        }
-        foreach my $item (@{$images}) {
-            $defaults{'showlogo'}{$item} = 1;
-        }
-    } else {
-        %defaults = (
-                       img => $defaultdesign{$role.'.img'},
-                       font => $defaultdesign{$role.'.font'},
-                       fontmenu => $defaultdesign{$role.'.fontmenu'},
-                    );
-    }
-    foreach my $item (@{$bgs}) {
-        $defaults{'bgs'}{$item} = $defaultdesign{$role.'.'.$item};
-    }
-    foreach my $item (@{$links}) {
-        $defaults{'links'}{$item} = $defaultdesign{$role.'.'.$item};
-    }
-    foreach my $item (@{$images}) {
-        $defaults{$item} = $defaultdesign{$role.'.'.$item};
-    }
-    return %defaults;
-}
-
 sub display_color_options {
     my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs,
         $images,$bgs,$links,$alt_text,$rowtotal,$logintext) = @_;
@@ -1509,7 +1221,7 @@ sub display_color_options {
     my $datatable = '<tr'.$css_class.'>'.
         '<td>'.$choices->{'font'}.'</td>';
     if (!$is_custom->{'font'}) {
-        $datatable .=  '<td>'.&mt('Default in use:').'&nbsp;<span class="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>';
+        $datatable .=  '<td>'.&mt('Default in use:').'&nbsp;<span id="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>';
     } else {
         $datatable .= '<td>&nbsp;</td>';
     }
@@ -1517,23 +1229,23 @@ sub display_color_options {
 
     $datatable .= '<td><span class="LC_nobreak">'.
                   '<input type="text" class="colorchooser" size="10" name="'.$role.'_font"'.
-                  ' value="'.$current_color.'" />&nbsp;'.
-                  '&nbsp;</span></td></tr>';
+                  ' value="'.$current_color.'" />&nbsp;'. 
+                  '&nbsp;</td></tr>';
     unless ($role eq 'login') { 
         $datatable .= '<tr'.$css_class.'>'.
                       '<td>'.$choices->{'fontmenu'}.'</td>';
         if (!$is_custom->{'fontmenu'}) {
-            $datatable .=  '<td>'.&mt('Default in use:').'&nbsp;<span class="css_default_'.$role.'_font" style="color: '.$defaults->{'fontmenu'}.';">'.$defaults->{'fontmenu'}.'</span></td>';
+            $datatable .=  '<td>'.&mt('Default in use:').'&nbsp;<span id="css_default_'.$role.'_font" style="color: '.$defaults->{'fontmenu'}.';">'.$defaults->{'fontmenu'}.'</span></td>';
         } 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="'
 		      .$role.'_fontmenu"'.
                       ' value="'.$current_color.'" />&nbsp;'.
-                      '&nbsp;</span></td></tr>';
+                      '&nbsp;</td></tr>';
     }
     my $switchserver = &check_switchserver($dom,$confname);
     foreach my $img (@{$images}) {
@@ -1548,7 +1260,7 @@ sub display_color_options {
                     &login_header_options($img,$role,$defaults,$is_custom,$choices);
                 $logincolors =
                     &login_text_colors($img,$role,$logintext,$phase,$choices,
-                                       $designs,$defaults);
+                                            $designs);
             } elsif ($img ne 'domlogo') {
                 $datatable.= &logo_display_options($img,$defaults,$designs);
             }
@@ -1592,8 +1304,7 @@ sub display_color_options {
                         if ($fullwidth ne '' && $fullheight ne '') {
                             if ($fullwidth > $width && $fullheight > $height) { 
                                 my $size = $width.'x'.$height;
-                                my @args = ('convert','-sample',$size,$input,$output);
-                                system({$args[0]} @args);
+                                system("convert -sample $size $input $output");
                                 $showfile = "/$imgdir/tn-".$filename;
                             }
                         }
@@ -1628,12 +1339,12 @@ sub display_color_options {
                 $datatable .= &image_changes($is_custom->{$img},$alt_text->{$img},$img_import,
                                              $showfile,$fullsize,$role,$img,$imgfile,$logincolors);
             } else {
-                $datatable .= '<td>&nbsp;</td><td class="LC_left_item">'.
-                              &mt('Upload:').'<br />';
+                $datatable .= '<td colspan="2" class="LC_right_item"><br />'.
+                              &mt('Upload:');
             }
         } else {
-            $datatable .= '<td>&nbsp;</td><td class="LC_left_item">'.
-                          &mt('Upload:').'<br />';
+            $datatable .= '<td colspan="2" class="LC_right_item"><br />'.
+                          &mt('Upload:');
         }
         if ($switchserver) {
             $datatable .= &mt('Upload to library server: [_1]',$switchserver);
@@ -1651,7 +1362,7 @@ sub display_color_options {
     my $bgs_def;
     foreach my $item (@{$bgs}) {
         if (!$is_custom->{$item}) {
-            $bgs_def .= '<td><span class="LC_nobreak">'.$choices->{$item}.'</span>&nbsp;<span class="css_default_'.$role.'_'.$item.'" style="background-color: '.$defaults->{'bgs'}{$item}.';">&nbsp;&nbsp;&nbsp;</span><br />'.$defaults->{'bgs'}{$item}.'</td>';
+            $bgs_def .= '<td><span class="LC_nobreak">'.$choices->{$item}.'</span>&nbsp;<span id="css_default_'.$role.'_'.$item.'" style="background-color: '.$defaults->{'bgs'}{$item}.';">&nbsp;&nbsp;&nbsp;</span><br />'.$defaults->{'bgs'}{$item}.'</td>';
         }
     }
     if ($bgs_def) {
@@ -1663,7 +1374,7 @@ sub display_color_options {
                   '<table border="0"><tr>';
 
     foreach my $item (@{$bgs}) {
-        $datatable .= '<td align="center">'.$choices->{$item};
+        $datatable .= '<td align="center">';
 	my $color = $designs->{'bgs'}{$item} ? $designs->{'bgs'}{$item} : $defaults->{'bgs'}{$item};
         if ($designs->{'bgs'}{$item}) {
             $datatable .= '&nbsp;';
@@ -1679,7 +1390,7 @@ sub display_color_options {
     my $links_def;
     foreach my $item (@{$links}) {
         if (!$is_custom->{$item}) {
-            $links_def .= '<td>'.$choices->{$item}.'<br /><span class="css_default_'.$role.'_'.$item.'" style="color: '.$defaults->{'links'}{$item}.';">'.$defaults->{'links'}{$item}.'</span></td>';
+            $links_def .= '<td>'.$choices->{$item}.'<br /><span id="css_default_'.$role.'_'.$item.'" style="color: '.$defaults->{'links'}{$item}.';">'.$defaults->{'links'}{$item}.'</span></td>';
         }
     }
     if ($links_def) {
@@ -1690,8 +1401,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};
-        $datatable .= '<td align="center">'.$choices->{$item}."\n";
+	my $color = $designs->{'link'}{$item} ? $designs->{'link'}{$item} : $defaults->{'links'}{$item};
+        $datatable .= '<td align="center">'."\n";
+
         if ($designs->{'links'}{$item}) {
             $datatable.='&nbsp;';
         }
@@ -1749,13 +1461,17 @@ sub login_header_options  {
 }
 
 sub login_text_colors {
-    my ($img,$role,$logintext,$phase,$choices,$designs,$defaults) = @_;
+    my ($img,$role,$logintext,$phase,$choices,$designs) = @_;
     my $color_menu = '<table border="0"><tr>';
     foreach my $item (@{$logintext}) {
-        $color_menu .= '<td align="center">'.$choices->{$item};
-        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>';
+        my $link = &color_pick($phase,$role,$item,$choices->{$item},$designs->{'logintext'}{$item});
+        $color_menu .= '<td align="center">'.$link;
+        if ($designs->{'logintext'}{$item}) {
+            $color_menu .= '&nbsp;<span id="css_'.$role.'_'.$item.'" style="background-color: '.$designs->{'logintext'}{$item}.';">&nbsp;&nbsp;&nbsp;</span>';
+        }
+        $color_menu .= '<br /><input type="text" size="8" name="'.$role.'_'.$item.'" value="'.
+                       $designs->{'logintext'}{$item}.'" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>'.
+                       '<td>&nbsp;</td>';
     }
     $color_menu .= '</tr></table><br />';
     return $color_menu;
@@ -1765,15 +1481,17 @@ sub image_changes {
     my ($is_custom,$alt_text,$img_import,$showfile,$fullsize,$role,$img,$imgfile,$logincolors) = @_;
     my $output;
     if ($img eq 'login') {
-        $output = '</td><td>'.$logincolors; # suppress image for Log-in header
+            # suppress image for Log-in header
     } elsif (!$is_custom) {
         if ($img ne 'domlogo') {
-            $output = &mt('Default image:').'<br />';
+            $output .= &mt('Default image:').'<br />';
         } else {
-            $output = &mt('Default in use:').'<br />';
+            $output .= &mt('Default in use:').'<br />';
         }
     }
-    if ($img ne 'login') {
+    if ($img eq 'login') { # suppress image for Log-in header
+        $output .= '<td>'.$logincolors;
+    } else {
         if ($img_import) {
             $output .= '<input type="hidden" name="'.$role.'_import_'.$img.'" value="'.$imgfile.'" />';
         }
@@ -1785,12 +1503,20 @@ sub image_changes {
                        $role.'_del_'.$img.'" value="1" />'.&mt('Delete?').
                        '</label>&nbsp;'.&mt('Replace:').'</span><br />';
         } else {
-            $output .= '<td valign="middle">'.$logincolors.&mt('Upload:').'<br />';
+            $output .= '<td valign="bottom">'.$logincolors.&mt('Upload:').'<br />';
         }
     }
     return $output;
 }
 
+sub color_pick {
+    my ($phase,$role,$item,$desc,$curcol) = @_;
+    my $link = '<a href="javascript:pjump('."'color_custom','".$desc.
+               "','".$curcol."','".$role.'_'.$item."','parmform.pres','psub'".
+               ');">'.$desc.'</a>';
+    return $link;
+}
+
 sub print_quotas {
     my ($dom,$settings,$rowtotal,$action) = @_;
     my $context;
@@ -1804,14 +1530,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();
@@ -2217,380 +1943,43 @@ sub print_quotas {
 }
 
 sub print_requestmail {
-    my ($dom,$action,$settings,$rowtotal,$customcss,$rowstyle) = @_;
-    my ($now,$datatable,%currapp);
+    my ($dom,$action,$settings,$rowtotal) = @_;
+    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;
-    if ($$rowtotal%2) {
-        $css_class = 'LC_odd_row';
-    }
-    if ($customcss) {
-        $css_class .= " $customcss";
-    }
-    $css_class =~ s/^\s+//;
-    if ($css_class) {
-        $css_class = ' class="'.$css_class.'"';
-    }
-    if ($rowstyle) {
-        $css_class .= ' style="'.$rowstyle.'"';
-    }
+    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').'</span></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";
-    }
-    $datatable .= '<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 ltitools_javascript {
-    my ($settings) = @_;
-    return unless(ref($settings) eq 'HASH');
-    my (%ordered,$total,%jstext);
-    $total = 0;
-    foreach my $item (keys(%{$settings})) {
-        if (ref($settings->{$item}) eq 'HASH') {
-            my $num = $settings->{$item}{'order'};
-            $ordered{$num} = $item;
-        }
-    }
-    $total = scalar(keys(%{$settings}));
-    my @jsarray = ();
-    foreach my $item (sort {$a <=> $b } (keys(%ordered))) {
-        push(@jsarray,$ordered{$item});
-    }
-    my $jstext = '    var ltitools = Array('."'".join("','",@jsarray)."'".');'."\n";
-    return <<"ENDSCRIPT";
-<script type="text/javascript">
-// <![CDATA[
-function reorderLTI(form,item) {
-    var changedVal;
-$jstext
-    var newpos = 'ltitools_add_pos';
-    var maxh = 1 + $total;
-    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;
-    }
-    for (var i=0; i<ltitools.length; i++) {
-        var elementName = 'ltitools_'+ltitools[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') {
@@ -2624,9 +2013,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" ';
@@ -2662,12 +2048,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" /></span></td></tr>';
-    $$rowtotal += 4;
+                  '</tr>';
+    $$rowtotal += 3;
     return $datatable;
 }
 
@@ -2715,7 +2097,7 @@ sub print_autoupdate {
         my $locknamesettings;
         $datatable .= &insttypes_row($settings,$types,$usertypes,
                                      $dom,$numinrow,$othertitle,
-                                    'lockablenames',$rowtotal);
+                                    'lockablenames');
         $$rowtotal ++;
     } else {
         my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
@@ -2755,7 +2137,7 @@ sub print_autocreate {
                 }
             }
         }
-        if ($settings->{'xmldc'} ne '') {
+        if ($settings->{'xmldc'} ne '') { 
             $currhash{$settings->{'xmldc'}} = 1;
         }
     } else {
@@ -2782,965 +2164,234 @@ sub print_autocreate {
                   $createoff{'req'}.' value="0" />'.&mt('No').'</label></span>';
     my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio',
                                                    'autocreate_xmldc',%currhash);
-    $datatable .= '</td></tr><tr class="LC_odd_row"><td>';
     if ($numdc > 1) {
-        $datatable .= &mt('Course creation processed as: (choose Dom. Coord.)').
-                      '</td><td class="LC_left_item">';
+        $datatable .= '</td></tr><tr class="LC_odd_row"><td>'.
+                      &mt('Course creation processed as: (choose Dom. Coord.)').
+                      '</td><td class="LC_left_item">'.$dctable.'</td></tr>';
     } else {
-        $datatable .= &mt('Course creation processed as:').
-                      '</td><td class="LC_right_item">';
+        $datatable .= $dctable.'</td></tr>';
     }
-    $datatable .= $dctable.'</td></tr>';
     $$rowtotal += $rows;
     return $datatable;
 }
 
 sub print_directorysrch {
-    my ($position,$dom,$settings,$rowtotal) = @_;
-    my $datatable;
-    if ($position eq 'top') {
-        my $instsrchon = ' ';
-        my $instsrchoff = ' checked="checked" ';
-        my ($exacton,$containson,$beginson);
-        my $instlocalon = ' ';
-        my $instlocaloff = ' checked="checked" ';
-        if (ref($settings) eq 'HASH') {
-            if ($settings->{'available'} eq '1') {
-                $instsrchon = $instsrchoff;
-                $instsrchoff = ' ';
-            }
-            if ($settings->{'localonly'} eq '1') {
-                $instlocalon = $instlocaloff;
-                $instlocaloff = ' ';
-            }
-            if (ref($settings->{'searchtypes'}) eq 'ARRAY') {
-                foreach my $type (@{$settings->{'searchtypes'}}) {
-                    if ($type eq 'exact') {
-                        $exacton = ' checked="checked" ';
-                    } elsif ($type eq 'contains') {
-                        $containson = ' checked="checked" ';
-                    } elsif ($type eq 'begins') {
-                        $beginson = ' checked="checked" ';
-                    }
-                }
-            } else {
-                if ($settings->{'searchtypes'} eq 'exact') {
-                    $exacton = ' checked="checked" ';
-                } elsif ($settings->{'searchtypes'} eq 'contains') {
-                    $containson = ' checked="checked" ';
-                } elsif ($settings->{'searchtypes'} eq 'specify') {
+    my ($dom,$settings,$rowtotal) = @_;
+    my $srchon = ' ';
+    my $srchoff = ' checked="checked" ';
+    my ($exacton,$containson,$beginson);
+    my $localon = ' ';
+    my $localoff = ' checked="checked" ';
+    if (ref($settings) eq 'HASH') {
+        if ($settings->{'available'} eq '1') {
+            $srchon = $srchoff;
+            $srchoff = ' ';
+        }
+        if ($settings->{'localonly'} eq '1') {
+            $localon = $localoff;
+            $localoff = ' ';
+        }
+        if (ref($settings->{'searchtypes'}) eq 'ARRAY') {
+            foreach my $type (@{$settings->{'searchtypes'}}) {
+                if ($type eq 'exact') {
                     $exacton = ' checked="checked" ';
+                } elsif ($type eq 'contains') {
                     $containson = ' checked="checked" ';
+                } elsif ($type eq 'begins') {
+                    $beginson = ' checked="checked" ';
                 }
             }
-        }
-        my ($searchtitles,$titleorder) = &sorted_searchtitles();
-        my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-
-        my $numinrow = 4;
-        my $cansrchrow = 0;
-        $datatable='<tr class="LC_odd_row">'.
-                   '<td colspan="2"><span class ="LC_nobreak">'.&mt('Institutional directory search available?').'</span></td>'.
-                   '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
-                   '<input type="radio" name="dirsrch_available"'.
-                   $instsrchon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
-                   '<label><input type="radio" name="dirsrch_available"'.
-                   $instsrchoff.' value="0" />'.&mt('No').'</label></span></td>'.
-                   '</tr><tr>'.
-                   '<td colspan="2"><span class ="LC_nobreak">'.&mt('Other domains can search institution?').'</span></td>'.
-                   '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
-                   '<input type="radio" name="dirsrch_instlocalonly"'.
-                   $instlocaloff.' value="0" />'.&mt('Yes').'</label>&nbsp;'.
-                   '<label><input type="radio" name="dirsrch_instlocalonly"'.
-                   $instlocalon.' value="1" />'.&mt('No').'</label></span></td>'.
-                   '</tr>';
-        $$rowtotal += 2;
-        if (ref($usertypes) eq 'HASH') {
-            if (keys(%{$usertypes}) > 0) {
-                $datatable .= &insttypes_row($settings,$types,$usertypes,$dom,
-                                             $numinrow,$othertitle,'cansearch',
-                                             $rowtotal);
-                $cansrchrow = 1;
+        } else {
+            if ($settings->{'searchtypes'} eq 'exact') {
+                $exacton = ' checked="checked" ';
+            } elsif ($settings->{'searchtypes'} eq 'contains') {
+                $containson = ' checked="checked" ';
+            } elsif ($settings->{'searchtypes'} eq 'specify') {
+                $exacton = ' checked="checked" ';
+                $containson = ' checked="checked" ';
             }
         }
-        if ($cansrchrow) {
-            $$rowtotal ++;
-            $datatable .= '<tr>';
-        } else {
-            $datatable .= '<tr class="LC_odd_row">';
+    }
+    my ($searchtitles,$titleorder) = &sorted_searchtitles();
+    my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+
+    my $numinrow = 4;
+    my $cansrchrow = 0;
+    my $datatable='<tr class="LC_odd_row">'.
+                  '<td colspan="2"><span class ="LC_nobreak">'.&mt('Directory search available?').'</span></td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                  '<input type="radio" name="dirsrch_available"'.
+                  $srchon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                  '<label><input type="radio" name="dirsrch_available"'.
+                  $srchoff.' value="0" />'.&mt('No').'</label></span></td>'.
+                  '</tr><tr>'.
+                  '<td colspan="2"><span class ="LC_nobreak">'.&mt('Other domains can search?').'</span></td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                  '<input type="radio" name="dirsrch_localonly"'.
+                  $localoff.' value="0" />'.&mt('Yes').'</label>&nbsp;'.
+                  '<label><input type="radio" name="dirsrch_localonly"'.
+                  $localon.' value="1" />'.&mt('No').'</label></span></td>'.
+                  '</tr>';
+    $$rowtotal += 2;
+    if (ref($usertypes) eq 'HASH') {
+        if (keys(%{$usertypes}) > 0) {
+            $datatable .= &insttypes_row($settings,$types,$usertypes,$dom,
+                                         $numinrow,$othertitle,'cansearch');
+            $cansrchrow = 1;
         }
-        $datatable .= '<td><span class ="LC_nobreak">'.&mt('Supported search methods').
-                      '</span></td><td class="LC_left_item" colspan="2"><table><tr>';
-        foreach my $title (@{$titleorder}) {
-            if (defined($searchtitles->{$title})) {
-                my $check = ' ';
-                if (ref($settings) eq 'HASH') {
-                    if (ref($settings->{'searchby'}) eq 'ARRAY') {
-                        if (grep(/^\Q$title\E$/,@{$settings->{'searchby'}})) {
-                            $check = ' checked="checked" ';
-                        }
+    }
+    if ($cansrchrow) {
+        $$rowtotal ++;
+        $datatable .= '<tr>';
+    } else {
+        $datatable .= '<tr class="LC_odd_row">';
+    }
+    $datatable .= '<td><span class ="LC_nobreak">'.&mt('Supported search methods').
+                  '</span></td><td class="LC_left_item" colspan="2"><table><tr>';
+    foreach my $title (@{$titleorder}) {
+        if (defined($searchtitles->{$title})) {
+            my $check = ' ';
+            if (ref($settings) eq 'HASH') {
+                if (ref($settings->{'searchby'}) eq 'ARRAY') {
+                    if (grep(/^\Q$title\E$/,@{$settings->{'searchby'}})) {
+                        $check = ' checked="checked" ';
                     }
                 }
-                $datatable .= '<td class="LC_left_item">'.
-                              '<span class="LC_nobreak"><label>'.
-                              '<input type="checkbox" name="searchby" '.
-                              'value="'.$title.'"'.$check.'/>'.
-                              $searchtitles->{$title}.'</label></span></td>';
             }
+            $datatable .= '<td class="LC_left_item">'.
+                          '<span class="LC_nobreak"><label>'.
+                          '<input type="checkbox" name="searchby" '.
+                          'value="'.$title.'"'.$check.'/>'.
+                          $searchtitles->{$title}.'</label></span></td>';
         }
-        $datatable .= '</tr></table></td></tr>';
-        $$rowtotal ++;
-        if ($cansrchrow) {
-            $datatable .= '<tr class="LC_odd_row">';
-        } else {
-            $datatable .= '<tr>';
-        }
-        $datatable .= '<td><span class ="LC_nobreak">'.&mt('Search latitude').'</span></td>'.   
-                      '<td class="LC_left_item" colspan="2">'.
-                      '<span class="LC_nobreak"><label>'.
-                      '<input type="checkbox" name="searchtypes" '.
-                      $exacton.' value="exact" />'.&mt('Exact match').
-                      '</label>&nbsp;'.
-                      '<label><input type="checkbox" name="searchtypes" '.
-                      $beginson.' value="begins" />'.&mt('Begins with').
-                      '</label>&nbsp;'.
-                      '<label><input type="checkbox" name="searchtypes" '.
-                      $containson.' value="contains" />'.&mt('Contains').
-                      '</label></span></td></tr>';
-        $$rowtotal ++;
+    }
+    $datatable .= '</tr></table></td></tr>';
+    $$rowtotal ++;
+    if ($cansrchrow) {
+        $datatable .= '<tr class="LC_odd_row">';
     } else {
-        my $domsrchon = ' checked="checked" ';
-        my $domsrchoff = ' ';
-        my $domlocalon = ' ';
-        my $domlocaloff = ' checked="checked" ';
-        if (ref($settings) eq 'HASH') {
-            if ($settings->{'lclocalonly'} eq '1') {
-                $domlocalon = $domlocaloff;
-                $domlocaloff = ' ';
-            }
-            if ($settings->{'lcavailable'} eq '0') {
-                $domsrchoff = $domsrchon;
-                $domsrchon = ' ';
-            }
-        }
-        $datatable='<tr class="LC_odd_row">'.
-                      '<td colspan="2"><span class ="LC_nobreak">'.&mt('LON-CAPA directory search available?').'</span></td>'.
-                      '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
-                      '<input type="radio" name="dirsrch_domavailable"'.
-                      $domsrchon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
-                      '<label><input type="radio" name="dirsrch_domavailable"'.
-                      $domsrchoff.' value="0" />'.&mt('No').'</label></span></td>'.
-                      '</tr><tr>'.
-                      '<td colspan="2"><span class ="LC_nobreak">'.&mt('Other domains can search LON-CAPA domain?').'</span></td>'.
-                      '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
-                      '<input type="radio" name="dirsrch_domlocalonly"'.
-                      $domlocaloff.' value="0" />'.&mt('Yes').'</label>&nbsp;'.
-                      '<label><input type="radio" name="dirsrch_domlocalonly"'.
-                      $domlocalon.' value="1" />'.&mt('No').'</label></span></td>'.
-                      '</tr>';
-        $$rowtotal += 2;
+        $datatable .= '<tr>';
     }
+    $datatable .= '<td><span class ="LC_nobreak">'.&mt('Search latitude').'</span></td>'.   
+                  '<td class="LC_left_item" colspan="2">'.
+                  '<span class="LC_nobreak"><label>'.
+                  '<input type="checkbox" name="searchtypes" '.
+                  $exacton.' value="exact" />'.&mt('Exact match').
+                  '</label>&nbsp;'.
+                  '<label><input type="checkbox" name="searchtypes" '.
+                  $beginson.' value="begins" />'.&mt('Begins with').
+                  '</label>&nbsp;'.
+                  '<label><input type="checkbox" name="searchtypes" '.
+                  $containson.' value="contains" />'.&mt('Contains').
+                  '</label></span></td></tr>';
+    $$rowtotal ++;
     return $datatable;
 }
 
 sub print_contacts {
-    my ($position,$dom,$settings,$rowtotal) = @_;
+    my ($dom,$settings,$rowtotal) = @_;
     my $datatable;
     my @contacts = ('adminemail','supportemail');
-    my (%checked,%to,%otheremails,%bccemails,%includestr,%includeloc,%currfield,
-        $maxsize,$fields,$fieldtitles,$fieldoptions,$possoptions,@mailings);
-    if ($position eq 'top') {
-        if (ref($settings) eq 'HASH') {
-            foreach my $item (@contacts) {
-                if (exists($settings->{$item})) {
-                    $to{$item} = $settings->{$item};
-                }
+    my (%checked,%to,%otheremails,%bccemails);
+    my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail',
+                    'requestsmail','updatesmail');
+    foreach my $type (@mailings) {
+        $otheremails{$type} = '';
+    }
+    $bccemails{'helpdeskmail'} = '';
+    if (ref($settings) eq 'HASH') {
+        foreach my $item (@contacts) {
+            if (exists($settings->{$item})) {
+                $to{$item} = $settings->{$item};
             }
         }
-    } elsif ($position eq 'middle') {
-        @mailings = ('errormail','packagesmail','lonstatusmail','requestsmail',
-                     'updatesmail','idconflictsmail','hostipmail');
-        foreach my $type (@mailings) {
-            $otheremails{$type} = '';
-        }
-    } else {
-        @mailings = ('helpdeskmail','otherdomsmail');
         foreach my $type (@mailings) {
-            $otheremails{$type} = '';
-        }
-        $bccemails{'helpdeskmail'} = '';
-        $bccemails{'otherdomsmail'} = '';
-        $includestr{'helpdeskmail'} = '';
-        $includestr{'otherdomsmail'} = '';
-        ($fields,$fieldtitles,$fieldoptions,$possoptions) = &helpform_fields();
-    }
-    if (ref($settings) eq 'HASH') {
-        unless ($position eq 'top') {
-            foreach my $type (@mailings) {
-                if (exists($settings->{$type})) {
-                    if (ref($settings->{$type}) eq 'HASH') {
-                        foreach my $item (@contacts) {
-                            if ($settings->{$type}{$item}) {
-                                $checked{$type}{$item} = ' checked="checked" ';
-                            }
-                        }
-                        $otheremails{$type} = $settings->{$type}{'others'};
-                        if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
-                            $bccemails{$type} = $settings->{$type}{'bcc'};
-                            if ($settings->{$type}{'include'} ne '') {
-                                ($includeloc{$type},$includestr{$type}) = split(/:/,$settings->{$type}{'include'},2);
-                                $includestr{$type} = &unescape($includestr{$type});
-                            }
+            if (exists($settings->{$type})) {
+                if (ref($settings->{$type}) eq 'HASH') {
+                    foreach my $item (@contacts) {
+                        if ($settings->{$type}{$item}) {
+                            $checked{$type}{$item} = ' checked="checked" ';
                         }
                     }
-                } elsif ($type eq 'lonstatusmail') {
-                    $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" ';
-                }
-            }
-        }
-        if ($position eq 'bottom') {
-            foreach my $type (@mailings) {
-                $bccemails{$type} = $settings->{$type}{'bcc'};
-                if ($settings->{$type}{'include'} ne '') {
-                    ($includeloc{$type},$includestr{$type}) = split(/:/,$settings->{$type}{'include'},2);
-                    $includestr{$type} = &unescape($includestr{$type});
-                }
-            }
-            if (ref($settings->{'helpform'}) eq 'HASH') {
-                if (ref($fields) eq 'ARRAY') {
-                    foreach my $field (@{$fields}) {
-                        $currfield{$field} = $settings->{'helpform'}{$field};
+                    $otheremails{$type} = $settings->{$type}{'others'};
+                    if ($type eq 'helpdeskmail') {
+                        $bccemails{$type} = $settings->{$type}{'bcc'};
                     }
                 }
-                if (exists($settings->{'helpform'}{'maxsize'})) {
-                    $maxsize = $settings->{'helpform'}{'maxsize'};
-                } else {
-                    $maxsize = '1.0';
-                }
-            } else {
-                if (ref($fields) eq 'ARRAY') {
-                    foreach my $field (@{$fields}) {
-                        $currfield{$field} = 'yes';
-                    }
-                }
-                $maxsize = '1.0';
+            } elsif ($type eq 'lonstatusmail') {
+                $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" ';
             }
         }
     } else {
-        if ($position eq 'top') {
-            $to{'supportemail'} = $Apache::lonnet::perlvar{'lonSupportEMail'};
-            $to{'adminemail'} = $Apache::lonnet::perlvar{'lonAdmEMail'};
-            $checked{'errormail'}{'adminemail'} = ' checked="checked" ';
-            $checked{'packagesmail'}{'adminemail'} = ' checked="checked" ';
-            $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" ';
-            $checked{'requestsmail'}{'adminemail'} = ' checked="checked" ';
-            $checked{'updatesmail'}{'adminemail'} = ' checked="checked" ';
-            $checked{'idconflictsmail'}{'adminemail'} = ' checked="checked" ';
-            $checked{'hostipmail'}{'adminemail'} = ' checked="checked" ';
-        } elsif ($position eq 'bottom') {
-            $checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" ';
-            $checked{'otherdomsmail'}{'supportemail'} = ' checked="checked" ';
-            if (ref($fields) eq 'ARRAY') {
-                foreach my $field (@{$fields}) {
-                    $currfield{$field} = 'yes';
-                }
-            }
-            $maxsize = '1.0';
-        }
+        $to{'supportemail'} = $Apache::lonnet::perlvar{'lonSupportEMail'};
+        $to{'adminemail'} = $Apache::lonnet::perlvar{'lonAdmEMail'};
+        $checked{'errormail'}{'adminemail'} = ' checked="checked" ';
+        $checked{'packagesmail'}{'adminemail'} = ' checked="checked" ';
+        $checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" ';
+        $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" '; 
+        $checked{'requestsmail'}{'adminemail'} = ' checked="checked" ';
+        $checked{'updatesmail'}{'adminemail'} = ' checked="checked" ';
     }
     my ($titles,$short_titles) = &contact_titles();
     my $rownum = 0;
     my $css_class;
-    if ($position eq 'top') {
-        foreach my $item (@contacts) {
-            $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 ++;
-        }
-    } elsif ($position eq 'bottom') {
+    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>';
+    }
+    foreach my $type (@mailings) {
+        $rownum ++;
         $css_class = $rownum%2?' class="LC_odd_row"':'';
         $datatable .= '<tr'.$css_class.'>'.
-                      '<td>'.&mt('Extra helpdesk form fields:').'<br />'.
-                      &mt('(e-mail, subject, and description always shown)').
-                      '</td><td class="LC_left_item">';
-        if ((ref($fields) eq 'ARRAY') && (ref($fieldtitles) eq 'HASH') &&
-            (ref($fieldoptions) eq 'HASH') && (ref($possoptions) eq 'HASH')) {
-            $datatable .= '<table><tr><th>'.&mt('Field').'</th><th>'.&mt('Status').'</th></tr>';
-            foreach my $field (@{$fields}) {
-                $datatable .= '<tr><td>'.$fieldtitles->{$field};
-                if (($field eq 'screenshot') || ($field eq 'cc')) {
-                    $datatable .= ' '.&mt('(logged-in users)');
-                }
-                $datatable .='</td><td>';
-                my $clickaction;
-                if ($field eq 'screenshot') {
-                    $clickaction = ' onclick="screenshotSize(this);"';
-                }
-                if (ref($possoptions->{$field}) eq 'ARRAY') {
-                    foreach my $option (@{$possoptions->{$field}}) {
-                        my $checked;
-                        if ($currfield{$field} eq $option) {
-                            $checked = ' checked="checked"';
-                        }
-                        $datatable .= '<span class="LC_nobreak"><label>'.
-                                      '<input type="radio" name="helpform_'.$field.'" '.
-                                      'value="'.$option.'"'.$checked.$clickaction.' />'.$fieldoptions->{$option}.
-                                      '</label></span>'.('&nbsp;'x2);
-                    }
-                }
-                if ($field eq 'screenshot') {
-                    my $display;
-                    if ($currfield{$field} eq 'no') {
-                        $display = ' style="display:none"';
-                    }
-                    $datatable .= '</td></tr><tr id="help_screenshotsize"'.$display.'>'.
-                                  '<td>'.&mt('Maximum size for upload (MB)').'</td><td>'.
-                                  '<input type="text" size="5" name="helpform_maxsize" value="'.$maxsize.'" />';
-                }
-                $datatable .= '</td></tr>';
-            }
-            $datatable .= '</table>';
+                      '<td><span class="LC_nobreak">'.
+                      $titles->{$type}.': </span></td>'.
+                      '<td class="LC_left_item">'.
+                      '<span class="LC_nobreak">';
+        foreach my $item (@contacts) {
+            $datatable .= '<label>'.
+                          '<input type="checkbox" name="'.$type.'"'.
+                          $checked{$type}{$item}.
+                          ' value="'.$item.'" />'.$short_titles->{$item}.
+                          '</label>&nbsp;';
+        }
+        $datatable .= '</span><br />'.&mt('Others').':&nbsp;&nbsp;'.
+                      '<input type="text" name="'.$type.'_others" '.
+                      'value="'.$otheremails{$type}.'"  />';
+        if ($type eq 'helpdeskmail') {
+            $datatable .= '<br />'.&mt('Bcc:').('&nbsp;'x6).
+                          '<input type="text" name="'.$type.'_bcc" '.
+                          'value="'.$bccemails{$type}.'"  />';
         }
         $datatable .= '</td></tr>'."\n";
-        $rownum ++;
-    }
-    unless ($position eq 'top') {
-        foreach my $type (@mailings) {
-            $css_class = $rownum%2?' class="LC_odd_row"':'';
-            $datatable .= '<tr'.$css_class.'>'.
-                          '<td><span class="LC_nobreak">'.
-                          $titles->{$type}.': </span></td>'.
-                          '<td class="LC_left_item">';
-            if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
-                $datatable .= '<fieldset><legend>'.&mt('E-mail recipient(s)').'</legend>';
-            }
-            $datatable .= '<span class="LC_nobreak">';
-            foreach my $item (@contacts) {
-                $datatable .= '<label>'.
-                              '<input type="checkbox" name="'.$type.'"'.
-                              $checked{$type}{$item}.
-                              ' value="'.$item.'" />'.$short_titles->{$item}.
-                              '</label>&nbsp;';
-            }
-            $datatable .= '</span><br />'.&mt('Others').':&nbsp;&nbsp;'.
-                          '<input type="text" name="'.$type.'_others" '.
-                          'value="'.$otheremails{$type}.'"  />';
-            my %locchecked;
-            if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
-                foreach my $loc ('s','b') {
-                    if ($includeloc{$type} eq $loc) {
-                        $locchecked{$loc} = ' checked="checked"';
-                        last;
-                    }
-                }
-                $datatable .= '<br />'.&mt('Bcc:').('&nbsp;'x6).
-                              '<input type="text" name="'.$type.'_bcc" '.
-                              'value="'.$bccemails{$type}.'"  /></fieldset>'.
-                              '<fieldset><legend>'.&mt('Optional added text').'</legend>'.
-                              &mt('Text automatically added to e-mail:').' '.
-                              '<input type="text" name="'.$type.'_includestr" value="'.$includestr{$type}.'" /><br />'.
-                              '<span class="LC_nobreak">'.&mt('Location:').'&nbsp;'.
-                              '<label><input type="radio" name="'.$type.'_includeloc" value="s"'.$locchecked{'s'}.' />'.&mt('in subject').'</label>'.
-                              ('&nbsp;'x2).
-                              '<label><input type="radio" name="'.$type.'_includeloc" value="b"'.$locchecked{'b'}.' />'.&mt('in body').'</label>'.
-                              '</span></fieldset>';
-            }
-            $datatable .= '</td></tr>'."\n";
-            $rownum ++;
-        }
-    }
-    if ($position eq 'middle') {
-        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;
-    } elsif ($position eq 'bottom') {
-        my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-        my (@posstypes,%usertypeshash);
-        if (ref($types) eq 'ARRAY') {
-            @posstypes = @{$types};
-        }
-        if (@posstypes) {
-            if (ref($usertypes) eq 'HASH') {
-                %usertypeshash = %{$usertypes};
-            }
-            my @overridden;
-            my $numinrow = 4;
-            if (ref($settings) eq 'HASH') {
-                if (ref($settings->{'overrides'}) eq 'HASH') {
-                    foreach my $key (sort(keys(%{$settings->{'overrides'}}))) {
-                        if (ref($settings->{'overrides'}{$key}) eq 'HASH') {
-                            push(@overridden,$key);
-                            foreach my $item (@contacts) {
-                                if ($settings->{'overrides'}{$key}{$item}) {
-                                    $checked{'override_'.$key}{$item} = ' checked="checked" ';
-                                }
-                            }
-                            $otheremails{'override_'.$key} = $settings->{'overrides'}{$key}{'others'};
-                            $bccemails{'override_'.$key} = $settings->{'overrides'}{$key}{'bcc'};
-                            $includeloc{'override_'.$key} = '';
-                            $includestr{'override_'.$key} = '';
-                            if ($settings->{'overrides'}{$key}{'include'} ne '') {
-                                ($includeloc{'override_'.$key},$includestr{'override_'.$key}) =
-                                    split(/:/,$settings->{'overrides'}{$key}{'include'},2);
-                                $includestr{'override_'.$key} = &unescape($includestr{'override_'.$key});
-                            }
-                        }
-                    }
-                }
-            }
-            my $customclass = 'LC_helpdesk_override';
-            my $optionsprefix = 'LC_options_helpdesk_';
-
-            my $onclicktypes = "toggleHelpdeskRow(this.form,'overrides','$customclass','$optionsprefix');";
-
-            $datatable .= &insttypes_row($settings,$types,$usertypes,$dom,
-                                         $numinrow,$othertitle,'overrides',
-                                         \$rownum,$onclicktypes,$customclass);
-            $rownum ++;
-            $usertypeshash{'default'} = $othertitle;
-            foreach my $status (@posstypes) {
-                my $css_class;
-                if ($rownum%2) {
-                    $css_class = 'LC_odd_row ';
-                }
-                $css_class .= $customclass;
-                my $rowid = $optionsprefix.$status;
-                my $hidden = 1;
-                my $currstyle = 'display:none';
-                if (grep(/^\Q$status\E$/,@overridden)) {
-                    $currstyle = 'display:table-row';
-                    $hidden = 0;
-                }
-                my $key = 'override_'.$status;
-                $datatable .= &overridden_helpdesk($checked{$key},$otheremails{$key},$bccemails{$key},
-                                                  $includeloc{$key},$includestr{$key},$status,$rowid,
-                                                  $usertypeshash{$status},$css_class,$currstyle,
-                                                  \@contacts,$short_titles);
-                unless ($hidden) {
-                    $rownum ++;
-                }
-            }
-        }
     }
     $$rowtotal += $rownum;
     return $datatable;
 }
 
-sub overridden_helpdesk {
-    my ($checked,$otheremails,$bccemails,$includeloc,$includestr,$type,$rowid,
-        $typetitle,$css_class,$rowstyle,$contacts,$short_titles) = @_;
-    my $class = 'LC_left_item';
-    if ($css_class) {
-        $css_class = ' class="'.$css_class.'"';
-    }
-    if ($rowid) {
-        $rowid = ' id="'.$rowid.'"';
-    }
-    if ($rowstyle) {
-        $rowstyle = ' style="'.$rowstyle.'"';
-    }
-    my ($output,$description);
-    $description = &mt('Helpdesk requests from: [_1] in this domain (overrides default)',"<b>$typetitle</b>");
-    $output = '<tr'.$css_class.$rowid.$rowstyle.'>'.
-              "<td>$description</td>\n".
-              '<td class="'.$class.'" colspan="2">'.
-              '<fieldset><legend>'.&mt('E-mail recipient(s)').'</legend>'.
-              '<span class="LC_nobreak">';
-    if (ref($contacts) eq 'ARRAY') {
-        foreach my $item (@{$contacts}) {
-            my $check;
-            if (ref($checked) eq 'HASH') {
-               $check = $checked->{$item};
-            }
-            my $title;
-            if (ref($short_titles) eq 'HASH') {
-                $title = $short_titles->{$item};
-            }
-            $output .= '<label>'.
-                       '<input type="checkbox" name="override_'.$type.'"'.$check.
-                       ' value="'.$item.'" />'.$title.'</label>&nbsp;';
-        }
-    }
-    $output .= '</span><br />'.&mt('Others').':&nbsp;&nbsp;'.
-               '<input type="text" name="override_'.$type.'_others" '.
-               'value="'.$otheremails.'"  />';
-    my %locchecked;
-    foreach my $loc ('s','b') {
-        if ($includeloc eq $loc) {
-            $locchecked{$loc} = ' checked="checked"';
-            last;
-        }
-    }
-    $output .= '<br />'.&mt('Bcc:').('&nbsp;'x6).
-               '<input type="text" name="override_'.$type.'_bcc" '.
-               'value="'.$bccemails.'"  /></fieldset>'.
-               '<fieldset><legend>'.&mt('Optional added text').'</legend>'.
-               &mt('Text automatically added to e-mail:').' '.
-               '<input type="text" name="override_'.$type.'_includestr" value="'.$includestr.'" /><br />'.
-               '<span class="LC_nobreak">'.&mt('Location:').'&nbsp;'.
-               '<label><input type="radio" name="override_'.$type.'_includeloc" value="s"'.$locchecked{'s'}.' />'.&mt('in subject').'</label>'.
-               ('&nbsp;'x2).
-               '<label><input type="radio" name="override_'.$type.'_includeloc" value="b"'.$locchecked{'b'}.' />'.&mt('in body').'</label>'.
-               '</span></fieldset>'.
-               '</td></tr>'."\n";
-    return $output;
-}
-
-sub contacts_javascript {
-    return <<"ENDSCRIPT";
-
-<script type="text/javascript">
-// <![CDATA[
-
-function screenshotSize(field) {
-    if (document.getElementById('help_screenshotsize')) {
-        if (field.value == 'no') {
-            document.getElementById('help_screenshotsize').style.display="none";
-        } else {
-            document.getElementById('help_screenshotsize').style.display="";
-        }
-    }
-    return;
-}
-
-function toggleHelpdeskRow(form,checkbox,target,prefix,docount) {
-    if (form.elements[checkbox].length != undefined) {
-        var count = 0;
-        if (docount) {
-            for (var i=0; i<form.elements[checkbox].length; i++) {
-                if (form.elements[checkbox][i].checked) {
-                    count ++;
-                }
-            }
-        }
-        for (var i=0; i<form.elements[checkbox].length; i++) {
-            var type = form.elements[checkbox][i].value;
-            if (document.getElementById(prefix+type)) {
-                if (form.elements[checkbox][i].checked) {
-                    document.getElementById(prefix+type).style.display = 'table-row';
-                    if (count % 2 == 1) {
-                        document.getElementById(prefix+type).className = target+' LC_odd_row';
-                    } else {
-                        document.getElementById(prefix+type).className = target;
-                    }
-                    count ++;
-                } else {
-                    document.getElementById(prefix+type).style.display = 'none';
-                }
-            }
-        }
-    }
-    return;
-}
-
-// ]]>
-</script>
-
-ENDSCRIPT
-}
-
 sub print_helpsettings {
-    my ($position,$dom,$settings,$rowtotal) = @_;
-    my $confname = $dom.'-domainconfig';
-    my $formname = 'display';
+    my ($dom,$confname,$settings,$rowtotal) = @_;
     my ($datatable,$itemcount);
-    if ($position eq 'top') {
-        $itemcount = 1;
-        my (%choices,%defaultchecked,@toggles);
-        $choices{'submitbugs'} = &mt('Display link to: [_1]?',
-                                     &Apache::loncommon::modal_link('http://bugs.loncapa.org',
-                                     &mt('LON-CAPA bug tracker'),600,500));
-        %defaultchecked = ('submitbugs' => 'on');
-        @toggles = ('submitbugs');
-        ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
-                                                     \%choices,$itemcount);
-        $$rowtotal ++;
-    } else {
-        my $css_class;
-        my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_');
-        my (%customroles,%ordered,%current);
-        if (ref($settings) eq 'HASH') {
-            if (ref($settings->{'adhoc'}) eq 'HASH') {
-                %current = %{$settings->{'adhoc'}};
-            }
-        }
-        my $count = 0;
-        foreach my $key (sort(keys(%existing))) {
-            if ($key=~/^rolesdef\_(\w+)$/) {
-                my $rolename = $1;
-                my (%privs,$order);
-                ($privs{'system'},$privs{'domain'},$privs{'course'}) = split(/\_/,$existing{$key});
-                $customroles{$rolename} = \%privs;
-                if (ref($current{$rolename}) eq 'HASH') {
-                    $order = $current{$rolename}{'order'};
-                }
-                if ($order eq '') {
-                    $order = $count;
-                }
-                $ordered{$order} = $rolename;
-                $count++;
-            }
-        }
-        my $maxnum = scalar(keys(%ordered));
-        my @roles_by_num = ();
-        foreach my $item (sort {$a <=> $b } (keys(%ordered))) {
-            push(@roles_by_num,$item);
-        }
-        my $context = 'domprefs';
-        my $crstype = 'Course';
-        my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-        my @accesstypes = ('all','dh','da','none');
-        my ($numstatustypes,@jsarray);
-        if (ref($types) eq 'ARRAY') {
-            if (@{$types} > 0) {
-                $numstatustypes = scalar(@{$types});
-                push(@accesstypes,'status');
-                @jsarray = ('bystatus');
-            }
-        }
-        my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh','da']);
-        if (keys(%domhelpdesk)) {
-            push(@accesstypes,('inc','exc'));
-            push(@jsarray,('notinc','notexc'));
-        }
-        my $hiddenstr = join("','",@jsarray);
-        $datatable .= &helpsettings_javascript(\@roles_by_num,$maxnum,$hiddenstr,$formname);
-        my $context = 'domprefs';
-        my $crstype = 'Course';
-        my $prefix = 'helproles_';
-        my $add_class = 'LC_hidden';
-        foreach my $num (@roles_by_num) {
-            my $role = $ordered{$num};
-            my ($desc,$access,@statuses);
-            if (ref($current{$role}) eq 'HASH') {
-                $desc = $current{$role}{'desc'};
-                $access = $current{$role}{'access'};
-                if (ref($current{$role}{'insttypes'}) eq 'ARRAY') {
-                    @statuses = @{$current{$role}{'insttypes'}};
-                }
-            }
-            if ($desc eq '') {
-                $desc = $role;
-            }
-            my $identifier = 'custhelp'.$num;
-            my %full=();
-            my %levels= (
-                         course => {},
-                         domain => {},
-                         system => {},
-                        );
-            my %levelscurrent=(
-                               course => {},
-                               domain => {},
-                               system => {},
-                              );
-            &Apache::lonuserutils::custom_role_privs($customroles{$role},\%full,\%levels,\%levelscurrent);
-            my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype);
-            $css_class = $itemcount%2?' class="LC_odd_row"':'';
-            my $chgstr = ' onchange="javascript:reorderHelpRoles(this.form,'."'helproles_".$num."_pos'".');"';
-            $datatable .= '<tr '.$css_class.'><td valign="top"><b>'.$role.'</b><br />'.
-                          '<select name="helproles_'.$num.'_pos"'.$chgstr.'>';
-            for (my $k=0; $k<=$maxnum; $k++) {
-                my $vpos = $k+1;
-                my $selstr;
-                if ($k == $num) {
-                    $selstr = ' selected="selected" ';
-                }
-                $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
-            }
-            $datatable .= '</select>'.('&nbsp;'x2).
-                          '<input type="hidden" name="helproles_'.$num.'" value="'.$role.'" />'.
-                          '</td>'.
-                          '<td><fieldset><legend>'.&mt('Role name').'</legend>'.
-                          &mt('Name shown to users:').
-                          '<input type="text" name="helproles_'.$num.'_desc" value="'.$desc.'" />'.
-                          '</fieldset>'.
-                          &helpdeskroles_access($dom,$prefix,$num,$add_class,$current{$role},\@accesstypes,
-                                                $othertitle,$usertypes,$types,\%domhelpdesk).
-                          '<fieldset>'.
-                          '<legend>'.&mt('Role privileges').&adhocbutton($prefix,$num,'privs','show').'</legend>'.
-                          &Apache::lonuserutils::custom_role_table($crstype,\%full,\%levels,
-                                                                   \%levelscurrent,$identifier,
-                                                                   'LC_hidden',$prefix.$num.'_privs').
-                          '</fieldset></td>';
-            $itemcount ++;
-        }
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        my $newcust = 'custhelp'.$count;
-        my (%privs,%levelscurrent);
-        my %full=();
-        my %levels= (
-                     course => {},
-                     domain => {},
-                     system => {},
-                    );
-        &Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent);
-        my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype);
-        my $chgstr = ' onchange="javascript:reorderHelpRoles(this.form,'."'helproles_".$count."_pos'".');"';
-        $datatable .= '<tr '.$css_class.'><td valign="top"><span class="LC_nobreak"><label>'.
-                      '<input type="hidden" name="helproles_maxnum" value="'.$maxnum.'" />'."\n".
-                      '<select name="helproles_'.$count.'_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="newcusthelp" value="'.$count.'" />'. &mt('Add').
-                      '</label></span></td>'.
-                      '<td><fieldset><legend>'.&mt('Role name').'</legend>'.
-                      '<span class="LC_nobreak">'.
-                      &mt('Internal name:').
-                      '<input type="text" size="10" name="custhelpname'.$count.'" value="" />'.
-                      '</span>'.('&nbsp;'x4).
-                      '<span class="LC_nobreak">'.
-                      &mt('Name shown to users:').
-                      '<input type="text" size="20" name="helproles_'.$count.'_desc" value="" />'.
-                      '</span></fieldset>'.
-                       &helpdeskroles_access($dom,$prefix,$count,'',undef,\@accesstypes,$othertitle,
-                                             $usertypes,$types,\%domhelpdesk).
-                      '<fieldset><legend>'.&mt('Role privileges').'</legend>'.
-                      &Apache::lonuserutils::custom_role_header($context,$crstype,
-                                                                \@templateroles,$newcust).
-                      &Apache::lonuserutils::custom_role_table('Course',\%full,\%levels,
-                                                               \%levelscurrent,$newcust).
-                      '</fieldset>'.
-                      &helpsettings_javascript(\@roles_by_num,$maxnum,$hiddenstr,$formname).
-                      '</td></tr>';
-        $count ++;
-        $$rowtotal += $count;
-    }
-    return $datatable;
-}
-
-sub adhocbutton {
-    my ($prefix,$num,$field,$visibility) = @_;
-    my %lt = &Apache::lonlocal::texthash(
-                                          show => 'Show details',
-                                          hide => 'Hide details',
-                                        );
-    return '<span style="text-decoration:line-through; font-weight: normal;">'.('&nbsp;'x10).
-           '</span>'.('&nbsp;'x2).'<input type="button" id="'.$prefix.$num.'_'.$field.'_vis"'.
-           ' value="'.$lt{$visibility}.'" style="height:20px;" '.
-           'onclick="toggleHelpdeskItem('."'$num','$field'".');" />'.('&nbsp;'x2);
-}
-
-sub helpsettings_javascript {
-    my ($roles_by_num,$total,$hiddenstr,$formname) = @_;
-    return unless(ref($roles_by_num) eq 'ARRAY');
-    my %html_js_lt = &Apache::lonlocal::texthash(
-                                          show => 'Show details',
-                                          hide => 'Hide details',
-                                        );
-    &html_escape(\%html_js_lt);
-    my $jstext = '    var helproles = Array('."'".join("','",@{$roles_by_num})."'".');'."\n";
-    return <<"ENDSCRIPT";
-<script type="text/javascript">
-// <![CDATA[
-
-function reorderHelpRoles(form,item) {
-    var changedVal;
-$jstext
-    var newpos = 'helproles_${total}_pos';
-    var maxh = 1 + $total;
-    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;
-    }
-    for (var i=0; i<helproles.length; i++) {
-        var elementName = 'helproles_'+helproles[i]+'_pos';
-        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;
-}
-
-function helpdeskAccess(num) {
-    var curraccess = null;
-    if (document.$formname.elements['helproles_'+num+'_access'].length) {
-        for (var i=0; i<document.$formname.elements['helproles_'+num+'_access'].length; i++) {
-            if (document.$formname.elements['helproles_'+num+'_access'][i].checked) {
-                curraccess = document.$formname.elements['helproles_'+num+'_access'][i].value;
-            }
-        }
-    }
-    var shown = Array();
-    var hidden = Array();
-    if (curraccess == 'none') {
-        hidden = Array('$hiddenstr');
-    } else {
-        if (curraccess == 'status') {
-            shown = Array('bystatus');
-            hidden = Array('notinc','notexc');
-        } else {
-            if (curraccess == 'exc') {
-                shown = Array('notexc');
-                hidden = Array('notinc','bystatus');
-            }
-            if (curraccess == 'inc') {
-                shown = Array('notinc');
-                hidden = Array('notexc','bystatus');
-            }
-            if ((curraccess == 'all') || (curraccess == 'dh') || (curraccess == 'da')) {
-                hidden = Array('notinc','notexc','bystatus');
-            }
-        }
-    }
-    if (hidden.length > 0) {
-        for (var i=0; i<hidden.length; i++) {
-            if (document.getElementById('helproles_'+num+'_'+hidden[i])) {
-                document.getElementById('helproles_'+num+'_'+hidden[i]).style.display = 'none';
-            }
-        }
-    }
-    if (shown.length > 0) {
-        for (var i=0; i<shown.length; i++) {
-            if (document.getElementById('helproles_'+num+'_'+shown[i])) {
-                if (shown[i] == 'privs') {
-                    document.getElementById('helproles_'+num+'_'+shown[i]).style.display = 'block';
-                } else {
-                    document.getElementById('helproles_'+num+'_'+shown[i]).style.display = 'inline-block';
-                }
-            }
-        }
-    }
-    return;
-}
-
-function toggleHelpdeskItem(num,field) {
-    if (document.getElementById('helproles_'+num+'_'+field)) {
-        if (document.getElementById('helproles_'+num+'_'+field).className.match(/(?:^|\\s)LC_hidden(?!\\S)/)) {
-            document.getElementById('helproles_'+num+'_'+field).className =
-                document.getElementById('helproles_'+num+'_'+field).className.replace(/(?:^|\\s)LC_hidden(?!\\S)/g ,'');
-            if (document.getElementById('helproles_'+num+'_'+field+'_vis')) {
-                document.getElementById('helproles_'+num+'_'+field+'_vis').value = '$html_js_lt{hide}';
-            }
-        } else {
-            document.getElementById('helproles_'+num+'_'+field).className += ' LC_hidden';
-            if (document.getElementById('helproles_'+num+'_'+field+'_vis')) {
-                document.getElementById('helproles_'+num+'_'+field+'_vis').value = '$html_js_lt{show}';
-            }
-        }
-    }
-    return;
-}
-
-// ]]>
-</script>
-
-ENDSCRIPT
-}
+    $itemcount = 1;
+    my (%choices,%defaultchecked,@toggles);
+    $choices{'submitbugs'} = &mt('Display link to: [_1]?',
+                                 &Apache::loncommon::modal_link('http://bugs.loncapa.org',
+                                 &mt('LON-CAPA bug tracker'),600,500));
+    %defaultchecked = ('submitbugs' => 'on');
+    @toggles = ('submitbugs',);
 
-sub helpdeskroles_access {
-    my ($dom,$prefix,$num,$add_class,$current,$accesstypes,$othertitle,
-        $usertypes,$types,$domhelpdesk) = @_;
-    return unless ((ref($accesstypes) eq 'ARRAY') && (ref($domhelpdesk) eq 'HASH'));
-    my %lt = &Apache::lonlocal::texthash(
-                    'rou'    => 'Role usage',
-                    'whi'    => 'Which helpdesk personnel may use this role?',
-                    'all'    => 'All with domain helpdesk or helpdesk assistant role',
-                    'dh'     => 'All with domain helpdesk role',
-                    'da'     => 'All with domain helpdesk assistant role',
-                    'none'   => 'None',
-                    'status' => 'Determined based on institutional status',
-                    'inc'    => 'Include all, but exclude specific personnel',
-                    'exc'    => 'Exclude all, but include specific personnel',
-                  );
-    my %usecheck = (
-                     all => ' checked="checked"',
-                   );
-    my %displaydiv = (
-                      status => 'none',
-                      inc    => 'none',
-                      exc    => 'none',
-                      priv   => 'block',
-                     );
-    my $output;
-    if (ref($current) eq 'HASH') {
-        if (($current->{'access'} ne '') && ($current->{'access'} ne 'all')) {
-            if (grep(/^\Q$current->{access}\E$/,@{$accesstypes})) {
-                $usecheck{$current->{access}} = $usecheck{'all'};
-                delete($usecheck{'all'});
-                if ($current->{access} =~ /^(status|inc|exc)$/) {
-                    my $access = $1;
-                    $displaydiv{$access} = 'inline';
-                } elsif ($current->{access} eq 'none') {
-                    $displaydiv{'priv'} = 'none';
-                }
-            }
-        }
-    }
-    $output = '<fieldset id="'.$prefix.$num.'_usage"><legend>'.$lt{'rou'}.'</legend>'.
-              '<p>'.$lt{'whi'}.'</p>';
-    foreach my $access (@{$accesstypes}) {
-        $output .= '<p><label><input type="radio" name="'.$prefix.$num.'_access" value="'.$access.'" '.$usecheck{$access}.
-                   ' onclick="helpdeskAccess('."'$num'".');" />'.
-                   $lt{$access}.'</label>';
-        if ($access eq 'status') {
-            $output .= '<div id="'.$prefix.$num.'_bystatus" style="display:'.$displaydiv{$access}.'">'.
-                       &Apache::lonuserutils::adhoc_status_types($dom,$prefix,$num,$current->{$access},
-                                                                 $othertitle,$usertypes,$types).
-                       '</div>';
-        } elsif (($access eq 'inc') && (keys(%{$domhelpdesk}) > 0)) {
-            $output .= '<div id="'.$prefix.$num.'_notinc" style="display:'.$displaydiv{$access}.'">'.
-                       &Apache::lonuserutils::adhoc_staff($access,$prefix,$num,$current->{$access},$domhelpdesk).
-                       '</div>';
-        } elsif (($access eq 'exc') && (keys(%{$domhelpdesk}) > 0)) {
-            $output .= '<div id="'.$prefix.$num.'_notexc" style="display:'.$displaydiv{$access}.'">'.
-                       &Apache::lonuserutils::adhoc_staff($access,$prefix,$num,$current->{$access},$domhelpdesk).
-                       '</div>';
-        }
-        $output .= '</p>';
-    }
-    $output .= '</fieldset>';
-    return $output;
+    ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
+                                                 \%choices,$itemcount);
+    return $datatable;
 }
 
 sub radiobutton_prefs {
     my ($settings,$toggles,$defaultchecked,$choices,$itemcount,$onclick,
-        $additional,$align) = @_;
+        $additional) = @_;
     return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') &&
                    (ref($choices) eq 'HASH'));
 
@@ -3774,14 +2425,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.'" '.
@@ -3794,508 +2439,30 @@ sub radiobutton_prefs {
     return ($datatable,$itemcount);
 }
 
-sub print_ltitools {
-    my ($dom,$settings,$rowtotal) = @_;
-    my $rownum = 0;
-    my $css_class;
-    my $itemcount = 1;
-    my $maxnum = 0;
-    my %ordered;
-    if (ref($settings) eq 'HASH') {
-        foreach my $item (keys(%{$settings})) {
-            if (ref($settings->{$item}) eq 'HASH') {
-                my $num = $settings->{$item}{'order'};
-                $ordered{$num} = $item;
-            }
-        }
-    }
-    my $confname = $dom.'-domainconfig';
-    my $switchserver = &check_switchserver($dom,$confname);
-    my $maxnum = scalar(keys(%ordered));
-    my $datatable = &ltitools_javascript($settings);
-    my %lt = &ltitools_names();
-    my @courseroles = ('cc','in','ta','ep','st');
-    my @ltiroles = qw(Instructor ContentDeveloper TeachingAssistant Learner);
-    my @fields = ('fullname','firstname','lastname','email','user','roles');
-    if (keys(%ordered)) {
-        my @items = sort { $a <=> $b } keys(%ordered);
-        for (my $i=0; $i<@items; $i++) {
-            $css_class = $itemcount%2?' class="LC_odd_row"':'';
-            my $item = $ordered{$items[$i]};
-            my ($title,$key,$secret,$url,$imgsrc,$version);
-            if (ref($settings->{$item}) eq 'HASH') {
-                $title = $settings->{$item}->{'title'};
-                $url = $settings->{$item}->{'url'};
-                $key = $settings->{$item}->{'key'};
-                $secret = $settings->{$item}->{'secret'};
-                my $image = $settings->{$item}->{'image'};
-                if ($image ne '') {
-                    $imgsrc = '<img src="'.$image.'" alt="'.&mt('Tool Provider icon').'" />';
-                }
-            }
-            my $chgstr = ' onchange="javascript:reorderLTI(this.form,'."'ltitools_".$item."'".');"';
-            $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
-                         .'<select name="ltitools_'.$item.'"'.$chgstr.'>';
-            for (my $k=0; $k<=$maxnum; $k++) {
-                my $vpos = $k+1;
-                my $selstr;
-                if ($k == $i) {
-                    $selstr = ' selected="selected" ';
-                }
-                $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
-            }
-            $datatable .= '</select>'.('&nbsp;'x2).
-                '<label><input type="checkbox" name="ltitools_del" value="'.$item.'" />'.
-                &mt('Delete?').'</label></span></td>'.
-                '<td colspan="2">'.
-                '<fieldset><legend>'.&mt('Required settings').'</legend>'.
-                '<span class="LC_nobreak">'.$lt{'title'}.':<input type="text" size="30" name="ltitools_title_'.$i.'" value="'.$title.'" /></span> '.
-                ('&nbsp;'x2).
-                '<span class="LC_nobreak">'.$lt{'version'}.':<select name="ltitools_version_'.$i.'">'.
-                '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '.
-                ('&nbsp;'x2).
-                '<span class="LC_nobreak">'.$lt{'msgtype'}.':<select name="ltitools_msgtype_'.$i.'">'.
-                '<option value="basic-lti-launch-request" selected="selected">Launch</option></select></span> '.
-                '<br /><br />'.
-                '<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="30" name="ltitools_url_'.$i.'"'.
-                ' value="'.$url.'" /></span>'.
-                ('&nbsp;'x2).
-                '<span class="LC_nobreak">'.$lt{'key'}.
-                '<input type="text" size="25" name="ltitools_key_'.$i.'" value="'.$key.'" /></span> '.
-                ('&nbsp;'x2).
-                '<span class="LC_nobreak">'.$lt{'secret'}.':'.
-                '<input type="password" size="20" name="ltitools_secret_'.$i.'" value="'.$secret.'" />'.
-                '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.ltitools_secret_'.$i.'.type='."'text'".' } else { this.form.ltitools_secret_'.$i.'.type='."'password'".' }" />'.&mt('Visible input').'</label>'.
-                '<input type="hidden" name="ltitools_id_'.$i.'" value="'.$item.'" /></span>'.
-                '</fieldset>'.
-                '<fieldset><legend>'.&mt('Optional settings').'</legend>'.
-                '<span class="LC_nobreak">'.&mt('Display target:');
-            my %currdisp;
-            if (ref($settings->{$item}->{'display'}) eq 'HASH') {
-                if ($settings->{$item}->{'display'}->{'target'} eq 'window') {
-                    $currdisp{'window'} = ' checked="checked"';
-                } elsif ($settings->{$item}->{'display'}->{'target'} eq 'tab') {
-                    $currdisp{'tab'} = ' checked="checked"';
-                } else {
-                    $currdisp{'iframe'} = ' checked="checked"';
-                }
-                if ($settings->{$item}->{'display'}->{'width'} =~ /^(\d+)$/) {
-                    $currdisp{'width'} = $1;
-                }
-                if ($settings->{$item}->{'display'}->{'height'} =~ /^(\d+)$/) {
-                     $currdisp{'height'} = $1;
-                }
-                $currdisp{'linktext'} = $settings->{$item}->{'display'}->{'linktext'};
-                $currdisp{'explanation'} = $settings->{$item}->{'display'}->{'explanation'};
-            } else {
-                $currdisp{'iframe'} = ' checked="checked"';
-            }
-            foreach my $disp ('iframe','tab','window') {
-                $datatable .= '<label><input type="radio" name="ltitools_target_'.$i.'" value="'.$disp.'"'.$currdisp{$disp}.' />'.
-                              $lt{$disp}.'</label>'.('&nbsp;'x2);
-            }
-            $datatable .= ('&nbsp;'x4);
-            foreach my $dimen ('width','height') {
-                $datatable .= '<label>'.$lt{$dimen}.'&nbsp;'.
-                              '<input type="text" name="ltitools_'.$dimen.'_'.$i.'" size="5" value="'.$currdisp{$dimen}.'" /></label>'.
-                              ('&nbsp;'x2);
-            }
-            $datatable .= '<br />'.
-                          '<div class="LC_left_float">'.$lt{'linktext'}.'<br />'.
-                          '<input type="text" name="ltitools_linktext_'.$i.'" size="25" value="'.$currdisp{'linktext'}.'" /></label></div>'.
-                          '<div class="LC_left_float">'.$lt{'explanation'}.'<br />'.
-                          '<textarea name="ltitools_explanation_'.$i.'" rows="5" cols="40">'.$currdisp{'explanation'}.
-                          '</textarea></div><div style=""></div><br />';
-            $datatable .= '<br />';
-            foreach my $extra ('passback','roster') {
-                my $checkedon = '';
-                my $checkedoff = ' checked="checked"';
-                if ($settings->{$item}->{$extra}) {
-                    $checkedon = $checkedoff;
-                    $checkedoff = '';
-                }
-                $datatable .= $lt{$extra}.'&nbsp;'.
-                              '<label><input type="radio" name="ltitools_'.$extra.'_'.$i.'" value="1"'.$checkedon.' />'.
-                              &mt('Yes').'</label>'.('&nbsp;'x2).
-                              '<label><input type="radio" name="ltitools_'.$extra.'_'.$i.'" value="0"'.$checkedoff.' />'.
-                              &mt('No').'</label>'.('&nbsp;'x4);
-            }
-            $datatable .= '<br /><br /><span class="LC_nobreak">'.$lt{'icon'}.':&nbsp;';
-            if ($imgsrc) {
-                $datatable .= $imgsrc.
-                              '<label><input type="checkbox" name="ltitools_image_del"'.
-                              ' value="'.$item.'" />'.&mt('Delete?').'</label></span> '.
-                              '<span class="LC_nobreak">&nbsp;'.&mt('Replace:').'&nbsp;';
-            } else {
-                $datatable .= '('.&mt('if larger than 21x21 pixels, image will be scaled').')&nbsp;';
-            }
-            if ($switchserver) {
-                $datatable .= &mt('Upload to library server: [_1]',$switchserver);
-            } else {
-                $datatable .= '<input type="file" name="ltitools_image_'.$i.'" value="" />';
-            }
-            $datatable .= '</span></fieldset>';
-            my (%checkedfields,%rolemaps);
-            if (ref($settings->{$item}) eq 'HASH') {
-                if (ref($settings->{$item}->{'fields'}) eq 'HASH') {
-                    %checkedfields = %{$settings->{$item}->{'fields'}};
-                }
-                if (ref($settings->{$item}->{'roles'}) eq 'HASH') {
-                    %rolemaps = %{$settings->{$item}->{'roles'}};
-                    $checkedfields{'roles'} = 1;
-                }
-            }
-            $datatable .= '<fieldset><legend>'.&mt('User data sent on launch').'</legend>'.
-                          '<span class="LC_nobreak">';
-            foreach my $field (@fields) {
-                my $checked;
-                if ($checkedfields{$field}) {
-                    $checked = ' checked="checked"';
-                }
-                $datatable .= '<label>'.
-                              '<input type="checkbox" name="ltitools_fields_'.$i.'" value="'.$field.'"'.$checked.' />'.
-                              $lt{$field}.'</label>'.('&nbsp;' x2);
-            }
-            $datatable .= '</span></fieldset>'.
-                          '<fieldset><legend>'.&mt('Role mapping').'</legend><table><tr>';
-            foreach my $role (@courseroles) {
-                my ($selected,$selectnone);
-                if (!$rolemaps{$role}) {
-                    $selectnone = ' selected="selected"';
-                }
-                $datatable .= '<td align="center">'.
-                              &Apache::lonnet::plaintext($role,'Course').'<br />'.
-                              '<select name="ltitools_roles_'.$role.'_'.$i.'">'.
-                              '<option value=""'.$selectnone.'>'.&mt('Select').'</option>';
-                foreach my $ltirole (@ltiroles) {
-                    unless ($selectnone) {
-                        if ($rolemaps{$role} eq $ltirole) {
-                            $selected = ' selected="selected"';
-                        } else {
-                            $selected = '';
-                        }
-                    }
-                    $datatable .= '<option value="'.$ltirole.'"'.$selected.'>'.$ltirole.'</option>';
-                }
-                $datatable .= '</select></td>';
-            }
-            $datatable .= '</tr></table></fieldset>';
-            my %courseconfig;
-            if (ref($settings->{$item}) eq 'HASH') {
-                if (ref($settings->{$item}->{'crsconf'}) eq 'HASH') {
-                    %courseconfig = %{$settings->{$item}->{'crsconf'}};
-                }
-            }
-            $datatable .= '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">';
-            foreach my $item ('label','title','target','linktext','explanation') {
-                my $checked;
-                if ($courseconfig{$item}) {
-                    $checked = ' checked="checked"';
-                }
-                $datatable .= '<label>'.
-                       '<input type="checkbox" name="ltitools_courseconfig_'.$i.'" value="'.$item.'"'.$checked.' />'.
-                       $lt{'crs'.$item}.'</label>'.('&nbsp;' x2)."\n";
-            }
-            $datatable .= '</span></fieldset>'.
-                          '<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'.
-                          '<table><tr><th>'.&mt('Action').'</th><th>'.&mt('Name').'</th><th>'.&mt('Value').'</th></tr>';
-            if (ref($settings->{$item}->{'custom'}) eq 'HASH') {
-                my %custom = %{$settings->{$item}->{'custom'}};
-                if (keys(%custom) > 0) {
-                    foreach my $key (sort(keys(%custom))) {
-                        $datatable .= '<tr><td><span class="LC_nobreak">'.
-                                      '<label><input type="checkbox" name="ltitools_customdel_'.$i.'" value="'.
-                                      $key.'" />'.&mt('Delete').'</label></span></td><td>'.$key.'</td>'.
-                                      '<td><input type="text" name="ltitools_customval_'.$key.'_'.$i.'"'.
-                                      ' value="'.$custom{$key}.'" /></td></tr>';
-                    }
-                }
-            }
-            $datatable .= '<tr><td><span class="LC_nobreak">'.
-                          '<label><input type="checkbox" name="ltitools_customadd" value="'.$i.'" />'.
-                          &mt('Add').'</label></span></td><td><input type="text" name="ltitools_custom_name_'.$i.'" />'.
-                          '</td><td><input type="text" name="ltitools_custom_value_'.$i.'" /></td></tr>';
-            $datatable .= '</table></fieldset></td></tr>'."\n";
-            $itemcount ++;
-        }
-    }
-    $css_class = $itemcount%2?' class="LC_odd_row"':'';
-    my $chgstr = ' onchange="javascript:reorderLTI(this.form,'."'ltitools_add_pos'".');"';
-    $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n".
-                  '<input type="hidden" name="ltitools_maxnum" value="'.$maxnum.'" />'."\n".
-                  '<select name="ltitools_add_pos"'.$chgstr.'>';
-    for (my $k=0; $k<$maxnum+1; $k++) {
-        my $vpos = $k+1;
-        my $selstr;
-        if ($k == $maxnum) {
-            $selstr = ' selected="selected" ';
-        }
-        $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
-    }
-    $datatable .= '</select>&nbsp;'."\n".
-                  '<input type="checkbox" name="ltitools_add" value="1" />'.&mt('Add').'</td>'."\n".
-                  '<td colspan="2">'.
-                  '<fieldset><legend>'.&mt('Required settings').'</legend>'.
-                  '<span class="LC_nobreak">'.$lt{'title'}.':<input type="text" size="30" name="ltitools_add_title" value="" /></span> '."\n".
-                  ('&nbsp;'x2).
-                  '<span class="LC_nobreak">'.$lt{'version'}.':<select name="ltitools_add_version">'.
-                  '<option value="LTI-1p0" selected="selected">1.1</option></select></span> '."\n".
-                  ('&nbsp;'x2).
-                  '<span class="LC_nobreak">'.$lt{'msgtype'}.':<select name="ltitools_add_msgtype">'.
-                  '<option value="basic-lti-launch-request" selected="selected">Launch</option></select></span> '.
-                  '<br />'.
-                  '<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="30" name="ltitools_add_url" value="" /></span> '."\n".
-                  ('&nbsp;'x2).
-                  '<span class="LC_nobreak">'.$lt{'key'}.':<input type="text" size="25" name="ltitools_add_key" value="" /></span> '."\n".
-                  ('&nbsp;'x2).
-                  '<span class="LC_nobreak">'.$lt{'secret'}.':<input type="password" size="20" name="ltitools_add_secret" value="" />'.
-                  '<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.ltitools_add_secret.type='."'text'".' } else { this.form.ltitools_add_secret.type='."'password'".' }" />'.&mt('Visible input').'</label></span> '."\n".
-                  '</fieldset>'.
-                  '<fieldset><legend>'.&mt('Optional settings').'</legend>'.
-                  '<span class="LC_nobreak">'.&mt('Display target:');
-    my %defaultdisp;
-    $defaultdisp{'iframe'} = ' checked="checked"';
-    foreach my $disp ('iframe','tab','window') {
-        $datatable .= '<label><input type="radio" name="ltitools_add_target" value="'.$disp.'"'.$defaultdisp{$disp}.' />'.
-                      $lt{$disp}.'</label>'.('&nbsp;'x2);
-    }
-    $datatable .= ('&nbsp;'x4);
-    foreach my $dimen ('width','height') {
-        $datatable .= '<label>'.$lt{$dimen}.'&nbsp;'.
-                      '<input type="text" name="ltitools_add_'.$dimen.'" size="5" /></label>'.
-                      ('&nbsp;'x2);
-    }
-    $datatable .= '<br />'.
-                  '<div class="LC_left_float">'.$lt{'linktext'}.'<br />'.
-                  '<input type="text" name="ltitools_add_linktext" size="5" /></label></div>'.
-                  '<div class="LC_left_float">'.$lt{'explanation'}.'<br />'.
-                  '<textarea name=ltitools_add_explanation" rows="5" cols="40"></textarea>'.
-                  '</div><div style=""></div><br />';
-    foreach my $extra ('passback','roster') {
-        $datatable .= $lt{$extra}.'&nbsp;'.
-                      '<label><input type="radio" name="ltitools_add_'.$extra.'" value="1" />'.
-                      &mt('Yes').'</label>'.('&nbsp;'x2).
-                      '<label><input type="radio" name="ltitools_add_'.$extra.'" value="0" checked="checked" />'.
-                      &mt('No').'</label>'.('&nbsp;'x4);
-    }
-    $datatable .= '<br /><br /><span class="LC_nobreak">'.$lt{'icon'}.':&nbsp;'.
-                  '('.&mt('if larger than 21x21 pixels, image will be scaled').')&nbsp;';
-    if ($switchserver) {
-        $datatable .= &mt('Upload to library server: [_1]',$switchserver);
-    } else {
-        $datatable .= '<input type="file" name="ltitools_add_image" value="" />';
-    }
-    $datatable .= '</span></fieldset>'.
-                  '<fieldset><legend>'.&mt('User data sent on launch').'</legend>'.
-                  '<span class="LC_nobreak">';
-    foreach my $field (@fields) {
-        $datatable .= '<label>'.
-                      '<input type="checkbox" name="ltitools_add_fields" value="'.$field.'" />'.
-                      $lt{$field}.'</label>'.('&nbsp;' x2);
-    }
-    $datatable .= '</span></fieldset>'.
-                  '<fieldset><legend>'.&mt('Role mapping').'</legend><table><tr>';
-    foreach my $role (@courseroles) {
-        my ($checked,$checkednone);
-        $datatable .= '<td align="center">'.
-                      &Apache::lonnet::plaintext($role,'Course').'<br />'.
-                      '<select name="ltitools_add_roles_'.$role.'">'.
-                      '<option value="" selected="selected">'.&mt('Select').'</option>';
-        foreach my $ltirole (@ltiroles) {
-            $datatable .= '<option value="'.$ltirole.'">'.$ltirole.'</option>';
-        }
-        $datatable .= '</select></td>';
-    }
-    $datatable .= '</tr></table></fieldset>'.
-                  '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">';
-    foreach my $item ('label','title','target','linktext','explanation') {
-        $datatable .= '<label>'.
-                      '<input type="checkbox" name="ltitools_courseconfig" value="'.$item.'" checked="checked" />'.
-                      $lt{'crs'.$item}.'</label>'.('&nbsp;' x2)."\n";
-    }
-    $datatable .= '</span></fieldset>'.
-                  '<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'.
-                  '<table><tr><th>'.&mt('Action').'</th><th>'.&mt('Name').'</th><th>'.&mt('Value').'</th></tr>'.
-                  '<tr><td><span class="LC_nobreak">'.
-                  '<label><input type="checkbox" name="ltitools_add_custom" value="1" />'.
-                  &mt('Add').'</label></span></td><td><input type="text" name="ltitools_add_custom_name" />'.
-                  '</td><td><input type="text" name="ltitools_add_custom_value" /></td></tr>'.
-                  '</table></fieldset></td></tr>'."\n".
-                  '</td>'."\n".
-                  '</tr>'."\n";
-    $itemcount ++;
-    return $datatable;
-}
-
-sub ltitools_names {
-    my %lt = &Apache::lonlocal::texthash(
-                                          'title'          => 'Title',
-                                          'version'        => 'Version',
-                                          'msgtype'        => 'Message Type',
-                                          'url'            => 'URL',
-                                          'key'            => 'Key',
-                                          'secret'         => 'Secret',
-                                          'icon'           => 'Icon',
-                                          'user'           => 'Username:domain',
-                                          'fullname'       => 'Full Name',
-                                          'firstname'      => 'First Name',
-                                          'lastname'       => 'Last Name',
-                                          'email'          => 'E-mail',
-                                          'roles'          => 'Role',
-                                          'window'         => 'Window',
-                                          'tab'            => 'Tab',
-                                          'iframe'         => 'iFrame',
-                                          'height'         => 'Height',
-                                          'width'          => 'Width',
-                                          'linktext'       => 'Default Link Text',
-                                          'explanation'    => 'Default Explanation',
-                                          'passback'       => 'Tool can return grades:',
-                                          'roster'         => 'Tool can retrieve roster:',
-                                          'crstarget'      => 'Display target',
-                                          'crslabel'       => 'Course label',
-                                          'crstitle'       => 'Course title',
-                                          'crslinktext'    => 'Link Text',
-                                          'crsexplanation' => 'Explanation',
-                                        );
-
-    return %lt;
-}
-
 sub print_coursedefaults {
     my ($position,$dom,$settings,$rowtotal) = @_;
     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)',
-        texengine            => 'Default method to display mathematics',
-        postsubmit           => 'Disable submit button/keypress following student submission',
-        canclone             => "People who may clone a course (besides course's owner and coordinators)",
-        mysqltables          => 'Lifetime (s) of "Temporary" MySQL tables (student performance data) on homeserver',
     );
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
                            uploadquota          => 500,
-                           postsubmit           => 60,
-                           mysqltables          => 172800,
                          );
     if ($position eq 'top') {
-        %defaultchecked = (
-                            'uselcmath'       => 'on',
-                            'usejsme'         => 'on',
-                            'canclone'        => 'none',
-                          );
-        @toggles = ('uselcmath','usejsme');
-        my $deftex = $Apache::lonnet::deftex;
-        if (ref($settings) eq 'HASH') {
-            if ($settings->{'texengine'}) {
-                if ($settings->{'texengine'} =~ /^(MathJax|mimetex|tth)$/) {
-                    $deftex = $settings->{'texengine'};
-                }
-            }
-        }
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        my $mathdisp = '<tr'.$css_class.'><td style="vertical-align: top">'.
-                       '<span class="LC_nobreak">'.$choices{'texengine'}.
-                       '</span></td><td class="LC_right_item">'.
-                       '<select name="texengine">'."\n";
-        my %texoptions = (
-                            MathJax  => 'MathJax',
-                            mimetex  => &mt('Convert to Images'),
-                            tth      => &mt('TeX to HTML'),
-                         );
-        foreach my $renderer ('MathJax','mimetex','tth') {
-            my $selected = '';
-            if ($renderer eq $deftex) {
-                $selected = ' selected="selected"';
-            }
-            $mathdisp .= '<option value="'.$renderer.'"'.$selected.'>'.$texoptions{$renderer}.'</option>'."\n";
-        }
-        $mathdisp .= '</select></td></tr>'."\n";
-        $itemcount ++;
+        %defaultchecked = ('canuse_pdfforms' => 'off');
+        @toggles = ('canuse_pdfforms');
         ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
-                                                     \%choices,$itemcount);
-        $datatable = $mathdisp.$datatable;
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .=
-            '<tr'.$css_class.'><td valign="top">'.
-            '<span class="LC_nobreak">'.$choices{'canclone'}.
-            '</span></td><td class="LC_left_item">';
-        my $currcanclone = 'none';
-        my $onclick;
-        my @cloneoptions = ('none','domain');
-        my %clonetitles = (
-                             none     => 'No additional course requesters',
-                             domain   => "Any course requester in course's domain",
-                             instcode => 'Course requests for official courses ...',
-                          );
-        my (%codedefaults,@code_order,@posscodes);
-        if (&Apache::lonnet::auto_instcode_defaults($dom,\%codedefaults,
-                                                    \@code_order) eq 'ok') {
-            if (@code_order > 0) {
-                push(@cloneoptions,'instcode');
-                $onclick = ' onclick="toggleDisplay(this.form,'."'cloneinstcode'".');"';
-            }
-        }
-        if (ref($settings) eq 'HASH') {
-            if ($settings->{'canclone'}) {
-                if (ref($settings->{'canclone'}) eq 'HASH') {
-                    if (ref($settings->{'canclone'}{'instcode'}) eq 'ARRAY') {
-                        if (@code_order > 0) {
-                            $currcanclone = 'instcode';
-                            @posscodes = @{$settings->{'canclone'}{'instcode'}};
-                        }
-                    }
-                } elsif ($settings->{'canclone'} eq 'domain') {
-                    $currcanclone = $settings->{'canclone'};
-                }
-            }
-        }
-        foreach my $option (@cloneoptions) {
-            my ($checked,$additional);
-            if ($currcanclone eq $option) {
-                $checked = ' checked="checked"';
-            }
-            if ($option eq 'instcode') {
-                if (@code_order) {
-                    my $show = 'none';
-                    if ($checked) {
-                        $show = 'block';
-                    }
-                    $additional = '<div id="cloneinstcode" style="display:'.$show.'" />'.
-                                  &mt('Institutional codes for new and cloned course have identical:').
-                                  '<br />';
-                    foreach my $item (@code_order) {
-                        my $codechk;
-                        if ($checked) {
-                            if (grep(/^\Q$item\E$/,@posscodes)) {
-                                $codechk = ' checked="checked"';
-                            }
-                        }
-                        $additional .= '<label>'.
-                                       '<input type="checkbox" name="clonecode" value="'.$item.'"'.$codechk.' />'.
-                                       $item.'</label>';
-                    }
-                    $additional .= ('&nbsp;'x2).'('.&mt('check as many as needed').')</div>';
-                }
-            }
-            $datatable .=
-                '<span class="LC_nobreak"><label><input type="radio" name="canclone"'.$checked.
-                ' value="'.$option.'"'.$onclick.' />'.$clonetitles{$option}.
-                '</label>&nbsp;'.$additional.'</span><br />';
-        }
-        $datatable .= '</td>'.
-                      '</tr>';
-        $itemcount ++;
+                                                 \%choices,$itemcount);
     } else {
         $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
-        my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout,%currmysql);
+        my ($currdefresponder,$def_official_credits,$def_unofficial_credits,%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') {
@@ -4304,51 +2471,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'};
-                }
-            }
-            if (ref($settings->{'mysqltables'}) eq 'HASH') {
-                foreach my $type (keys(%{$settings->{'mysqltables'}})) {
-                    $currmysql{$type} = $settings->{'mysqltables'}{$type};
-                }
-            } else {
-                foreach my $type (@types) {
-                    $currmysql{$type} = $staticdefaults{'mysqltables'};
-                }
-            }
-        } else {
-            foreach my $type (@types) {
-                $deftimeout{$type} = $staticdefaults{'postsubmit'};
-            }
         }
         if (!$currdefresponder) {
             $currdefresponder = $staticdefaults{'anonsurvey_threshold'};
@@ -4367,35 +2495,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 = {
@@ -4403,698 +2531,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');
-        $current = {
-                       'postsubmit' => $postsubmitclient,
-                   };
-        ($table,$itemcount) =
-            &radiobutton_prefs($current,\@toggles,\%defaultchecked,
-                               \%choices,$itemcount,$onclick,$additional,'left');
-        $datatable .= $table;
-        $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
-        $datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.
-                      $choices{'mysqltables'}.
-                      '</span></td>'.
-                      '<td align="right" class="LC_right_item">'.
-                      '<table><tr>';
-        foreach my $type (@types) {
-            $datatable .= '<td align="center">'.&mt($type).'<br />'.
-                           '<input type="text" name="mysqltables_'.$type.'"'.
-                           ' value="'.$currmysql{$type}.'" size="8" /></td>';
-        }
-        $datatable .= '</tr></table></td></tr>'."\n";
-        $itemcount ++;
-
     }
     $$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">'.
-                           $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 .= '<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_passwords {
-    my ($position,$dom,$confname,$settings,$rowtotal) = @_;
-    my ($datatable,$css_class);
-    my $itemcount = 0;
-    my %titles = &Apache::lonlocal::texthash (
-        captcha        => '"Forgot Password" CAPTCHA validation',
-        link           => 'Reset link expiration (hours)',
-        case           => 'Case-sensitive usernames/e-mail',
-        prelink        => 'Information required (form 1)',
-        postlink       => 'Information required (form 2)',
-        emailsrc       => 'LON-CAPA e-mail address type(s)',
-        customtext     => 'Domain specific text (HTML)',
-        intauth_cost   => 'Encryption cost for bcrypt (positive integer)',
-        intauth_check  => 'Check bcrypt cost if authenticated',
-        intauth_switch => 'Existing crypt-based switched to bcrypt on authentication',
-        permanent      => 'Permanent e-mail address',
-        critical       => 'Critical notification address',
-        notify         => 'Notification address',
-        min            => 'Minimum password length',
-        max            => 'Maximum password length',
-        chars          => 'Required characters',
-        numsaved       => 'Number of previous passwords to save and disallow reuse',
-    );
-    if ($position eq 'top') {
-        my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-        my $shownlinklife = 2;
-        my $prelink = 'both';
-        my (%casesens,%postlink,%emailsrc,$nostdtext,$customurl);
-        if (ref($settings) eq 'HASH') {
-            if ($settings->{resetlink} =~ /^\d+(|\.\d*)$/) {
-                $shownlinklife = $settings->{resetlink};
-            }
-            if (ref($settings->{resetcase}) eq 'ARRAY') {
-                map { $casesens{$_} = 1; } (@{$settings->{resetcase}});
-            }
-            if ($settings->{resetprelink} =~ /^(both|either)$/) {
-                $prelink = $settings->{resetprelink};
-            }
-            if (ref($settings->{resetpostlink}) eq 'HASH') {
-                %postlink = %{$settings->{resetpostlink}};
-            }
-            if (ref($settings->{resetemail}) eq 'ARRAY') {
-                map { $emailsrc{$_} = 1; } (@{$settings->{resetemail}});
-            }
-            if ($settings->{resetremove}) {
-                $nostdtext = 1;
-            }
-            if ($settings->{resetcustom}) {
-                $customurl = $settings->{resetcustom};
-            }
-        } else {
-            if (ref($types) eq 'ARRAY') {
-                foreach my $item (@{$types}) {
-                    $casesens{$item} = 1;
-                    $postlink{$item} = ['username','email'];
-                }
-            }
-            $casesens{'default'} = 1;
-            $postlink{'default'} = ['username','email'];
-            $prelink = 'both';
-            %emailsrc = (
-                          permanent => 1,
-                          critical  => 1,
-                          notify    => 1,
-            );
-        }
-        $datatable = &captcha_choice('passwords',$settings,$$rowtotal);
-        $itemcount ++;
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .= '<tr'.$css_class.'><td>'.$titles{'link'}.'</td>'.
-                      '<td class="LC_left_item">'.
-                      '<input type="textbox" value="'.$shownlinklife.'" '.
-                      'name="passwords_link" size="3" /></td></tr>';
-        $itemcount ++;
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .= '<tr'.$css_class.'><td>'.$titles{'case'}.'</td>'.
-                      '<td class="LC_left_item">';
-        if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
-            foreach my $item (@{$types}) {
-                my $checkedcase;
-                if ($casesens{$item}) {
-                    $checkedcase = ' checked="checked"';
-                }
-                $datatable .= '<span class="LC_nobreak"><label>'.
-                              '<input type="checkbox" name="passwords_case_sensitive" value="'.
-                              $item.'"'.$checkedcase.' />'.$usertypes->{$item}.'</label>'.
-                              '<span>&nbsp;&nbsp; ';
-            }
-        }
-        my $checkedcase;
-        if ($casesens{'default'}) {
-            $checkedcase = ' checked="checked"';
-        }
-        $datatable .= '<span class="LC_nobreak"><label><input type="checkbox" '.
-                      'name="passwords_case_sensitive" value="default"'.$checkedcase.' />'.
-                      $othertitle.'</label></span></td>';
-        $itemcount ++;
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        my %checkedpre = (
-                             both => ' checked="checked"',
-                             either => '',
-                         );
-        if ($prelink eq 'either') {
-            $checkedpre{either} = ' checked="checked"';
-            $checkedpre{both} = '';
-        }
-        $datatable .= '<tr'.$css_class.'><td>'.$titles{'prelink'}.'</td>'.
-                      '<td class="LC_left_item"><span class="LC_nobreak">'.
-                      '<label><input type="radio" name="passwords_prelink" value="both"'.$checkedpre{'both'}.' />'.
-                      &mt('Both username and e-mail address').'</label></span>&nbsp;&nbsp; '.
-                      '<span class="LC_nobreak"><label>'.
-                      '<input type="radio" name="passwords_prelink" value="either"'.$checkedpre{'either'}.' />'.
-                      &mt('Either username or e-mail address').'</label></span></td></tr>';
-        $itemcount ++;
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .= '<tr'.$css_class.'><td>'.$titles{'postlink'}.'</td>'.
-                      '<td class="LC_left_item">';
-        my %postlinked;
-        if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
-            foreach my $item (@{$types}) {
-                undef(%postlinked);
-                $datatable .= '<fieldset style="display: inline-block;">'.
-                              '<legend>'.$usertypes->{$item}.'</legend>';
-                if (ref($postlink{$item}) eq 'ARRAY') {
-                    map { $postlinked{$_} = 1; } (@{$postlink{$item}});
-                }
-                foreach my $field ('email','username') {
-                    my $checked;
-                    if ($postlinked{$field}) {
-                        $checked = ' checked="checked"';
-                    }
-                    $datatable .= '<span class="LC_nobreak"><label>'.
-                                  '<input type="checkbox" name="passwords_postlink_'.$item.'" value="'.
-                                  $field.'"'.$checked.' />'.$field.'</label>'.
-                                  '<span>&nbsp;&nbsp; ';
-                }
-                $datatable .= '</fieldset>';
-            }
-        }
-        if (ref($postlink{'default'}) eq 'ARRAY') {
-            map { $postlinked{$_} = 1; } (@{$postlink{'default'}});
-        }
-        $datatable .= '<fieldset style="display: inline-block;">'.
-                      '<legend>'.$othertitle.'</legend>';
-        foreach my $field ('email','username') {
-            my $checked;
-            if ($postlinked{$field}) {
-                $checked = ' checked="checked"';
-            }
-            $datatable .= '<span class="LC_nobreak"><label>'.
-                          '<input type="checkbox" name="passwords_postlink_default" value="'.
-                          $field.'"'.$checked.' />'.$field.'</label>'.
-                          '<span>&nbsp;&nbsp; ';
-        }
-        $datatable .= '</fieldset></td></tr>';
-        $itemcount ++;
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .= '<tr'.$css_class.'><td>'.$titles{'emailsrc'}.'</td>'.
-                      '<td class="LC_left_item">';
-        foreach my $type ('permanent','critical','notify') {
-            my $checkedemail;
-            if ($emailsrc{$type}) {
-                $checkedemail = ' checked="checked"';
-            }
-            $datatable .= '<span class="LC_nobreak"><label>'.
-                          '<input type="checkbox" name="passwords_emailsrc" value="'.
-                          $type.'"'.$checkedemail.' />'.$titles{$type}.'</label>'.
-                          '<span>&nbsp;&nbsp; ';
-        }
-        $datatable .= '</td></tr>';
-        $itemcount ++;
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        my $switchserver = &check_switchserver($dom,$confname);
-        my ($showstd,$noshowstd);
-        if ($nostdtext) {
-            $noshowstd = ' checked="checked"';
-        } else {
-            $showstd = ' checked="checked"';
-        }
-        $datatable .= '<tr'.$css_class.'><td>'.$titles{'customtext'}.'</td>'.
-                      '<td class="LC_left_item"><span class="LC_nobreak">'.
-                      &mt('Retain standard text:').
-                      '<label><input type="radio" name="passwords_stdtext" value="1"'.$showstd.' />'.
-                      &mt('Yes').'</label>'.'&nbsp;'.
-                      '<label><input type="radio" name="passwords_stdtext" value="0"'.$noshowstd.' />'.
-                      &mt('No').'</label></span><br />'.
-                      '<span class="LC_fontsize_small">'.
-                      &mt('(If you use the same account ...  reset a password from this page.)').'</span><br /><br />'.
-                      &mt('Include custom text:');
-        if ($customurl) {
-            my $link =  &Apache::loncommon::modal_link($customurl,&mt('Custom text file'),600,500,
-                                                       undef,undef,undef,undef,'background-color:#ffffff');
-            $datatable .= '<span class="LC_nobreak">&nbsp;'.$link.
-                          '<label><input type="checkbox" name="passwords_custom_del"'.
-                          ' value="1" />'.&mt('Delete?').'</label></span>'.
-                          ' <span class="LC_nobreak">&nbsp;'.&mt('Replace:').'</span>';
-        }
-        if ($switchserver) {
-            $datatable .= '<span class="LC_nobreak">&nbsp;'.&mt('Upload to library server: [_1]',$switchserver).'</span>';
-        } else {
-            $datatable .='<span class="LC_nobreak">&nbsp;'.
-                         '<input type="file" name="passwords_customfile" /></span>';
-        }
-        $datatable .= '</td></tr>';
-    } elsif ($position eq 'middle') {
-        my %domconf = &Apache::lonnet::get_dom('configuration',['defaults'],$dom);
-        my @items = ('intauth_cost','intauth_check','intauth_switch');
-        my %defaults;
-        if (ref($domconf{'defaults'}) eq 'HASH') {
-            %defaults = %{$domconf{'defaults'}};
-            if ($defaults{'intauth_cost'} !~ /^\d+$/) {
-                $defaults{'intauth_cost'} = 10;
-            }
-            if ($defaults{'intauth_check'} !~ /^(0|1|2)$/) {
-                $defaults{'intauth_check'} = 0;
-            }
-            if ($defaults{'intauth_switch'} !~ /^(0|1|2)$/) {
-                $defaults{'intauth_switch'} = 0;
-            }
-        } else {
-            %defaults = (
-                          'intauth_cost'   => 10,
-                          'intauth_check'  => 0,
-                          'intauth_switch' => 0,
-                        );
-        }
-        foreach my $item (@items) {
-            if ($itemcount%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_left_item" colspan="3">';
-            if ($item eq 'intauth_switch') {
-                my @options = (0,1,2);
-                my %optiondesc = &Apache::lonlocal::texthash (
-                                   0 => 'No',
-                                   1 => 'Yes',
-                                   2 => 'Yes, and copy existing passwd file to passwd.bak file',
-                                 );
-                $datatable .= '<table width="100%">';
-                foreach my $option (@options) {
-                    my $checked = ' ';
-                    if ($defaults{$item} eq $option) {
-                        $checked = ' checked="checked"';
-                    }
-                    $datatable .= '<tr><td class="LC_left_item"><span class="LC_nobreak">'.
-                                  '<label><input type="radio" name="'.$item.
-                                  '" value="'.$option.'"'.$checked.' />'.
-                                  $optiondesc{$option}.'</label></span></td></tr>';
-                }
-                $datatable .= '</table>';
-            } elsif ($item eq 'intauth_check') {
-                my @options = (0,1,2);
-                my %optiondesc = &Apache::lonlocal::texthash (
-                                   0 => 'No',
-                                   1 => 'Yes, allow login then update passwd file using default cost (if higher)',
-                                   2 => 'Yes, disallow login if stored cost is less than domain default',
-                                 );
-                $datatable .= '<table width="100%">';
-                foreach my $option (@options) {
-                    my $checked = ' ';
-                    my $onclick;
-                    if ($defaults{$item} eq $option) {
-                        $checked = ' checked="checked"';
-                    }
-                    if ($option == 2) {
-                        $onclick = ' onclick="javascript:warnIntAuth(this);"';
-                    }
-                    $datatable .= '<tr><td class="LC_left_item"><span class="LC_nobreak">'.
-                                  '<label><input type="radio" name="'.$item.
-                                  '" value="'.$option.'"'.$checked.$onclick.' />'.
-                                  $optiondesc{$option}.'</label></span></td></tr>';
-                }
-                $datatable .= '</table>';
-            } else {
-                $datatable .= '<input type="text" name="'.$item.'" value="'.
-                              $defaults{$item}.'" size="3" onblur="javascript:warnIntAuth(this);" />';
-            }
-            $datatable .= '</td></tr>';
-            $itemcount ++;
-        }
-    } elsif ($position eq 'lower') {
-        my ($min,$max,%chars,$numsaved);
-        $min = $Apache::lonnet::passwdmin;
-        if (ref($settings) eq 'HASH') {
-            if ($settings->{min}) {
-                $min = $settings->{min};
-            }
-            if ($settings->{max}) {
-                $max = $settings->{max};
-            }
-            if (ref($settings->{chars}) eq 'ARRAY') {
-                map { $chars{$_} = 1; } (@{$settings->{chars}});
-            }
-            if ($settings->{numsaved}) {
-                $numsaved = $settings->{numsaved};
-            }
-        }
-        my %rulenames = &Apache::lonlocal::texthash(
-                                                     uc => 'At least one upper case letter',
-                                                     lc => 'At least one lower case letter',
-                                                     num => 'At least one number',
-                                                     spec => 'At least one non-alphanumeric',
-                                                   );
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .= '<tr'.$css_class.'><td>'.$titles{'min'}.'</td>'.
-                      '<td class="LC_left_item"><span class="LC_nobreak">'.
-                      '<input type="text" name="passwords_min" value="'.$min.'" size="3" '.
-                      'onblur="javascript:warnIntPass(this);" />'.
-                      '<span class="LC_fontsize_small"> '.&mt('(Enter an integer: 7 or larger)').'</span>'.
-                      '</span></td></tr>';
-        $itemcount ++;
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .= '<tr'.$css_class.'><td>'.$titles{'max'}.'</td>'.
-                      '<td class="LC_left_item"><span class="LC_nobreak">'.
-                      '<input type="text" name="passwords_max" value="'.$max.'" size="3" '.
-                      'onblur="javascript:warnIntPass(this);" />'.
-                      '<span class="LC_fontsize_small"> '.&mt('(Leave blank for no maximum)').'</span>'.
-                      '</span></td></tr>';
-        $itemcount ++;
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .= '<tr'.$css_class.'><td>'.$titles{'chars'}.'<br />'.
-                      '<span class="LC_nobreak LC_fontsize_small">'.&mt('(Leave unchecked if not required)').
-                      '</span></td>';
-        my $numinrow = 2;
-        my @possrules = ('uc','lc','num','spec');
-        $datatable .= '<td class="LC_left_item"><table>';
-        for (my $i=0; $i<@possrules; $i++) {
-            my ($rem,$checked);
-            if ($chars{$possrules[$i]}) {
-                $checked = ' checked="checked"';
-            }
-            $rem = $i%($numinrow);
-            if ($rem == 0) {
-                if ($i > 0) {
-                    $datatable .= '</tr>';
-                }
-                $datatable .= '<tr>';
-            }
-            $datatable .= '<td><span class="LC_nobreak"><label>'.
-                          '<input type="checkbox" name="passwords_chars" value="'.$possrules[$i].'"'.$checked.' />'.
-                          $rulenames{$possrules[$i]}.'</label></span></td>';
-        }
-        my $rem = @possrules%($numinrow);
-        my $colsleft = $numinrow - $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 .='</table></td></tr>';
-        $itemcount ++;
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .= '<tr'.$css_class.'><td>'.$titles{'numsaved'}.'</td>'.
-                      '<td class="LC_left_item"><span class="LC_nobreak">'.
-                      '<input type="text" name="passwords_numsaved" value="'.$numsaved.'" size="3" '.
-                      'onblur="javascript:warnIntPass(this);" />'.
-                      '<span class="LC_fontsize_small"> '.&mt('(Leave blank to not save previous passwords)').'</span>'.
-                      '</span></td></tr>';
-    } else {
-        my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-        my %ownerchg = (
-                          by  => {},
-                          for => {},
-                       );
-        my %ownertitles = &Apache::lonlocal::texthash (
-                            by  => 'Course owner status(es) allowed',
-                            for => 'Student status(es) allowed',
-                          );
-        if (ref($settings) eq 'HASH') {
-            if (ref($settings->{crsownerchg}) eq 'HASH') {
-                if (ref($settings->{crsownerchg}{'by'}) eq 'ARRAY') {
-                    map { $ownerchg{by}{$_} = 1; } (@{$settings->{crsownerchg}{'by'}});
-                }
-                if (ref($settings->{crsownerchg}{'for'}) eq 'ARRAY') {
-                    map { $ownerchg{for}{$_} = 1; } (@{$settings->{crsownerchg}{'for'}});
-                }
-            }
-        }
-        $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .= '<tr '.$css_class.'>'.
-                      '<td>'.
-                      &mt('Requirements').'<ul>'.
-                      '<li>'.&mt("Course 'type' is not a Community").'</li>'.
-                      '<li>'.&mt('User is Course Coordinator and also course owner').'</li>'.
-                      '<li>'.&mt("Student's only active roles are student role(s) in course(s) owned by this user").'</li>'.
-                      '<li>'.&mt('User, course, and student share same domain').'</li>'.
-                      '</ul>'.
-                      '</td>'.
-                      '<td class="LC_left_item">';
-        foreach my $item ('by','for') {
-            $datatable .= '<fieldset style="display: inline-block;">'.
-                          '<legend>'.$ownertitles{$item}.'</legend>';
-            if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
-                foreach my $type (@{$types}) {
-                    my $checked;
-                    if ($ownerchg{$item}{$type}) {
-                        $checked = ' checked="checked"';
-                    }
-                    $datatable .= '<span class="LC_nobreak"><label>'.
-                                  '<input type="checkbox" name="passwords_crsowner_'.$item.'" value="'.
-                                  $type.'"'.$checked.' />'.$usertypes->{$type}.'</label>'.
-                                  '<span>&nbsp;&nbsp; ';
-                }
-            }
-            my $checked;
-            if ($ownerchg{$item}{'default'}) {
-                $checked = ' checked="checked"';
-            }
-            $datatable .= '<span class="LC_nobreak"><label><input type="checkbox" '.
-                          'name="passwords_crsowner_'.$item.'" value="default"'.$checked.' />'.
-                          $othertitle.'</label></span></fieldset>';
-        }
-        $datatable .= '</td></tr>';
-    }
-    return $datatable;
-}
-
 sub print_usersessions {
     my ($position,$dom,$settings,$rowtotal) = @_;
     my ($css_class,$datatable,%checked,%choices);
@@ -5109,13 +2552,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.');
@@ -5365,7 +2802,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;
@@ -5385,21 +2822,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 = 
@@ -5524,19 +2952,19 @@ sub print_loadbalancing {
     my $numinrow = 1;
     my $datatable;
     my %servers = &Apache::lonnet::internet_dom_servers($dom);
-    my (%currbalancer,%currtargets,%currrules,%existing,%currcookies);
+    my (%currbalancer,%currtargets,%currrules,%existing);
     if (ref($settings) eq 'HASH') {
         %existing = %{$settings};
     }
     if ((keys(%servers) > 1) || (keys(%existing) > 0)) {
         &get_loadbalancers_config(\%servers,\%existing,\%currbalancer,
-                                  \%currtargets,\%currrules,\%currcookies);
+                                  \%currtargets,\%currrules);
     } else {
         return;
     }
     my ($othertitle,$usertypes,$types) =
         &Apache::loncommon::sorted_inst_types($dom);
-    my $rownum = 8;
+    my $rownum = 6;
     if (ref($types) eq 'ARRAY') {
         $rownum += scalar(@{$types});
     }
@@ -5567,7 +2995,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 {
@@ -5583,7 +3011,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 {
@@ -5604,12 +3032,6 @@ sub print_loadbalancing {
         my ($numspares,@spares) = &count_servers($lonhost,%servers);
         my @sparestypes = ('primary','default');
         my %typetitles = &sparestype_titles();
-        my %hostherechecked = (
-                                  no => ' checked="checked"',
-                              );
-        my %balcookiechecked = (
-                                  no => ' checked="checked"',
-                               );
         foreach my $sparetype (@sparestypes) {
             my $targettable;
             for (my $i=0; $i<$numspares; $i++) {
@@ -5628,11 +3050,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)) {
@@ -5655,35 +3076,8 @@ sub print_loadbalancing {
                 $datatable .=  '<i>'.$typetitles{$sparetype}.'</i><br />'.
                                '<table><tr>'.$targettable.'</tr></table><br />';
             }
-            $hostherechecked{$sparetype} = '';
-            if (ref($currtargets{$lonhost}) eq 'HASH') {
-                if (ref($currtargets{$lonhost}{$sparetype}) eq 'ARRAY') {
-                    if (grep(/^\Q$lonhost\E$/,@{$currtargets{$lonhost}{$sparetype}})) {
-                        $hostherechecked{$sparetype} = ' checked="checked"';
-                        $hostherechecked{'no'} = '';
-                    }
-                }
-            }
-        }
-        if ($currcookies{$lonhost}) {
-            %balcookiechecked = (
-                                    yes => ' checked="checked"',
-                                );
         }
-        $datatable .= &mt('Hosting on balancer itself').'<br />'.
-                      '<label><input type="radio" name="loadbalancing_target_'.$balnum.'_hosthere" value="no"'.
-                      $hostherechecked{'no'}.' />'.&mt('No').'</label><br />';
-        foreach my $sparetype (@sparestypes) {
-            $datatable .= '<label><input type="radio" name="loadbalancing_target_'.$balnum.'_hosthere" '.
-                          'value="'.$sparetype.'"'.$hostherechecked{$sparetype}.' /><i>'.$typetitles{$sparetype}.
-                          '</i></label><br />';
-        }
-        $datatable .= &mt('Use balancer cookie').'<br />'.
-                      '<label><input type="radio" name="loadbalancing_cookie_'.$balnum.'" value="1"'.
-                      $balcookiechecked{'yes'}.' />'.&mt('Yes').'</label><br />'.
-                      '<label><input type="radio" name="loadbalancing_cookie_'.$balnum.'" value="0"'.
-                      $balcookiechecked{'no'}.' />'.&mt('No').'</label><br />'.
-                      '</div></td></tr>'.
+        $datatable .= '</div></td></tr>'.
                       &loadbalancing_rules($dom,$intdom,$currrules{$lonhost},
                                            $othertitle,$usertypes,$types,\%servers,
                                            \%currbalancer,$lonhost,
@@ -5697,11 +3091,10 @@ sub print_loadbalancing {
 }
 
 sub get_loadbalancers_config {
-    my ($servers,$existing,$currbalancer,$currtargets,$currrules,$currcookies) = @_;
+    my ($servers,$existing,$currbalancer,$currtargets,$currrules) = @_;
     return unless ((ref($servers) eq 'HASH') &&
                    (ref($existing) eq 'HASH') && (ref($currbalancer) eq 'HASH') &&
-                   (ref($currtargets) eq 'HASH') && (ref($currrules) eq 'HASH') &&
-                   (ref($currcookies) eq 'HASH'));
+                   (ref($currtargets) eq 'HASH') && (ref($currrules) eq 'HASH'));
     if (keys(%{$existing}) > 0) {
         my $oldlonhost;
         foreach my $key (sort(keys(%{$existing}))) {
@@ -5720,9 +3113,6 @@ sub get_loadbalancers_config {
                 $currbalancer->{$key} = 1;
                 $currtargets->{$key} = $existing->{$key}{'targets'};
                 $currrules->{$key} = $existing->{$key}{'rules'};
-                if ($existing->{$key}{'cookie'}) {
-                    $currcookies->{$key} = 1;
-                }
             }
         }
     } else {
@@ -5744,7 +3134,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}) {
@@ -5774,18 +3164,11 @@ 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 @available;
+    my @alltypes = ('_LC_adv','_LC_author','_LC_internetdom','_LC_external');
     if (ref($types) eq 'ARRAY') {
-        @available = @{$types};
+        unshift(@alltypes,@{$types},'default');
     }
-    unless (grep(/^default$/,@available)) {
-        push(@available,'default');
-    }
-    unshift(@alltypes,@available);
     my %titles;
     foreach my $type (@alltypes) {
         if ($type =~ /^_LC_/) {
@@ -5807,19 +3190,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;
@@ -5828,7 +3206,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.
@@ -5848,7 +3226,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".
@@ -5872,13 +3250,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;
@@ -5891,9 +3264,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;
 }
@@ -5908,17 +3278,14 @@ sub sparestype_titles {
 
 sub contact_titles {
     my %titles = &Apache::lonlocal::texthash (
-                   'supportemail'    => 'Support E-mail address',
-                   'adminemail'      => 'Default Server Admin E-mail address',
-                   'errormail'       => 'Error reports to be e-mailed to',
-                   'packagesmail'    => 'Package update alerts to be e-mailed to',
-                   'helpdeskmail'    => "Helpdesk requests from all users in this domain",
-                   'otherdomsmail'   => 'Helpdesk requests from users in other (unconfigured) domains',
-                   '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',
-                   'hostipmail'      => 'E-mail from nightly check of hostname/IP network changes',
+                   'supportemail' => 'Support E-mail address',
+                   'adminemail'   => 'Default Server Admin E-mail address',
+                   'errormail'    => 'Error reports to be e-mailed to',
+                   'packagesmail' => 'Package update alerts to be e-mailed to',
+                   'helpdeskmail' => 'Helpdesk requests to be e-mailed to',
+                   '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',
                  );
     my %short_titles = &Apache::lonlocal::texthash (
                            adminemail   => 'Admin E-mail address',
@@ -5927,34 +3294,6 @@ sub contact_titles {
     return (\%titles,\%short_titles);
 }
 
-sub helpform_fields {
-    my %titles =  &Apache::lonlocal::texthash (
-                       'username'   => 'Name',
-                       'user'       => 'Username/domain',
-                       'phone'      => 'Phone',
-                       'cc'         => 'Cc e-mail',
-                       'course'     => 'Course Details',
-                       'section'    => 'Sections',
-                       'screenshot' => 'File upload',
-    );
-    my @fields = ('username','phone','user','course','section','cc','screenshot');
-    my %possoptions = (
-                        username     => ['yes','no','req'],
-                        phone        => ['yes','no','req'],
-                        user         => ['yes','no'],
-                        cc           => ['yes','no'],
-                        course       => ['yes','no'],
-                        section      => ['yes','no'],
-                        screenshot   => ['yes','no'],
-                      );
-    my %fieldoptions = &Apache::lonlocal::texthash (
-                         'yes'  => 'Optional',
-                         'req'  => 'Required',
-                         'no'   => "Not shown",
-    );
-    return (\@fields,\%titles,\%fieldoptions,\%possoptions);
-}
-
 sub tool_titles {
     my %titles = &Apache::lonlocal::texthash (
                      aboutme    => 'Personal web page',
@@ -5964,7 +3303,6 @@ sub tool_titles {
                      official   => 'Official courses (with institutional codes)',
                      unofficial => 'Unofficial courses',
                      community  => 'Communities',
-                     textbook   => 'Textbook courses',
                  );
     return %titles;
 }
@@ -5974,7 +3312,6 @@ sub courserequest_titles {
                                    official   => 'Official',
                                    unofficial => 'Unofficial',
                                    community  => 'Communities',
-                                   textbook   => 'Textbook',
                                    norequest  => 'Not allowed',
                                    approval   => 'Approval by Dom. Coord.',
                                    validate   => 'With validation',
@@ -5991,7 +3328,7 @@ sub authorrequest_titles {
                                    automatic  => 'Automatic approval',
                  );
     return %titles;
-}
+} 
 
 sub courserequest_conditions {
     my %conditions = &Apache::lonlocal::texthash (
@@ -6027,22 +3364,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'}})) {
@@ -6054,8 +3411,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) {
@@ -6066,18 +3425,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_'.
@@ -6086,6 +3457,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');
@@ -6137,530 +3524,15 @@ sub print_usercreation {
     return $datatable;
 }
 
-sub print_selfcreation {
-    my ($position,$dom,$settings,$rowtotal) = @_;
-    my (@selfcreate,$createsettings,$processing,$emailoptions,$emailverified,
-        $emaildomain,$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'};
-                }
-                if (ref($createsettings->{'emailoptions'}) eq 'HASH') {
-                    $emailoptions = $createsettings->{'emailoptions'};
-                }
-                if (ref($createsettings->{'emailverified'}) eq 'HASH') {
-                    $emailverified = $createsettings->{'emailverified'};
-                }
-                if (ref($createsettings->{'emaildomain'}) eq 'HASH') {
-                    $emaildomain = $createsettings->{'emaildomain'};
-                }
-            }
-        }
-    }
-    my %radiohash;
-    my $numinrow = 4;
-    map { $radiohash{'cancreate_'.$_} = 1; } @selfcreate;
-    my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-    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;
-
-        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>'."\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 @posstypes;
-        if (ref($types) eq 'ARRAY') {
-            @posstypes = @{$types};
-        }
-        unless (grep(/^default$/,@posstypes)) {
-            push(@posstypes,'default');
-        }
-        my %usertypeshash;
-        if (ref($usertypes) eq 'HASH') {
-            %usertypeshash = %{$usertypes};
-        }
-        $usertypeshash{'default'} = $othertitle;
-        foreach my $status (@posstypes) {
-            $datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'},
-                                                   $numinrow,$$rowtotal,\%usertypeshash);
-            $$rowtotal ++;
-        }
-    } else {
-        my %choices = &Apache::lonlocal::texthash (
-                          'cancreate_email' => 'Non-institutional username (via e-mail verification)',
-                                                  );
-        my @toggles = sort(keys(%choices));
-        my %defaultchecked = (
-                               'cancreate_email' => 'off',
-                             );
-        my $customclass = 'LC_selfcreate_email';
-        my $classprefix = 'LC_canmodify_emailusername_';
-        my $optionsprefix = 'LC_options_emailusername_';
-        my $display = 'none';
-        my $rowstyle = 'display:none';
-        if (grep(/^\Qemail\E$/,@selfcreate)) {
-            $display = 'block';
-            $rowstyle = 'display:table-row';
-        }
-        my $onclick = "toggleRows(this.form,'cancreate_email','selfassign','$customclass','$classprefix','$optionsprefix');";
-        ($datatable,$$rowtotal) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
-                                                     \%choices,$$rowtotal,$onclick);
-        $datatable .= &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal,$customclass,
-                                         $rowstyle);
-        $$rowtotal ++;
-        $datatable .= &captcha_choice('cancreate',$createsettings,$$rowtotal,$customclass,
-                                      $rowstyle);
-        $$rowtotal ++;
-        my (@ordered,@posstypes,%usertypeshash);
-        my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
-        my ($emailrules,$emailruleorder) =
-            &Apache::lonnet::inst_userrules($dom,'email');
-        my $primary_id = &Apache::lonnet::domain($dom,'primary');
-        my $intdom = &Apache::lonnet::internet_dom($primary_id);
-        if (ref($types) eq 'ARRAY') {
-            @posstypes = @{$types};
-        }
-        if (@posstypes) {
-            unless (grep(/^default$/,@posstypes)) {
-                push(@posstypes,'default');
-            }
-            if (ref($usertypes) eq 'HASH') {
-                %usertypeshash = %{$usertypes};
-            }
-            my $currassign;
-            if (ref($domdefaults{'inststatusguest'}) eq 'ARRAY') {
-                $currassign = {
-                                  selfassign => $domdefaults{'inststatusguest'},
-                              };
-                @ordered = @{$domdefaults{'inststatusguest'}};
-            } else {
-                $currassign = { selfassign => [] };
-            }
-            my $onclicktypes = "toggleDataRow(this.form,'selfassign','$customclass','$optionsprefix',);".
-                               "toggleDataRow(this.form,'selfassign','$customclass','$classprefix',1);";
-            $datatable .= &insttypes_row($currassign,$types,$usertypes,$dom,
-                                         $numinrow,$othertitle,'selfassign',
-                                         $rowtotal,$onclicktypes,$customclass,
-                                         $rowstyle);
-            $$rowtotal ++;
-            $usertypeshash{'default'} = $othertitle;
-            foreach my $status (@posstypes) {
-                my $css_class;
-                if ($$rowtotal%2) {
-                    $css_class = 'LC_odd_row ';
-                }
-                $css_class .= $customclass;
-                my $rowid = $optionsprefix.$status;
-                my $hidden = 1;
-                my $currstyle = 'display:none';
-                if (grep(/^\Q$status\E$/,@ordered)) {
-                    $currstyle = $rowstyle;
-                    $hidden = 0;
-                }
-                $datatable .= &noninst_users($processing,$emailverified,$emailoptions,$emaildomain,
-                                             $emailrules,$emailruleorder,$settings,$status,$rowid,
-                                             $usertypeshash{$status},$css_class,$currstyle,$intdom);
-                unless ($hidden) {
-                    $$rowtotal ++;
-                }
-            }
-        } else {
-            my $css_class;
-            if ($$rowtotal%2) {
-                $css_class = 'LC_odd_row ';
-            }
-            $css_class .= $customclass;
-            $usertypeshash{'default'} = $othertitle;
-            $datatable .= &noninst_users($processing,$emailverified,$emailoptions,$emaildomain,
-                                         $emailrules,$emailruleorder,$settings,'default','',
-                                         $othertitle,$css_class,$rowstyle,$intdom);
-            $$rowtotal ++;
-        }
-        my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
-        $numinrow = 1;
-        if (@posstypes) {
-            foreach my $status (@posstypes) {
-                my $rowid = $classprefix.$status;
-                my $datarowstyle = 'display:none';
-                if (grep(/^\Q$status\E$/,@ordered)) {
-                    $datarowstyle = $rowstyle;
-                }
-                $datatable .= &modifiable_userdata_row('cancreate','emailusername_'.$status,$settings,
-                                                       $numinrow,$$rowtotal,\%usertypeshash,$infofields,
-                                                       $infotitles,$rowid,$customclass,$datarowstyle);
-                unless ($datarowstyle eq 'display:none') {
-                    $$rowtotal ++;
-                }
-            }
-        } else {
-            $datatable .= &modifiable_userdata_row('cancreate','emailusername_default',$settings,
-                                                   $numinrow,$$rowtotal,\%usertypeshash,$infofields,
-                                                   $infotitles,'',$customclass,$rowstyle);
-        }
-    }
-    return $datatable;
-}
-
-sub selfcreate_javascript {
-    return <<"ENDSCRIPT";
-
-<script type="text/javascript">
-// <![CDATA[
-
-function toggleRows(form,radio,checkbox,target,prefix,altprefix) {
-    var x = document.getElementsByClassName(target);
-    var insttypes = 0;
-    var insttypeRegExp = new RegExp(prefix);
-    if ((x.length != undefined) && (x.length > 0)) {
-        if (form.elements[radio].length != undefined) {
-            for (var i=0; i<form.elements[radio].length; i++) {
-                if (form.elements[radio][i].checked) {
-                    if (form.elements[radio][i].value == 1) {
-                        for (var j=0; j<x.length; j++) {
-                            if (x[j].id == 'undefined') {
-                                x[j].style.display = 'table-row';
-                            } else if (insttypeRegExp.test(x[j].id)) {
-                                insttypes ++;
-                            } else {
-                                x[j].style.display = 'table-row';
-                            }
-                        }
-                    } else {
-                        for (var j=0; j<x.length; j++) {
-                            x[j].style.display = 'none';
-                        }
-                    }
-                    break;
-                }
-            }
-            if (insttypes > 0) {
-                toggleDataRow(form,checkbox,target,altprefix);
-                toggleDataRow(form,checkbox,target,prefix,1);
-            }
-        }
-    }
-    return;
-}
-
-function toggleDataRow(form,checkbox,target,prefix,docount) {
-    if (form.elements[checkbox].length != undefined) {
-        var count = 0;
-        if (docount) {
-            for (var i=0; i<form.elements[checkbox].length; i++) {
-                if (form.elements[checkbox][i].checked) {
-                    count ++;
-                }
-            }
-        }
-        for (var i=0; i<form.elements[checkbox].length; i++) {
-            var type = form.elements[checkbox][i].value;
-            if (document.getElementById(prefix+type)) {
-                if (form.elements[checkbox][i].checked) {
-                    document.getElementById(prefix+type).style.display = 'table-row';
-                    if (count % 2 == 1) {
-                        document.getElementById(prefix+type).className = target+' LC_odd_row';
-                    } else {
-                        document.getElementById(prefix+type).className = target;
-                    }
-                    count ++;
-                } else {
-                    document.getElementById(prefix+type).style.display = 'none';
-                }
-            }
-        }
-    }
-    return;
-}
-
-function toggleEmailOptions(form,radio,prefix,altprefix,status) {
-    var caller = radio+'_'+status;
-    if (form.elements[caller].length != undefined) {
-        for (var i=0; i<form.elements[caller].length; i++) {
-            if (form.elements[caller][i].checked) {
-                if (document.getElementById(altprefix+'_inst_'+status)) {
-                    var curr = form.elements[caller][i].value;
-                    if (prefix) {
-                        document.getElementById(prefix+'_'+status).style.display = 'none';
-                    }
-                    document.getElementById(altprefix+'_inst_'+status).style.display = 'none';
-                    document.getElementById(altprefix+'_noninst_'+status).style.display = 'none';
-                    if (curr == 'custom') {
-                        if (prefix) {
-                            document.getElementById(prefix+'_'+status).style.display = 'inline';
-                        }
-                    } else if (curr == 'inst') {
-                        document.getElementById(altprefix+'_inst_'+status).style.display = 'inline';
-                    } else if (curr == 'noninst') {
-                        document.getElementById(altprefix+'_noninst_'+status).style.display = 'inline';
-                    }
-                    break;
-                }
-            }
-        }
-    }
-}
-
-// ]]>
-</script>
-
-ENDSCRIPT
-}
-
-sub noninst_users {
-    my ($processing,$emailverified,$emailoptions,$emaildomain,$emailrules,
-        $emailruleorder,$settings,$type,$rowid,$typetitle,$css_class,$rowstyle,$intdom) = @_;
-    my $class = 'LC_left_item';
-    if ($css_class) {
-        $css_class = ' class="'.$css_class.'"';
-    }
-    if ($rowid) {
-        $rowid = ' id="'.$rowid.'"';
-    }
-    if ($rowstyle) {
-        $rowstyle = ' style="'.$rowstyle.'"';
-    }
-    my ($output,$description);
-    if ($type eq 'default') {
-        $description = &mt('Requests for: [_1]',$typetitle);
-    } else {
-        $description = &mt('Requests for: [_1] (status self-reported)',$typetitle);
-    }
-    $output = '<tr'.$css_class.$rowid.$rowstyle.'>'.
-              "<td>$description</td>\n".
-              '<td class="'.$class.'" colspan="2">'.
-              '<table><tr>';
-    my %headers = &Apache::lonlocal::texthash(
-              approve  => 'Processing',
-              email    => 'E-mail',
-              username => 'Username',
-    );
-    foreach my $item ('approve','email','username') {
-        $output .= '<th>'.$headers{$item}.'</th>';
-    }
-    $output .= '</tr><tr>';
-    foreach my $item ('approve','email','username') {
-        $output .= '<td valign="top">';
-        my (%choices,@options,$hashref,$defoption,$name,$onclick,$hascustom);
-        if ($item eq 'approve') {
-            %choices = &Apache::lonlocal::texthash (
-                                                     automatic => 'Automatically approved',
-                                                     approval  => 'Queued for approval',
-                                                   );
-            @options = ('automatic','approval');
-            $hashref = $processing;
-            $defoption = 'automatic';
-            $name = 'cancreate_emailprocess_'.$type;
-        } elsif ($item eq 'email') {
-            %choices = &Apache::lonlocal::texthash (
-                                                     any     => 'Any e-mail',
-                                                     inst    => 'Institutional only',
-                                                     noninst => 'Non-institutional only',
-                                                     custom  => 'Custom restrictions',
-                                                   );
-            @options = ('any','inst','noninst');
-            my $showcustom;
-            if (ref($emailrules) eq 'HASH') {
-                if (keys(%{$emailrules}) > 0) {
-                    push(@options,'custom');
-                    $showcustom = 'cancreate_emailrule';
-                    if (ref($settings) eq 'HASH') {
-                        if (ref($settings->{'email_rule'}) eq 'ARRAY') {
-                            foreach my $rule (@{$settings->{'email_rule'}}) {
-                                if (exists($emailrules->{$rule})) {
-                                    $hascustom ++;
-                                }
-                            }
-                        } elsif (ref($settings->{'email_rule'}) eq 'HASH') {
-                            if (ref($settings->{'email_rule'}{$type}) eq 'ARRAY') {
-                                foreach my $rule (@{$settings->{'email_rule'}{$type}}) {
-                                    if (exists($emailrules->{$rule})) {
-                                        $hascustom ++;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            $onclick = ' onclick="toggleEmailOptions(this.form,'."'cancreate_emailoptions','$showcustom',".
-                                                     "'cancreate_emaildomain','$type'".');"';
-            $hashref = $emailoptions;
-            $defoption = 'any';
-            $name = 'cancreate_emailoptions_'.$type;
-        } elsif ($item eq 'username') {
-            %choices = &Apache::lonlocal::texthash (
-                                                     all    => 'Same as e-mail',
-                                                     first  => 'Omit @domain',
-                                                     free   => 'Free to choose',
-                                                   );
-            @options = ('all','first','free');
-            $hashref = $emailverified;
-            $defoption = 'all';
-            $name = 'cancreate_usernameoptions_'.$type;
-        }
-        foreach my $option (@options) {
-            my $checked;
-            if (ref($hashref) eq 'HASH') {
-                if ($type eq '') {
-                    if (!exists($hashref->{'default'})) {
-                        if ($option eq $defoption) {
-                            $checked = ' checked="checked"';
-                        }
-                    } else {
-                        if ($hashref->{'default'} eq $option) {
-                            $checked = ' checked="checked"';
-                        }
-                    }
-                } else {
-                    if (!exists($hashref->{$type})) {
-                        if ($option eq $defoption) {
-                            $checked = ' checked="checked"';
-                        }
-                    } else {
-                        if ($hashref->{$type} eq $option) {
-                            $checked = ' checked="checked"';
-                        }
-                    }
-                }
-            } elsif (($item eq 'email') && ($hascustom)) {
-                if ($option eq 'custom') {
-                    $checked = ' checked="checked"';
-                }
-            } elsif ($option eq $defoption) {
-                $checked = ' checked="checked"';
-            }
-            $output .= '<span class="LC_nobreak"><label>'.
-                       '<input type="radio" name="'.$name.'"'.
-                       $checked.' value="'.$option.'"'.$onclick.' />'.
-                       $choices{$option}.'</label></span><br />';
-            if ($item eq 'email') {
-                if ($option eq 'custom') {
-                    my $id = 'cancreate_emailrule_'.$type;
-                    my $display = 'none';
-                    if ($checked) {
-                        $display = 'inline';
-                    }
-                    my $numinrow = 2;
-                    $output .= '<fieldset id="'.$id.'" style="display:'.$display.';">'.
-                               '<legend>'.&mt('Disallow').'</legend><table>'.
-                               &user_formats_row('email',$settings,$emailrules,
-                                                 $emailruleorder,$numinrow,'',$type);
-                              '</table></fieldset>';
-                } elsif (($option eq 'inst') || ($option eq 'noninst')) {
-                    my %text = &Apache::lonlocal::texthash (
-                                                             inst    => 'must end:',
-                                                             noninst => 'cannot end:',
-                                                           );
-                    my $value;
-                    if (ref($emaildomain) eq 'HASH') {
-                        if (ref($emaildomain->{$type}) eq 'HASH') {
-                            $value = $emaildomain->{$type}->{$option};
-                        }
-                    }
-                    if ($value eq '') {
-                        $value = '@'.$intdom;
-                    }
-                    my $condition = 'cancreate_emaildomain_'.$option.'_'.$type;
-                    my $display = 'none';
-                    if ($checked) {
-                        $display = 'inline';
-                    }
-                    $output .= '<div id="'.$condition.'" style="display:'.$display.';">'.
-                               '<span class="LC_domprefs_email">'.$text{$option}.'</span> '.
-                               '<input type="text" name="'.$condition.'" value="'.$value.'" size="10" />'.
-                               '</div>';
-                }
-            }
-        }
-        $output .= '</td>'."\n";
-    }
-    $output .= "</tr></table></td></tr>\n";
-    return $output;
-}
-
 sub captcha_choice {
-    my ($context,$settings,$itemcount,$customcss,$rowstyle) = @_;
-    my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext,
-        $vertext,$currver); 
+    my ($context,$settings,$itemcount) = @_;
+    my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext);
     my %lt = &captcha_phrases();
     $keyentry = 'hidden';
-    my $colspan=2;
     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');
-    } elsif ($context eq 'passwords') {
-        $rowname = &mt('"Forgot Password" CAPTCHA validation');
-        $colspan=1;
     }
     if (ref($settings) eq 'HASH') {
         if ($settings->{'captcha'}) {
@@ -6672,11 +3544,6 @@ sub captcha_choice {
             $pubtext = $lt{'pub'};
             $privtext = $lt{'priv'};
             $keyentry = 'text';
-            $vertext = $lt{'ver'};
-            $currver = $settings->{'recaptchaversion'};
-            if ($currver ne '2') {
-                $currver = 1;
-            }
         }
         if (ref($settings->{'recaptchakeys'}) eq 'HASH') {
             $currpub = $settings->{'recaptchakeys'}{'public'};
@@ -6685,22 +3552,9 @@ sub captcha_choice {
     } else {
         $checked{'original'} = ' checked="checked"';
     }
-    my $css_class;
-    if ($itemcount%2) {
-        $css_class = 'LC_odd_row';
-    }
-    if ($customcss) {
-        $css_class .= " $customcss";
-    }
-    $css_class =~ s/^\s+//;
-    if ($css_class) {
-        $css_class = ' class="'.$css_class.'"';
-    }
-    if ($rowstyle) {
-        $css_class .= ' style="'.$rowstyle.'"';
-    }
+    my $css_class = $itemcount%2?' class="LC_odd_row"':'';
     my $output = '<tr'.$css_class.'>'.
-                 '<td class="LC_left_item">'.$rowname.'</td><td class="LC_left_item" colspan="'.$colspan.'">'."\n".
+                 '<td class="LC_left_item">'.$rowname.'</td><td class="LC_left_item" colspan="2">'."\n".
                  '<table><tr><td>'."\n";
     foreach my $option ('original','recaptcha','notused') {
         $output .= '<span class="LC_nobreak"><label><input type="radio" name="'.$context.'_captcha" value="'.
@@ -6713,39 +3567,39 @@ 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 class="LC_zero_height">'."\n".
+               '<tr><td>'."\n".
                '<span class="LC_nobreak"><span id="'.$context.'_recaptchapubtxt">'.$pubtext.'</span>&nbsp;'."\n".
                '<input type="'.$keyentry.'" id="'.$context.'_recaptchapub" name="'.$context.'_recaptchapub" value="'.
                $currpub.'" size="40" /></span><br />'."\n".
                '<span class="LC_nobreak"><span id="'.$context.'_recaptchaprivtxt">'.$privtext.'</span>&nbsp;'."\n".
                '<input type="'.$keyentry.'" id="'.$context.'_recaptchapriv" name="'.$context.'_recaptchapriv" value="'.
-               $currpriv.'" size="40" /></span><br />'.
-               '<span class="LC_nobreak"><span id="'.$context.'_recaptchavertxt">'.$vertext.'</span>&nbsp;'."\n".
-               '<input type="'.$keyentry.'" id="'.$context.'_recaptchaversion" name="'.$context.'_recaptchaversion" value="'.
-               $currver.'" size="3" /></span><br />'.
-               '</td></tr></table>'."\n".
+               $currpriv.'" size="40" /></span></td></tr></table>'."\n".
                '</td></tr>';
     return $output;
 }
 
 sub user_formats_row {
-    my ($type,$settings,$rules,$ruleorder,$numinrow,$rowcount,$status) = @_;
+    my ($type,$settings,$rules,$ruleorder,$numinrow,$rowcount) = @_;
     my $output;
     my %text = (
                    'username' => 'new usernames',
                    'id'       => 'IDs',
+                   'email'    => 'self-created accounts (e-mail)',
                );
-    unless ($type eq 'email') {
-        my $css_class = $rowcount%2?' class="LC_odd_row"':'';
-        $output = '<tr '.$css_class.'>'.
-                  '<td><span class="LC_nobreak">'.
-                  &mt("Format rules to check for $text{$type}: ").
-                  '</td><td class="LC_left_item" colspan="2"><table>';
+    my $css_class = $rowcount%2?' class="LC_odd_row"':'';
+    $output = '<tr '.$css_class.'>'.
+              '<td><span class="LC_nobreak">';
+    if ($type eq 'email') {
+        $output .= &mt("Formats disallowed for $text{$type}: ");
+    } else {
+        $output .= &mt("Format rules to check for $text{$type}: ");
     }
+    $output .= '</span></td>'.
+               '<td class="LC_left_item" colspan="2"><table>';
     my $rem;
     if (ref($ruleorder) eq 'ARRAY') {
         for (my $i=0; $i<@{$ruleorder}; $i++) {
@@ -6763,41 +3617,25 @@ sub user_formats_row {
                         if (grep(/^\Q$ruleorder->[$i]\E$/,@{$settings->{$type.'_rule'}})) {
                             $check = ' checked="checked" ';
                         }
-                    } elsif ((ref($settings->{$type.'_rule'}) eq 'HASH') && ($status ne '')) {
-                        if (ref($settings->{$type.'_rule'}->{$status}) eq 'ARRAY') {
-                            if (grep(/^\Q$ruleorder->[$i]\E$/,@{$settings->{$type.'_rule'}->{$status}})) {
-                                $check = ' checked="checked" ';
-                            }
-                        }
                     }
                 }
-                my $name = $type.'_rule';
-                if ($type eq 'email') {
-                    $name .= '_'.$status;
-                }
                 $output .= '<td class="LC_left_item">'.
                            '<span class="LC_nobreak"><label>'.
-                           '<input type="checkbox" name="'.$name.'" '.
+                           '<input type="checkbox" name="'.$type.'_rule" '.
                            'value="'.$ruleorder->[$i].'"'.$check.'/>'.
                            $rules->{$ruleorder->[$i]}{'name'}.'</label></span></td>';
             }
         }
         $rem = @{$ruleorder}%($numinrow);
     }
-    my $colsleft;
-    if ($rem) {
-        $colsleft = $numinrow - $rem;
-    }
+    my $colsleft = $numinrow - $rem;
     if ($colsleft > 1 ) {
         $output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'.
                    '&nbsp;</td>';
     } elsif ($colsleft == 1) {
         $output .= '<td class="LC_left_item">&nbsp;</td>';
     }
-    $output .= '</tr></table>';
-    unless ($type eq 'email') {
-        $output .= '</td></tr>';
-    }
+    $output .= '</tr></table></td></tr>';
     return $output;
 }
 
@@ -6806,26 +3644,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',
@@ -6858,7 +3688,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') {
@@ -6867,126 +3697,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,$titles);
-    unless ($position eq 'bottom') {
-        $titles = &defaults_titles($dom);
-    }
-    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};
+    my ($datatable,$css_class);
+    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" ';
         }
-        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')) {
-                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 $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>';
-                    }
-                    $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></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>'.
-                              '</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;
@@ -7012,9 +3797,6 @@ sub defaults_titles {
                    'timezone_def'  => 'Default timezone',
                    'datelocale_def' => 'Default locale for dates',
                    'portal_def'     => 'Portal/Default URL',
-                   'intauth_cost'   => 'Encryption cost for bcrypt (positive integer)',
-                   'intauth_check'  => 'Check bcrypt cost if authenticated',
-                   'intauth_switch' => 'Existing crypt-based switched to bcrypt on authentication',
                  );
     if ($dom) {
         my $uprimary_id = &Apache::lonnet::domain($dom,'primary');
@@ -7029,58 +3811,6 @@ sub defaults_titles {
     return (\%titles);
 }
 
-sub print_scantron {
-    my ($r,$position,$dom,$confname,$settings,$rowtotal) = @_;
-    if ($position eq 'top') {
-        return &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
-    } else {
-        return &print_scantronconfig($dom,$settings,\$rowtotal);
-    }
-}
-
-sub scantron_javascript {
-    return <<"ENDSCRIPT";
-
-<script type="text/javascript">
-// <![CDATA[
-
-function toggleScantron(form) {
-    var csvfieldset = new Array();
-    if (document.getElementById('scantroncsv_cols')) {
-        csvfieldset.push(document.getElementById('scantroncsv_cols'));
-    }
-    if (document.getElementById('scantroncsv_options')) {
-        csvfieldset.push(document.getElementById('scantroncsv_options'));
-    }
-    if (csvfieldset.length) {
-        if (document.getElementById('scantronconfcsv')) {
-            var scantroncsv = document.getElementById('scantronconfcsv');
-            if (scantroncsv.checked) {
-                for (var i=0; i<csvfieldset.length; i++) {
-                    csvfieldset[i].style.display = 'block';
-                }
-            } else {
-                for (var i=0; i<csvfieldset.length; i++) {
-                    csvfieldset[i].style.display = 'none';
-                }
-                var csvselects = document.getElementsByClassName('scantronconfig_csv');
-                if (csvselects.length) {
-                    for (var j=0; j<csvselects.length; j++) {
-                        csvselects[j].selectedIndex = 0;
-                    }
-                }
-            }
-        }
-    }
-    return;
-}
-// ]]>
-</script>
-
-ENDSCRIPT
-
-}
-
 sub print_scantronformat {
     my ($r,$dom,$confname,$settings,$rowtotal) = @_;
     my $itemcount = 1;
@@ -7107,8 +3837,8 @@ sub print_scantronformat {
             if ($configuserok eq 'ok') {
                 if ($author_ok eq 'ok') {
                     my %legacyfile = (
- default => $Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab',
- custom  => $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab',
+ default => $Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab', 
+ custom  => $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab', 
                     );
                     my %md5chk;
                     foreach my $type (keys(%legacyfile)) {
@@ -7117,7 +3847,7 @@ sub print_scantronformat {
                     }
                     if ($md5chk{'default'} ne $md5chk{'custom'}) {
                         foreach my $type (keys(%legacyfile)) {
-                            ($scantronurls{$type},my $error) =
+                            ($scantronurls{$type},my $error) = 
                                 &legacy_scantronformat($r,$dom,$confname,
                                                  $type,$legacyfile{$type},
                                                  $scantronurls{$type},
@@ -7128,13 +3858,13 @@ sub print_scantronformat {
                         }
                         if (keys(%error) == 0) {
                             $is_custom = 1;
-                            $confhash{'scantron'}{'scantronformat'} =
+                            $confhash{'scantron'}{'scantronformat'} = 
                                 $scantronurls{'custom'};
-                            my $putresult =
+                            my $putresult = 
                                 &Apache::lonnet::put_dom('configuration',
                                                          \%confhash,$dom);
                             if ($putresult ne 'ok') {
-                                $error{'custom'} =
+                                $error{'custom'} = 
                                     '<span class="LC_error">'.
                                     &mt('An error occurred updating the domain configuration: [_1]',$putresult).'</span>';
                             }
@@ -7190,8 +3920,8 @@ sub print_scantronformat {
         $datatable .= '<td>'.&mt('Default in use:').'<br />'.
                       '<span class="LC_nobreak">';
         if ($scantronurl) {
-            $datatable .= &Apache::loncommon::modal_link($scantronurl,&mt('Default bubblesheet format file'),600,500,
-                                                         undef,undef,undef,undef,'background-color:#ffffff');
+            $datatable .= '<a href="'.$scantronurl.'" target="_blank">'.
+                          &mt('Default bubblesheet format file').'</a>';
         } else {
             $datatable = &mt('File unavailable for display');
         }
@@ -7216,12 +3946,11 @@ sub print_scantronformat {
             } 
             $datatable .= '<td>'.$errorstr.'</td><td>&nbsp;';
         } elsif ($scantronurl) {
-            my $link =  &Apache::loncommon::modal_link($scantronurl,&mt('Custom bubblesheet format file'),600,500,
-                                                       undef,undef,undef,undef,'background-color:#ffffff');
             $datatable .= '<td><span class="LC_nobreak">'.
-                          $link.
-                          '<label><input type="checkbox" name="scantronformat_del"'.
-                          ' value="1" />'.&mt('Delete?').'</label></span></td>'.
+                          '<a href="'.$scantronurl.'" target="_blank">'.
+                          &mt('Custom bubblesheet format file').'</a><label>'.
+                          '<input type="checkbox" name="scantronformat_del"'.
+                          '" value="1" />'.&mt('Delete?').'</label></span></td>'.
                           '<td><span class="LC_nobreak">&nbsp;'.
                           &mt('Replace:').'</span><br />';
         }
@@ -7254,176 +3983,10 @@ sub legacy_scantronformat {
     return ($url,$error);
 }
 
-sub print_scantronconfig {
-    my ($dom,$settings,$rowtotal) = @_;
-    my $itemcount = 2;
-    my $is_checked = ' checked="checked"';
-    my %optionson = (
-                     hdr => ' checked="checked"',
-                     pad => ' checked="checked"',
-                     rem => ' checked="checked"',
-                    );
-    my %optionsoff = (
-                      hdr => '',
-                      pad => '',
-                      rem => '',
-                     );
-    my $currcsvsty = 'none';
-    my ($datatable,%csvfields,%checked,%onclick,%csvoptions);
-    my @fields = &scantroncsv_fields();
-    my %titles = &scantronconfig_titles();
-    if (ref($settings) eq 'HASH') {
-        if (ref($settings->{config}) eq 'HASH') {
-            if ($settings->{config}->{dat}) {
-                $checked{'dat'} = $is_checked;
-            }
-            if (ref($settings->{config}->{csv}) eq 'HASH') {
-                if (ref($settings->{config}->{csv}->{fields}) eq 'HASH') {
-                    %csvfields = %{$settings->{config}->{csv}->{fields}};
-                    if (keys(%csvfields) > 0) {
-                        $checked{'csv'} = $is_checked;
-                        $currcsvsty = 'block';
-                    }
-                }
-                if (ref($settings->{config}->{csv}->{options}) eq 'HASH') {
-                    %csvoptions = %{$settings->{config}->{csv}->{options}};
-                    foreach my $option (keys(%optionson)) {
-                        unless ($csvoptions{$option}) {
-                            $optionsoff{$option} = $optionson{$option};
-                            $optionson{$option} = '';
-                        }
-                    }
-                }
-            }
-        } else {
-            $checked{'dat'} = $is_checked;
-        }
-    } else {
-        $checked{'dat'} = $is_checked;
-    }
-    $onclick{'csv'} = ' onclick="toggleScantron(this.form);"';
-    my $css_class = $itemcount%2? ' class="LC_odd_row"':'';
-    $datatable = '<tr '.$css_class.'><td>'.&mt('Supported formats').'</td>'.
-                 '<td class="LC_left_item" valign="top"><span class="LC_nobreak">';
-    foreach my $item ('dat','csv') {
-        my $id;
-        if ($item eq 'csv') {
-            $id = 'id="scantronconfcsv" ';
-        }
-        $datatable .= '<label><input type="checkbox" name="scantronconfig" '.$id.'value="'.$item.'"'.$checked{$item}.$onclick{$item}.' />'.
-                      $titles{$item}.'</label>'.('&nbsp;'x3);
-        if ($item eq 'csv') {
-            $datatable .= '<fieldset style="display:'.$currcsvsty.'" id="scantroncsv_cols">'.
-                          '<legend>'.&mt('CSV Column Mapping').'</legend>'.
-                          '<table><tr><th>'.&mt('Field').'</th><th>'.&mt('Location').'</th></tr>'."\n";
-            foreach my $col (@fields) {
-                my $selnone;
-                if ($csvfields{$col} eq '') {
-                    $selnone = ' selected="selected"';
-                }
-                $datatable .= '<tr><td>'.$titles{$col}.'</td>'.
-                              '<td><select name="scantronconfig_csv_'.$col.'" class="scantronconfig_csv">'.
-                              '<option value=""'.$selnone.'></option>';
-                for (my $i=0; $i<20; $i++) {
-                    my $shown = $i+1;
-                    my $sel;
-                    unless ($selnone) {
-                        if (exists($csvfields{$col})) {
-                            if ($csvfields{$col} == $i) {
-                                $sel = ' selected="selected"';
-                            }
-                        }
-                    }
-                    $datatable .= '<option value="'.$i.'"'.$sel.'>'.$shown.'</option>';
-                }
-                $datatable .= '</select></td></tr>';
-           }
-           $datatable .= '</table></fieldset>'.
-                         '<fieldset style="display:'.$currcsvsty.'" id="scantroncsv_options">'.
-                         '<legend>'.&mt('CSV Options').'</legend>';
-           foreach my $option ('hdr','pad','rem') {
-               $datatable .= '<span class="LC_nobreak">'.$titles{$option}.':'.
-                         '<label><input type="radio" name="scantroncsv_'.$option.'" value="1"'.$optionson{$option}.' />'.
-                         &mt('Yes').'</label>'.('&nbsp;'x2)."\n".
-                         '<label><input type="radio" name="scantroncsv_'.$option.'" value="0"'.$optionsoff{$option}.' />'.&mt('No').'</label></span><br />';
-           }
-           $datatable .= '</fieldset>';
-           $itemcount ++;
-        }
-    }
-    $datatable .= '</td></tr>';
-    $$rowtotal ++;
-    return $datatable;
-}
-
-sub scantronconfig_titles {
-    return &Apache::lonlocal::texthash(
-                                          dat => 'Standard format (.dat)',
-                                          csv => 'Comma separated values (.csv)',
-                                          hdr => 'Remove first line in file (contains column titles)',
-                                          pad => 'Prepend 0s to PaperID',
-                                          rem => 'Remove leading spaces (except Question Response columns)',
-                                          CODE => 'CODE',
-                                          ID   => 'Student ID',
-                                          PaperID => 'Paper ID',
-                                          FirstName => 'First Name',
-                                          LastName => 'Last Name',
-                                          FirstQuestion => 'First Question Response',
-                                          Section => 'Section',
-    );
-}
-
-sub scantroncsv_fields {
-    return ('PaperID','LastName','FirstName','ID','Section','CODE','FirstQuestion');
-}
-
 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 .= '</span></td></tr>';
-           $itemcount ++;
-        }
-        $$rowtotal += $itemcount;
-    } elsif ($position eq 'middle') {
         my $toggle_cats_crs = ' ';
         my $toggle_cats_dom = ' checked="checked" ';
         my $can_cat_crs = ' ';
@@ -7541,7 +4104,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>';
@@ -7571,8 +4134,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;
@@ -7630,7 +4192,7 @@ sub print_coursecategories {
                 $datatable .= &initialize_categories($itemcount);
             }
         } else {
-            $datatable .= '<tr><td class="LC_right_item">'.$hdritem->{'header'}->[1]->{'col2'}.'</td></tr>'
+            $datatable .= '<td class="LC_right_item">'.$hdritem->{'header'}->[0]->{'col2'}.'</td>'
                           .&initialize_categories($itemcount);
         }
         $$rowtotal += $itemcount;
@@ -7678,7 +4240,7 @@ sub print_serverstatuses {
                       '<span class="LC_nobreak">'.
                       '<input type="text" name="'.$type.'_machines" '.
                       'value="'.$machineaccess{$type}.'" size="10" />'.
-                      '</span></td></tr>'."\n";
+                      '</td></tr>'."\n";
     }
     $$rowtotal += $rownum;
     return $datatable;
@@ -7687,159 +4249,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
-    }
-}
-
-sub passwords_javascript {
-    my %intalert = &Apache::lonlocal::texthash (
-        authcheck => 'Warning: disallowing login for an authenticated user if the stored cost is less than the default will require a password reset by/for the user.',
-        authcost => 'Warning: bcrypt encryption cost for internal authentication must be an integer.',
-        passmin => 'Warning: minimum password length must be a positive integer greater than 6.',
-        passmax => 'Warning: maximum password length must be a positive integer (or blank).',
-        passexp => 'Warning: days before password expiration must be a positive integer (or blank).',
-        passnum => 'Warning: number of previous passwords to save must be a positive integer (or blank).',
-    );
-    &js_escape(\%intalert);
-    my $defmin = $Apache::lonnet::passwdmin;
-    my $intauthjs = <<"ENDSCRIPT";
-
-function warnIntAuth(field) {
-    if (field.name == 'intauth_check') {
-        if (field.value == '2') {
-            alert('$intalert{authcheck}');
-        }
-    }
-    if (field.name == 'intauth_cost') {
-        field.value.replace(/\s/g,'');
-        if (field.value != '') {
-            var regexdigit=/^\\d+\$/;
-            if (!regexdigit.test(field.value)) {
-                alert('$intalert{authcost}');
-            }
-        }
-    }
-    return;
-}
-
-function warnIntPass(field) {
-    field.value.replace(/^\s+/,'');
-    field.value.replace(/\s+\$/,'');
-    var regexdigit=/^\\d+\$/;
-    if (field.name == 'passwords_min') {
-        if (field.value == '') {
-            alert('$intalert{passmin}');
-            field.value = '$defmin';
-        } else {
-            if (!regexdigit.test(field.value)) {
-                alert('$intalert{passmin}');
-                field.value = '$defmin';
-            }
-            var minval = parseInt(field.value,10);
-            if (minval < $defmin) {
-                alert('$intalert{passmin}');
-                field.value = '$defmin';
-            }
-        }
-    } else {
-        if (field.value == '0') {
-            field.value = '';
-        }
-        if (field.value != '') {
-            if (field.name == 'passwords_expire') {
-                var regexpposnum=/^\\d+(|\\.\\d*)\$/;
-                if (!regexpposnum.test(field.value)) {
-                    alert('$intalert{passexp}');
-                    field.value = '';
-                } else {
-                    var expval = parseFloat(field.value);
-                    if (expval == 0) {
-                        alert('$intalert{passexp}');
-                        field.value = '';
-                    }
-                }
-            } else {
-                if (!regexdigit.test(field.value)) {
-                    if (field.name == 'passwords_max') {
-                        alert('$intalert{passmax}');
-                    } else {
-                        if (field.name == 'passwords_numsaved') {
-                            alert('$intalert{passnum}');
-                        }
-                    }
-                }
-                field.value = '';
-            }
-        }
-    }
-    return;
-}
-
-ENDSCRIPT
-    return &Apache::lonhtmlcommon::scripttag($intauthjs);
+            'takeoffline','takeonline','showenv','toggledebug','ping','domconf');
 }
 
 sub coursecategories_javascript {
@@ -7864,12 +4274,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[
@@ -7877,6 +4284,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;
@@ -7959,7 +4367,7 @@ sub initialize_categories {
     my $select1 = '';
     foreach my $default ('instcode','communities') {
         $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','$default"."_pos','0'".');"';
+        $chgstr = ' onchange="javascript:reorderCats(this.form,'."'',$default"."_pos','0'".');"';
         if ($default eq 'communities') {
             $select1 = $select0;
             $select0 = '';
@@ -7984,9 +4392,8 @@ sub initialize_categories {
                   .'<option value="0">1</option>'
                   .'<option value="1">2</option>'
                   .'<option value="2" selected="selected">3</option></select>&nbsp;'
-                  .&mt('Add category').'</span></td><tda<span class="LC_nobreak">>'.&mt('Name:')
-                  .'&nbsp;<input type="text" size="20" name="addcategory_name" value="" /></span>'
-                  .'</td></tr>';
+                  .&mt('Add category').'</td><td>'.&mt('Name:')
+                  .'&nbsp;<input type="text" size="20" name="addcategory_name" value="" /></td></tr>';
     return $datatable;
 }
 
@@ -7999,7 +4406,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) {
@@ -8041,7 +4448,7 @@ sub build_category_rows {
                             pop(@{$path});
                         }
                     } else {
-                        $text .= &mt('Add subcategory:').'&nbsp;</span><input type="text" size="20" name="addcategory_name_';
+                        $text .= &mt('Add subcategory:').'&nbsp;</span><input type="textbox" size="20" name="addcategory_name_';
                         if ($j == $numchildren) {
                             $text .= $name;
                         } else {
@@ -8064,7 +4471,7 @@ sub build_category_rows {
                 my $colspan;
                 if ($parent ne 'instcode') {
                     $colspan = $maxdepth - $depth - 1;
-                    $text .= '<td colspan="'.$colspan.'">'.&mt('Add subcategory:').'<input type="text" size="20" name="subcat_'.$name.'" value="" /></td>';
+                    $text .= '<td colspan="'.$colspan.'">'.&mt('Add subcategory:').'<input type="textbox" size="20" name="subcat_'.$name.'" value="" /></td>';
                 }
             }
         }
@@ -8073,23 +4480,9 @@ sub build_category_rows {
 }
 
 sub modifiable_userdata_row {
-    my ($context,$item,$settings,$numinrow,$rowcount,$usertypes,$fieldsref,$titlesref,
-        $rowid,$customcss,$rowstyle) = @_;
-    my ($role,$rolename,$statustype);
-    $role = $item;
-    if ($context eq 'cancreate') {
-        if ($item =~ /^(emailusername)_(.+)$/) {
-            $role = $1;
-            $statustype = $2;
-            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 {
@@ -8102,38 +4495,12 @@ 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;
-    if ($rowcount%2) {
-        $css_class = 'LC_odd_row';
-    }
-    if ($customcss) {
-        $css_class .= " $customcss";
-    }
-    $css_class =~ s/^\s+//;
-    if ($css_class) {
-        $css_class = ' class="'.$css_class.'"';
-    }
-    if ($rowstyle) {
-        $css_class .= ' style="'.$rowstyle.'"';
-    }
-    if ($rowid) {
-        $rowid = ' id="'.$rowid.'"';
-    }
-
-    $output = '<tr '.$css_class.$rowid.'>'.
+    my $css_class = $rowcount%2?' class="LC_odd_row"':'';
+    $output = '<tr '.$css_class.'>'.
               '<td><span class="LC_nobreak">'.$rolename.'</span></td>'.
               '<td class="LC_left_item" colspan="2"><table>';
     my $rem;
@@ -8141,36 +4508,16 @@ 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" ';
                     }
                 }
             }
         }
     }
-
-    my $total = scalar(@fields);
-    for (my $i=0; $i<$total; $i++) {
-        $rem = $i%($numinrow);
+    for (my $i=0; $i<@fields; $i++) {
+        my $rem = $i%($numinrow);
         if ($rem == 0) {
             if ($i > 0) {
                 $output .= '</tr>';
@@ -8178,47 +4525,24 @@ 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>';
-    }
-    $rem = $total%$numinrow;
-    my $colsleft;
-    if ($rem) {
-        $colsleft = $numinrow - $rem;
+                   '<span class="LC_nobreak"><label>'.
+                   '<input type="checkbox" name="canmodify_'.$role.'" '.
+                   'value="'.$fields[$i].'"'.$check.'/>'.$fieldtitles{$fields[$i]}.
+                   '</label></span></td>';
+        $rem = @fields%($numinrow);
     }
-    if ($colsleft > 1) {
+    my $colsleft = $numinrow - $rem;
+    if ($colsleft > 1 ) {
         $output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'.
                    '&nbsp;</td>';
     } elsif ($colsleft == 1) {
@@ -8229,14 +4553,11 @@ sub modifiable_userdata_row {
 }
 
 sub insttypes_row {
-    my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle,$context,$rowtotal,$onclick,
-        $customcss,$rowstyle) = @_;
+    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)',
                       lockablenames => 'User preference to lock name',
-                      selfassign    => 'Self-reportable affiliations',
-                      overrides     => "Override domain's helpdesk settings based on requester's affiliation",
              );
     my $showdom;
     if ($context eq 'cansearch') {
@@ -8246,26 +4567,9 @@ sub insttypes_row {
     if ($context eq 'statustocreate') {
         $class = 'LC_right_item';
     }
-    my $css_class;
-    if ($$rowtotal%2) {
-        $css_class = 'LC_odd_row';
-    }
-    if ($customcss) {
-        $css_class .= ' '.$customcss;
-    }
-    $css_class =~ s/^\s+//;
-    if ($css_class) {
-        $css_class = ' class="'.$css_class.'"';
-    }
-    if ($rowstyle) {
-        $css_class .= ' style="'.$rowstyle.'"';
-    }
-    if ($onclick) {
-        $onclick = 'onclick="'.$onclick.'" ';
-    }
-    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++) {
@@ -8283,10 +4587,6 @@ sub insttypes_row {
                         if (grep(/^\Q$types->[$i]\E$/,@{$settings->{$context}})) {
                             $check = ' checked="checked" ';
                         }
-                    } elsif (ref($settings->{$context}) eq 'HASH') {
-                        if (ref($settings->{$context}->{$types->[$i]}) eq 'HASH') {
-                            $check = ' checked="checked" ';
-                        }
                     } elsif ($context eq 'statustocreate') {
                         $check = ' checked="checked" ';
                     }
@@ -8294,45 +4594,36 @@ sub insttypes_row {
                 $output .= '<td class="LC_left_item">'.
                            '<span class="LC_nobreak"><label>'.
                            '<input type="checkbox" name="'.$context.'" '.
-                           'value="'.$types->[$i].'"'.$check.$onclick.'/>'.
+                           'value="'.$types->[$i].'"'.$check.'/>'.
                            $usertypes->{$types->[$i]}.'</label></span></td>';
             }
         }
         $rem = @{$types}%($numinrow);
     }
     my $colsleft = $numinrow - $rem;
-    if ($context eq 'overrides') {
-        if ($colsleft > 1) {
-            $output .= '<td colspan="'.$colsleft.'" class="LC_left_item">';
-        } else {
-            $output .= '<td class="LC_left_item">';
-        }
-        $output .= '&nbsp;';
+    if (($rem == 0) && (@{$types} > 0)) {
+        $output .= '<tr>';
+    }
+    if ($colsleft > 1) {
+        $output .= '<td colspan="'.$colsleft.'" class="LC_left_item">';
     } else {
-        if ($rem == 0) {
-            $output .= '<tr>';
-        }
-        if ($colsleft > 1) {
-            $output .= '<td colspan="'.$colsleft.'" class="LC_left_item">';
-        } else {
-            $output .= '<td class="LC_left_item">';
-        }
-        my $defcheck = ' ';
-        if (ref($settings) eq 'HASH') {  
-            if (ref($settings->{$context}) eq 'ARRAY') {
-                if (grep(/^default$/,@{$settings->{$context}})) {
-                    $defcheck = ' checked="checked" ';
-                }
-            } elsif ($context eq 'statustocreate') {
+        $output .= '<td class="LC_left_item">';
+    }
+    my $defcheck = ' ';
+    if (ref($settings) eq 'HASH') {  
+        if (ref($settings->{$context}) eq 'ARRAY') {
+            if (grep(/^default$/,@{$settings->{$context}})) {
                 $defcheck = ' checked="checked" ';
             }
+        } elsif ($context eq 'statustocreate') {
+            $defcheck = ' checked="checked" ';
         }
-        $output .= '<span class="LC_nobreak"><label>'.
-                   '<input type="checkbox" name="'.$context.'" '.
-                   'value="default"'.$defcheck.$onclick.' />'.
-                   $othertitle.'</label></span>';
     }
-    $output .= '</td></tr></table></td></tr>';
+    $output .= '<span class="LC_nobreak"><label>'.
+               '<input type="checkbox" name="'.$context.'" '.
+               'value="default"'.$defcheck.'/>'.
+               $othertitle.'</label></span></td>'.
+               '</tr></table></td></tr>';
     return $output;
 }
 
@@ -8407,7 +4698,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',
@@ -8436,7 +4727,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)) {
@@ -8479,7 +4769,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;
                     }
@@ -8573,8 +4878,9 @@ 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};
                         }
                     }
@@ -8590,84 +4896,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';
@@ -8708,9 +4936,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') {
@@ -8768,28 +4993,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 {
@@ -8818,18 +5024,11 @@ sub modify_login {
                         if (!$privkey) {
                             $chgtxt .= '<li>'.&mt('Private key deleted').'</li>';
                         } else {
-                            $chgtxt .= '<li>'.&mt('Private key set to [_1]',$privkey).'</li>';
+                            $chgtxt .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>';
                         }
                         $chgtxt .= '</ul>';
                         $resulttext .= '<li>'.$chgtxt.'</li>';
                     }
-                } elsif ($item eq 'recaptchaversion') {
-                    if (ref($loginhash{'login'}) eq 'HASH') {
-                        if ($loginhash{'login'}{'captcha'} eq 'recaptcha') {
-                            $resulttext .= '<li>'.&mt('ReCAPTCHA for helpdesk form set to version [_1]',$loginhash{'login'}{'recaptchaversion'}).
-                                           '</li>';
-                        }
-                    }
                 } else {
                     $resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>';
                 }
@@ -8849,27 +5048,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 (
@@ -8878,7 +5056,7 @@ sub color_font_choices {
             links => "Link colors",
             images => "Images",
             font => "Font color",
-            fontmenu => "Font menu",
+            fontmenu => "Font Menu",
             pgbg => "Page",
             tabbg => "Header",
             sidebg => "Border",
@@ -8890,7 +5068,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') {
@@ -8905,9 +5083,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 {
@@ -8933,61 +5108,24 @@ sub modify_colors {
     my @images;
     my $servadm = $r->dir_config('lonAdmEMail');
     my $errors;
-    my %defaults;
     foreach my $role (@{$roles}) {
         if ($role eq 'login') {
             %choices = &login_choices();
             @logintext = ('textcol','bgcol');
         } else {
             %choices = &color_font_choices();
+            $confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'};
         }
         if ($role eq 'login') {
             @images = ('img','logo','domlogo','login');
             @bgs = ('pgbg','mainbg','sidebg');
         } else {
             @images = ('img');
-            @bgs = ('pgbg','tabbg','sidebg');
-        }
-        my %defaults = &role_defaults($role,\@bgs,\@links,\@images,\@logintext);
-        unless ($env{'form.'.$role.'_font'} eq $defaults{'font'}) {
-            $confhash->{$role}{'font'} = $env{'form.'.$role.'_font'};
-        }
-        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})) {
-                    $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'})) {
-                $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})) {
-                $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
-            }
+            @bgs = ('pgbg','tabbg','sidebg'); 
         }
-        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})) {
-                $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
-            }
+        $confhash->{$role}{'font'} = $env{'form.'.$role.'_font'};
+        foreach my $item (@bgs,@links,@logintext) {
+            $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
         }
         my ($configuserok,$author_ok,$switchserver) = 
             &config_check($dom,$confname,$servadm);
@@ -9292,7 +5430,7 @@ sub check_configuser {
     my ($configuserok,%currroles);
     if ($uhome eq 'no_host') {
         srand( time() ^ ($$ + ($$ << 15))  ); # Seed rand.
-        my $configpass = &LONCAPA::Enrollment::create_password($dom);
+        my $configpass = &LONCAPA::Enrollment::create_password();
         $configuserok = 
             &Apache::lonnet::modifyuser($dom,$confname,'','internal',
                              $configpass,'','','','','',undef,$servadm);
@@ -9335,7 +5473,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);
@@ -9355,7 +5493,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);
@@ -9366,14 +5504,14 @@ sub publishlogo {
     } else {
         my $source = $filepath.'/'.$file;
         my $logfile;
-        if (!open($logfile,">>",$source.'.log')) {
+        if (!open($logfile,">>$source".'.log')) {
             return (&mt('No write permission to Authoring Space'));
         }
         print $logfile
 "\n================= Publish ".localtime()." ================\n".
 $env{'user.name'}.':'.$env{'user.domain'}."\n";
 # Save the file
-        if (!open(FH,">",$source)) {
+        if (!open(FH,'>'.$source)) {
             &Apache::lonnet::logthis('Failed to create '.$source);
             return (&mt('Failed to create file'));
         }
@@ -9434,8 +5572,7 @@ $env{'user.name'}.':'.$env{'user.domain'
                 if ($fullwidth ne '' && $fullheight ne '') { 
                     if ($fullwidth > $thumbwidth && $fullheight > $thumbheight) {
                         my $thumbsize = $thumbwidth.'x'.$thumbheight;
-                        my @args = ('convert','-sample',$thumbsize,$inputfile,$outfile);
-                        system({$args[0]} @args);
+                        system("convert -sample $thumbsize $inputfile $outfile");
                         chmod(0660, $filepath.'/tn-'.$file);
                         if (-e $outfile) {
                             my $copyfile=$targetdir.'/tn-'.$file;
@@ -9514,7 +5651,7 @@ sub write_metadata {
     {
         print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file;
         my $mfh;
-        if (open($mfh,">",$targetdir.'/'.$file.'.meta')) {
+        if (open($mfh,'>'.$targetdir.'/'.$file.'.meta')) {
             foreach (sort(keys(%metadatafields))) {
                 unless ($_=~/\./) {
                     my $unikey=$_;
@@ -9548,7 +5685,7 @@ sub notifysubscribed {
         next unless (ref($targetsource) eq 'ARRAY');
         my ($target,$source)=@{$targetsource};
         if ($source ne '') {
-            if (open(my $logfh,">>",$source.'.log')) {
+            if (open(my $logfh,'>>'.$source.'.log')) {
                 print $logfh "\nCleanup phase: Notifications\n";
                 my @subscribed=&subscribed_hosts($target);
                 foreach my $subhost (@subscribed) {
@@ -9574,7 +5711,7 @@ sub notifysubscribed {
 sub subscribed_hosts {
     my ($target) = @_;
     my @subscribed;
-    if (open(my $fh,"<","$target.subscription")) {
+    if (open(my $fh,"<$target.subscription")) {
         while (my $subline=<$fh>) {
             if ($subline =~ /^($match_lonid):/) {
                 my $host = $1;
@@ -9605,28 +5742,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();
@@ -9634,7 +5764,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') {
@@ -9662,46 +5792,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'}) {
@@ -9712,240 +5805,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);
-                                    if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') {
-                                        $errors .= '<li><span class="LC_error">'.&mt('Image not saved: could not find textbook course').'</li>';
-                                    } else {
-                                        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});
-                            if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') {
-                                $errors .= '<li><span class="LC_error">'.&mt('Image not saved: could not find textbook course').'</li>';
-                            } else {
-                                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 = &Apache::lonnet::get_active_domroles($dom,['dc']);
-                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'};
@@ -10087,9 +5950,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};
         }
     }
 
@@ -10102,11 +5963,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>';
@@ -10116,20 +5975,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>';
@@ -10140,7 +5999,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}};
@@ -10154,7 +6013,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;
@@ -10226,68 +6085,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);
@@ -10305,626 +6102,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/$cdom/$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_ltitools {
-    my ($r,$dom,$action,$lastactref,%domconfig) = @_;
-    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
-    my ($newid,@allpos,%changes,%confhash,%encconfig,$errors,$resulttext);
-    my $confname = $dom.'-domainconfig';
-    my $servadm = $r->dir_config('lonAdmEMail');
-    my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm);
-    my (%posslti,%possfield);
-    my @courseroles = ('cc','in','ta','ep','st');
-    my @ltiroles = qw(Instructor ContentDeveloper TeachingAssistant Learner);
-    map { $posslti{$_} = 1; } @ltiroles;
-    my @allfields = ('fullname','firstname','lastname','email','user','roles');
-    map { $possfield{$_} = 1; } @allfields;
-    my %lt = &ltitools_names();
-    if ($env{'form.ltitools_add'}) {
-        my $title = $env{'form.ltitools_add_title'};
-        $title =~ s/(`)/'/g;
-        ($newid,my $error) = &get_ltitools_id($dom,$title);
-        if ($newid) {
-            my $position = $env{'form.ltitools_add_pos'};
-            $position =~ s/\D+//g;
-            if ($position ne '') {
-                $allpos[$position] = $newid;
-            }
-            $changes{$newid} = 1;
-            foreach my $item ('title','url','key','secret') {
-                $env{'form.ltitools_add_'.$item} =~ s/(`)/'/g;
-                if ($env{'form.ltitools_add_'.$item}) {
-                    if (($item eq 'key') || ($item eq 'secret')) {
-                        $encconfig{$newid}{$item} = $env{'form.ltitools_add_'.$item};
-                    } else {
-                        $confhash{$newid}{$item} = $env{'form.ltitools_add_'.$item};
-                    }
-                }
-            }
-            if ($env{'form.ltitools_add_version'} eq 'LTI-1p0') {
-                $confhash{$newid}{'version'} = $env{'form.ltitools_add_version'};
-            }
-            if ($env{'form.ltitools_add_msgtype'} eq 'basic-lti-launch-request') {
-                $confhash{$newid}{'msgtype'} = $env{'form.ltitools_add_msgtype'};
-            }
-            foreach my $item ('width','height','linktext','explanation') {
-                $env{'form.ltitools_add_'.$item} =~ s/^\s+//;
-                $env{'form.ltitools_add_'.$item} =~ s/\s+$//;
-                if (($item eq 'width') || ($item eq 'height')) {
-                    if ($env{'form.ltitools_add_'.$item} =~ /^\d+$/) {
-                        $confhash{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item};
-                    }
-                } else {
-                    if ($env{'form.ltitools_add_'.$item} ne '') {
-                        $confhash{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item};
-                    }
-                }
-            }
-            if ($env{'form.ltitools_add_target'} eq 'window') {
-                $confhash{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'};
-            } elsif ($env{'form.ltitools_add_target'} eq 'tab') {
-                $confhash{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'};
-            } else {
-                $confhash{$newid}{'display'}{'target'} = 'iframe';
-            }
-            foreach my $item ('passback','roster') {
-                if ($env{'form.ltitools_add_'.$item}) {
-                    $confhash{$newid}{$item} = 1;
-                }
-            }
-            if ($env{'form.ltitools_add_image.filename'} ne '') {
-                my ($imageurl,$error) =
-                    &process_ltitools_image($r,$dom,$confname,'ltitools_add_image',$newid,
-                                            $configuserok,$switchserver,$author_ok);
-                if ($imageurl) {
-                    $confhash{$newid}{'image'} = $imageurl;
-                }
-                if ($error) {
-                    &Apache::lonnet::logthis($error);
-                    $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
-                }
-            }
-            my @fields = &Apache::loncommon::get_env_multiple('form.ltitools_add_fields');
-            foreach my $field (@fields) {
-                if ($possfield{$field}) {
-                    if ($field eq 'roles') {
-                        foreach my $role (@courseroles) {
-                            my $choice = $env{'form.ltitools_add_roles_'.$role};
-                            if (($choice ne '') && ($posslti{$choice})) {
-                                $confhash{$newid}{'roles'}{$role} = $choice;
-                                if ($role eq 'cc') {
-                                    $confhash{$newid}{'roles'}{'co'} = $choice;
-                                }
-                            }
-                        }
-                    } else {
-                        $confhash{$newid}{'fields'}{$field} = 1;
-                    }
-                }
-            }
-            my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig');
-            foreach my $item (@courseconfig) {
-                $confhash{$newid}{'crsconf'}{$item} = 1;
-            }
-            if ($env{'form.ltitools_add_custom'}) {
-                my $name = $env{'form.ltitools_add_custom_name'};
-                my $value = $env{'form.ltitools_add_custom_value'};
-                $value =~ s/(`)/'/g;
-                $name =~ s/(`)/'/g;
-                $confhash{$newid}{'custom'}{$name} = $value;
-            }
-        } else {
-            my $error = &mt('Failed to acquire unique ID for new external tool');
-            $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
-        }
-    }
-    if (ref($domconfig{$action}) eq 'HASH') {
-        my %deletions;
-        my @todelete = &Apache::loncommon::get_env_multiple('form.ltitools_del');
-        if (@todelete) {
-            map { $deletions{$_} = 1; } @todelete;
-        }
-        my %customadds;
-        my @newcustom = &Apache::loncommon::get_env_multiple('form.ltitools_customadd');
-        if (@newcustom) {
-            map { $customadds{$_} = 1; } @newcustom;
-        }
-        my %imgdeletions;
-        my @todeleteimages = &Apache::loncommon::get_env_multiple('form.ltitools_image_del');
-        if (@todeleteimages) {
-            map { $imgdeletions{$_} = 1; } @todeleteimages;
-        }
-        my $maxnum = $env{'form.ltitools_maxnum'};
-        for (my $i=0; $i<=$maxnum; $i++) {
-            my $itemid = $env{'form.ltitools_id_'.$i};
-            $itemid =~ s/\D+//g;
-            if (ref($domconfig{$action}{$itemid}) eq 'HASH') {
-                if ($deletions{$itemid}) {
-                    if ($domconfig{$action}{$itemid}{'image'}) {
-                        #FIXME need to obsolete item in RES space
-                    }
-                    $changes{$itemid} = $domconfig{$action}{$itemid}{'title'};
-                    next;
-                } else {
-                    my $newpos = $env{'form.ltitools_'.$itemid};
-                    $newpos =~ s/\D+//g;
-                    foreach my $item ('title','url') {
-                        $confhash{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i};
-                        if ($domconfig{$action}{$itemid}{$item} ne $confhash{$itemid}{$item}) {
-                            $changes{$itemid} = 1;
-                        }
-                    }
-                    foreach my $item ('key','secret') {
-                        $encconfig{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i};
-                        if ($domconfig{$action}{$itemid}{$item} ne $encconfig{$itemid}{$item}) {
-                            $changes{$itemid} = 1;
-                        }
-                    }
-                    if ($env{'form.ltitools_version_'.$i} eq 'LTI-1p0') {
-                        $confhash{$itemid}{'version'} = $env{'form.ltitools_version_'.$i};
-                    }
-                    if ($env{'form.ltitools_msgtype_'.$i} eq 'basic-lti-launch-request') {
-                        $confhash{$itemid}{'msgtype'} = $env{'form.ltitools_msgtype_'.$i};
-                    }
-                    foreach my $size ('width','height') {
-                        $env{'form.ltitools_'.$size.'_'.$i} =~ s/^\s+//;
-                        $env{'form.ltitools_'.$size.'_'.$i} =~ s/\s+$//;
-                        if ($env{'form.ltitools_'.$size.'_'.$i} =~ /^\d+$/) {
-                            $confhash{$itemid}{'display'}{$size} = $env{'form.ltitools_'.$size.'_'.$i};
-                            if (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') {
-                                if ($domconfig{$action}{$itemid}{'display'}{$size} ne $confhash{$itemid}{'display'}{$size}) {
-                                    $changes{$itemid} = 1;
-                                }
-                            } else {
-                                $changes{$itemid} = 1;
-                            }
-                        } elsif (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') {
-                            if ($domconfig{$action}{$itemid}{'display'}{$size} ne '') {
-                                $changes{$itemid} = 1;
-                            }
-                        }
-                    }
-                    foreach my $item ('linktext','explanation') {
-                        $env{'form.ltitools_'.$item.'_'.$i} =~ s/^\s+//;
-                        $env{'form.ltitools_'.$item.'_'.$i} =~ s/\s+$//;
-                        if ($env{'form.ltitools_'.$item.'_'.$i} ne '') {
-                            $confhash{$itemid}{'display'}{$item} = $env{'form.ltitools_'.$item.'_'.$i};
-                            if (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') {
-                                if ($domconfig{$action}{$itemid}{'display'}{$item} ne $confhash{$itemid}{'display'}{$item}) {
-                                    $changes{$itemid} = 1;
-                                }
-                            } else {
-                                $changes{$itemid} = 1;
-                            }
-                        } elsif (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') {
-                            if ($domconfig{$action}{$itemid}{'display'}{$item} ne '') {
-                                $changes{$itemid} = 1;
-                            }
-                        }
-                    }
-                    if ($env{'form.ltitools_target_'.$i} eq 'window') {
-                        $confhash{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i};
-                    } elsif ($env{'form.ltitools_target_'.$i} eq 'tab') {
-                        $confhash{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i};
-                    } else {
-                        $confhash{$itemid}{'display'}{'target'} = 'iframe';
-                    }
-                    if (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') {
-                        if ($domconfig{$action}{$itemid}{'display'}{'target'} ne $confhash{$itemid}{'display'}{'target'}) {
-                            $changes{$itemid} = 1;
-                        }
-                    } else {
-                        $changes{$itemid} = 1;
-                    }
-                    foreach my $extra ('passback','roster') {
-                        if ($env{'form.ltitools_'.$extra.'_'.$i}) {
-                            $confhash{$itemid}{$extra} = 1;
-                        }
-                        if ($domconfig{$action}{$itemid}{$extra} ne $confhash{$itemid}{$extra}) {
-                            $changes{$itemid} = 1;
-                        }
-                    }
-                    my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig_'.$i);
-                    foreach my $item ('label','title','target','linktext','explanation') {
-                        if (grep(/^\Q$item\E$/,@courseconfig)) {
-                            $confhash{$itemid}{'crsconf'}{$item} = 1;
-                            if (ref($domconfig{$action}{$itemid}{'crsconf'}) eq 'HASH') {
-                                if ($domconfig{$action}{$itemid}{'crsconf'}{$item} ne $confhash{$itemid}{'crsconf'}{$item}) {
-                                    $changes{$itemid} = 1;
-                                }
-                            } else {
-                                $changes{$itemid} = 1;
-                            }
-                        }
-                    }
-                    my @fields = &Apache::loncommon::get_env_multiple('form.ltitools_fields_'.$i);
-                    foreach my $field (@fields) {
-                        if ($possfield{$field}) {
-                            if ($field eq 'roles') {
-                                foreach my $role (@courseroles) {
-                                    my $choice = $env{'form.ltitools_roles_'.$role.'_'.$i};
-                                    if (($choice ne '') && ($posslti{$choice})) {
-                                        $confhash{$itemid}{'roles'}{$role} = $choice;
-                                        if ($role eq 'cc') {
-                                            $confhash{$itemid}{'roles'}{'co'} = $choice;
-                                        }
-                                    }
-                                    if (ref($domconfig{$action}{$itemid}{'roles'}) eq 'HASH') {
-                                        if ($domconfig{$action}{$itemid}{'roles'}{$role} ne $confhash{$itemid}{'roles'}{$role}) {
-                                            $changes{$itemid} = 1;
-                                        }
-                                    } elsif ($confhash{$itemid}{'roles'}{$role}) {
-                                        $changes{$itemid} = 1;
-                                    }
-                                }
-                            } else {
-                                $confhash{$itemid}{'fields'}{$field} = 1;
-                                if (ref($domconfig{$action}{$itemid}{'fields'}) eq 'HASH') {
-                                    if ($domconfig{$action}{$itemid}{'fields'}{$field} ne $confhash{$itemid}{'fields'}{$field}) {
-                                        $changes{$itemid} = 1;
-                                    }
-                                } else {
-                                    $changes{$itemid} = 1;
-                                }
-                            }
-                        }
-                    }
-                    $allpos[$newpos] = $itemid;
-                }
-                if ($imgdeletions{$itemid}) {
-                    $changes{$itemid} = 1;
-                    #FIXME need to obsolete item in RES space
-                } elsif ($env{'form.ltitools_image_'.$i.'.filename'}) {
-                    my ($imgurl,$error) = &process_ltitools_image($r,$dom,$confname,'ltitools_image_'.$i,
-                                                                 $itemid,$configuserok,$switchserver,
-                                                                 $author_ok);
-                    if ($imgurl) {
-                        $confhash{$itemid}{'image'} = $imgurl;
-                        $changes{$itemid} = 1;
-                    }
-                    if ($error) {
-                        &Apache::lonnet::logthis($error);
-                        $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
-                    }
-                } elsif ($domconfig{$action}{$itemid}{'image'}) {
-                    $confhash{$itemid}{'image'} =
-                       $domconfig{$action}{$itemid}{'image'};
-                }
-                if ($customadds{$i}) {
-                    my $name = $env{'form.ltitools_custom_name_'.$i};
-                    $name =~ s/(`)/'/g;
-                    $name =~ s/^\s+//;
-                    $name =~ s/\s+$//;
-                    my $value = $env{'form.ltitools_custom_value_'.$i};
-                    $value =~ s/(`)/'/g;
-                    $value =~ s/^\s+//;
-                    $value =~ s/\s+$//;
-                    if ($name ne '') {
-                        $confhash{$itemid}{'custom'}{$name} = $value;
-                        $changes{$itemid} = 1;
-                    }
-                }
-                my %customdels;
-                my @customdeletions = &Apache::loncommon::get_env_multiple('form.ltitools_customdel_'.$i);
-                if (@customdeletions) {
-                    $changes{$itemid} = 1;
-                }
-                map { $customdels{$_} = 1; } @customdeletions;
-                if (ref($domconfig{$action}{$itemid}{'custom'}) eq 'HASH') {
-                    foreach my $key (keys(%{$domconfig{$action}{$itemid}{'custom'}})) {
-                        unless ($customdels{$key}) {
-                            if ($env{'form.ltitools_customval_'.$key.'_'.$i} ne '') {
-                                $confhash{$itemid}{'custom'}{$key} = $env{'form.ltitools_customval_'.$key.'_'.$i};
-                            }
-                            if ($domconfig{$action}{$itemid}{'custom'}{$key} ne $env{'form.ltitools_customval_'.$key.'_'.$i}) {
-                                $changes{$itemid} = 1;
-                            }
-                        }
-                    }
-                }
-                unless ($changes{$itemid}) {
-                    foreach my $key (keys(%{$domconfig{$action}{$itemid}})) {
-                        if (ref($domconfig{$action}{$itemid}{$key}) eq 'HASH') {
-                            if (ref($confhash{$itemid}{$key}) eq 'HASH') {
-                                foreach my $innerkey (keys(%{$domconfig{$action}{$itemid}{$key}})) {
-                                    unless (exists($confhash{$itemid}{$key}{$innerkey})) {
-                                        $changes{$itemid} = 1;
-                                        last;
-                                    }
-                                }
-                            } elsif (keys(%{$domconfig{$action}{$itemid}{$key}}) > 0) {
-                                $changes{$itemid} = 1;
-                            }
-                        }
-                        last if ($changes{$itemid});
-                    }
-                }
-            }
-        }
-    }
-    if (@allpos > 0) {
-        my $idx = 0;
-        foreach my $itemid (@allpos) {
-            if ($itemid ne '') {
-                $confhash{$itemid}{'order'} = $idx;
-                if (ref($domconfig{$action}) eq 'HASH') {
-                    if (ref($domconfig{$action}{$itemid}) eq 'HASH') {
-                        if ($domconfig{$action}{$itemid}{'order'} ne $idx) {
-                            $changes{$itemid} = 1;
-                        }
-                    }
-                }
-                $idx ++;
-            }
-        }
-    }
-    my %ltitoolshash = (
-                          $action => { %confhash }
-                       );
-    my $putresult = &Apache::lonnet::put_dom('configuration',\%ltitoolshash,
-                                             $dom);
-    if ($putresult eq 'ok') {
-        my %ltienchash = (
-                             $action => { %encconfig }
-                         );
-        &Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom);
-        if (keys(%changes) > 0) {
-            my $cachetime = 24*60*60;
-            my %ltiall = %confhash;
-            foreach my $id (keys(%ltiall)) {
-                if (ref($encconfig{$id}) eq 'HASH') {
-                    foreach my $item ('key','secret') {
-                        $ltiall{$id}{$item} = $encconfig{$id}{$item};
-                    }
-                }
-            }
-            &Apache::lonnet::do_cache_new('ltitools',$dom,\%ltiall,$cachetime);
-            if (ref($lastactref) eq 'HASH') {
-                $lastactref->{'ltitools'} = 1;
-            }
-            $resulttext = &mt('Changes made:').'<ul>';
-            my %bynum;
-            foreach my $itemid (sort(keys(%changes))) {
-                my $position = $confhash{$itemid}{'order'};
-                $bynum{$position} = $itemid;
-            }
-            foreach my $pos (sort { $a <=> $b } keys(%bynum)) {
-                my $itemid = $bynum{$pos};
-                if (ref($confhash{$itemid}) ne 'HASH') {
-                    $resulttext .= '<li>'.&mt('Deleted: [_1]',$changes{$itemid}).'</li>';
-                } else {
-                    $resulttext .= '<li><b>'.$confhash{$itemid}{'title'}.'</b>';
-                    if ($confhash{$itemid}{'image'}) {
-                        $resulttext .= '&nbsp;'.
-                                       '<img src="'.$confhash{$itemid}{'image'}.'"'.
-                                       ' alt="'.&mt('Tool Provider icon').'" />';
-                    }
-                    $resulttext .= '</li><ul>';
-                    my $position = $pos + 1;
-                    $resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>';
-                    foreach my $item ('version','msgtype','url') {
-                        if ($confhash{$itemid}{$item} ne '') {
-                            $resulttext .= '<li>'.$lt{$item}.':&nbsp;'.$confhash{$itemid}{$item}.'</li>';
-                        }
-                    }
-                    if ($encconfig{$itemid}{'key'} ne '') {
-                        $resulttext .= '<li>'.$lt{'key'}.':&nbsp;'.$encconfig{$itemid}{'key'}.'</li>';
-                    }
-                    if ($encconfig{$itemid}{'secret'} ne '') {
-                        $resulttext .= '<li>'.$lt{'secret'}.':&nbsp;';
-                        my $num = length($encconfig{$itemid}{'secret'});
-                        $resulttext .= ('*'x$num).'</li>';
-                    }
-                    $resulttext .= '<li>'.&mt('Configurable in course:');
-                    my @possconfig = ('label','title','target','linktext','explanation');
-                    my $numconfig = 0;
-                    if (ref($confhash{$itemid}{'crsconf'}) eq 'HASH') {
-                        foreach my $item (@possconfig) {
-                            if ($confhash{$itemid}{'crsconf'}{$item}) {
-                                $numconfig ++;
-                                $resulttext .= ' "'.$lt{'crs'.$item}.'"';
-                            }
-                        }
-                    }
-                    if (!$numconfig) {
-                        $resulttext .= &mt('None');
-                    }
-                    $resulttext .= '</li>';
-                    foreach my $item ('passback','roster') {
-                        $resulttext .= '<li>'.$lt{$item}.'&nbsp;';
-                        if ($confhash{$itemid}{$item}) {
-                            $resulttext .= &mt('Yes');
-                        } else {
-                            $resulttext .= &mt('No');
-                        }
-                        $resulttext .= '</li>';
-                    }
-                    if (ref($confhash{$itemid}{'display'}) eq 'HASH') {
-                        my $displaylist;
-                        if ($confhash{$itemid}{'display'}{'target'}) {
-                            $displaylist = &mt('Display target').':&nbsp;'.
-                                           $confhash{$itemid}{'display'}{'target'}.',';
-                        }
-                        foreach my $size ('width','height') {
-                            if ($confhash{$itemid}{'display'}{$size}) {
-                                $displaylist .= ('&nbsp;'x2).$lt{$size}.':&nbsp;'.
-                                                $confhash{$itemid}{'display'}{$size}.',';
-                            }
-                        }
-                        if ($displaylist) {
-                            $displaylist =~ s/,$//;
-                            $resulttext .= '<li>'.$displaylist.'</li>';
-                        }
-                        foreach my $item ('linktext','explanation') {
-                            if ($confhash{$itemid}{'display'}{$item}) {
-                                $resulttext .= '<li>'.$lt{$item}.':&nbsp;'.$confhash{$itemid}{'display'}{$item}.'</li>';
-                            }
-                        }
-                    }
-                    if (ref($confhash{$itemid}{'fields'}) eq 'HASH') {
-                        my $fieldlist;
-                        foreach my $field (@allfields) {
-                            if ($confhash{$itemid}{'fields'}{$field}) {
-                                $fieldlist .= ('&nbsp;'x2).$lt{$field}.',';
-                            }
-                        }
-                        if ($fieldlist) {
-                            $fieldlist =~ s/,$//;
-                            $resulttext .= '<li>'.&mt('Data sent').':'.$fieldlist.'</li>';
-                        }
-                    }
-                    if (ref($confhash{$itemid}{'roles'}) eq 'HASH') {
-                        my $rolemaps;
-                        foreach my $role (@courseroles) {
-                            if ($confhash{$itemid}{'roles'}{$role}) {
-                                $rolemaps .= ('&nbsp;'x2).&Apache::lonnet::plaintext($role,'Course').'='.
-                                             $confhash{$itemid}{'roles'}{$role}.',';
-                            }
-                        }
-                        if ($rolemaps) {
-                            $rolemaps =~ s/,$//;
-                            $resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>';
-                        }
-                    }
-                    if (ref($confhash{$itemid}{'custom'}) eq 'HASH') {
-                        my $customlist;
-                        if (keys(%{$confhash{$itemid}{'custom'}})) {
-                            foreach my $key (sort(keys(%{$confhash{$itemid}{'custom'}}))) {
-                                $customlist .= $key.':'.$confhash{$itemid}{'custom'}{$key}.('&nbsp;'x2);
-                            }
-                        }
-                        if ($customlist) {
-                            $resulttext .= '<li>'.&mt('Custom items').':'.$customlist.'</li>';
-                        }
-                    }
-                    $resulttext .= '</ul></li>';
-                }
-            }
-            $resulttext .= '</ul>';
-        } else {
-            $resulttext = &mt('No changes made.');
-        }
-    } else {
-        $errors .= '<li><span class="LC_error">'.&mt('Failed to save changes').'</span></li>';
-    }
-    if ($errors) {
-        $resulttext .= &mt('The following errors occurred: ').'<ul>'.
-                       $errors.'</ul>';
-    }
-    return $resulttext;
-}
-
-sub process_ltitools_image {
-    my ($r,$dom,$confname,$caller,$itemid,$configuserok,$switchserver,$author_ok) = @_;
-    my $filename = $env{'form.'.$caller.'.filename'};
-    my ($error,$url);
-    my ($width,$height) = (21,21);
-    if ($configuserok eq 'ok') {
-        if ($switchserver) {
-            $error = &mt('Upload of Tool Provider (LTI) icon is not permitted to this server: [_1]',
-                         $switchserver);
-        } elsif ($author_ok eq 'ok') {
-            my ($result,$imageurl,$madethumb) =
-                &publishlogo($r,'upload',$caller,$dom,$confname,
-                             "ltitools/$itemid/icon",$width,$height);
-            if ($result eq 'ok') {
-                if ($madethumb) {
-                    my ($path,$imagefile) = ($imageurl =~ m{^(.+)/([^/]+)$});
-                    my $imagethumb = "$path/tn-".$imagefile;
-                    $url = $imagethumb;
-                } else {
-                    $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 get_ltitools_id {
-    my ($cdom,$title) = @_;
-    # get lock on ltitools db
-    my $lockhash = {
-                      lock => $env{'user.name'}.
-                              ':'.$env{'user.domain'},
-                   };
-    my $tries = 0;
-    my $gotlock = &Apache::lonnet::newput_dom('ltitools',$lockhash,$cdom);
-    my ($id,$error);
-
-    while (($gotlock ne 'ok') && ($tries<10)) {
-        $tries ++;
-        sleep (0.1);
-        $gotlock = &Apache::lonnet::newput_dom('ltitools',$lockhash,$cdom);
-    }
-    if ($gotlock eq 'ok') {
-        my %currids = &Apache::lonnet::dump_dom('ltitools',$cdom);
-        if ($currids{'lock'}) {
-            delete($currids{'lock'});
-            if (keys(%currids)) {
-                my @curr = sort { $a <=> $b } keys(%currids);
-                if ($curr[-1] =~ /^\d+$/) {
-                    $id = 1 + $curr[-1];
-                }
-            } else {
-                $id = 1;
-            }
-            if ($id) {
-                unless (&Apache::lonnet::newput_dom('ltitools',{ $id => $title },$cdom) eq 'ok') {
-                    $error = 'nostore';
-                }
-            } else {
-                $error = 'nonumber';
-            }
-        }
-        my $dellockoutcome = &Apache::lonnet::del_dom('ltitools',['lock'],$cdom);
-    } else {
-        $error = 'nolock';
-    }
-    return ($id,$error);
-}
-
 sub modify_autoenroll {
-    my ($dom,$lastactref,%domconfig) = @_;
+    my ($dom,%domconfig) = @_;
     my ($resulttext,%changes);
     my %currautoenroll;
     if (ref($domconfig{'autoenroll'}) eq 'HASH') {
@@ -10935,8 +6117,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'};
@@ -10946,17 +6127,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,
@@ -10983,10 +6158,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'}) {
@@ -11002,20 +6174,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('Failsafe for no drops if institutional data missing for a section set to: [_1]',$failsafe).'</li>';
-                } else {
-                    $resulttext .= '<li>'.&mt('Failsafe for no drops if institutional data missing for a section: deleted');
-                }
-                &Apache::lonnet::get_domain_defaults($dom,1);
-                if (ref($lastactref) eq 'HASH') {
-                    $lastactref->{'domdefaults'} = 1;
-                }
             }
             $resulttext .= '</ul>';
         } else {
@@ -11232,7 +6390,7 @@ sub modify_autocreate {
         $newvals{$item} = 0 if ($newvals{$item} eq '');
     }
     $newvals{'xmldc'} = $env{'form.autocreate_xmldc'};
-    my %domcoords = &Apache::lonnet::get_active_domroles($dom,['dc']);
+    my %domcoords = &get_active_dcs($dom);
     unless (exists($domcoords{$newvals{'xmldc'}})) {
         $newvals{'xmldc'} = '';
     } 
@@ -11289,7 +6447,7 @@ sub modify_autocreate {
 }
 
 sub modify_directorysrch {
-    my ($dom,$lastactref,%domconfig) = @_;
+    my ($dom,%domconfig) = @_;
     my ($resulttext,%changes);
     my %currdirsrch;
     if (ref($domconfig{'directorysrch'}) eq 'HASH') {
@@ -11297,10 +6455,8 @@ sub modify_directorysrch {
             $currdirsrch{$key} = $domconfig{'directorysrch'}{$key};
         }
     }
-    my %title = ( available => 'Institutional directory search available',
-                  localonly => 'Other domains can search institution',
-                  lcavailable => 'LON-CAPA directory search available',
-                  lclocalonly => 'Other domains can search LON-CAPA domain',
+    my %title = ( available => 'Directory search available',
+                  localonly => 'Other domains can search',
                   searchby => 'Search types',
                   searchtypes => 'Search latitude');
     my @offon = ('off','on');
@@ -11374,9 +6530,7 @@ sub modify_directorysrch {
     my %dirsrch_hash =  (
             directorysrch => { available => $env{'form.dirsrch_available'},
                                cansearch => \@cansearch,
-                               localonly => $env{'form.dirsrch_instlocalonly'},
-                               lclocalonly => $env{'form.dirsrch_domlocalonly'},
-                               lcavailable => $env{'form.dirsrch_domavailable'},
+                               localonly => $env{'form.dirsrch_localonly'},
                                searchby => \@searchby,
                                searchtypes => \@searchtypes,
                              }
@@ -11393,47 +6547,24 @@ sub modify_directorysrch {
                 $changes{'available'} = 1;
             }
         }
-        if (exists($currdirsrch{'lcavailable'})) {
-            if ($currdirsrch{'lcavailable'} ne $env{'form.dirsrch_domavailable'}) {
-                $changes{'lcavailable'} = 1;
-            }
-        } else {
-            if ($env{'form.dirsrch_lcavailable'} eq '1') {
-                $changes{'lcavailable'} = 1;
-            }
-        }
         if (exists($currdirsrch{'localonly'})) {
-            if ($currdirsrch{'localonly'} ne $env{'form.dirsrch_instlocalonly'}) {
-                $changes{'localonly'} = 1;
-            }
+             if ($currdirsrch{'localonly'} ne $env{'form.dirsrch_localonly'}) {
+                 $changes{'localonly'} = 1;
+             }
         } else {
-            if ($env{'form.dirsrch_instlocalonly'} eq '1') {
+            if ($env{'form.dirsrch_localonly'} eq '1') {
                 $changes{'localonly'} = 1;
             }
         }
-        if (exists($currdirsrch{'lclocalonly'})) {
-            if ($currdirsrch{'lclocalonly'} ne $env{'form.dirsrch_domlocalonly'}) {
-                $changes{'lclocalonly'} = 1;
-            }
-        } else {
-            if ($env{'form.dirsrch_domlocalonly'} eq '1') {
-                $changes{'lclocalonly'} = 1;
-            }
-        }
         if (keys(%changes) > 0) {
             $resulttext = &mt('Changes made:').'<ul>';
             if ($changes{'available'}) {
                 $resulttext .= '<li>'.&mt("$title{'available'} set to: $offon[$env{'form.dirsrch_available'}]").'</li>';
             }
-            if ($changes{'lcavailable'}) {
-                $resulttext .= '<li>'.&mt("$title{'lcavailable'} set to: $offon[$env{'form.dirsrch_domavailable'}]").'</li>';
-            }
             if ($changes{'localonly'}) {
-                $resulttext .= '<li>'.&mt("$title{'localonly'} set to: $otherdoms[$env{'form.dirsrch_instlocalonly'}]").'</li>';
-            }
-            if ($changes{'lclocalonly'}) {
-                $resulttext .= '<li>'.&mt("$title{'lclocalonly'} set to: $otherdoms[$env{'form.dirsrch_domlocalonly'}]").'</li>';
+                $resulttext .= '<li>'.&mt("$title{'localonly'} set to: $otherdoms[$env{'form.dirsrch_localonly'}]").'</li>';
             }
+
             if (ref($changes{'cansearch'}) eq 'ARRAY') {
                 my $chgtext;
                 if (ref($usertypes) eq 'HASH') {
@@ -11448,7 +6579,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).
@@ -11483,12 +6614,8 @@ sub modify_directorysrch {
                 $resulttext .= '<li>'.&mt($title{'searchtypes'}.' set to: "[_1]"',$chgtext).'</li>';
             }
             $resulttext .= '</ul>';
-            &Apache::lonnet::do_cache_new('directorysrch',$dom,$dirsrch_hash{'directorysrch'},3600);
-            if (ref($lastactref) eq 'HASH') {
-                $lastactref->{'directorysrch'} = 1;
-            }
         } else {
-            $resulttext = &mt('No changes made to directory search settings');
+            $resulttext = &mt('No changes made to institution directory search settings');
         }
     } else {
         $resulttext = '<span class="LC_error">'.
@@ -11498,19 +6625,17 @@ 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'}})) {
             $currsetting{$key} = $domconfig{'contacts'}{$key};
         }
     }
-    my (%others,%to,%bcc,%includestr,%includeloc);
+    my (%others,%to,%bcc);
     my @contacts = ('supportemail','adminemail');
-    my @mailings = ('errormail','packagesmail','helpdeskmail','otherdomsmail',
-                    'lonstatusmail','requestsmail','updatesmail','idconflictsmail','hostipmail');
-    my @toggles = ('reporterrors','reportupdates');
-    my ($fields,$fieldtitles,$fieldoptions,$possoptions) = &helpform_fields();
+    my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail',
+                    'requestsmail','updatesmail');
     foreach my $type (@mailings) {
         @{$newsetting{$type}} = 
             &Apache::loncommon::get_env_multiple('form.'.$type);
@@ -11520,85 +6645,18 @@ sub modify_contacts {
             } else {
                 $contacts_hash{contacts}{$type}{$item} = 0;
             }
-        }
+        }  
         $others{$type} = $env{'form.'.$type.'_others'};
         $contacts_hash{contacts}{$type}{'others'} = $others{$type};
-        if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
+        if ($type eq 'helpdeskmail') {
             $bcc{$type} = $env{'form.'.$type.'_bcc'};
             $contacts_hash{contacts}{$type}{'bcc'} = $bcc{$type};
-            if (($env{'form.'.$type.'_includestr'} ne '') && ($env{'form.'.$type.'_includeloc'} =~ /^s|b$/)) {
-                $includestr{$type} = $env{'form.'.$type.'_includestr'};
-                $includeloc{$type} = $env{'form.'.$type.'_includeloc'};
-                $contacts_hash{contacts}{$type}{'include'} = $includeloc{$type}.':'.&escape($includestr{$type});
-            }
         }
     }
     foreach my $item (@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 ((ref($fields) eq 'ARRAY') && (ref($possoptions) eq 'HASH')) {
-        foreach my $field (@{$fields}) {
-            if (ref($possoptions->{$field}) eq 'ARRAY') {
-                my $value = $env{'form.helpform_'.$field};
-                $value =~ s/^\s+|\s+$//g;
-                if (grep(/^\Q$value\E$/,@{$possoptions->{$field}})) {
-                    $contacts_hash{'contacts'}{'helpform'}{$field} = $value;
-                    if ($field eq 'screenshot') {
-                        $env{'form.helpform_maxsize'} =~ s/^\s+|\s+$//g;
-                        if ($env{'form.helpform_maxsize'} =~ /^\d+\.?\d*$/) {
-                            $contacts_hash{'contacts'}{'helpform'}{'maxsize'} = $env{'form.helpform_maxsize'};
-                        }
-                    }
-                }
-            }
-        }
-    }
-    my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-    my (@statuses,%usertypeshash,@overrides);
-    if ((ref($types) eq 'ARRAY') && (@{$types} > 0)) {
-        @statuses = @{$types};
-        if (ref($usertypes) eq 'HASH') {
-            %usertypeshash = %{$usertypes};
-        }
-    }
-    if (@statuses) {
-        my @possoverrides = &Apache::loncommon::get_env_multiple('form.overrides');
-        foreach my $type (@possoverrides) {
-            if (($type ne '') && (grep(/^\Q$type\E$/,@statuses))) {
-                push(@overrides,$type);
-            }
-        }
-        if (@overrides) {
-            foreach my $type (@overrides) {
-                my @standard = &Apache::loncommon::get_env_multiple('form.override_'.$type);
-                foreach my $item (@contacts) {
-                    if (grep(/^\Q$item\E$/,@standard)) {
-                        $contacts_hash{'contacts'}{'overrides'}{$type}{$item} = 1;
-                        $newsetting{'override_'.$type}{$item} = 1;
-                    } else {
-                        $contacts_hash{'contacts'}{'overrides'}{$type}{$item} = 0;
-                        $newsetting{'override_'.$type}{$item} = 0;
-                    }
-                }
-                $contacts_hash{'contacts'}{'overrides'}{$type}{'others'} = $env{'form.override_'.$type.'_others'};
-                $contacts_hash{'contacts'}{'overrides'}{$type}{'bcc'} = $env{'form.override_'.$type.'_bcc'};
-                $newsetting{'override_'.$type}{'others'} = $env{'form.override_'.$type.'_others'};
-                $newsetting{'override_'.$type}{'bcc'} = $env{'form.override_'.$type.'_bcc'};
-                if (($env{'form.override_'.$type.'_includestr'} ne '') && ($env{'form.override_'.$type.'_includeloc'} =~ /^s|b$/)) {
-                    $includestr{$type} = $env{'form.override_'.$type.'_includestr'};
-                    $includeloc{$type} = $env{'form.override_'.$type.'_includeloc'};
-                    $contacts_hash{'contacts'}{'overrides'}{$type}{'include'} = $includeloc{$type}.':'.&escape($includestr{$type});
-                    $newsetting{'override_'.$type}{'include'} = $contacts_hash{'contacts'}{'overrides'}{$type}{'include'};
-                }
-            }    
-        }
-    }
     if (keys(%currsetting) > 0) {
         foreach my $item (@contacts) {
             if ($to{$item} ne $currsetting{$item}) {
@@ -11618,66 +6676,10 @@ sub modify_contacts {
             if ($others{$type} ne $currsetting{$type}{'others'}) {
                 push(@{$changes{$type}},'others');
             }
-            if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
+            if ($type eq 'helpdeskmail') {   
                 if ($bcc{$type} ne $currsetting{$type}{'bcc'}) {
                     push(@{$changes{$type}},'bcc'); 
                 }
-                my ($currloc,$currstr) = split(/:/,$currsetting{$type}{'include'},2);
-                if (($includeloc{$type} ne $currloc) || (&escape($includestr{$type}) ne $currstr)) {
-                    push(@{$changes{$type}},'include');
-                }
-            }
-        }
-        if (ref($fields) eq 'ARRAY') {
-            if (ref($currsetting{'helpform'}) eq 'HASH') {
-                foreach my $field (@{$fields}) {
-                    if ($currsetting{'helpform'}{$field} ne $contacts_hash{'contacts'}{'helpform'}{$field}) {
-                        push(@{$changes{'helpform'}},$field);
-                    }
-                    if (($field eq 'screenshot') && ($contacts_hash{'contacts'}{'helpform'}{'screenshot'} ne 'no')) {
-                        if ($currsetting{'helpform'}{'maxsize'} ne $contacts_hash{'contacts'}{'helpform'}{'maxsize'}) {
-                            push(@{$changes{'helpform'}},'maxsize');
-                        }
-                    }
-                }
-            } else {
-                foreach my $field (@{$fields}) {
-                    if ($contacts_hash{'contacts'}{'helpform'}{$field} ne 'yes') {
-                        push(@{$changes{'helpform'}},$field);
-                    }
-                    if (($field eq 'screenshot') && ($contacts_hash{'contacts'}{'helpform'}{'screenshot'} ne 'no')) {
-                        if ($contacts_hash{'contacts'}{'helpform'}{'maxsize'} != 1) {
-                            push(@{$changes{'helpform'}},'maxsize');
-                        }
-                    }
-                }
-            }
-        }
-        if (@statuses) {
-            if (ref($currsetting{'overrides'}) eq 'HASH') {
-                foreach my $key (keys(%{$currsetting{'overrides'}})) {
-                    if (ref($currsetting{'overrides'}{$key}) eq 'HASH') {
-                        if (ref($newsetting{'override_'.$key}) eq 'HASH') {
-                            foreach my $item (@contacts,'bcc','others','include') {
-                                if ($currsetting{'overrides'}{$key}{$item} ne $newsetting{'override_'.$key}{$item}) {
-                                    push(@{$changes{'overrides'}},$key);
-                                    last;
-                                }
-                            }
-                        } else {
-                            push(@{$changes{'overrides'}},$key);
-                        }
-                    }
-                }
-                foreach my $key (@overrides) {
-                    unless (exists($currsetting{'overrides'}{$key})) {
-                        push(@{$changes{'overrides'}},$key);
-                    }
-                }
-            } else {
-                foreach my $key (@overrides) {
-                    push(@{$changes{'overrides'}},$key);
-                }
             }
         }
     } else {
@@ -11687,61 +6689,33 @@ sub modify_contacts {
         $default{'errormail'} = 'adminemail';
         $default{'packagesmail'} = 'adminemail';
         $default{'helpdeskmail'} = 'supportemail';
-        $default{'otherdomsmail'} = 'supportemail';
         $default{'lonstatusmail'} = 'adminemail';
         $default{'requestsmail'} = 'adminemail';
         $default{'updatesmail'} = 'adminemail';
-        $default{'hostipmail'} = 'adminemail';
         foreach my $item (@contacts) {
            if ($to{$item} ne $default{$item}) {
-               $changes{$item} = 1;
-           }
+              $changes{$item} = 1;
+           } 
         }
         foreach my $type (@mailings) {
             if ((@{$newsetting{$type}} != 1) || ($newsetting{$type}[0] ne $default{$type})) {
+               
                 push(@{$changes{$type}},@{$newsetting{$type}});
             }
             if ($others{$type} ne '') {
                 push(@{$changes{$type}},'others');
             }
-            if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
+            if ($type eq 'helpdeskmail') {
                 if ($bcc{$type} ne '') {
                     push(@{$changes{$type}},'bcc');
                 }
-                if (($includeloc{$type} =~ /^b|s$/) && ($includestr{$type} ne '')) {
-                    push(@{$changes{$type}},'include');
-                }
-            }
-        }
-        if (ref($fields) eq 'ARRAY') {
-            foreach my $field (@{$fields}) {
-                if ($contacts_hash{'contacts'}{'helpform'}{$field} ne 'yes') {
-                    push(@{$changes{'helpform'}},$field);
-                }
-                if (($field eq 'screenshot') && ($contacts_hash{'contacts'}{'helpform'}{'screenshot'} ne 'no')) {
-                    if ($contacts_hash{'contacts'}{'helpform'}{'maxsize'} != 1) {
-                        push(@{$changes{'helpform'}},'maxsize');
-                    }
-                }
             }
         }
     }
-    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) {
@@ -11754,11 +6728,7 @@ sub modify_contacts {
             }
             foreach my $type (@mailings) {
                 if (ref($changes{$type}) eq 'ARRAY') {
-                    if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
-                        $resulttext .= '<li>'.$titles->{$type}.' -- '.&mt('sent to').': ';
-                    } else {
-                        $resulttext .= '<li>'.$titles->{$type}.': ';
-                    }
+                    $resulttext .= '<li>'.$titles->{$type}.': ';
                     my @text;
                     foreach my $item (@{$newsetting{$type}}) {
                         push(@text,$short_titles->{$item});
@@ -11766,149 +6736,19 @@ sub modify_contacts {
                     if ($others{$type} ne '') {
                         push(@text,$others{$type});
                     }
-                    if (@text) {
-                        $resulttext .= '<span class="LC_cusr_emph">'.
-                                       join(', ',@text).'</span>';
-                    }
-                    if (($type eq 'helpdeskmail') || ($type eq 'otherdomsmail')) {
+                    $resulttext .= '<span class="LC_cusr_emph">'.
+                                   join(', ',@text).'</span>';
+                    if ($type eq 'helpdeskmail') {
                         if ($bcc{$type} ne '') {
-                            my $bcctext;
-                            if (@text) {
-                                $bcctext = '&nbsp;'.&mt('with Bcc to');
-                            } else {
-                                $bcctext = '(Bcc)';
-                            }
-                            $resulttext .= $bcctext.': <span class="LC_cusr_emph">'.$bcc{$type}.'</span>';
-                        } elsif (!@text) {
-                            $resulttext .= &mt('No one');
-                        }
-                        if ($includestr{$type} ne '') {
-                            if ($includeloc{$type} eq 'b') {
-                                $resulttext .= '<br />'.&mt('Text automatically added to e-mail body:').' '.$includestr{$type};
-                            } elsif ($includeloc{$type} eq 's') {
-                                $resulttext .= '<br />'.&mt('Text automatically added to e-mail subject:').' '.$includestr{$type};
-                            }
+                            $resulttext .= '&nbsp;'.&mt('with Bcc to').': <span class="LC_cusr_emph">'.$bcc{$type}.'</span>';
                         }
-                    } elsif (!@text) {
-                        $resulttext .= &mt('No recipients');
                     }
                     $resulttext .= '</li>';
                 }
             }
-            if (ref($changes{'overrides'}) eq 'ARRAY') {
-                my @deletions;
-                foreach my $type (@{$changes{'overrides'}}) {
-                    if ($usertypeshash{$type}) {
-                        if (grep(/^\Q$type\E/,@overrides)) {
-                            $resulttext .= '<li>'.&mt("Overrides based on requester's affiliation set for [_1]",
-                                                      $usertypeshash{$type}).'<ul><li>';
-                            if (ref($newsetting{'override_'.$type}) eq 'HASH') {
-                                my @text;
-                                foreach my $item (@contacts) {
-                                    if ($newsetting{'override_'.$type}{$item}) {
-                                        push(@text,$short_titles->{$item});
-                                    }
-                                }
-                                if ($newsetting{'override_'.$type}{'others'} ne '') {
-                                    push(@text,$newsetting{'override_'.$type}{'others'});
-                                }
-
-                                if (@text) {
-                                    $resulttext .= &mt('Helpdesk e-mail sent to: [_1]',
-                                                       '<span class="LC_cusr_emph">'.join(', ',@text).'</span>');
-                                }
-                                if ($newsetting{'override_'.$type}{'bcc'} ne '') {
-                                    my $bcctext;
-                                    if (@text) {
-                                        $bcctext = '&nbsp;'.&mt('with Bcc to');
-                                    } else {
-                                        $bcctext = '(Bcc)';
-                                    }
-                                    $resulttext .= $bcctext.': <span class="LC_cusr_emph">'.$newsetting{'override_'.$type}{'bcc'}.'</span>';
-                                } elsif (!@text) {
-                                     $resulttext .= &mt('Helpdesk e-mail sent to no one');
-                                }
-                                $resulttext .= '</li>';
-                                if ($newsetting{'override_'.$type}{'include'} ne '') {
-                                    my ($loc,$str) = split(/:/,$newsetting{'override_'.$type}{'include'});
-                                    if ($loc eq 'b') {
-                                        $resulttext .= '<li>'.&mt('Text automatically added to e-mail body:').' '.&unescape($str).'</li>';
-                                    } elsif ($loc eq 's') {
-                                        $resulttext .= '<li>'.&mt('Text automatically added to e-mail subject:').' '.&unescape($str).'</li>';
-                                    }
-                                }
-                            }
-                            $resulttext .= '</li></ul></li>';
-                        } else {
-                            push(@deletions,$usertypeshash{$type});
-                        }
-                    }
-                }
-                if (@deletions) {
-                    $resulttext .= '<li>'.&mt("Overrides based on requester's affiliation discontinued for: [_1]",
-                                              join(', ',@deletions)).'</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>';
-            }
-            if ((ref($changes{'helpform'}) eq 'ARRAY') && (ref($fields) eq 'ARRAY')) {
-                my (@optional,@required,@unused,$maxsizechg);
-                foreach my $field (@{$changes{'helpform'}}) {
-                    if ($field eq 'maxsize') {
-                        $maxsizechg = 1;
-                        next;
-                    }
-                    if ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'yes') {
-                        push(@optional,$field);
-                    } elsif ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'no') {
-                        push(@unused,$field);
-                    } elsif ($contacts_hash{'contacts'}{'helpform'}{$field} eq 'req') {
-                        push(@required,$field);
-                    }
-                }
-                if (@optional) {
-                    $resulttext .= '<li>'.
-                                   &mt('Help form fields changed to "Optional": [_1].',
-                                       '<span class="LC_cusr_emph">'.join(', ',map { $fieldtitles->{$_}; } @optional)).'</span>'.
-                                   '</li>';
-                }
-                if (@required) {
-                    $resulttext .= '<li>'.
-                                   &mt('Help form fields changed to "Required": [_1].',
-                                       '<span class="LC_cusr_emph">'.join(', ',map { $fieldtitles->{$_}; } @required)).'</span>'.
-                                   '</li>';
-                }
-                if (@unused) {
-                    $resulttext .= '<li>'.
-                                   &mt('Help form fields changed to "Not shown": [_1].',
-                                       '<span class="LC_cusr_emph">'.join(', ',map { $fieldtitles->{$_}; } @unused)).'</span>'.
-                                   '</li>';
-                }
-                if ($maxsizechg) {
-                    $resulttext .= '<li>'.
-                                   &mt('Max size for file uploaded to help form by logged-in user set to [_1] MB.',
-                                       $contacts_hash{'contacts'}{'helpform'}{'maxsize'}).
-                                   '</li>';
-                }
-            }
             $resulttext .= '</ul>';
         } else {
-            $resulttext = &mt('No changes made to contacts and form settings');
+            $resulttext = &mt('No changes made to contact information');
         }
     } else {
         $resulttext = '<span class="LC_error">'.
@@ -11917,559 +6757,108 @@ sub modify_contacts {
     return $resulttext;
 }
 
-sub modify_passwords {
-    my ($r,$dom,$confname,$lastactref,%domconfig) = @_;
-    my ($resulttext,%current,%changes,%newvalues,@oktypes,$errors,
-        $updatedefaults,$updateconf);
-    my $customfn = 'resetpw.html';
-    if (ref($domconfig{'passwords'}) eq 'HASH') {
-        %current = %{$domconfig{'passwords'}};
-    }
-    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
-    my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-    if (ref($types) eq 'ARRAY') {
-        @oktypes = @{$types};
-    }
-    push(@oktypes,'default');
-
-    my %titles = &Apache::lonlocal::texthash (
-        intauth_cost   => 'Encryption cost for bcrypt (positive integer)',
-        intauth_check  => 'Check bcrypt cost if authenticated',
-        intauth_switch => 'Existing crypt-based switched to bcrypt on authentication',
-        permanent      => 'Permanent e-mail address',
-        critical       => 'Critical notification address',
-        notify         => 'Notification address',
-        min            => 'Minimum password length',
-        max            => 'Maximum password length',
-        chars          => 'Required characters',
-        numsaved       => 'Number of previous passwords to save',
-        reset          => 'Resetting Forgotten Password',
-        intauth        => 'Encryption of Stored Passwords (Internal Auth)',
-        rules          => 'Rules for LON-CAPA Passwords',
-        crsownerchg    => 'Course Owner Changing Student Passwords',
-        username       => 'Username',
-        email          => 'E-mail address',
-    );
-
-#
-# Retrieve current domain configuration for internal authentication from $domconfig{'defaults'}.
-#
-    my (%curr_defaults,%save_defaults);
-    if (ref($domconfig{'defaults'}) eq 'HASH') {
-        foreach my $key (keys(%{$domconfig{'defaults'}})) {
-            if ($key =~ /^intauth_(cost|check|switch)$/) {
-                $curr_defaults{$key} = $domconfig{'defaults'}{$key};
-            } else {
-                $save_defaults{$key} = $domconfig{'defaults'}{$key};
-            }
-        }
-    }
-    my %staticdefaults = (
-        'resetlink'      => 2,
-        'resetcase'      => \@oktypes,
-        'resetprelink'   => 'both',
-        'resetemail'     => ['critical','notify','permanent'],
-        'intauth_cost'   => 10,
-        'intauth_check'  => 0,
-        'intauth_switch' => 0,
-    );
-    $staticdefaults{'min'} = $Apache::lonnet::passwdmin;
-    foreach my $type (@oktypes) {
-        $staticdefaults{'resetpostlink'}{$type} = ['email','username'];
-    }
-    my $linklife = $env{'form.passwords_link'};
-    $linklife =~ s/^\s+|\s+$//g;
-    if (($linklife =~ /^\d+(|\.\d*)$/) && ($linklife > 0)) {
-        $newvalues{'resetlink'} = $linklife;
-        if ($current{'resetlink'}) {
-            if ($current{'resetlink'} ne $linklife) {
-                $changes{'reset'} = 1;
-            }
-        } elsif (!ref($domconfig{passwords}) eq 'HASH') {
-            if ($staticdefaults{'resetlink'} ne $linklife) {
-                $changes{'reset'} = 1;
-            }
-        }
-    } elsif ($current{'resetlink'}) {
-        $changes{'reset'} = 1;
-    }
-    my @casesens;
-    my @posscase = &Apache::loncommon::get_env_multiple('form.passwords_case_sensitive');
-    foreach my $case (sort(@posscase)) {
-        if (grep(/^\Q$case\E$/,@oktypes)) {
-            push(@casesens,$case);
-        }
-    }
-    $newvalues{'resetcase'} = \@casesens;
-    if (ref($current{'resetcase'}) eq 'ARRAY') {
-        my @diffs = &Apache::loncommon::compare_arrays($current{'resetcase'},\@casesens);
-        if (@diffs > 0) {
-            $changes{'reset'} = 1;
-        }
-    } elsif (!ref($domconfig{passwords}) eq 'HASH') {
-        my @diffs = &Apache::loncommon::compare_arrays($staticdefaults{'resetcase'},\@casesens);
-        if (@diffs > 0) {
-            $changes{'reset'} = 1;
-        }
-    }
-    if ($env{'form.passwords_prelink'} =~ /^(both|either)$/) {
-        $newvalues{'resetprelink'} = $env{'form.passwords_prelink'};
-        if (exists($current{'resetprelink'})) {
-            if ($current{'resetprelink'} ne $newvalues{'resetprelink'}) {
-                $changes{'reset'} = 1;
-            }
-        } elsif (!ref($domconfig{passwords}) eq 'HASH') {
-            if ($staticdefaults{'resetprelink'} ne $newvalues{'resetprelink'}) {
-                $changes{'reset'} = 1;
-            }
-        }
-    } elsif ($current{'resetprelink'}) {
-        $changes{'reset'} = 1;
-    }
-    foreach my $type (@oktypes) {
-        my @possplink = &Apache::loncommon::get_env_multiple('form.passwords_postlink_'.$type);
-        my @postlink;
-        foreach my $item (sort(@possplink)) {
-            if ($item =~ /^(email|username)$/) {
-                push(@postlink,$item);
-            }
-        }
-        $newvalues{'resetpostlink'}{$type} = \@postlink;
-        unless ($changes{'reset'}) {
-            if (ref($current{'resetpostlink'}) eq 'HASH') {
-                if (ref($current{'resetpostlink'}{$type}) eq 'ARRAY') {
-                    my @diffs = &Apache::loncommon::compare_arrays($current{'resetpostlink'}{$type},\@postlink);
-                    if (@diffs > 0) {
-                        $changes{'reset'} = 1;
-                    }
-                } else {
-                    $changes{'reset'} = 1;
-                }
-            } elsif (!ref($domconfig{passwords}) eq 'HASH') {
-                my @diffs = &Apache::loncommon::compare_arrays($staticdefaults{'resetpostlink'}{$type},\@postlink);
-                if (@diffs > 0) {
-                    $changes{'reset'} = 1;
-                }
-            }
-        }
-    }
-    my @possemailsrc = &Apache::loncommon::get_env_multiple('form.passwords_emailsrc');
-    my @resetemail;
-    foreach my $item (sort(@possemailsrc)) {
-        if ($item =~ /^(permanent|critical|notify)$/) {
-            push(@resetemail,$item);
-        }
-    }
-    $newvalues{'resetemail'} = \@resetemail;
-    unless ($changes{'reset'}) {
-        if (ref($current{'resetemail'}) eq 'ARRAY') {
-            my @diffs = &Apache::loncommon::compare_arrays($current{'resetemail'},\@resetemail);
-            if (@diffs > 0) {
-                $changes{'reset'} = 1;
-            }
-        } elsif (!ref($domconfig{passwords}) eq 'HASH') {
-            my @diffs = &Apache::loncommon::compare_arrays($staticdefaults{'resetemail'},\@resetemail);
-            if (@diffs > 0) {
-                $changes{'reset'} = 1;
-            }
-        }
-    }
-    if ($env{'form.passwords_stdtext'} == 0) {
-        $newvalues{'resetremove'} = 1;
-        unless ($current{'resetremove'}) {
-            $changes{'reset'} = 1;
+sub modify_usercreation {
+    my ($dom,%domconfig) = @_;
+    my ($resulttext,%curr_usercreation,%changes,%authallowed,%cancreate);
+    my $warningmsg;
+    if (ref($domconfig{'usercreation'}) eq 'HASH') {
+        foreach my $key (keys(%{$domconfig{'usercreation'}})) {
+            $curr_usercreation{$key} = $domconfig{'usercreation'}{$key};
         }
-    } elsif ($current{'resetremove'}) {
-        $changes{'reset'} = 1;
     }
-    if ($env{'form.passwords_customfile.filename'} ne '') {
-        my $servadm = $r->dir_config('lonAdmEMail');
-        my $servadm = $r->dir_config('lonAdmEMail');
-        my ($configuserok,$author_ok,$switchserver) =
-            &config_check($dom,$confname,$servadm);
-        my $error;
-        if ($configuserok eq 'ok') {
-            if ($switchserver) {
-                $error = &mt("Upload of file containing domain-specific text is not permitted to this server: [_1]",$switchserver);
-            } else {
-                if ($author_ok eq 'ok') {
-                    my ($result,$customurl) =
-                        &publishlogo($r,'upload','passwords_customfile',$dom,
-                                     $confname,'customtext/resetpw','','',$customfn);
-                    if ($result eq 'ok') {
-                        $newvalues{'resetcustom'} = $customurl;
-                        $changes{'reset'} = 1;
-                    } else {
-                        $error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$customfn,$result);
+    my @username_rule = &Apache::loncommon::get_env_multiple('form.username_rule');
+    my @id_rule = &Apache::loncommon::get_env_multiple('form.id_rule');
+    my @email_rule = &Apache::loncommon::get_env_multiple('form.email_rule');
+    my @contexts = ('author','course','requestcrs','selfcreate');
+    foreach my $item(@contexts) {
+        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 {
-                    $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].",$customfn,$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].",$customfn,$confname,$dom,$configuserok);
-        }
-        if ($error) {
-            &Apache::lonnet::logthis($error);
-            $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+            $cancreate{$item} = $env{'form.can_createuser_'.$item};
         }
-    } elsif ($current{'resetcustom'}) {
-        if ($env{'form.passwords_custom_del'}) {
-            $changes{'reset'} = 1;
-        } else {
-            $newvalues{'resetcustom'} = $current{'resetcustom'};
-        }
-    }
-    $env{'form.intauth_cost'} =~ s/^\s+|\s+$//g;
-    if (($env{'form.intauth_cost'} ne '') && ($env{'form.intauth_cost'} =~ /^\d+$/)) {
-        $save_defaults{'intauth_cost'} = $env{'form.intauth_cost'};
-        if ($save_defaults{'intauth_cost'} ne $curr_defaults{'intauth_cost'}) {
-            $changes{'intauth'} = 1;
-        }
-    } else {
-        $save_defaults{'intauth_cost'} = $curr_defaults{'intauth_cost'};
     }
-    if ($env{'form.intauth_check'} =~ /^(0|1|2)$/) {
-        $save_defaults{'intauth_check'} = $env{'form.intauth_check'};
-        if ($save_defaults{'intauth_check'} ne $curr_defaults{'intauth_check'}) {
-            $changes{'intauth'} = 1;
-        }
-    } else {
-        $save_defaults{'intauth_check'} = $curr_defaults{'intauth_check'};
-    }
-    if ($env{'form.intauth_switch'} =~ /^(0|1|2)$/) {
-        $save_defaults{'intauth_switch'} = $env{'form.intauth_switch'};
-        if ($save_defaults{'intauth_switch'} ne $curr_defaults{'intauth_switch'}) {
-            $changes{'intauth'} = 1;
-        }
-    } else {
-        $save_defaults{'intauth_check'} = $curr_defaults{'intauth_check'};
-    }
-    foreach my $item ('cost','check','switch') {
-        if ($save_defaults{'intauth_'.$item} ne $domdefaults{'intauth_'.$item}) {
-            $domdefaults{'intauth_'.$item} = $save_defaults{'intauth_'.$item};
-            $updatedefaults = 1;
-        }
-    }
-    foreach my $rule ('min','max','numsaved') {
-        $env{'form.passwords_'.$rule} =~ s/^\s+|\s+$//g;
-        my $ruleok;
-        if ($rule eq 'min') {
-            if ($env{'form.passwords_'.$rule} =~ /^\d+$/) {
-                if ($env{'form.passwords_'.$rule} >= $Apache::lonnet::passwdmin) {
-                    $ruleok = 1;
-                }
-            }
-        } elsif (($env{'form.passwords_'.$rule} =~ /^\d+$/) &&
-                 ($env{'form.passwords_'.$rule} ne '0')) {
-            $ruleok = 1;
-        }
-        if ($ruleok) {
-            $newvalues{$rule} = $env{'form.passwords_'.$rule};
-            if (exists($current{$rule})) {
-                if ($newvalues{$rule} ne $current{$rule}) {
-                    $changes{'rules'} = 1;
-                }
-            } elsif ($rule eq 'min') {
-                if ($staticdefaults{$rule} ne $newvalues{$rule}) {
-                    $changes{'rules'} = 1;
-                }
-            }
-        } elsif (exists($current{$rule})) {
-            $changes{'rules'} = 1;
-        }
-    }
-    my @posschars = &Apache::loncommon::get_env_multiple('form.passwords_chars');
-    my @chars;
-    foreach my $item (sort(@posschars)) {
-        if ($item =~ /^(uc|lc|num|spec)$/) {
-            push(@chars,$item);
-        }
-    }
-    $newvalues{'chars'} = \@chars;
-    unless ($changes{'rules'}) {
-        if (ref($current{'chars'}) eq 'ARRAY') {
-            my @diffs = &Apache::loncommon::compare_arrays($current{'chars'},\@chars);
-            if (@diffs > 0) {
-                $changes{'rules'} = 1;
-            }
+    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 {
-            if (@chars > 0) {
-                $changes{'rules'} = 1;
-            }
+            @{$cancreate{'statustocreate'}} = ();
         }
+        push(@contexts,'statustocreate');
     }
-    my %crsownerchg = (
-                        by => [],
-                        for => [],
-                      );
-    foreach my $item ('by','for') {
-        my @posstypes = &Apache::loncommon::get_env_multiple('form.passwords_crsowner_'.$item);
-        foreach my $type (sort(@posstypes)) {
-            if (grep(/^\Q$type\E$/,@oktypes)) {
-                push(@{$crsownerchg{$item}},$type);
-            }
-        }
-    }
-    $newvalues{'crsownerchg'} = \%crsownerchg;
-    if (ref($current{'crsownerchg'}) eq 'HASH') {
-        foreach my $item ('by','for') {
-            if (ref($current{'crsownerchg'}{$item}) eq 'ARRAY') {
-                my @diffs = &Apache::loncommon::compare_arrays($current{'crsownerchg'}{$item},$crsownerchg{$item});
-                if (@diffs > 0) {
-                    $changes{'crsownerchg'} = 1;
-                    last;
-                }
-            }
-        }
-    } elsif (!(ref($domconfig{passwords}) eq 'HASH')) {
-        foreach my $item ('by','for') {
-            if (@{$crsownerchg{$item}} > 0) {
-                $changes{'crsownerchg'} = 1;
-                last;
-            }
-        }
-    }
-
-    my %confighash = (
-                        defaults  => \%save_defaults,
-                        passwords => \%newvalues,
-                     );
-    &process_captcha('passwords',\%changes,$confighash{'passwords'},$domconfig{'passwords'});
-
-    my $putresult = &Apache::lonnet::put_dom('configuration',\%confighash,$dom);
-    if ($putresult eq 'ok') {
-        if (keys(%changes) > 0) {
-            $resulttext = &mt('Changes made: ').'<ul>';
-            foreach my $key ('reset','intauth','rules','crsownerchg') {
-                if ($changes{$key}) {
-                    unless ($key eq 'intauth') {
-                        $updateconf = 1;
-                    }
-                    $resulttext .= '<li>'.$titles{$key}.':<ul>';
-                    if ($key eq 'reset') {
-                        if ($confighash{'passwords'}{'captcha'} eq 'original') {
-                            $resulttext .= '<li>'.&mt('CAPTCHA validation set to use: original CAPTCHA').'</li>';
-                        } elsif ($confighash{'passwords'}{'captcha'} eq 'recaptcha') {
-                            $resulttext .= '<li>'.&mt('CAPTCHA validation set to use: reCAPTCHA').' '.
-                                           &mt('version: [_1]',$confighash{'passwords'}{'recaptchaversion'}).'<br />'.
-                                           &mt('Public key: [_1]',$confighash{'passwords'}{'recaptchapub'}).'</br>'.
-                                           &mt('Private key: [_1]',$confighash{'passwords'}{'recaptchapriv'}).'</li>';
-                        } else {
-                            $resulttext .= '<li>'.&mt('No CAPTCHA validation').'</li>';
-                        }
-                        if ($confighash{'passwords'}{'resetlink'}) {
-                            $resulttext .= '<li>'.&mt('Reset link expiration set to [quant,_1,hour]',$confighash{'passwords'}{'resetlink'}).'</li>';
-                        } else {
-                            $resulttext .= '<li>'.&mt('No reset link expiration set.').' '.
-                                                  &mt('Will default to 2 hours').'</li>';
-                        }
-                        if (ref($confighash{'passwords'}{'resetcase'}) eq 'ARRAY') {
-                            if (@{$confighash{'passwords'}{'resetcase'}} == 0) {
-                                $resulttext .= '<li>'.&mt('User input for username and/or e-mail address not case sensitive for "Forgot Password" web form').'</li>';
-                            } else {
-                                my $casesens;
-                                foreach my $type (@{$confighash{'passwords'}{'resetcase'}}) {
-                                    if ($type eq 'default') {
-                                        $casesens .= $othertitle.', ';
-                                    } elsif ($usertypes->{$type} ne '') {
-                                        $casesens .= $usertypes->{$type}.', ';
-                                    }
+    &process_captcha('cancreate',\%changes,\%cancreate,\%curr_usercreation);
+    if (ref($curr_usercreation{'cancreate'}) eq 'HASH') {
+        foreach my $item (@contexts) {
+            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);
                                 }
-                                $casesens =~ s/\Q, \E$//;
-                                $resulttext .= '<li>'.&mt('"Forgot Password" web form input for username and/or e-mail address is case-sensitive for: [_1]',$casesens).'</li>';
                             }
-                        } else {
-                            $resulttext .= '<li>'.&mt('Case-sensitivity not set for "Forgot Password" web form').' '.&mt('Will default to case-sensitive for username and/or e-mail address for all').'</li>';
                         }
-                        if ($confighash{'passwords'}{'resetprelink'} eq 'either') {
-                            $resulttext .= '<li>'.&mt('Users can enter either a username or an e-mail address in "Forgot Password" web form').'</li>';
-                        } else {
-                            $resulttext .= '<li>'.&mt('Users can enter both a username and an e-mail address in "Forgot Password" web form').'</li>';
+                    }
+                } else {
+                    if ($curr_usercreation{'cancreate'}{$item} eq '') {
+                        if (@{$cancreate{$item}} > 0) {
+                            if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                push(@{$changes{'cancreate'}},$item);
+                            }
                         }
-                        if (ref($confighash{'passwords'}{'resetpostlink'}) eq 'HASH') {
-                            my $output;
-                            if (ref($types) eq 'ARRAY') {
-                                foreach my $type (@{$types}) {
-                                    if (ref($confighash{'passwords'}{'resetpostlink'}{$type}) eq 'ARRAY') {
-                                        if (@{$confighash{'passwords'}{'resetpostlink'}{$type}} == 0) {
-                                            $output .= $usertypes->{$type}.' -- '.&mt('none');
-                                        } else {
-                                            $output .= $usertypes->{$type}.' -- '.
-                                                       join(', ',map { $titles{$_}; } (@{$confighash{'passwords'}{'resetpostlink'}{$type}})).'; ';
-                                        }
-                                    }
+                    } else {
+                        if ($curr_usercreation{'cancreate'}{$item} eq 'any') {
+                            if (@{$cancreate{$item}} < 3) {
+                                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                    push(@{$changes{'cancreate'}},$item);
                                 }
                             }
-                            if (ref($confighash{'passwords'}{'resetpostlink'}{'default'}) eq 'ARRAY') {
-                                if (@{$confighash{'passwords'}{'resetpostlink'}{'default'}} == 0) {
-                                    $output .= $othertitle.' -- '.&mt('none');
-                                } else {
-                                    $output .= $othertitle.' -- '.
-                                               join(', ',map { $titles{$_}; } (@{$confighash{'passwords'}{'resetpostlink'}{'default'}}));
+                        } elsif ($curr_usercreation{'cancreate'}{$item} eq 'none') {
+                            if (@{$cancreate{$item}} > 0) {
+                                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                    push(@{$changes{'cancreate'}},$item);
                                 }
                             }
-                            if ($output) {
-                                $resulttext .= '<li>'.&mt('Information required for new password form (by user type) set to: [_1]',$output).'</li>';
-                            } else {
-                                $resulttext .= '<li>'.&mt('Information required for new password form not set.').' '.&mt('Will default to requiring both the username and an e-mail address').'</li>';
-                            }
-                        } else {
-                            $resulttext .= '<li>'.&mt('Information required for new password form not set.').' '.&mt('Will default to requiring both the username and an e-mail address').'</li>';
-                        }
-                        if (ref($confighash{'passwords'}{'resetemail'}) eq 'ARRAY') {
-                            if (@{$confighash{'passwords'}{'resetemail'}} > 0) {
-                                $resulttext .= '<li>'.&mt('E-mail address(es) in LON-CAPA used for verification will include: [_1]',join(', ',map { $titles{$_}; } @{$confighash{'passwords'}{'resetemail'}})).'</li>';
-                            } else {
-                                $resulttext .= '<li>'.&mt('E-mail address(es) in LON-CAPA used for verification will include: [_1]',join(', ',map { $titles{$_}; } @{$staticdefaults{'resetemail'}})).'</li>';
-                            }
-                        } else {
-                            $resulttext .= '<li>'.&mt('E-mail address(es) in LON-CAPA usedfor verification will include: [_1]',join(', ',map { $titles{$_}; } @{$staticdefaults{'resetemail'}})).'</li>';
-                        }
-                        if ($confighash{'passwords'}{'resetremove'}) {
-                            $resulttext .= '<li>'.&mt('Preamble to "Forgot Password" web form not shown').'</li>';
-                        } else {
-                            $resulttext .= '<li>'.&mt('Preamble to "Forgot Password" web form is shown').'</li>';
-                        }
-                        if ($confighash{'passwords'}{'resetcustom'}) {
-                            my $customlink = &Apache::loncommon::modal_link($confighash{'passwords'}{'resetcustom'},
-                                                                            $titles{custom},600,500);
-                            $resulttext .= '<li>'.&mt('Preamble to "Forgot Password" form includes [_1]',$customlink).'</li>';
-                        } else {
-                            $resulttext .= '<li>'.&mt('No custom text included in preamble to "Forgot Password" form').'</li>';
-                        }
-                    } elsif ($key eq 'intauth') {
-                        foreach my $item ('cost','switch','check') {
-                            my $value = $save_defaults{$key.'_'.$item};
-                            if ($item eq 'switch') {
-                                my %optiondesc = &Apache::lonlocal::texthash (
-                                                     0 => 'No',
-                                                     1 => 'Yes',
-                                                     2 => 'Yes, and copy existing passwd file to passwd.bak file',
-                                                 );
-                                if ($value =~ /^(0|1|2)$/) {
-                                    $value = $optiondesc{$value};
-                                } else {
-                                    $value = &mt('none -- defaults to No');
-                                }
-                            } elsif ($item eq 'check') {
-                                my %optiondesc = &Apache::lonlocal::texthash (
-                                                     0 => 'No',
-                                                     1 => 'Yes, allow login then update passwd file using default cost (if higher)',
-                                                     2 => 'Yes, disallow login if stored cost is less than domain default',
-                                                 );
-                                if ($value =~ /^(0|1|2)$/) {
-                                    $value = $optiondesc{$value};
-                                } else {
-                                    $value = &mt('none -- defaults to No');
-                                }
+                        } elsif (!grep(/^$curr_usercreation{'cancreate'}{$item}$/,@{$cancreate{$item}})) {
+                            if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
+                                push(@{$changes{'cancreate'}},$item);
                             }
-                            $resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$titles{$key.'_'.$item},$value).'</li>';
                         }
-                    } elsif ($key eq 'rules') {
-                        foreach my $rule ('min','max','numsaved') {
-                            if ($confighash{'passwords'}{$rule} eq '') {
-                                if ($rule eq 'min') {
-                                    $resulttext .= '<li>'.&mt('[_1] not set.',$titles{$rule});
-                                                   ' '.&mt('Default of [_1] will be used',
-                                                           $Apache::lonnet::passwdmin).'</li>';
-                                } else {
-                                    $resulttext .= '<li>'.&mt('[_1] set to none',$titles{$rule}).'</li>';
+                    }
+                }
+                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);
                                 }
-                            } else {
-                                $resulttext .= '<li>'.&mt('[_1] set to [_2]',$titles{$rule},$confighash{'passwords'}{$rule}).'</li>';
                             }
-                        }
-                    } elsif ($key eq 'crsownerchg') {
-                        if (ref($confighash{'passwords'}{'crsownerchg'}) eq 'HASH') {
-                            if ((@{$confighash{'passwords'}{'crsownerchg'}{'by'}} == 0) ||
-                                (@{$confighash{'passwords'}{'crsownerchg'}{'for'}} == 0)) {
-                                $resulttext .= '<li>'.&mt('Course owner may not change student passwords.').'</li>';
-                            } else {
-                                my %crsownerstr;
-                                foreach my $item ('by','for') {
-                                    if (ref($confighash{'passwords'}{'crsownerchg'}{$item}) eq 'ARRAY') {
-                                        foreach my $type (@{$confighash{'passwords'}{'crsownerchg'}{$item}}) {
-                                            if ($type eq 'default') {
-                                                $crsownerstr{$item} .= $othertitle.', ';
-                                            } elsif ($usertypes->{$type} ne '') {
-                                                $crsownerstr{$item} .= $usertypes->{$type}.', ';
-                                            }
-                                        }
-                                        $crsownerstr{$item} =~ s/\Q, \E$//;
-                                    }
+                        } 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);
                                 }
-                                $resulttext .= '<li>'.&mt('Course owner (with status: [_1]) may change passwords for students (with status: [_2]).',
-                                           $crsownerstr{'by'},$crsownerstr{'for'}).'</li>';
                             }
-                        } else {
-                            $resulttext .= '<li>'.&mt('Course owner may not change student passwords.').'</li>';
                         }
                     }
-                    $resulttext .= '</ul></li>';
                 }
-            }
-            $resulttext .= '</ul>';
-        } else {
-            $resulttext = &mt('No changes made to password settings');
-        }
-        my $cachetime = 24*60*60;
-        if ($updatedefaults) {
-            &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
-            if (ref($lastactref) eq 'HASH') {
-                $lastactref->{'domdefaults'} = 1;
-            }
-        }
-        if ($updateconf) {
-            &Apache::lonnet::do_cache_new('passwdconf',$dom,$confighash{'passwords'},$cachetime);
-            if (ref($lastactref) eq 'HASH') {
-                $lastactref->{'passwdconf'} = 1;
-            }
-        }
-    } else {
-        $resulttext = '<span class="LC_error">'.
-            &mt('An error occurred: [_1]',$putresult).'</span>';
-    }
-    if ($errors) {
-        $resulttext .= '<p>'.&mt('The following errors occurred: ').'<ul>'.
-                       $errors.'</ul></p>';
-    }
-    return $resulttext;
-}
-
-sub modify_usercreation {
-    my ($dom,%domconfig) = @_;
-    my ($resulttext,%curr_usercreation,%changes,%authallowed,%cancreate,%save_usercreate);
-    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 'requestcrs') || ($item eq 'course') || ($item eq 'author')) {
-                            $curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
-                        } else {
-                            $save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item};
-                        }
-                    }
-                }
-            } elsif ($key eq 'email_rule') {
-                $save_usercreate{$key} = $domconfig{'usercreation'}{$key};
             } else {
-                $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');
-    foreach my $item(@contexts) {
-        $cancreate{$item} = $env{'form.can_createuser_'.$item};
-    }
-    if (ref($curr_usercreation{'cancreate'}) eq 'HASH') {
-        foreach my $item (@contexts) {
-            if ($curr_usercreation{'cancreate'}{$item} ne $cancreate{$item}) {
-                push(@{$changes{'cancreate'}},$item);
+                if ($curr_usercreation{'cancreate'}{$item} ne $cancreate{$item}) {
+                    push(@{$changes{'cancreate'}},$item);
+                }
             }
         }
     } elsif (ref($curr_usercreation{'cancreate'}) eq 'ARRAY') {
@@ -12520,6 +6909,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;
@@ -12550,592 +6954,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,$lastactref,%domconfig) = @_;
-    my ($resulttext,$warningmsg,%curr_usercreation,%curr_usermodify,%curr_inststatus,%changes,%cancreate);
-    my (%save_usercreate,%save_usermodify,%save_inststatus,@types,%usertypes);
-    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
-    my ($othertitle,$usertypesref,$typesref) = &Apache::loncommon::sorted_inst_types($dom);
-    if (ref($typesref) eq 'ARRAY') {
-        @types = @{$typesref};
-    }
-    if (ref($usertypesref) eq 'HASH') {
-        %usertypes = %{$usertypesref};
-    }
-    $usertypes{'default'} = $othertitle;
-#
-# 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 'recaptchaversion') || ($item eq 'notify') ||
-                            ($item eq 'emailusername') || ($item eq 'shibenv') ||
-                            ($item eq 'selfcreateprocessing') || ($item eq 'emailverified') ||
-                            ($item eq 'emailoptions') || ($item eq 'emaildomain')) {
-                            $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};
-            }
-        }
-    }
-#
-# Retrieve current domain configuration for institutional status types from $domconfig{'inststatus'}.
-#
-    if (ref($domconfig{'inststatus'}) eq 'HASH') {
-        foreach my $key (keys(%{$domconfig{'inststatus'}})) {
-            if ($key eq 'inststatusguest') {
-                $curr_inststatus{$key} = $domconfig{'inststatus'}{$key};
-            } else {
-                $save_inststatus{$key} = $domconfig{'inststatus'}{$key};
-            }
-        }
-    }
-
-    my @contexts = ('selfcreate');
-    @{$cancreate{'selfcreate'}} = ();
-    %{$cancreate{'emailusername'}} = ();
-    if (@types) {
-        @{$cancreate{'statustocreate'}} = ();
-    }
-    %{$cancreate{'selfcreateprocessing'}} = ();
-    %{$cancreate{'shibenv'}} = ();
-    %{$cancreate{'emailverified'}} = ();
-    %{$cancreate{'emailoptions'}} = ();
-    %{$cancreate{'emaildomain'}} = ();
     my %selfcreatetypes = (
                              sso   => 'users authenticated by institutional single sign on',
                              login => 'users authenticated by institutional log-in',
-                             email => 'users verified by e-mail',
+                             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 ($emailrules,$emailruleorder) = &Apache::lonnet::inst_userrules($dom,'email');
-
-    my (@statuses,%email_rule);
-    foreach my $item ('login','sso','email') {
-        if ($item eq 'email') {
-            if ($env{'form.cancreate_email'}) {
-                if (@types) {
-                    my @poss_statuses = &Apache::loncommon::get_env_multiple('form.selfassign');
-                    foreach my $status (@poss_statuses) {
-                        if (grep(/^\Q$status\E$/,(@types,'default'))) {
-                            push(@statuses,$status);
-                        }
-                    }
-                    $save_inststatus{'inststatusguest'} = \@statuses;
-                } else {
-                    push(@statuses,'default');
-                }
-                if (@statuses) {
-                    my %curr_rule;
-                    if (ref($curr_usercreation{'email_rule'}) eq 'ARRAY') {
-                        foreach my $type (@statuses) {
-                            $curr_rule{$type} = $curr_usercreation{'email_rule'};
-                        }
-                    } elsif (ref($curr_usercreation{'email_rule'}) eq 'HASH') {
-                        foreach my $type (@statuses) {
-                            $curr_rule{$type} = $curr_usercreation{'email_rule'}{$type};
-                        }
-                    }
-                    push(@{$cancreate{'selfcreate'}},'email');
-                    push(@contexts,('selfcreateprocessing','emailverified','emailoptions'));
-                    my %curremaildom;
-                    if (ref($curr_usercreation{'cancreate'}{'emaildomain'}) eq 'HASH') {
-                        %curremaildom = %{$curr_usercreation{'cancreate'}{'emaildomain'}};
-                    }
-                    foreach my $type (@statuses) {
-                        if ($env{'form.cancreate_emailprocess_'.$type} =~ /^(?:approval|automatic)$/) {
-                            $cancreate{'selfcreateprocessing'}{$type} = $env{'form.cancreate_emailprocess_'.$type};
-                        }
-                        if ($env{'form.cancreate_usernameoptions_'.$type} =~ /^(?:all|first|free)$/) {
-                            $cancreate{'emailverified'}{$type} = $env{'form.cancreate_usernameoptions_'.$type};
-                        }
-                        if ($env{'form.cancreate_emailoptions_'.$type} =~ /^(any|inst|noninst|custom)$/) {
-#
-# Retrieve rules (if any) governing types of e-mail address which may be used to verify a username.
-#
-                            my $chosen = $1;
-                            if (($chosen eq 'inst') || ($chosen eq 'noninst')) {
-                                my $emaildom;
-                                if ($env{'form.cancreate_emaildomain_'.$chosen.'_'.$type} =~ /^\@[^\@]+$/) {
-                                    $emaildom = $env{'form.cancreate_emaildomain_'.$chosen.'_'.$type};
-                                    $cancreate{'emaildomain'}{$type}{$chosen} = $emaildom;
-                                    if (ref($curremaildom{$type}) eq 'HASH') {
-                                        if (exists($curremaildom{$type}{$chosen})) {
-                                            if ($curremaildom{$type}{$chosen} ne $emaildom) {
-                                                push(@{$changes{'cancreate'}},'emaildomain');
-                                            }
-                                        } elsif ($emaildom ne '') {
-                                            push(@{$changes{'cancreate'}},'emaildomain');
-                                        }
-                                    } elsif ($emaildom ne '') {
-                                        push(@{$changes{'cancreate'}},'emaildomain');
-                                    }
-                                }
-                                $cancreate{'emailoptions'}{$type} = $env{'form.cancreate_emailoptions_'.$type};
-                            } elsif ($chosen eq 'custom') {
-                                my @possemail_rules = &Apache::loncommon::get_env_multiple('form.email_rule_'.$type);
-                                $email_rule{$type} = [];
-                                if (ref($emailrules) eq 'HASH') {
-                                    foreach my $rule (@possemail_rules) {
-                                        if (exists($emailrules->{$rule})) {
-                                            push(@{$email_rule{$type}},$rule);
-                                        }
-                                    }
-                                }
-                                if (@{$email_rule{$type}}) {
-                                    $cancreate{'emailoptions'}{$type} = 'custom';
-                                    if (ref($curr_rule{$type}) eq 'ARRAY') {
-                                        if (@{$curr_rule{$type}} > 0) {
-                                            foreach my $rule (@{$curr_rule{$type}}) {
-                                                if (!grep(/^\Q$rule\E$/,@{$email_rule{$type}})) {
-                                                    push(@{$changes{'email_rule'}},$type);
-                                                }
-                                            }
-                                        }
-                                        foreach my $type (@{$email_rule{$type}}) {
-                                            if (!grep(/^\Q$type\E$/,@{$curr_rule{$type}})) {
-                                                push(@{$changes{'email_rule'}},$type);
-                                            }
-                                        }
-                                    } else {
-                                        push(@{$changes{'email_rule'}},$type);
-                                    }
-                                }
-                            } else {
-                                $cancreate{'emailoptions'}{$type} = $env{'form.cancreate_emailoptions_'.$type};
-                            }
-                        }
-                    }
-                    if (@types) {
-                        if (ref($curr_inststatus{'inststatusguest'}) eq 'ARRAY') {
-                            my @changed = &Apache::loncommon::compare_arrays(\@statuses,$curr_inststatus{'inststatusguest'});
-                            if (@changed) {
-                                push(@{$changes{'inststatus'}},'inststatusguest');
-                            }
-                        } else {
-                            push(@{$changes{'inststatus'}},'inststatusguest');
-                        }
-                    }
-                } else {
-                    delete($env{'form.cancreate_email'});
-                    if (ref($curr_inststatus{'inststatusguest'}) eq 'ARRAY') {
-                        if (@{$curr_inststatus{'inststatusguest'}} > 0) {
-                            push(@{$changes{'inststatus'}},'inststatusguest');
-                        }
-                    }
-                }
-            } else {
-                $save_inststatus{'inststatusguest'} = [];
-                if (ref($curr_inststatus{'inststatusguest'}) eq 'ARRAY') {
-                    if (@{$curr_inststatus{'inststatusguest'}} > 0) {
-                        push(@{$changes{'inststatus'}},'inststatusguest');
-                    }
-                }
-            }
-        } else {
-            if ($env{'form.cancreate_'.$item}) {
-                push(@{$cancreate{'selfcreate'}},$item);
-            }
-        }
-    }
-    my (%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 (@statuses) {
-            foreach my $type (@statuses) {
-                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 verified by e-mail.
-#
-
-        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');
-        }
-
-        &process_captcha('cancreate',\%changes,\%savecaptcha,$curr_usercreation{'cancreate'});
-    }
-#  
-# 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'}})) {
-        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 (@types) {
-            @{$cancreate{'statustocreate'}} = &Apache::loncommon::get_env_multiple('form.statustocreate');
-            push(@contexts,'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 $type (keys(%{$curr_usercreation{'cancreate'}{$item}})) {
-                    if (ref($curr_usercreation{'cancreate'}{$item}{$type}) eq 'HASH') {
-                        foreach my $field (keys(%{$curr_usercreation{'cancreate'}{$item}{$type}})) {
-                            unless ($curr_usercreation{'cancreate'}{$item}{$type}{$field} eq $cancreate{$item}{$type}{$field}) {
-                                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
-                                    push(@{$changes{'cancreate'}},$item);
-                                }
-                            }
-                        }
-                    } elsif (($item eq 'selfcreateprocessing') || ($item eq 'emailverified') || ($item eq 'emailoptions')) {
-                        if ($cancreate{$item}{$type} ne $curr_usercreation{'cancreate'}{$item}{$type}) {
-                            if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
-                                push(@{$changes{'cancreate'}},$item);
-                            }
-                        }
-                    }
-                }
-                foreach my $type (keys(%{$cancreate{$item}})) {
-                    if (ref($cancreate{$item}{$type}) eq 'HASH') {
-                        foreach my $field (keys(%{$cancreate{$item}{$type}})) {
-                            if (ref($curr_usercreation{'cancreate'}{$item}{$type}) eq 'HASH') {
-                                unless ($curr_usercreation{'cancreate'}{$item}{$type}{$field} eq $cancreate{$item}{$type}{$field}) {
-                                    if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
-                                        push(@{$changes{'cancreate'}},$item);
-                                    }
-                                }
-                            } else {
-                                if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
-                                    push(@{$changes{'cancreate'}},$item);
-                                }
-                            }
-                        }
-                    } elsif (($item eq 'selfcreateprocessing') || ($item eq 'emailverified') || ($item eq 'emailoptions')) {
-                        if ($cancreate{$item}{$type} ne $curr_usercreation{'cancreate'}{$item}{$type}) {
-                            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 (($item eq 'selfcreateprocessing') || ($item eq 'emailverified') || ($item eq 'emailoptions')) {
-            if (ref($cancreate{$item}) eq 'HASH') {
-                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'}{'recaptchaversion'} = $savecaptcha{'recaptchaversion'};
-    $save_usercreate{'cancreate'}{'selfcreate'} = $cancreate{'selfcreate'};
-    if (ref($cancreate{'notify'}) eq 'HASH') {
-        $save_usercreate{'cancreate'}{'notify'} = $cancreate{'notify'};
-    }
-    if (ref($cancreate{'selfcreateprocessing'}) eq 'HASH') {
-        $save_usercreate{'cancreate'}{'selfcreateprocessing'} = $cancreate{'selfcreateprocessing'};
-    }
-    if (ref($cancreate{'emailverified'}) eq 'HASH') {
-        $save_usercreate{'cancreate'}{'emailverified'} = $cancreate{'emailverified'};
-    }
-    if (ref($cancreate{'emailoptions'}) eq 'HASH') {
-        $save_usercreate{'cancreate'}{'emailoptions'} = $cancreate{'emailoptions'};
-    }
-    if (ref($cancreate{'emaildomain'}) eq 'HASH') {
-        $save_usercreate{'cancreate'}{'emaildomain'} = $cancreate{'emaildomain'};
-    }
-    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{'email_rule'} = \%email_rule;
-
-    my %userconfig_hash = (
-            usercreation     => \%save_usercreate,
-            usermodification => \%save_usermodify,
-            inststatus       => \%save_inststatus,
-    );
-
-    my $putresult = &Apache::lonnet::put_dom('configuration',\%userconfig_hash,
-                                             $dom);
-#
-# Accumulate details of changes to domain configuration 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 = '';
+                    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>';
                             }
@@ -13144,51 +6995,23 @@ sub modify_selfcreation {
                                 if (grep(/^(login|sso)$/,@{$cancreate{$type}})) {
                                     if (ref($cancreate{'statustocreate'}) eq 'ARRAY') {
                                         if (@{$cancreate{'statustocreate'}} == 0) {
-                                            $chgtext .= '<span class="LC_warning">'.
-                                                        &mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts via log-in or single sign-on.").
-                                                        '</span><br />';
+                                            $chgtext .= '<br /><span class="LC_warning">'.&mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts.").'</span>';
                                         }
                                     }
                                 }
-                                if (grep(/^email$/,@{$cancreate{$type}})) {
-                                    if (!@statuses) {
-                                        $chgtext .= '<span class="LC_warning">'.
-                                                    &mt("However, e-mail verification is currently set to 'unavailable' for all user types (including 'other'), so self-creation of accounts is not possible for non-institutional log-in.").
-                                                    '</span><br />';
-
-                                    }
-                                }
                             }
                         }
-                    } elsif ($type eq 'shibenv') {
-                        if (keys(%{$cancreate{$type}}) == 0) {
-                            $chgtext .= &mt('Shibboleth-autheticated user does not use environment variables to set user information').'<br />'; 
-                        } 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>';
-                                    }
-                                } elsif (keys(%usertypes) > 0) {
+                                        $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):');
                                     } else {
@@ -13199,14 +7022,12 @@ sub modify_selfcreation {
                                         if ($case eq 'default') {
                                             $chgtext .= '<li>'.$othertitle.'</li>';
                                         } else {
-                                            $chgtext .= '<li>'.$usertypes{$case}.'</li>';
+                                            $chgtext .= '<li>'.$usertypes->{$case}.'</li>';
                                         }
                                     }
                                     $chgtext .= '</ul>';
                                     if (!grep(/^(login|sso)$/,@{$cancreate{'selfcreate'}})) {
-                                        $chgtext .= '<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 {
@@ -13216,146 +7037,23 @@ sub modify_selfcreation {
                                     $chgtext .= &mt('Although institutional affiliations permitted to create accounts were changed, self creation of accounts is not currently permitted for any authentication types.');
                                 }
                             }
-                            $chgtext .= '<br />';
-                        }
-                    } elsif ($type eq 'selfcreateprocessing') {
-                        my %choices = &Apache::lonlocal::texthash (
-                                                                    automatic => 'Automatic approval',
-                                                                    approval  => 'Queued for approval',
-                                                                  );
-                        if (@types) {
-                            if (@statuses) {
-                                $chgtext .= &mt('Processing of requests to create account with e-mail verification set as follows:').
-                                            '<ul>';
-                                foreach my $status (@statuses) {
-                                    if ($status eq 'default') {
-                                        $chgtext .= '<li>'.$othertitle.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$status}}.'</li>';
-                                    } else {
-                                        $chgtext .= '<li>'.$usertypes{$status}.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$status}}.'</li>';
-                                    }
-                                }
-                                $chgtext .= '</ul>';
-                            }
-                        } else {
-                            $chgtext .= &mt('Processing of requests to create account with e-mail verification set to: "[_1]"',
-                                            $choices{$cancreate{'selfcreateprocessing'}{'default'}});
-                        }
-                    } elsif ($type eq 'emailverified') {
-                        my %options = &Apache::lonlocal::texthash (
-                                                                    all   => 'Same as e-mail',
-                                                                    first => 'Omit @domain',
-                                                                    free  => 'Free to choose',
-                                                                  );
-                        if (@types) {
-                            if (@statuses) {
-                                $chgtext .= &mt('For self-created accounts verified by e-mail address, username is set as follows:').
-                                            '<ul>';
-                                foreach my $status (@statuses) {
-                                    if ($status eq 'default') {
-                                        $chgtext .= '<li>'.$othertitle.' -- '.$options{$cancreate{'emailverified'}{$status}}.'</li>';
-                                    } else {
-                                        $chgtext .= '<li>'.$usertypes{$status}.' -- '.$options{$cancreate{'emailverified'}{$status}}.'</li>';
-                                    }
-                                }
-                                $chgtext .= '</ul>';
-                            }
-                        } else {
-                            $chgtext .= &mt("For self-created accounts verified by e-mail address, user's username is: '[_1]'",
-                                            $options{$cancreate{'emailverified'}{'default'}});
-                        }
-                    } elsif ($type eq 'emailoptions') {
-                        my %options = &Apache::lonlocal::texthash (
-                                                                    any     => 'Any e-mail',
-                                                                    inst    => 'Institutional only',
-                                                                    noninst => 'Non-institutional only',
-                                                                    custom  => 'Custom restrictions',
-                                                                  );
-                        if (@types) {
-                            if (@statuses) {
-                                $chgtext .= &mt('For self-created accounts verified by e-mail address, requirements for e-mail address are as follows:').
-                                            '<ul>';
-                                foreach my $status (@statuses) {
-                                    if ($type eq 'default') {
-                                        $chgtext .= '<li>'.$othertitle.' -- '.$options{$cancreate{'emailoptions'}{$status}}.'</li>';
-                                    } else {
-                                        $chgtext .= '<li>'.$usertypes{$status}.' -- '.$options{$cancreate{'emailoptions'}{$status}}.'</li>';
-                                    }
-                                }
-                                $chgtext .= '</ul>';
-                            }
-                        } else {
-                            if ($cancreate{'emailoptions'}{'default'} eq 'any') {
-                                $chgtext .= &mt('For self-created accounts verified by e-mail address, any e-mail may be used');
-                            } else {
-                                $chgtext .= &mt('For self-created accounts verified by e-mail address, e-mail restricted to: "[_1]"',
-                                                $options{$cancreate{'emailoptions'}{'default'}});
-                            }
-                        }
-                    } elsif ($type eq 'emaildomain') {
-                        my $output;
-                        if (@statuses) {
-                            foreach my $type (@statuses) {
-                                if (ref($cancreate{'emaildomain'}{$type}) eq 'HASH') {
-                                    if ($cancreate{'emailoptions'}{$type} eq 'inst') {
-                                        if ($type eq 'default') {
-                                            if ((ref($cancreate{'emaildomain'}{$type}) ne 'HASH') ||
-                                                ($cancreate{'emaildomain'}{$type}{'inst'} eq '')) {
-                                                $output = '<li>'.$othertitle.' -- '.&mt('No restriction on e-mail domain').'</li>';
-                                            } else {
-                                                $output = '<li>'.$othertitle.' -- '.&mt("User's e-mail address needs to end: [_1]",
-                                                                                        $cancreate{'emaildomain'}{$type}{'inst'}).'</li>';
-                                            }
-                                        } else {
-                                            if ((ref($cancreate{'emaildomain'}{$type}) ne 'HASH') ||
-                                                ($cancreate{'emaildomain'}{$type}{'inst'} eq '')) {
-                                                $output = '<li>'.$usertypes{$type}.' -- '.&mt('No restriction on e-mail domain').'</li>';
-                                            } else {
-                                                $output = '<li>'.$usertypes{$type}.' -- '.&mt("User's e-mail address needs to end: [_1]",
-                                                                                              $cancreate{'emaildomain'}{$type}{'inst'}).'</li>';
-                                            }
-                                        }
-                                    } elsif ($cancreate{'emailoptions'}{$type} eq 'noninst') {
-                                        if ($type eq 'default') {
-                                            if ((ref($cancreate{'emaildomain'}{$type}) ne 'HASH') ||
-                                                ($cancreate{'emaildomain'}{$type}{'noninst'} eq '')) {
-                                                $output = '<li>'.$othertitle.' -- '.&mt('No restriction on e-mail domain').'</li>';
-                                            } else {
-                                                $output = '<li>'.$othertitle.' -- '.&mt("User's e-mail address must not end: [_1]",
-                                                                                        $cancreate{'emaildomain'}{$type}{'noninst'}).'</li>';
-                                            }
-                                        } else {
-                                            if ((ref($cancreate{'emaildomain'}{$type}) ne 'HASH') ||
-                                                ($cancreate{'emaildomain'}{$type}{'noninst'} eq '')) {
-                                                $output = '<li>'.$usertypes{$type}.' -- '.&mt('No restriction on e-mail domain').'</li>';
-                                            } else {
-                                                $output = '<li>'.$usertypes{$type}.' -- '.&mt("User's e-mail address must not end: [_1]",
-                                                                                                $cancreate{'emaildomain'}{$type}{'noninst'}).'</li>';
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        if ($output ne '') {
-                            $chgtext .= &mt('For self-created accounts verified by e-mail address:').
-                                        '<ul>'.$output.'</ul>';
                         }
                     } 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) {
@@ -13369,145 +7067,94 @@ sub modify_selfcreation {
                             $chgtext .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>';
                         }
                         $chgtext .= '</ul>';
-                    } elsif ($type eq 'recaptchaversion') {
-                        if ($savecaptcha{'captcha'} eq 'recaptcha') {
-                            $chgtext .= &mt('ReCAPTCHA set to version [_1]',$savecaptcha{$type});
-                        }
-                    } elsif ($type eq 'emailusername') {
-                        if (ref($cancreate{'emailusername'}) eq 'HASH') {
-                            if (@statuses) {
-                                foreach my $type (@statuses) {
-                                    if (ref($cancreate{'emailusername'}{$type}) eq 'HASH') {
-                                        if (keys(%{$cancreate{'emailusername'}{$type}}) > 0) {
-                                            $chgtext .= &mt('When self-creating account with e-mail verification, 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 verification, no information besides e-mail address will be provided by [_1].',"'$usertypes{$type}'").'<br />';
-                                        }
-                                    } else {
-                                        $chgtext .= &mt('When self creating account with e-mail verification, no information besides e-mail address will be provided by [_1].',"'$usertypes{$type}'").'<br />';
-                                    }
-                                }
-                            }
-                        }
-                    } elsif ($type eq 'notify') {
-                        my $numapprove = 0;
-                        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'};
-                                    $numapprove ++;
-                                }
-                            }
-                        }
-                        unless ($numapprove) {
-                            $chgtext .= &mt('No Domain Coordinators will receive notification of username requests requiring 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{'email_rule'}) eq 'ARRAY') && (@{$changes{'email_rule'}} > 0)) {
-                my ($emailrules,$emailruleorder) =
-                    &Apache::lonnet::inst_userrules($dom,'email');
-                foreach my $type (@{$changes{'email_rule'}}) {
-                    if (ref($email_rule{$type}) eq 'ARRAY') {
-                        my $chgtext = '<ul>';
-                        foreach my $rule (@{$email_rule{$type}}) {
-                            if (ref($emailrules->{$rule}) eq 'HASH') {
-                                $chgtext .= '<li>'.$emailrules->{$rule}{'name'}.'</li>';
-                            }
-                        }
-                        $chgtext .= '</ul>';
-                        my $typename;
-                        if (@types) {
-                            if ($type eq 'default') {
-                                $typename = $othertitle;
-                            } else {
-                                $typename = $usertypes{$type};
-                            }
-                            $chgtext .= &mt('(Affiliation: [_1])',$typename);
-                        }
-                        if (@{$email_rule{$type}} > 0) {
-                            $resulttext .= '<li>'.
-                                           &mt('Accounts may not be created by users verified by e-mail, for e-mail addresses of the following types: ',
-                                               $usertypes{$type}).
-                                           $chgtext.
-                                           '</li>';
-                        } else {
-                            $resulttext .= '<li>'.
-                                           &mt('There are now no restrictions on e-mail addresses which may be used for verification when a user requests an account.').
-                                           '</li>'.
-                                           &mt('(Affiliation: [_1])',$typename);
-                        }
+            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{'inststatus'}) eq 'ARRAY') {
-                if (ref($save_inststatus{'inststatusguest'}) eq 'ARRAY') {
-                    if (@{$save_inststatus{'inststatusguest'}} > 0) {
-                        my $chgtext = '<ul>';
-                        foreach my $type (@{$save_inststatus{'inststatusguest'}}) {
-                            $chgtext .= '<li>'.$usertypes{$type}.'</li>';
-                        }
-                        $chgtext .= '</ul>';
-                        $resulttext .= '<li>'.
-                                       &mt('A user will self-report one of the following affiliations when requesting an account verified by e-mail: ').
-                                          $chgtext.
-                                       '</li>';
-                    } else {
-                        $resulttext .= '<li>'.
-                                       &mt('No affiliations available for self-reporting when requesting an account verified by e-mail.').
-                                       '</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{'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 (keys(%usertypes) > 0) {
-                        if ($usertypes{$type} ne '') {
-                            $typename = $usertypes{$type};
-                        }
+            if (ref($changes{'email_rule'}) eq 'ARRAY') {
+                my ($emailrules,$emailruleorder) =
+                    &Apache::lonnet::inst_userrules($dom,'email');
+                my $chgtext = '<ul>';
+                foreach my $type (@email_rule) {
+                    if (ref($emailrules->{$type}) eq 'HASH') {
+                        $chgtext .= '<li>'.$emailrules->{$type}{'name'}.'</li>';
                     }
-                    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>');
+                }
+                $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>';
+                } else {
+                    $resulttext .= '<li>'.&mt('There are now no restrictions on e-mail addresses which may be used as a username when self-enrolling.').'</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 (@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>';
-            my $cachetime = 24*60*60;
-            $domdefaults{'inststatusguest'} = $save_inststatus{'inststatusguest'};
-            &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
-            if (ref($lastactref) eq 'HASH') {
-                $lastactref->{'domdefaults'} = 1;
-            }
         } 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">'.
@@ -13527,34 +7174,26 @@ 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'})) {
                 $changes->{'cancreate'} = ['captcha'];
             }
-        } elsif ($container eq 'passwords') {
-            $changes->{'reset'} = 1;
         } else {
             $changes->{'captcha'} = 1;
         }
     }
-    my ($newpub,$newpriv,$currpub,$currpriv,$newversion,$currversion);
+    my ($newpub,$newpriv,$currpub,$currpriv);
     if ($newsettings->{'captcha'} eq 'recaptcha') {
         $newpub = $env{'form.'.$container.'_recaptchapub'};
         $newpriv = $env{'form.'.$container.'_recaptchapriv'};
-        $newpub =~ s/[^\w\-]//g;
-        $newpriv =~ s/[^\w\-]//g;
+        $newpub =~ s/\W//g;
+        $newpriv =~ s/\W//g;
         $newsettings->{'recaptchakeys'} = {
                                              public  => $newpub,
                                              private => $newpriv,
                                           };
-        $newversion = $env{'form.'.$container.'_recaptchaversion'};
-        $newversion =~ s/\D//g;
-        if ($newversion ne '2') {
-            $newversion = 1;
-        }
-        $newsettings->{'recaptchaversion'} = $newversion;
     }
     if (ref($current->{'recaptchakeys'}) eq 'HASH') {
         $currpub = $current->{'recaptchakeys'}{'public'};
@@ -13566,25 +7205,6 @@ sub process_captcha {
                                               }
         }
     }
-    if ($current->{'captcha'} eq 'recaptcha') {
-        $currversion = $current->{'recaptchaversion'};
-        if ($currversion ne '2') {
-            $currversion = 1;
-        }
-    }
-    if ($currversion ne $newversion) {
-        if ($container eq 'cancreate') {
-            if (ref($changes->{'cancreate'}) eq 'ARRAY') {
-                push(@{$changes->{'cancreate'}},'recaptchaversion');
-            } elsif (!defined($changes->{'cancreate'})) {
-                $changes->{'cancreate'} = ['recaptchaversion'];
-            }
-        } elsif ($container eq 'passwords') {
-            $changes->{'reset'} = 1;
-        } else {
-            $changes->{'recaptchaversion'} = 1;
-        }
-    }
     if (($newpub ne $currpub) || ($newpriv ne $currpriv)) {
         if ($container eq 'cancreate') {
             if (ref($changes->{'cancreate'}) eq 'ARRAY') {
@@ -13592,10 +7212,8 @@ sub process_captcha {
             } elsif (!defined($changes->{'cancreate'})) {
                 $changes->{'cancreate'} = ['recaptchakeys'];
             }
-        } elsif ($container eq 'passwords') {
-            $changes->{'reset'} = 1;
         } else {
-            $changes->{'recaptchakeys'} = 1;
+            $changes->{'recaptchakeys'} = 1; 
         }
     }
     return;
@@ -13603,20 +7221,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');
@@ -13624,7 +7239,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);
@@ -13670,13 +7292,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});
@@ -13705,11 +7340,10 @@ 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 @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def',
-                 'portal_def');
+    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) {
         $newvalues{$item} = $env{'form.'.$item};
@@ -13759,171 +7393,41 @@ sub modify_defaults {
         }
         $domdefaults{$item} = $newvalues{$item};
     }
-    my %staticdefaults = (
-                           'intauth_cost'   => 10,
-                           'intauth_check'  => 0,
-                           'intauth_switch' => 0,
-                         );
-    foreach my $item ('intauth_cost','intauth_check','intauth_switch') {
-        if (exists($domdefaults{$item})) {
-            $newvalues{$item} = $domdefaults{$item};
-        } else {
-            $newvalues{$item} = $staticdefaults{$item};
-        }
-    }
     my %defaults_hash = (
                          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 %alltypes;
-    my @inststatusguest;
-    if (ref($currinststatus) eq 'HASH') {
-        if (ref($currinststatus->{'inststatusguest'}) eq 'ARRAY') {
-            foreach my $type (@{$currinststatus->{'inststatusguest'}}) {
-                unless (grep(/^\Q$type\E$/,@todelete)) {
-                    push(@inststatusguest,$type);
-                }
-            }
-        }
-    }
-    my ($currtitles,$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;
-                }
-            }
-            $currorder = join(',',@{$currinststatus->{'inststatusorder'}});
-            $currtitles =~ s/,$//;
-        }
-    }
-    if ($env{'form.addinststatus'}) {
-        my $newtype = $env{'form.addinststatus'};
-        $newtype =~ s/\W//g;
-        unless (exists($alltypes{$newtype})) {
-            $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;
-    foreach my $type (@allpos) {
-        unless (($type eq '') || (grep(/^\Q$type\E$/,@orderedstatus))) {
-            push(@orderedstatus,$type);
-        }
-    }
-    foreach my $type (keys(%alltypes)) {
-        unless (grep(/^\Q$type\E$/,@orderedstatus)) {
-            delete($alltypes{$type});
-        }
-    }
-    $defaults_hash{'inststatus'} = {
-                                     inststatustypes => \%alltypes,
-                                     inststatusorder => \@orderedstatus,
-                                     inststatusguest => \@inststatusguest,
-                                   };
-    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;
-    }
-    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 (@orderedstatus) {
-                            $resulttext .= '<li>'.&mt('Institutional user status types set to:').' ';
-                            foreach my $type (@orderedstatus) { 
-                                $resulttext .= $alltypes{$type}.', ';
-                            }
-                            $resulttext =~ s/, $//;
-                            $resulttext .= '</li>';
-                        } else {
-                            $resulttext .= '<li>'.&mt('Institutional user status types deleted').'</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');
@@ -13943,12 +7447,12 @@ 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';
     my $servadm = $r->dir_config('lonAdmEMail');
-    my ($configuserok,$author_ok,$switchserver) =
+    my ($configuserok,$author_ok,$switchserver) = 
         &config_check($dom,$confname,$servadm);
     if ($env{'form.scantronformat.filename'} ne '') {
         my $error;
@@ -13983,67 +7487,6 @@ sub modify_scantron {
             if ($env{'form.scantronformat_del'}) {
                 $confhash{'scantron'}{'scantronformat'} = '';
                 $changes{'scantronformat'} = 1;
-            } else {
-                $confhash{'scantron'}{'scantronformat'} = $domconfig{'scantron'}{'scantronformat'};
-            }
-        }
-    }
-    my @options = ('hdr','pad','rem');
-    my @fields = &scantroncsv_fields();
-    my %titles = &scantronconfig_titles();
-    my @formats = &Apache::loncommon::get_env_multiple('form.scantronconfig');
-    my ($newdat,$currdat,%newcol,%currcol);
-    if (grep(/^dat$/,@formats)) {
-        $confhash{'scantron'}{config}{dat} = 1;
-        $newdat = 1;
-    } else {
-        $newdat = 0;
-    }
-    if (grep(/^csv$/,@formats)) {
-        my %bynum;
-        foreach my $field (@fields) {
-            if ($env{'form.scantronconfig_csv_'.$field} =~ /^(\d+)$/) {
-                my $posscol = $1;
-                if (($posscol < 20) && (!$bynum{$posscol})) {
-                    $confhash{'scantron'}{config}{csv}{fields}{$field} = $posscol;
-                    $bynum{$posscol} = $field;
-                    $newcol{$field} = $posscol;
-                }
-            }
-        }
-        if (keys(%newcol)) {
-            foreach my $option (@options) {
-                if ($env{'form.scantroncsv_'.$option}) {
-                    $confhash{'scantron'}{config}{csv}{options}{$option} = 1;
-                }
-            }
-        }
-    }
-    $currdat = 1;
-    if (ref($domconfig{'scantron'}) eq 'HASH') {
-        if (ref($domconfig{'scantron'}{'config'}) eq 'HASH') {
-            unless (exists($domconfig{'scantron'}{'config'}{'dat'})) {
-                $currdat = 0;
-            }
-            if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') {
-                if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
-                    %currcol = %{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}};
-                }
-            }
-        }
-    }
-    if ($currdat != $newdat) {
-        $changes{'config'} = 1;
-    } else {
-        foreach my $field (@fields) {
-            if ($currcol{$field} ne '') {
-                if ($currcol{$field} ne $newcol{$field}) {
-                    $changes{'config'} = 1;
-                    last;
-                }
-            } elsif ($newcol{$field} ne '') {
-                $changes{'config'} = 1;
-                last;
             }
         }
     }
@@ -14054,64 +7497,26 @@ sub modify_scantron {
             if (keys(%changes) > 0) {
                 if (ref($confhash{'scantron'}) eq 'HASH') {
                     $resulttext = &mt('Changes made:').'<ul>';
-                    if ($changes{'scantronformat'}) {
-                        if ($confhash{'scantron'}{'scantronformat'} eq '') {
-                            $resulttext .= '<li>'.&mt('[_1] bubblesheet format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>';
-                        } else {
-                            $resulttext .= '<li>'.&mt('Custom bubblesheet format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>';
-                        }
-                    }
-                    if ($changes{'config'}) {
-                        if (ref($confhash{'scantron'}{'config'}) eq 'HASH') {
-                            if ($confhash{'scantron'}{'config'}{'dat'}) {
-                                $resulttext .= '<li>'.&mt('Bubblesheet data upload formats includes .dat format').'</li>';
-                            }
-                            if (ref($confhash{'scantron'}{'config'}{'csv'}) eq 'HASH') {
-                                if (ref($confhash{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
-                                    if (keys(%{$confhash{'scantron'}{'config'}{'csv'}{'fields'}})) {
-                                        $resulttext .= '<li>'.&mt('Bubblesheet data upload formats includes .csv format, with following fields/column numbers supported:').'<ul>';
-                                        foreach my $field (@fields) {
-                                            if ($confhash{'scantron'}{'config'}{'csv'}{'fields'}{$field} ne '') {
-                                                my $showcol = $confhash{'scantron'}{'config'}{'csv'}{'fields'}{$field} + 1;
-                                                $resulttext .= '<li>'.$titles{$field}.': '.$showcol.'</li>';
-                                            }
-                                        }
-                                        $resulttext .= '</ul></li>';
-                                        if (ref($confhash{'scantron'}{'config'}{'csv'}{'options'}) eq 'HASH') {
-                                            if (keys(%{$confhash{'scantron'}{'config'}{'csv'}{'options'}})) {
-                                                $resulttext .= '<li>'.&mt('Bubblesheet data upload formats includes .csv format, with following options:').'<ul>';
-                                                foreach my $option (@options) {
-                                                    if ($confhash{'scantron'}{'config'}{'csv'}{'options'}{$option} ne '') {
-                                                        $resulttext .= '<li>'.$titles{$option}.'</li>';
-                                                    }
-                                                }
-                                                $resulttext .= '</ul></li>';
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        } else {
-                            $resulttext .= '<li>'.&mt('No bubblesheet data upload formats set -- will default to assuming .dat format').'</li>';
-                        }
+                    if ($confhash{'scantron'}{'scantronformat'} eq '') {
+                        $resulttext .= '<li>'.&mt('[_1] bubblesheet format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>';
+                    } else {
+                        $resulttext .= '<li>'.&mt('Custom bubblesheet format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>';
                     }
                     $resulttext .= '</ul>';
                 } else {
                     $resulttext = &mt('Changes made to bubblesheet format file.');
                 }
+                $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 settings');
+                $resulttext = &mt('No changes made to bubblesheet format file');
             }
         } else {
             $resulttext = '<span class="LC_error">'.
                 &mt('An error occurred: [_1]',$putresult).'</span>';
         }
     } else {
-        $resulttext = &mt('No changes made to bubblesheet format settings');
+        $resulttext = &mt('No changes made to bubblesheet format file'); 
     }
     if ($errors) {
         $resulttext .= &mt('The following errors occurred: ').'<ul>'.
@@ -14121,12 +7526,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'}) {
@@ -14145,14 +7548,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;
@@ -14164,14 +7559,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)) {
@@ -14294,10 +7681,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'}) {
@@ -14312,12 +7695,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') {
@@ -14360,26 +7737,8 @@ sub modify_coursecategories {
                     }
                     $resulttext .= '</ul></li>';
                 }
-                &Apache::lonnet::do_cache_new('cats',$dom,$cathash,3600);
-                if (ref($lastactref) eq 'HASH') {
-                    $lastactref->{'cats'} = 1;
-                }
             }
             $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>';
@@ -14515,210 +7874,32 @@ sub modify_serverstatuses {
 }
 
 sub modify_helpsettings {
-    my ($r,$dom,$confname,$lastactref,%domconfig) = @_;
+    my ($r,$dom,$confname,%domconfig) = @_;
     my ($resulttext,$errors,%changes,%helphash);
     my %defaultchecked = ('submitbugs' => 'on');
     my @offon = ('off','on');
     my @toggles = ('submitbugs');
-    my %current = ('submitbugs' => '',
-                   'adhoc'      => {},
-                  );
     if (ref($domconfig{'helpsettings'}) eq 'HASH') {
-        %current = %{$domconfig{'helpsettings'}};
-    }
-    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
-    foreach my $item (@toggles) {
-        if ($defaultchecked{$item} eq 'on') { 
-            if ($current{$item} eq '') {
-                if ($env{'form.'.$item} eq '0') {
-                    $changes{$item} = 1;
-                }
-            } elsif ($current{$item} ne $env{'form.'.$item}) {
-                $changes{$item} = 1;
-            }
-        } elsif ($defaultchecked{$item} eq 'off') {
-            if ($current{$item} eq '') {
-                if ($env{'form.'.$item} eq '1') {
-                    $changes{$item} = 1;
-                }
-            } elsif ($current{$item} ne $env{'form.'.$item}) {
-                $changes{$item} = 1;
-            }
-        }
-        if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) {
-            $helphash{'helpsettings'}{$item} = $env{'form.'.$item};
-        }
-    }
-    my $maxnum = $env{'form.helproles_maxnum'};
-    my $confname = $dom.'-domainconfig';
-    my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_');
-    my (@allpos,%newsettings,%changedprivs,$newrole);
-    my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-    my @accesstypes = ('all','dh','da','none','status','inc','exc');
-    my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh','da']);
-    my %lt = &Apache::lonlocal::texthash(
-                    s      => 'system',
-                    d      => 'domain',
-                    order  => 'Display order',
-                    access => 'Role usage',
-                    all    => 'All with domain helpdesk or helpdesk assistant role',
-                    dh     => 'All with domain helpdesk role',
-                    da     => 'All with domain helpdesk assistant role',
-                    none   => 'None',
-                    status => 'Determined based on institutional status',
-                    inc    => 'Include all, but exclude specific personnel',
-                    exc    => 'Exclude all, but include specific personnel',
-    );
-    for (my $num=0; $num<=$maxnum; $num++) {
-        my ($prefix,$identifier,$rolename,%curr);
-        if ($num == $maxnum) {
-            next unless ($env{'form.newcusthelp'} == $maxnum);
-            $identifier = 'custhelp'.$num;
-            $prefix = 'helproles_'.$num;
-            $rolename = $env{'form.custhelpname'.$num};
-            $rolename=~s/[^A-Za-z0-9]//gs;
-            next if ($rolename eq '');
-            next if (exists($existing{'rolesdef_'.$rolename}));
-            my %newprivs = &Apache::lonuserutils::custom_role_update($rolename,$identifier);
-            my $result = &Apache::lonnet::definerole($rolename,$newprivs{'s'},$newprivs{'d'},
-                                                     $newprivs{'c'},$confname,$dom);
-            if ($result ne 'ok') {
-                $errors .= '<li><span class="LC_error">'.
-                           &mt('An error occurred storing the new custom role: [_1]',
-                           $result).'</span></li>';
-                next;
-            } else {
-                $changedprivs{$rolename} = \%newprivs;
-                $newrole = $rolename;
-            }
-        } else {
-            $prefix = 'helproles_'.$num;
-            $rolename = $env{'form.'.$prefix};
-            next if ($rolename eq '');
-            next unless (exists($existing{'rolesdef_'.$rolename}));
-            $identifier = 'custhelp'.$num;
-            my %newprivs = &Apache::lonuserutils::custom_role_update($rolename,$identifier);
-            my %currprivs;
-            ($currprivs{'s'},$currprivs{'d'},$currprivs{'c'}) =
-                split(/\_/,$existing{'rolesdef_'.$rolename});
-            foreach my $level ('c','d','s') {
-                if ($newprivs{$level} ne $currprivs{$level}) {
-                    my $result = &Apache::lonnet::definerole($rolename,$newprivs{'s'},$newprivs{'d'},
-                                                             $newprivs{'c'},$confname,$dom);
-                    if ($result ne 'ok') {
-                        $errors .= '<li><span class="LC_error">'.
-                                   &mt('An error occurred storing privileges for existing role [_1]: [_2]',
-                                       $rolename,$result).'</span></li>';
-                    } else {
-                        $changedprivs{$rolename} = \%newprivs;
-                    }
-                    last;
-                }
-            }
-            if (ref($current{'adhoc'}) eq 'HASH') {
-                if (ref($current{'adhoc'}{$rolename}) eq 'HASH') {
-                    %curr = %{$current{'adhoc'}{$rolename}};
-                }
-            }
-        }
-        my $newpos = $env{'form.'.$prefix.'_pos'};
-        $newpos =~ s/\D+//g;
-        $allpos[$newpos] = $rolename;
-        my $newdesc = $env{'form.'.$prefix.'_desc'};
-        $helphash{'helpsettings'}{'adhoc'}{$rolename}{'desc'} = $newdesc;
-        if ($curr{'desc'}) {
-            if ($curr{'desc'} ne $newdesc) {
-                $changes{'customrole'}{$rolename}{'desc'} = 1;
-                $newsettings{$rolename}{'desc'} = $newdesc;
-            }
-        } elsif ($newdesc ne '') {
-            $changes{'customrole'}{$rolename}{'desc'} = 1;
-            $newsettings{$rolename}{'desc'} = $newdesc;
-        }
-        my $access = $env{'form.'.$prefix.'_access'};
-        if (grep(/^\Q$access\E$/,@accesstypes)) {
-            $helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'} = $access;
-            if ($access eq 'status') {
-                my @statuses = &Apache::loncommon::get_env_multiple('form.'.$prefix.'_status');
-                if (scalar(@statuses) == 0) {
-                    $helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'} = 'none';
-                } else {
-                    my (@shownstatus,$numtypes);
-                    $helphash{'helpsettings'}{'adhoc'}{$rolename}{$access} = [];
-                    if (ref($types) eq 'ARRAY') {
-                        $numtypes = scalar(@{$types});
-                        foreach my $type (sort(@statuses)) {
-                            if ($type eq 'default') {
-                                push(@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}},$type);
-                            } elsif (grep(/^\Q$type\E$/,@{$types})) {
-                                push(@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}},$type);
-                                push(@shownstatus,$usertypes->{$type});
-                            }
-                        }
-                    }
-                    if (grep(/^default$/,@statuses)) {
-                        push(@shownstatus,$othertitle);
-                    }
-                    if (scalar(@shownstatus) == 1+$numtypes) {
-                        $helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'} = 'all';
-                        delete($helphash{'helpsettings'}{'adhoc'}{$rolename}{'status'});
-                    } else {
-                        $newsettings{$rolename}{'status'} = join(' '.&mt('or').' ',@shownstatus);
-                        if (ref($curr{'status'}) eq 'ARRAY') {
-                            my @diffs = &Apache::loncommon::compare_arrays($helphash{'helpsettings'}{'adhoc'}{$rolename}{$access},$curr{$access});
-                            if (@diffs) {
-                                $changes{'customrole'}{$rolename}{$access} = 1;
-                            }
-                        } elsif (@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}}) {
-                            $changes{'customrole'}{$rolename}{$access} = 1;
-                        }
-                    }
-                }
-            } elsif (($access eq 'inc') || ($access eq 'exc')) {
-                my @personnel = &Apache::loncommon::get_env_multiple('form.'.$prefix.'_staff_'.$access);
-                my @newspecstaff;
-                $helphash{'helpsettings'}{'adhoc'}{$rolename}{$access} = [];
-                foreach my $person (sort(@personnel)) {
-                    if ($domhelpdesk{$person}) {
-                        push(@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}},$person);
+        foreach my $item (@toggles) {
+            if ($defaultchecked{$item} eq 'on') { 
+                if ($domconfig{'helpsettings'}{$item} eq '') {
+                    if ($env{'form.'.$item} eq '0') {
+                        $changes{$item} = 1;
                     }
+                } elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) {
+                    $changes{$item} = 1;
                 }
-                if (ref($curr{$access}) eq 'ARRAY') {
-                    my @diffs = &Apache::loncommon::compare_arrays($helphash{'helpsettings'}{'adhoc'}{$rolename}{$access},$curr{$access});
-                    if (@diffs) {
-                        $changes{'customrole'}{$rolename}{$access} = 1;
+            } elsif ($defaultchecked{$item} eq 'off') {
+                if ($domconfig{'helpsettings'}{$item} eq '') {
+                    if ($env{'form.'.$item} eq '1') {
+                        $changes{$item} = 1;
                     }
-                } elsif (@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}}) {
-                    $changes{'customrole'}{$rolename}{$access} = 1;
-                }
-                foreach my $person (@{$helphash{'helpsettings'}{'adhoc'}{$rolename}{$access}}) {
-                    my ($uname,$udom) = split(/:/,$person);
-                        push(@newspecstaff,&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom,'lastname'),$uname,$udom));
+                } elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) {
+                    $changes{$item} = 1;
                 }
-                $newsettings{$rolename}{$access} = join(', ',sort(@newspecstaff));
             }
-        } else {
-            $helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'}= 'all';
-        }
-        unless ($curr{'access'} eq $access) {
-            $changes{'customrole'}{$rolename}{'access'} = 1;
-            $newsettings{$rolename}{'access'} = $lt{$helphash{'helpsettings'}{'adhoc'}{$rolename}{'access'}};
-        }
-    }
-    if (@allpos > 0) {
-        my $idx = 0;
-        foreach my $rolename (@allpos) {
-            if ($rolename ne '') {
-                $helphash{'helpsettings'}{'adhoc'}{$rolename}{'order'} = $idx;
-                if (ref($current{'adhoc'}) eq 'HASH') {
-                    if (ref($current{'adhoc'}{$rolename}) eq 'HASH') {
-                        if ($current{'adhoc'}{$rolename}{'order'} ne $idx) {
-                            $changes{'customrole'}{$rolename}{'order'} = 1;
-                            $newsettings{$rolename}{'order'} = $idx+1;
-                        }
-                    }
-                }
-                $idx ++;
+            if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) { 
+                $helphash{'helpsettings'}{$item} = $env{'form.'.$item};
             }
         }
     }
@@ -14726,142 +7907,42 @@ sub modify_helpsettings {
     if (keys(%changes) > 0) {
         $putresult = &Apache::lonnet::put_dom('configuration',\%helphash,$dom);
         if ($putresult eq 'ok') {
-            if (ref($helphash{'helpsettings'}) eq 'HASH') {
-                $domdefaults{'submitbugs'} = $helphash{'helpsettings'}{'submitbugs'};
-                if (ref($helphash{'helpsettings'}{'adhoc'}) eq 'HASH') {
-                    $domdefaults{'adhocroles'} = $helphash{'helpsettings'}{'adhoc'};
-                }
-            }
-            my $cachetime = 24*60*60;
-            &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
-            if (ref($lastactref) eq 'HASH') {
-                $lastactref->{'domdefaults'} = 1;
-            }
-        } else {
-            $errors .= '<li><span class="LC_error">'.
-                       &mt('An error occurred storing the settings: [_1]',
-                           $putresult).'</span></li>';
-        }
-    }
-    if ((keys(%changes) && ($putresult eq 'ok')) || (keys(%changedprivs))) {
-        $resulttext = &mt('Changes made:').'<ul>';
-        my (%shownprivs,@levelorder);
-        @levelorder = ('c','d','s');
-        if ((keys(%changes)) && ($putresult eq 'ok')) {
+            $resulttext = &mt('Changes made:').'<ul>';
             foreach my $item (sort(keys(%changes))) {
                 if ($item eq 'submitbugs') {
                     $resulttext .= '<li>'.&mt('Display link to: [_1] set to "'.$offon[$env{'form.'.$item}].'".',
                                               &Apache::loncommon::modal_link('http://bugs.loncapa.org',
                                               &mt('LON-CAPA bug tracker'),600,500)).'</li>';
-                } elsif ($item eq 'customrole') {
-                    if (ref($changes{'customrole'}) eq 'HASH') {
-                        my @keyorder = ('order','desc','access','status','exc','inc');
-                        my %keytext = &Apache::lonlocal::texthash(
-                                                                   order  => 'Order',
-                                                                   desc   => 'Role description',
-                                                                   access => 'Role usage',
-                                                                   status => 'Allowed institutional types',
-                                                                   exc    => 'Allowed personnel',
-                                                                   inc    => 'Disallowed personnel',
-                        );
-                        foreach my $role (sort(keys(%{$changes{'customrole'}}))) {
-                            if (ref($changes{'customrole'}{$role}) eq 'HASH') {
-                                if ($role eq $newrole) {
-                                    $resulttext .= '<li>'.&mt('New custom role added: [_1]',
-                                                              $role).'<ul>';
-                                } else {
-                                    $resulttext .= '<li>'.&mt('Existing custom role modified: [_1]',
-                                                              $role).'<ul>';
-                                }
-                                foreach my $key (@keyorder) {
-                                    if ($changes{'customrole'}{$role}{$key}) {
-                                        $resulttext .= '<li>'.&mt("[_1] set to: [_2]",
-                                                                  $keytext{$key},$newsettings{$role}{$key}).
-                                                       '</li>';
-                                    }
-                                }
-                                if (ref($changedprivs{$role}) eq 'HASH') {
-                                    $shownprivs{$role} = 1;
-                                    $resulttext .= '<li>'.&mt('Privileges set to :').'<ul>';
-                                    foreach my $level (@levelorder) {
-                                        foreach my $item (split(/\:/,$changedprivs{$role}{$level})) {
-                                            next if ($item eq '');
-                                            my ($priv) = split(/\&/,$item,2);
-                                            if (&Apache::lonnet::plaintext($priv)) {
-                                                $resulttext .= '<li>'.&Apache::lonnet::plaintext($priv);
-                                                unless ($level eq 'c') {
-                                                    $resulttext .= ' ('.$lt{$level}.')';
-                                                }
-                                                $resulttext .= '</li>';
-                                            }
-                                        }
-                                    }
-                                    $resulttext .= '</ul>';
-                                }
-                                $resulttext .= '</ul></li>';
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        if (keys(%changedprivs)) {
-            foreach my $role (sort(keys(%changedprivs))) {
-                unless ($shownprivs{$role}) {
-                    $resulttext .= '<li>'.&mt('Existing custom role modified: [_1]',
-                                              $role).'<ul>'.
-                                   '<li>'.&mt('Privileges set to :').'<ul>';
-                    foreach my $level (@levelorder) {
-                        foreach my $item (split(/\:/,$changedprivs{$role}{$level})) {
-                            next if ($item eq '');
-                            my ($priv) = split(/\&/,$item,2);
-                            if (&Apache::lonnet::plaintext($priv)) {
-                                $resulttext .= '<li>'.&Apache::lonnet::plaintext($priv);
-                                unless ($level eq 'c') {
-                                    $resulttext .= ' ('.$lt{$level}.')';
-                                }
-                                $resulttext .= '</li>';
-                            }
-                        }
-                    }
-                    $resulttext .= '</ul></li></ul></li>';
                 }
             }
+            $resulttext .= '</ul>';
+        } else {
+            $resulttext = &mt('No changes made to help settings');
+            $errors .= '<li><span class="LC_error">'.
+                       &mt('An error occurred storing the settings: [_1]',
+                           $putresult).'</span></li>';
         }
-        $resulttext .= '</ul>';
-    } else {
-        $resulttext = &mt('No changes made to help settings');
     }
     if ($errors) {
         $resulttext .= '<br />'.&mt('The following errors occurred: ').'<ul>'.
-                                    $errors.'</ul>';
+                       $errors.'</ul>';
     }
     return $resulttext;
 }
 
 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','mysqltables_official',
-                   'mysqltables_unofficial','mysqltables_community','mysqltables_textbook');
-    my @types = ('official','unofficial','community','textbook');
+                   'uploadquota_community');
+    my @types = ('official','unofficial','community');
     my %staticdefaults = (
                            anonsurvey_threshold => 10,
                            uploadquota          => 500,
-                           postsubmit           => 60,
-                           mysqltables          => 172800,
                          );
-    my %texoptions = (
-                        MathJax  => 'MathJax',
-                        mimetex  => &mt('Convert to Images'),
-                        tth      => &mt('TeX to HTML'),
-                     );
+
     $defaultshash{'coursedefaults'} = {};
 
     if (ref($domconfig{'coursedefaults'}) ne 'HASH') {
@@ -14891,7 +7972,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;
@@ -14900,184 +7981,60 @@ sub modify_coursedefaults {
                 }
                 $defaultshash{'coursedefaults'}{$item} = $newdef;
             } else {
-                my ($setting,$type) = ($item =~ /^(uploadquota|mysqltables)_(\w+)$/);
-                if (ref($domconfig{'coursedefaults'}{$setting}) eq 'HASH') {
-                    $currdef = $domconfig{'coursedefaults'}{$setting}{$type};
+                my ($type) = ($item =~ /^\Quploadquota_\E(\w+)$/);
+                if (ref($domconfig{'coursedefaults'}{'uploadquota'}) eq 'HASH') {
+                    $currdef = $domconfig{'coursedefaults'}{'uploadquota'}{$type};
                 }
                 $newdef =~ s/[^\w.\-]//g;
-                $defaultshash{'coursedefaults'}{$setting}{$type} = $newdef;
+                $defaultshash{'coursedefaults'}{'uploadquota'}{$type} = $newdef;
             }
             if ($currdef ne $newdef) {
+                my $staticdef;
                 if ($item eq 'anonsurvey_threshold') {
                     unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) {
                         $changes{$item} = 1;
                     }
-                } elsif ($item =~ /^(uploadquota|mysqltables)_/) {
-                    my $setting = $1;
-                    unless (($currdef eq '') && ($newdef == $staticdefaults{$setting})) {
-                        $changes{$setting} = 1;
+                } else {
+                    unless (($currdef eq '') && ($newdef == $staticdefaults{'uploadquota'})) {
+                        $changes{'uploadquota'} = 1;
                     }
                 }
             }
         }
-        my $texengine;
-        if ($env{'form.texengine'} =~ /^(MathJax|mimetex|tth)$/) {
-            $texengine = $env{'form.texengine'};
-            my $currdef = $domconfig{'coursedefaults'}{'texengine'};
-            if ($currdef eq '') {
-                unless ($texengine eq $Apache::lonnet::deftex) {
-                    $changes{'texengine'} = 1;
-                }
-            } elsif ($currdef ne $texengine) {
-                $changes{'texengine'} = 1;
-            }
-        }
-        if ($texengine ne '') {
-            $defaultshash{'coursedefaults'}{'texengine'} = $texengine;
-        }
-        my $currclone = $domconfig{'coursedefaults'}{'canclone'};
-        my @currclonecode;
-        if (ref($currclone) eq 'HASH') {
-            if (ref($currclone->{'instcode'}) eq 'ARRAY') {
-                @currclonecode = @{$currclone->{'instcode'}};
-            }
-        }
-        my $newclone;
-        if ($env{'form.canclone'} =~ /^(none|domain|instcode)$/) {
-            $newclone = $env{'form.canclone'};
-        }
-        if ($newclone eq 'instcode') {
-            my @newcodes = &Apache::loncommon::get_env_multiple('form.clonecode');
-            my (%codedefaults,@code_order,@clonecode);
-            &Apache::lonnet::auto_instcode_defaults($dom,\%codedefaults,
-                                                    \@code_order);
-            foreach my $item (@code_order) {
-                if (grep(/^\Q$item\E$/,@newcodes)) {
-                    push(@clonecode,$item);
-                }
-            }
-            if (@clonecode) {
-                $defaultshash{'coursedefaults'}{'canclone'} = { $newclone => \@clonecode };
-                my @diffs = &Apache::loncommon::compare_arrays(\@currclonecode,\@clonecode);
-                if (@diffs) {
-                    $changes{'canclone'} = 1;
-                }
-            } else {
-                $newclone eq '';
-            }
-        } elsif ($newclone ne '') {
-            $defaultshash{'coursedefaults'}{'canclone'} = $newclone;
-        }
-        if ($newclone ne $currclone) {
-            $changes{'canclone'} = 1;
-        }
-        my %credits;
-        foreach my $type (@types) {
-            unless ($type eq 'community') {
-                $credits{$type} = $env{'form.'.$type.'_credits'};
-                $credits{$type} =~ s/[^\d.]+//g;
-            }
-        }
-        if ((ref($domconfig{'coursedefaults'}{'coursecredits'}) ne 'HASH') &&
-            ($env{'form.coursecredits'} eq '1')) {
-            $changes{'coursecredits'} = 1;
-            foreach my $type (keys(%credits)) {
-                $defaultshash{'coursedefaults'}{'coursecredits'}{$type} = $credits{$type};
-            }
+        my $officialcreds = $env{'form.official_credits'};
+        $officialcreds =~ s/^[^\d\.]//g;
+        my $unofficialcreds = $env{'form.unofficial_credits'};
+        $unofficialcreds =~ s/^[^\d\.]//g;
+        if (ref($domconfig{'coursedefaults'}{'coursecredits'} ne 'HASH') &&
+                ($env{'form.coursecredits'} eq '1')) {
+                $changes{'coursecredits'} = 1;
         } else {
-            if ($env{'form.coursecredits'} eq '1') {
-                foreach my $type (@types) {
-                    unless ($type eq 'community') {
-                        if ($domconfig{'coursedefaults'}{'coursecredits'}{$type} ne $credits{$type}) {
-                            $changes{'coursecredits'} = 1;
-                        }
-                        $defaultshash{'coursedefaults'}{'coursecredits'}{$type} = $credits{$type};
-                    }
-                }
-            } elsif (ref($domconfig{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
-                foreach my $type (@types) {
-                    unless ($type eq 'community') {
-                        if ($domconfig{'coursedefaults'}{'coursecredits'}{$type}) {
-                            $changes{'coursecredits'} = 1;
-                            last;
-                        }
-                    }
-                }
+            if (($domconfig{'coursedefaults'}{'coursecredits'}{'official'} ne $officialcreds)  ||
+                ($domconfig{'coursedefaults'}{'coursecredits'}{'unofficial'} ne $unofficialcreds)) {
+                $changes{'coursecredits'} = 1;
             }
         }
-        if ($env{'form.postsubmit'} eq '1') {
-            $defaultshash{'coursedefaults'}{'postsubmit'}{'client'} = 'on';
-            my %currtimeout;
-            if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
-                if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'off') {
-                    $changes{'postsubmit'} = 1;
-                }
-                if (ref($domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') {
-                    %currtimeout = %{$domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}};
-                }
-            } else {
-                $changes{'postsubmit'} = 1;
-            }
-            foreach my $type (@types) {
-                my $timeout = $env{'form.'.$type.'_timeout'};
-                $timeout =~ s/\D//g;
-                if ($timeout == $staticdefaults{'postsubmit'}) {
-                    $timeout = '';
-                } elsif (($timeout eq '') || ($timeout =~ /^0+$/)) {
-                    $timeout = '0';
-                }
-                unless ($timeout eq '') {
-                    $defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}{$type} = $timeout;
-                }
-                if (exists($currtimeout{$type})) {
-                    if ($timeout ne $currtimeout{$type}) {
-                        $changes{'postsubmit'} = 1;
-                    }
-                } elsif ($timeout ne '') {
-                    $changes{'postsubmit'} = 1;
-                }
-            }
-        } else {
-            $defaultshash{'coursedefaults'}{'postsubmit'}{'client'} = 'off';
-            if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
-                if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'on') {
-                    $changes{'postsubmit'} = 1;
-                }
-            } else {
-                $changes{'postsubmit'} = 1;
-            }
+        $defaultshash{'coursedefaults'}{'coursecredits'} = {
+            official   => $officialcreds,
+            unofficial => $unofficialcreds,
         }
     }
     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'}) || ($changes{'mysqltables'}) || ($changes{'texengine'})) {
-                foreach my $item ('uselcmath','usejsme','texengine') {
-                    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'}) {
@@ -15087,42 +8044,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>';
-                    }
-                } elsif ($item eq 'texengine') {
-                    if ($defaultshash{'coursedefaults'}{'texengine'} ne '') {
-                        $resulttext .= '<li>'.&mt('Default method to display mathematics set to: "[_1]"',
-                                                  $texoptions{$defaultshash{'coursedefaults'}{'texengine'}}).'</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>';
@@ -15131,90 +8062,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 'mysqltables') {
-                    if (ref($defaultshash{'coursedefaults'}{'mysqltables'}) eq 'HASH') {
-                        $resulttext .= '<li>'.&mt('Lifetime of "Temporary" MySQL tables (student performance data) on homeserver').'<ul>'.
-                                       '<li>'.&mt('Official courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'official'}.'</b>').'</li>'.
-                                       '<li>'.&mt('Unofficial courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'unofficial'}.'</b>').'</li>'.
-                                       '<li>'.&mt('Textbook courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'textbook'}.'</b>').'</li>'.
-                                       '<li>'.&mt('Communities: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'community'}.'</b>').'</li>'.
-                                       '</ul>'.
-                                       '</li>';
-                    } else {
-                        $resulttext .= '<li>'.&mt('Lifetime of "Temporary" MySQL tables (student performance data) on homeserver remains default: [_1] s',$staticdefaults{'uploadquota'}).'</li>';
-                    }
-                } elsif ($item eq 'postsubmit') {
-                    if ($domdefaults{'postsubmit'} eq 'off') {
-                        $resulttext .= '<li>'.&mt('Submit button(s) remain enabled on page after student makes submission.');
-                    } else {
-                        $resulttext .= '<li>'.&mt('Submit button(s) disabled on page after student makes submission').'; ';
-                        if (ref($defaultshash{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
-                            $resulttext .= &mt('durations:').'<ul>';
-                            foreach my $type (@types) {
-                                $resulttext .= '<li>';
-                                my $timeout;
-                                if (ref($defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') {
-                                    $timeout = $defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}{$type};
-                                }
-                                my $display;
-                                if ($timeout eq '0') {
-                                    $display = &mt('unlimited');
-                                } elsif ($timeout eq '') {
-                                    $display = &mt('[quant,_1,second] (default)',$staticdefaults{'postsubmit'});
-                                } else {
-                                    $display = &mt('[quant,_1,second]',$timeout);
-                                }
-                                if ($type eq 'community') {
-                                    $resulttext .= &mt('Communities');
-                                } elsif ($type eq 'official') {
-                                    $resulttext .= &mt('Official courses');
-                                } elsif ($type eq 'unofficial') {
-                                    $resulttext .= &mt('Unofficial courses');
-                                } elsif ($type eq 'textbook') {
-                                    $resulttext .= &mt('Textbook courses');
-                                }
-                                $resulttext .= ' -- '.$display.'</li>';
-                            }
-                            $resulttext .= '</ul>';
-                        }
-                        $resulttext .= '</li>';
-                    }
                 } elsif ($item eq 'coursecredits') {
                     if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
                         if (($domdefaults{'officialcredits'} eq '') &&
-                            ($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>';
@@ -15228,247 +8096,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 = (
@@ -15485,7 +8114,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) {
@@ -15633,23 +8262,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') {
@@ -15660,27 +8273,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,
@@ -15693,17 +8287,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);
-            &Apache::lonnet::do_cache_new('usersessions',$dom,$defaultshash{'usersessions'},3600);
-            if (ref($lastactref) eq 'HASH') {
-                $lastactref->{'domdefaults'} = 1;
-                $lastactref->{'usersessions'} = 1;
-            }
             if (keys(%changes) > 0) {
                 my %lt = &usersession_titles();
                 $resulttext = &mt('Changes made:').'<ul>';
@@ -15715,8 +8301,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}) {
@@ -15766,21 +8351,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;
@@ -15802,16 +8372,15 @@ 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;
-    my (%currbalancer,%currtargets,%currrules,%existing,%currcookies);
+    my (%currbalancer,%currtargets,%currrules,%existing);
     if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
         %existing = %{$domconfig{'loadbalancing'}};
     }
     &get_loadbalancers_config(\%servers,\%existing,\%currbalancer,
-                              \%currtargets,\%currrules,\%currcookies);
+                              \%currtargets,\%currrules);
     my ($saveloadbalancing,%defaultshash,%changes);
     my ($alltypes,$othertypes,$titles) =
         &loadbalancing_titles($dom,$intdom,$usertypes,$types);
@@ -15822,7 +8391,7 @@ sub modify_loadbalancing {
         if ($balancer eq '') {
             next;
         }
-        if (!exists($servers{$balancer})) {
+        if (!exists($servers{$balancer})) { 
             if (exists($currbalancer{$balancer})) {
                 push(@{$changes{'delete'}},$balancer);
             }
@@ -15855,24 +8424,7 @@ sub modify_loadbalancing {
                         push(@offloadto,$target);
                     }
                 }
-            }
-            if ($env{'form.loadbalancing_target_'.$i.'_hosthere'} eq $sparetype) {
-                unless(grep(/^\Q$balancer\E$/,@offloadto)) {
-                    push(@offloadto,$balancer);
-                }
-            }
-            $defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype} = \@offloadto;
-        }
-        if ($env{'form.loadbalancing_cookie_'.$i}) {
-            $defaultshash{'loadbalancing'}{$balancer}{'cookie'} = 1;
-            if (exists($currbalancer{$balancer})) {
-                unless ($currcookies{$balancer}) {
-                    $changes{'curr'}{$balancer}{'cookie'} = 1;
-                }
-            }
-        } elsif (exists($currbalancer{$balancer})) {
-            if ($currcookies{$balancer}) {
-                $changes{'curr'}{$balancer}{'cookie'} = 1;
+                $defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype} = \@offloadto;
             }
         }
         if (ref($currtargets{$balancer}) eq 'HASH') {
@@ -15890,14 +8442,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) {
@@ -15906,15 +8458,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') {
@@ -15934,24 +8483,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;
@@ -15987,70 +8534,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>';
+                                        $resulttext .= '<li>'.&mt('Load Balancer: [_1] -- balancing for [_2] set to - "[_3]"',$balancer,$titles->{$type},$balancetext).'</li>';     
                                     }
                                 }
                             }
                         }
-                        if ($changes{'curr'}{$balancer}{'cookie'}) {
-                            $resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use enabled',
-                                                      $balancer).'</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;
-                                    }
-                                } 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 '') {
@@ -16111,9 +8605,24 @@ sub recurse_cat_deletes {
     return;
 }
 
+sub get_active_dcs {
+    my ($dom) = @_;
+    my $now = time;
+    my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc'],$now,$now);
+    my %domcoords;
+    my $numdcs = 0;
+    foreach my $server (keys(%dompersonnel)) {
+        foreach my $user (sort(keys(%{$dompersonnel{$server}}))) {
+            my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user);
+            $domcoords{$uname.':'.$udom} = $dompersonnel{$server}{$user};
+        }
+    }
+    return %domcoords;
+}
+
 sub active_dc_picker {
     my ($dom,$numinrow,$inputtype,$name,%currhash) = @_;
-    my %domcoords = &Apache::lonnet::get_active_domroles($dom,['dc']);
+    my %domcoords = &get_active_dcs($dom); 
     my @domcoord = keys(%domcoords);
     if (keys(%currhash)) {
         foreach my $dc (keys(%currhash)) {
@@ -16123,7 +8632,7 @@ sub active_dc_picker {
         }
     }
     @domcoord = sort(@domcoord);
-    my $numdcs = scalar(@domcoord);
+    my $numdcs = scalar(@domcoord); 
     my $rows = 0;
     my $table;
     if ($numdcs > 1) {
@@ -16167,31 +8676,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 ++;
         }
     }
@@ -16261,13 +8760,13 @@ sub lonbalance_targets_js {
     }
     push(@alltypes,'default','_LC_adv','_LC_author','_LC_internetdom','_LC_external');
     $allinsttypes = join("','",@alltypes);
-    my (%currbalancer,%currtargets,%currrules,%existing,%currcookies);
+    my (%currbalancer,%currtargets,%currrules,%existing);
     if (ref($settings) eq 'HASH') {
         %existing = %{$settings};
     }
     &get_loadbalancers_config($servers,\%existing,\%currbalancer,
-                              \%currtargets,\%currrules,\%currcookies);
-    my $balancers = join("','",sort(keys(%currbalancer)));
+                              \%currtargets,\%currrules);
+    my $balancers = join("','",sort(keys(%currbalancer))); 
     return <<"END";
 
 <script type="text/javascript">
@@ -16338,6 +8837,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';
@@ -16349,11 +8849,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);
+                    
                 }
             }
         }
@@ -16677,8 +9178,6 @@ function updateCaptcha(caller,context) {
     var pubitem;
     var privtext;
     var pubtext;
-    var versionitem;
-    var versiontext;
     if (document.getElementById(context+'_recaptchapub')) {
         pubitem = document.getElementById(context+'_recaptchapub');
     } else {
@@ -16699,16 +9198,6 @@ function updateCaptcha(caller,context) {
     } else {
         return;
     }
-    if (document.getElementById(context+'_recaptchaversion')) {
-        versionitem = document.getElementById(context+'_recaptchaversion');
-    } else {
-        return;
-    }
-    if (document.getElementById(context+'_recaptchavertxt')) {
-        versiontext = document.getElementById(context+'_recaptchavertxt');
-    } else {
-        return;
-    }
     if (caller.checked) {
         if (caller.value == 'recaptcha') {
             pubitem.type = 'text';
@@ -16717,16 +9206,11 @@ function updateCaptcha(caller,context) {
             privitem.size = '40';
             pubtext.innerHTML = "$lt{'pub'}";
             privtext.innerHTML = "$lt{'priv'}";
-            versionitem.type = 'text';
-            versionitem.size = '3';
-            versiontext.innerHTML = "$lt{'ver'}";
         } else {
             pubitem.type = 'hidden';
             privitem.type = 'hidden';
-            versionitem.type = 'hidden';
             pubtext.innerHTML = '';
             privtext.innerHTML = '';
-            versiontext.innerHTML = '';
         }
     }
     return;
@@ -16739,45 +9223,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';
-        var selfcreateRegExp = /^cancreate_emailverified/;
-        if (caller == 'emailoptions') {
-            optionsElement = domForm.cancreate_email; 
-        }
-        if (caller == 'studentsubmission') {
-            optionsElement = domForm.postsubmit;
-        }
-        if (caller == 'cloneinstcode') {
-            optionsElement = domForm.canclone;
-            checkval = 'instcode';
-        }
-        if (selfcreateRegExp.test(caller)) {
-            optionsElement = domForm.elements[caller];
-            checkval = 'other';
-            dispval = 'inline'
-        }
-        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';
             }
         }
     }
@@ -16798,33 +9264,7 @@ sub captcha_phrases {
                  original  => 'original (CAPTCHA)',
                  recaptcha => 'successor (ReCAPTCHA)',
                  notused   => 'unused',
-                 ver => 'ReCAPTCHA version (1 or 2)',
     );
 }
 
-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','usersessions',
-                      'ltitools','directorysrch','passwdconf','cats');
-    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;